diff --git a/src/views/company-manage/performance-manage/index.vue b/src/views/company-manage/performance-manage/index.vue index 4f5695e..9d1a23f 100644 --- a/src/views/company-manage/performance-manage/index.vue +++ b/src/views/company-manage/performance-manage/index.vue @@ -259,4 +259,3 @@ export default { }, } - diff --git a/src/views/data-create/epc-template/index.vue b/src/views/data-create/epc-template/index.vue index c7071a0..8d5ef83 100644 --- a/src/views/data-create/epc-template/index.vue +++ b/src/views/data-create/epc-template/index.vue @@ -204,4 +204,3 @@ export default { }, } - diff --git a/src/views/data-create/gw-template/components/addAndEditForm.vue b/src/views/data-create/gw-template/components/addAndEditForm.vue index 0b78599..d7255cc 100644 --- a/src/views/data-create/gw-template/components/addAndEditForm.vue +++ b/src/views/data-create/gw-template/components/addAndEditForm.vue @@ -989,6 +989,7 @@ export default { proPerf: item.proPerf, einDate: item.einDate, exitDate: item.exitDate, + perfId: item.perfId, }) }) } @@ -1086,6 +1087,9 @@ export default { this.companyKeyPersonList[this.keyTableCurrentIndex].proPerf = keyPersonPerformanceInnerSelectList .map((item) => item.proName) .join(',') + this.companyKeyPersonList[this.keyTableCurrentIndex].perfId = keyPersonPerformanceInnerSelectList + .map((item) => item.id) + .join(',') } else { this.$modal.msgError('请选择人员') return false @@ -1234,6 +1238,7 @@ export default { async addCompanyKeyPerson() { this.companyKeyPersonList.push({ userId: '', // 人员id + perfId: '', // 人员业绩id userName: '', // 人员名称 title: '', // 人员职称 diploma: '', // 执业资格证书 @@ -1652,16 +1657,16 @@ export default { JSON.parse( JSON.stringify({ ...item, - subcontractorPersonList: item.subPersonList, companyPerformanceList: item.subPerfList, + subcontractorPersonList: item.subPersonList, }), ), ) }) } } else { - this.$modal.msgError('详情获取失败' + res.message) this.$modal.closeDialogOuter() + this.$modal.msgError('详情获取失败' + res.message) } }, }, diff --git a/src/views/data-create/gw-template/index.vue b/src/views/data-create/gw-template/index.vue index 75cd395..bf33b23 100644 --- a/src/views/data-create/gw-template/index.vue +++ b/src/views/data-create/gw-template/index.vue @@ -1,5 +1,5 @@