From 6feeade30878d3f1e0c8b89549cfa61ddbd8542a Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Fri, 20 Jun 2025 18:19:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../key-person/components/addAndEditForm.vue | 63 ++++++++++++++-----
.../components/addAndEditForm.vue | 29 ++++++---
.../company-manage/other-person/index.vue | 6 +-
3 files changed, 69 insertions(+), 29 deletions(-)
diff --git a/src/views/company-manage/key-person/components/addAndEditForm.vue b/src/views/company-manage/key-person/components/addAndEditForm.vue
index 3ecabac..bd82863 100644
--- a/src/views/company-manage/key-person/components/addAndEditForm.vue
+++ b/src/views/company-manage/key-person/components/addAndEditForm.vue
@@ -151,25 +151,50 @@
show-word-limit
placeholder="请输入资格证书"
v-model="item.diploma"
+ v-if="formType === 2"
>
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -292,6 +317,7 @@ export default {
fileViewUrl: process.env.VUE_APP_BASE_API + '/files',
deleteFileList: [],
uploadOuterVisible: false,
+ diplomaList: [{ name: '注册建造师' }, { name: '项目经理B证' }], // 资格证书列表
addAndEditForm: {
userName: '', // 姓名
idCard: '', // 身份证号码
@@ -650,6 +676,9 @@ export default {
handler(newVal) {
if (newVal && Object.keys(newVal).length > 0) {
Object.assign(this.addAndEditForm, { ...newVal })
+ // if (!['注册建造师', '项目经理B证'].includes(newVal.diploma)) {
+ // this.diplomaList.push({ name: newVal.diploma })
+ // }
this.addAndEditForm.idCardFront = this.addAndEditForm.tbFileSourceVoList
.filter((item) => item.fileType == 1)
.map((e) => {
diff --git a/src/views/company-manage/other-person/components/addAndEditForm.vue b/src/views/company-manage/other-person/components/addAndEditForm.vue
index 99f6625..66244fe 100644
--- a/src/views/company-manage/other-person/components/addAndEditForm.vue
+++ b/src/views/company-manage/other-person/components/addAndEditForm.vue
@@ -116,6 +116,17 @@
/>
+
+
+
+
+
@@ -343,13 +354,13 @@ export default {
trigger: 'blur',
},
],
- diplomaNum: [
- {
- required: true,
- message: '请输入证书编码',
- trigger: 'blur',
- },
- ],
+ // diplomaNum: [
+ // {
+ // required: true,
+ // message: '请输入证书编码',
+ // trigger: 'blur',
+ // },
+ // ],
isNormal: [
{
required: true,
@@ -398,7 +409,7 @@ export default {
workType, // 职工类型
major, // 专业
// diploma, // 资格证书
- // diplomaNum, // 证书编码
+ diplomaNum, // 证书编码
// level, // 级别
// isNormal, // 养老保险
idCardFront, // 身份证正面
@@ -537,7 +548,7 @@ export default {
title,
major,
// diploma,
- // diplomaNum,
+ diplomaNum,
// level,
// isNormal,
tbFileSourceVoList,
diff --git a/src/views/company-manage/other-person/index.vue b/src/views/company-manage/other-person/index.vue
index b679507..c65f4cd 100644
--- a/src/views/company-manage/other-person/index.vue
+++ b/src/views/company-manage/other-person/index.vue
@@ -168,7 +168,7 @@ export default {
{ label: '职称', prop: 'title' },
// { label: '资格证书', prop: 'diploma' },
// { label: '级别', prop: 'level' },
- // { label: '证书编号', prop: 'diplomaNum' },
+ { label: '证书号', prop: 'diplomaNum' },
{ label: '专业', prop: 'major' },
// { label: '养老保险', prop: 'isNormal', isSlot: true },
{ label: '职工类型', prop: 'workType', isSlot: true },
@@ -219,7 +219,7 @@ export default {
workType, // 职工类型
major, // 专业
// diploma, // 资格证书
- // diplomaNum, // 证书编码
+ diplomaNum, // 证书编码
// level, // 级别
// isNormal, // 养老保险
id,
@@ -234,7 +234,7 @@ export default {
workType,
major,
// diploma,
- // diplomaNum,
+ diplomaNum,
// level,
// isNormal,
id,