From 680c4f9e4e8b079593c8e57c100b92890e70960d Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期日, 14 三月 2021 14:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/Informationinput.vue | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index 9ad4b6d..90ca9bc 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -909,7 +909,7 @@
</el-col>
<el-col :span="24">
<el-form-item label="相关证件" prop="certificateList">
- <el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件">
+ <el-select v-model="empBaseInfoForm.certificateList" multiple placeholder="请选择相关证件">
<el-option
v-for="dict in certificateListOptions"
:key="dict.dicItemCode"
@@ -4284,6 +4284,11 @@
},
editEmpBase(row) {
this.isAdd = false
+ let certificateList = []
+ if (row.certificateList && typeof row.certificateList === 'string') {
+ certificateList = row.certificateList.split(',')
+ row.certificateList = certificateList
+ }
this.empBaseInfoForm.empId = row.empId
this.empBaseInfoForm.customerId = row.customerId
this.empBaseInfoForm.archivesNumb = row.archivesNumb
@@ -5866,6 +5871,7 @@
this[this.inputForName].certificateNumb = data.certificateNumb
this[this.inputForName].deptId = data.deptId
this[this.inputForName].deptName = data.deptName
+ this[this.inputForName].allDeptName = data.allDeptName
this[this.inputForName].JobId = data.jobId
this[this.inputForName].jobName = data.jobName
this[this.inputForName].sex = data.sex === '1' ? '男' : '女'
--
Gitblit v1.8.0