From d0d7e4f064f256638a530564fba62aa2bc2d3818 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 13 Oct 2023 10:22:24 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E8=81=94=E8=B0=83=E8=81=94=E7=BB=9C?=
 =?UTF-8?q?=E4=BA=BA=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contactManage/ContactManageList.vue       | 12 +++----
 .../modules/ContactManageModal.vue            | 34 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/views/system/contactManage/ContactManageList.vue b/src/views/system/contactManage/ContactManageList.vue
index 9a0e508c..970207fc 100644
--- a/src/views/system/contactManage/ContactManageList.vue
+++ b/src/views/system/contactManage/ContactManageList.vue
@@ -44,7 +44,7 @@
 
         <!--    操作栏   -->
         <div slot="action" slot-scope="{record}" class="action-span-cell">
-          <a @click="handleEdit(record)" class="table-ope-btn" v-has="'system:contactManage:edit'">{{ $t('edt') }}</a>
+          <a @click="handleEdit(record)" class="table-ope-btn" v-has="'system:contactManage:edit'">{{ $t('edit') }}</a>
           <a-divider type="vertical" />
           <a @click="handleDelete(record.id)" class="table-ope-btn" v-has="'system:contactManage:delete'">{{ $t('delete') }}</a>
         </div>
@@ -76,28 +76,28 @@ export default {
           title: this.$t('system.contact.departName'),
           align: 'center',
           width: 180,
-          dataIndex: 'departName',
+          dataIndex: 'departId_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 标准化工程师
           title: this.$t('system.contact.standardizationEngineer'),
           align: 'center',
           width: 180,
-          dataIndex: 'standardizationEngineer',
+          dataIndex: 'engineerId_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 联络人
           title: this.$t('system.contact.contactPerson'),
           align: 'center',
           width: 180,
-          dataIndex: 'contactPerson',
+          dataIndex: 'contactId_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 部门联络人主管级领导
           title: this.$t('system.contact.contactPersonSupervisorLevelLeader'),
           align: 'center',
           width: 240,
-          dataIndex: 'contactPersonSupervisorLevelLeader',
+          dataIndex: 'leaderId_dictText',
           scopedSlots: { customRender: 'text' }
         },
         {
@@ -109,7 +109,7 @@ export default {
         }
       ],
       url: {
-        list: ''
+        list: '/laws/system/lawsContactManage/page'
       }
     }
   }
diff --git a/src/views/system/contactManage/modules/ContactManageModal.vue b/src/views/system/contactManage/modules/ContactManageModal.vue
index 85a173c0..865eb97c 100644
--- a/src/views/system/contactManage/modules/ContactManageModal.vue
+++ b/src/views/system/contactManage/modules/ContactManageModal.vue
@@ -14,7 +14,7 @@
         <!--  部门名称  -->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('system.contact.departName')">
           <j-select-depart
-            v-decorator.trim="[ 'departName', validatorRules.departName]"
+            v-decorator.trim="[ 'departId', validatorRules.departId]"
             :multi="false"
             :backDepart="true"
             :treeOpera="true">
@@ -23,28 +23,28 @@
         <!--  标准化工程师  -->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('system.contact.standardizationEngineer')">
           <user-selection :placeholder="$t('pleaseSelect')+$t('system.contact.standardizationEngineer')"
-                          v-decorator.trim="[ 'standardizationEngineer', validatorRules.standardizationEngineer]"
-                          filedName="standardizationEngineer"
+                          v-decorator.trim="[ 'engineerId', validatorRules.engineerId]"
+                          filedName="engineerId"
                           @nameChange="userSelectNameChange"
-                          :nameStr="model.standardizationEngineer_dictText"
+                          :nameStr="model.engineerId_dictText"
                           type="radio" />
         </a-form-item>
         <!--  联络人  -->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('system.contact.contactPerson')">
           <user-selection :placeholder="$t('pleaseSelect')+$t('system.contact.contactPerson')"
-                          v-decorator.trim="[ 'contactPerson', validatorRules.contactPerson]"
-                          filedName="contactPerson"
+                          v-decorator.trim="[ 'contactId', validatorRules.contactId]"
+                          filedName="contactId"
                           @nameChange="userSelectNameChange"
-                          :nameStr="model.contactPerson_dictText"
+                          :nameStr="model.contactId_dictText"
                           type="radio" />
         </a-form-item>
         <!--  部门联络人主管级领导  -->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('system.contact.contactPersonSupervisorLevelLeader')">
           <user-selection :placeholder="$t('pleaseSelect')+$t('system.contact.contactPersonSupervisorLevelLeader')"
-                          v-decorator.trim="[ 'contactPersonSupervisorLevelLeader', validatorRules.contactPersonSupervisorLevelLeader]"
-                          filedName="contactPersonSupervisorLevelLeader"
+                          v-decorator.trim="[ 'leaderId', validatorRules.leaderId]"
+                          filedName="leaderId"
                           @nameChange="userSelectNameChange"
-                          :nameStr="model.contactPersonSupervisorLevelLeader_dictText"
+                          :nameStr="model.leaderId_dictText"
                           type="radio" />
         </a-form-item>
       </a-form>
@@ -78,28 +78,28 @@ export default {
       },
       validatorRules: {
         // 部门名称
-        departName: {
+        departId: {
           rules: [
             { required: true, message: this.$t('pleaseEnter') + this.$t('system.contact.departName') }
           ],
           validateTrigger: 'blur'
         },
         // 标准化工程师
-        standardizationEngineer: {
+        engineerId: {
           rules: [
             { required: true, message: this.$t('pleaseEnter') + this.$t('system.contact.standardizationEngineer') }
           ],
           validateTrigger: 'change'
         },
         // 联络人
-        contactPerson: {
+        contactId: {
           rules: [
             { required: true, message: this.$t('pleaseEnter') + this.$t('system.contact.contactPerson') }
           ],
           validateTrigger: 'change'
         },
         // 部门联络人主管级领导
-        contactPersonSupervisorLevelLeader: {
+        leaderId: {
           rules: [
             { required: true, message: this.$t('pleaseEnter') + this.$t('system.contact.contactPersonSupervisorLevelLeader') }
           ],
@@ -107,8 +107,8 @@ export default {
         }
       },
       url: {
-        add: '',
-        edit: ''
+        add: '/laws/system/lawsContactManage/add',
+        edit: '/laws/system/lawsContactManage/edit'
       }
     }
   },
@@ -121,7 +121,7 @@ export default {
       this.form.resetFields()
       this.model = Object.assign({}, record)
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'departName', 'standardizationEngineer', 'contactPerson', 'contactPersonSupervisorLevelLeader'))
+        this.form.setFieldsValue(pick(this.model, 'departId', 'engineerId', 'contactId', 'leaderId'))
       })
     },
     // 选择用户得到用户名