From 3a2ef1392b06e41d58afa8c27a2628c3a463590e Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 24 Jun 2025 14:12:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E6=9D=BF=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E6=97=B6=E8=AF=81=E4=B9=A6=E7=9A=84=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/addAndEditForm.vue | 44 +++++++++++++++---
.../gw-template/components/addAndEditForm.vue | 46 ++++++++++++++++---
.../nw-template/components/addAndEditForm.vue | 44 +++++++++++++++---
3 files changed, 113 insertions(+), 21 deletions(-)
diff --git a/src/views/data-create/epc-template/components/addAndEditForm.vue b/src/views/data-create/epc-template/components/addAndEditForm.vue
index 122c948..3d27a7b 100644
--- a/src/views/data-create/epc-template/components/addAndEditForm.vue
+++ b/src/views/data-create/epc-template/components/addAndEditForm.vue
@@ -96,12 +96,14 @@
-
+
-
- {{ row.diploma }}
+
+
+
+ {{ `${item.diploma} (${item.diplomaNum})` }}
+
-
{{ row.idCard }}
@@ -225,9 +227,17 @@
-
+
-
+
+
+
+
+ {{ `${item.diploma} / ${item.diplomaNum}` }}
+
+
+
+
@@ -1091,6 +1101,7 @@ export default {
this.companyKeyPersonList[index].userName = rowInfo.userName
this.companyKeyPersonList[index].diploma = rowInfo.diploma
this.companyKeyPersonList[index].idCard = rowInfo.idCard
+ this.companyKeyPersonList[index].certificateList = rowInfo.certificateList
const keyPersonPerformanceInnerSelectList = this.waitSelectData.filter((item) =>
this.selectData.includes(item.perfId),
)
@@ -1112,7 +1123,8 @@ export default {
return false
} else {
// 选取需要的数据
- const { id, userName, title, diploma, diplomaNum, major, level } = this.selectedOtherPerson
+ const { id, userName, title, diploma, diplomaNum, major, level, certificateList } =
+ this.selectedOtherPerson
Object.assign(this.companyOtherPersonList[this.otherTableCurrentIndex], {
userId: id,
userName,
@@ -1121,6 +1133,7 @@ export default {
diplomaNum,
major,
level,
+ certificateList,
})
}
}
@@ -1272,6 +1285,7 @@ export default {
proPerf: '', // 人员业绩
einDate: '', // 计划入场事件
exitDate: '', // 计划退场事件
+ certificateList: [], // 执业资格证书
})
},
// 选择公司关键人员
@@ -1397,6 +1411,7 @@ export default {
diplomaNum: '', // 证书编号
major: '', // 专业
level: '', // 级别
+ certificateList: [], // 执业资格证书
})
},
// 选择公司其他人员
@@ -1660,6 +1675,21 @@ export default {
if (res.code === 200) {
const { name, comCoreList, comOtherList, comPerfList, subList } = res.data
this.addAndEditForm.name = name
+ // 判断关键人员和公司其他人员是否存在证书
+ if (comCoreList.length > 0) {
+ comCoreList.forEach((item) => {
+ if (item.certList && item.certList.length > 0) {
+ item.certificateList = item.certList
+ }
+ })
+ }
+ if (comOtherList.length > 0) {
+ comOtherList.forEach((item) => {
+ if (item.certList && item.certList.length > 0) {
+ item.certificateList = item.certList
+ }
+ })
+ }
// 根据详情回显数据
// 1. 回显公司业绩数据
this.companyPerformanceList = comPerfList
diff --git a/src/views/data-create/gw-template/components/addAndEditForm.vue b/src/views/data-create/gw-template/components/addAndEditForm.vue
index 15c7ee1..f88596f 100644
--- a/src/views/data-create/gw-template/components/addAndEditForm.vue
+++ b/src/views/data-create/gw-template/components/addAndEditForm.vue
@@ -96,12 +96,14 @@
-
+
-
- {{ row.diploma }}
+
+
+
+ {{ `${item.diploma} (${item.diplomaNum})` }}
+
-
{{ row.idCard }}
@@ -225,9 +227,17 @@
-
+
-
+
+
+
+
+ {{ `${item.diploma} / ${item.diplomaNum}` }}
+
+
+
+
@@ -1091,6 +1101,7 @@ export default {
this.companyKeyPersonList[index].userName = rowInfo.userName
this.companyKeyPersonList[index].diploma = rowInfo.diploma
this.companyKeyPersonList[index].idCard = rowInfo.idCard
+ this.companyKeyPersonList[index].certificateList = rowInfo.certificateList
const keyPersonPerformanceInnerSelectList = this.waitSelectData.filter((item) =>
this.selectData.includes(item.perfId),
)
@@ -1112,7 +1123,8 @@ export default {
return false
} else {
// 选取需要的数据
- const { id, userName, title, diploma, diplomaNum, major, level } = this.selectedOtherPerson
+ const { id, userName, title, diploma, diplomaNum, major, level, certificateList } =
+ this.selectedOtherPerson
Object.assign(this.companyOtherPersonList[this.otherTableCurrentIndex], {
userId: id,
userName,
@@ -1121,6 +1133,7 @@ export default {
diplomaNum,
major,
level,
+ certificateList,
})
}
}
@@ -1272,6 +1285,7 @@ export default {
proPerf: '', // 人员业绩
einDate: '', // 计划入场事件
exitDate: '', // 计划退场事件
+ certificateList: [], // 执业资格证书
})
},
// 选择公司关键人员
@@ -1336,6 +1350,7 @@ export default {
// 人员下拉选的change事件
async onChangePerson(value) {
+ console.log(value, 'value')
if (
this.companyKeyPersonList.length > 0 &&
this.companyKeyPersonList.some((item) => item.userId == value)
@@ -1397,6 +1412,7 @@ export default {
diplomaNum: '', // 证书编号
major: '', // 专业
level: '', // 级别
+ certificateList: [], // 执业资格证书
})
},
// 选择公司其他人员
@@ -1660,6 +1676,22 @@ export default {
if (res.code === 200) {
const { name, comCoreList, comOtherList, comPerfList, subList } = res.data
this.addAndEditForm.name = name
+
+ // 判断关键人员和公司其他人员是否存在证书
+ if (comCoreList.length > 0) {
+ comCoreList.forEach((item) => {
+ if (item.certList && item.certList.length > 0) {
+ item.certificateList = item.certList
+ }
+ })
+ }
+ if (comOtherList.length > 0) {
+ comOtherList.forEach((item) => {
+ if (item.certList && item.certList.length > 0) {
+ item.certificateList = item.certList
+ }
+ })
+ }
// 根据详情回显数据
// 1. 回显公司业绩数据
this.companyPerformanceList = comPerfList
diff --git a/src/views/data-create/nw-template/components/addAndEditForm.vue b/src/views/data-create/nw-template/components/addAndEditForm.vue
index da08357..dccb852 100644
--- a/src/views/data-create/nw-template/components/addAndEditForm.vue
+++ b/src/views/data-create/nw-template/components/addAndEditForm.vue
@@ -96,12 +96,14 @@
-
+
-
- {{ row.diploma }}
+
+
+
+ {{ `${item.diploma} (${item.diplomaNum})` }}
+
-
{{ row.idCard }}
@@ -225,9 +227,17 @@
-
+
-
+
+
+
+
+ {{ `${item.diploma} / ${item.diplomaNum}` }}
+
+
+
+
@@ -1091,6 +1101,7 @@ export default {
this.companyKeyPersonList[index].userName = rowInfo.userName
this.companyKeyPersonList[index].diploma = rowInfo.diploma
this.companyKeyPersonList[index].idCard = rowInfo.idCard
+ this.companyKeyPersonList[index].certificateList = rowInfo.certificateList
const keyPersonPerformanceInnerSelectList = this.waitSelectData.filter((item) =>
this.selectData.includes(item.perfId),
)
@@ -1112,7 +1123,8 @@ export default {
return false
} else {
// 选取需要的数据
- const { id, userName, title, diploma, diplomaNum, major, level } = this.selectedOtherPerson
+ const { id, userName, title, diploma, diplomaNum, major, level, certificateList } =
+ this.selectedOtherPerson
Object.assign(this.companyOtherPersonList[this.otherTableCurrentIndex], {
userId: id,
userName,
@@ -1121,6 +1133,7 @@ export default {
diplomaNum,
major,
level,
+ certificateList,
})
}
}
@@ -1272,6 +1285,7 @@ export default {
proPerf: '', // 人员业绩
einDate: '', // 计划入场事件
exitDate: '', // 计划退场事件
+ certificateList: [], // 执业资格证书
})
},
// 选择公司关键人员
@@ -1397,6 +1411,7 @@ export default {
diplomaNum: '', // 证书编号
major: '', // 专业
level: '', // 级别
+ certificateList: [], // 执业资格证书
})
},
// 选择公司其他人员
@@ -1660,6 +1675,21 @@ export default {
if (res.code === 200) {
const { name, comCoreList, comOtherList, comPerfList, subList } = res.data
this.addAndEditForm.name = name
+ // 判断关键人员和公司其他人员是否存在证书
+ if (comCoreList.length > 0) {
+ comCoreList.forEach((item) => {
+ if (item.certList && item.certList.length > 0) {
+ item.certificateList = item.certList
+ }
+ })
+ }
+ if (comOtherList.length > 0) {
+ comOtherList.forEach((item) => {
+ if (item.certList && item.certList.length > 0) {
+ item.certificateList = item.certList
+ }
+ })
+ }
// 根据详情回显数据
// 1. 回显公司业绩数据
this.companyPerformanceList = comPerfList