From ae92767bff14f1bd913e75906b41a56f48742b0b Mon Sep 17 00:00:00 2001
From: baoyu <102349094+Bytq@users.noreply.github.com>
Date: Tue, 9 Apr 2024 16:47:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=2083389=EF=BC=8C=E5=9B=BD?=
 =?UTF-8?q?=E5=86=85=E5=A4=96=E6=94=BF=E7=AD=96-=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=92=8C=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2--=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E7=9A=84=E4=B8=89=E4=B8=AA=E5=AD=97=E6=AE=B5=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../policy/components/advancedSearch.vue      | 18 ++--
 .../policy/components/editDrawer.vue          | 89 ++++++++++---------
 .../policyWarehousing/components/Basic.vue    | 24 ++---
 3 files changed, 69 insertions(+), 62 deletions(-)

diff --git a/src/pages/policyRegulation/policy/components/advancedSearch.vue b/src/pages/policyRegulation/policy/components/advancedSearch.vue
index 0f27c01b5..c99d950e3 100644
--- a/src/pages/policyRegulation/policy/components/advancedSearch.vue
+++ b/src/pages/policyRegulation/policy/components/advancedSearch.vue
@@ -71,10 +71,11 @@
               <!--                label="备注（最终政策发布）"-->
               <!--                title="备注（最终政策发布）"-->
               <!--              />-->
-              <InputFormItem
-                v-model="lawsStandInfoSearch.lawsKeyPoint"
-                label="政策要点"
-                title="政策要点"
+              <SelectMultipleFormItem
+                  v-model="lawsStandInfoSearch.lawsLabel"
+                  label="标签"
+                  title="标签"
+                  :options="dict.lawsLabelOptions"
               />
               <InputFormItem
                 v-model="lawsStandInfoSearch.lawsRemark"
@@ -133,11 +134,10 @@
                 label="参考消息"
                 title="参考消息"
               />
-              <SelectMultipleFormItem
-                v-model="lawsStandInfoSearch.lawsLabel"
-                label="标签"
-                title="标签"
-                :options="dict.lawsLabelOptions"
+              <InputFormItem
+                  v-model="lawsStandInfoSearch.lawsKeyPoint"
+                  label="政策要点"
+                  title="政策要点"
               />
               <InputFormItem
                 v-model="lawsStandInfoSearch.lawsOriginalLink"
diff --git a/src/pages/policyRegulation/policy/components/editDrawer.vue b/src/pages/policyRegulation/policy/components/editDrawer.vue
index 07e5fdf8e..1d12232ca 100644
--- a/src/pages/policyRegulation/policy/components/editDrawer.vue
+++ b/src/pages/policyRegulation/policy/components/editDrawer.vue
@@ -291,59 +291,61 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item prop="lawsLabel" label-width="150px" class="add-form-item">
-                  <template slot="label">标签</template>
-                  <el-select
-                    v-model="sarLawsStandEO.lawsLabel"
-                    multiple
-                    placeholder="请选择标签"
-                    clearable
-                  >
-                    <el-option
-                      v-for="opt in lawsLabelOptions"
-                      :key="opt.value"
-                      :value="opt.value === undefined ? '' :opt.value"
-                      :label="opt.label"
+              <el-col :span="24" style="border-bottom: 1px dashed #e5e5e5" class="lawsKeyPoint">
+                <el-col :span="12">
+                  <el-form-item prop="lawsLabel" label-width="150px" class="add-form-item" style="border-bottom: 0px solid">
+                    <template slot="label">标签</template>
+                    <el-select
+                        v-model="sarLawsStandEO.lawsLabel"
+                        multiple
+                        placeholder="请选择标签"
+                        clearable
                     >
-                      {{ opt.label }}
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item
-                  label="政策原文链接"
-                  prop="lawsOriginalLink"
-                  label-width="150px"
-                  class="add-form-item"
-                  title="政策原文链接"
-                >
-                  <el-input
-                    v-model="sarLawsStandEO.lawsOriginalLink"
-                    placeholder="政策原文链接"
-                    clearable
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <CustomTextarea
-                  v-model="sarLawsStandEO.lawsKeyPoint"
-                  :config="{
+                      <el-option
+                          v-for="opt in lawsLabelOptions"
+                          :key="opt.value"
+                          :value="opt.value === undefined ? '' :opt.value"
+                          :label="opt.label"
+                      >
+                        {{ opt.label }}
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <CustomTextarea
+                      v-model="sarLawsStandEO.lawsKeyPoint"
+                      :config="{
                     attrName: '政策要点',
                     attrField: 'lawsKeyPoint'
                   }"
-                />
+                  />
+                </el-col>
               </el-col>
               <el-col :span="24">
                 <CustomTextarea
-                  v-model="sarLawsStandEO.lawsRemark"
-                  :config="{
+                    v-model="sarLawsStandEO.lawsRemark"
+                    :config="{
                     attrName: '备注',
                     attrField: 'lawsRemark'
                   }"
                 />
               </el-col>
+              <el-col :span="24">
+                <el-form-item
+                    label="政策原文链接"
+                    prop="lawsOriginalLink"
+                    label-width="150px"
+                    class="add-form-item"
+                    title="政策原文链接"
+                >
+                  <el-input
+                      v-model="sarLawsStandEO.lawsOriginalLink"
+                      placeholder="政策原文链接"
+                      clearable
+                  />
+                </el-form-item>
+              </el-col>
 
             <!--#region-->
             <!--<el-col :span="12">-->
@@ -1682,6 +1684,11 @@ export default {
 </script>
 
 <style scoped lang="less">
+.lawsKeyPoint{
+  /deep/ .add-form-item{
+    border-bottom: 0;
+  }
+}
 .drawer-content {
   padding: 0 19px;
   overflow-y: auto;
diff --git a/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/Basic.vue b/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/Basic.vue
index 0d4ff0034..c75437e6e 100644
--- a/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/Basic.vue
+++ b/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/Basic.vue
@@ -178,28 +178,28 @@
           />
         </el-col>
         <el-col :span="12">
-          <InputFormItem
-            v-model="form.lawsOriginalLink"
-            label="政策原文链接"
-            prop="lawsOriginalLink"
-            :disabled="disabled"
+          <TextareaFormItem
+              v-model="form.lawsKeyPoint"
+              label="政策要点"
+              prop="lawsKeyPoint"
+              :disabled="disabled"
           />
         </el-col>
         <el-col :span="24">
           <el-row>
             <el-col :span="12">
               <TextareaFormItem
-                  v-model="form.lawsKeyPoint"
-                  label="政策要点"
-                  prop="lawsKeyPoint"
+                  v-model="form.lawsRemark"
+                  label="备注"
+                  prop="lawsRemark"
                   :disabled="disabled"
               />
             </el-col>
             <el-col :span="12">
-              <TextareaFormItem
-                  v-model="form.lawsRemark"
-                  label="备注"
-                  prop="lawsRemark"
+              <InputFormItem
+                  v-model="form.lawsOriginalLink"
+                  label="政策原文链接"
+                  prop="lawsOriginalLink"
                   :disabled="disabled"
               />
             </el-col>