修改模板新增时证书的回显

src/views/data-create/epc-template/components/addAndEditForm.vue

@@ -96,12 +96,14 @@
                         </template>
                     </el-table-column>
                     <el-table-column align="center" label="职称" prop="title" show-overflow-tooltip />
-                    <el-table-column align="center" label="职业资格证书/身份证" width="200">
+                    <el-table-column align="center" label="职业资格证书/身份证" width="200" show-overflow-tooltip>
                         <template slot-scope="{ row }">
-                            <span>
+                            <span v-if="row.certificateList.length > 0">
-                                {{ row.diploma }}
+                                <!-- {{ row.diploma }} -->
+                                <span v-for="(item, index) in row.certificateList" :key="index">
+                                    {{ `${item.diploma} (${item.diplomaNum})` }} <br />
+                                </span>
                             </span>
-                            <br />
                             <span>
                                 {{ row.idCard }}
                             </span>
@@ -225,9 +227,17 @@
                         </template>
                     </el-table-column>
                     <el-table-column align="center" label="职称" show-overflow-tooltip prop="title" />
-                    <el-table-column align="center" label="证书名称" show-overflow-tooltip prop="diploma" />
+                    <!-- <el-table-column align="center" label="证书名称" show-overflow-tooltip prop="diploma" /> -->
                     <el-table-column align="center" label="级别" show-overflow-tooltip prop="level" />
-                    <el-table-column align="center" label="证书编号" show-overflow-tooltip prop="diplomaNum" />
+                    <el-table-column align="center" label="证书名称/证书编号" show-overflow-tooltip>
+                        <template slot-scope="{ row }">
+                            <span v-if="row.certificateList.length > 0">
+                                <span v-for="(item, index) in row.certificateList" :key="index">
+                                    {{ `${item.diploma} / ${item.diplomaNum}` }} <br />
+                                </span>
+                            </span>
+                        </template>
+                    </el-table-column>
                     <el-table-column align="center" label="专业" show-overflow-tooltip prop="major" />
                     <el-table-column align="center" label="操作" v-if="formType !== 2" width="80">
                         <template slot-scope="scope">
@@ -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

src/views/data-create/gw-template/components/addAndEditForm.vue

@@ -96,12 +96,14 @@
                         </template>
                     </el-table-column>
                     <el-table-column align="center" label="职称" prop="title" show-overflow-tooltip />
-                    <el-table-column align="center" label="职业资格证书/身份证" width="200">
+                    <el-table-column align="center" label="职业资格证书/身份证" width="200" show-overflow-tooltip>
                         <template slot-scope="{ row }">
-                            <span>
+                            <span v-if="row.certificateList.length > 0">
-                                {{ row.diploma }}
+                                <!-- {{ row.diploma }} -->
+                                <span v-for="(item, index) in row.certificateList" :key="index">
+                                    {{ `${item.diploma} (${item.diplomaNum})` }} <br />
+                                </span>
                             </span>
-                            <br />
                             <span>
                                 {{ row.idCard }}
                             </span>
@@ -225,9 +227,17 @@
                         </template>
                     </el-table-column>
                     <el-table-column align="center" label="职称" show-overflow-tooltip prop="title" />
-                    <el-table-column align="center" label="证书名称" show-overflow-tooltip prop="diploma" />
+                    <!-- <el-table-column align="center" label="证书名称" show-overflow-tooltip prop="diploma" /> -->
                     <el-table-column align="center" label="级别" show-overflow-tooltip prop="level" />
-                    <el-table-column align="center" label="证书编号" show-overflow-tooltip prop="diplomaNum" />
+                    <el-table-column align="center" label="证书名称/证书编号" show-overflow-tooltip>
+                        <template slot-scope="{ row }">
+                            <span v-if="row.certificateList.length > 0">
+                                <span v-for="(item, index) in row.certificateList" :key="index">
+                                    {{ `${item.diploma} / ${item.diplomaNum}` }} <br />
+                                </span>
+                            </span>
+                        </template>
+                    </el-table-column>
                     <el-table-column align="center" label="专业" show-overflow-tooltip prop="major" />
                     <el-table-column align="center" label="操作" v-if="formType !== 2" width="80">
                         <template slot-scope="scope">
@@ -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

src/views/data-create/nw-template/components/addAndEditForm.vue

@@ -96,12 +96,14 @@
                         </template>
                     </el-table-column>
                     <el-table-column align="center" label="职称" prop="title" show-overflow-tooltip />
-                    <el-table-column align="center" label="职业资格证书/身份证" width="200">
+                    <el-table-column align="center" label="职业资格证书/身份证" width="200" show-overflow-tooltip>
                         <template slot-scope="{ row }">
-                            <span>
+                            <span v-if="row.certificateList.length > 0">
-                                {{ row.diploma }}
+                                <!-- {{ row.diploma }} -->
+                                <span v-for="(item, index) in row.certificateList" :key="index">
+                                    {{ `${item.diploma} (${item.diplomaNum})` }} <br />
+                                </span>
                             </span>
-                            <br />
                             <span>
                                 {{ row.idCard }}
                             </span>
@@ -225,9 +227,17 @@
                         </template>
                     </el-table-column>
                     <el-table-column align="center" label="职称" show-overflow-tooltip prop="title" />
-                    <el-table-column align="center" label="证书名称" show-overflow-tooltip prop="diploma" />
+                    <!-- <el-table-column align="center" label="证书名称" show-overflow-tooltip prop="diploma" /> -->
                     <el-table-column align="center" label="级别" show-overflow-tooltip prop="level" />
-                    <el-table-column align="center" label="证书编号" show-overflow-tooltip prop="diplomaNum" />
+                    <el-table-column align="center" label="证书名称/证书编号" show-overflow-tooltip>
+                        <template slot-scope="{ row }">
+                            <span v-if="row.certificateList.length > 0">
+                                <span v-for="(item, index) in row.certificateList" :key="index">
+                                    {{ `${item.diploma} / ${item.diplomaNum}` }} <br />
+                                </span>
+                            </span>
+                        </template>
+                    </el-table-column>
                     <el-table-column align="center" label="专业" show-overflow-tooltip prop="major" />
                     <el-table-column align="center" label="操作" v-if="formType !== 2" width="80">
                         <template slot-scope="scope">
@@ -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