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 @@
- {{ $t('edt') }} + {{ $t('edit') }} {{ $t('delete') }}
@@ -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 @@ @@ -23,28 +23,28 @@ @@ -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')) }) }, // 选择用户得到用户名