禅道bug修复
This commit is contained in:
parent
166d05ba94
commit
b4d6279265
|
|
@ -45,7 +45,9 @@
|
||||||
:upload-file-url="uploadFileUrl"
|
:upload-file-url="uploadFileUrl"
|
||||||
:file-type="['jpg', 'png', 'jpeg']"
|
:file-type="['jpg', 'png', 'jpeg']"
|
||||||
:file-list.sync="addAndEditForm.idCardFront"
|
:file-list.sync="addAndEditForm.idCardFront"
|
||||||
:is-uploaded="addAndEditForm.idCardFront.length >= 1"
|
:is-uploaded="
|
||||||
|
addAndEditForm.idCardFront && addAndEditForm.idCardFront.length >= 1
|
||||||
|
"
|
||||||
>
|
>
|
||||||
<template #upload-img-box> 身份证正面 </template>
|
<template #upload-img-box> 身份证正面 </template>
|
||||||
</UploadImg>
|
</UploadImg>
|
||||||
|
|
@ -59,7 +61,9 @@
|
||||||
:upload-file-url="uploadFileUrl"
|
:upload-file-url="uploadFileUrl"
|
||||||
:file-type="['jpg', 'png', 'jpeg']"
|
:file-type="['jpg', 'png', 'jpeg']"
|
||||||
:file-list.sync="addAndEditForm.idCardBack"
|
:file-list.sync="addAndEditForm.idCardBack"
|
||||||
:is-uploaded="addAndEditForm.idCardBack.length >= 1"
|
:is-uploaded="
|
||||||
|
addAndEditForm.idCardBack && addAndEditForm.idCardBack.length >= 1
|
||||||
|
"
|
||||||
>
|
>
|
||||||
<template #upload-img-box> 身份证反面 </template>
|
<template #upload-img-box> 身份证反面 </template>
|
||||||
</UploadImg>
|
</UploadImg>
|
||||||
|
|
@ -251,7 +255,7 @@
|
||||||
:upload-file-url="uploadFileUrl"
|
:upload-file-url="uploadFileUrl"
|
||||||
:file-type="['jpg', 'png', 'jpeg']"
|
:file-type="['jpg', 'png', 'jpeg']"
|
||||||
:file-list.sync="item.diplomaImg"
|
:file-list.sync="item.diplomaImg"
|
||||||
:is-uploaded="item.diplomaImg.length >= 5"
|
:is-uploaded="item.diplomaImg && item.diplomaImg.length >= 5"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
@ -277,7 +281,7 @@
|
||||||
:upload-file-url="uploadFileUrl"
|
:upload-file-url="uploadFileUrl"
|
||||||
:file-type="['jpg', 'png', 'jpeg']"
|
:file-type="['jpg', 'png', 'jpeg']"
|
||||||
:file-list.sync="addAndEditForm.otherImg"
|
:file-list.sync="addAndEditForm.otherImg"
|
||||||
:is-uploaded="addAndEditForm.otherImg.length >= 5"
|
:is-uploaded="addAndEditForm.otherImg && addAndEditForm.otherImg.length >= 5"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
@ -319,7 +323,10 @@ export default {
|
||||||
fileViewUrl: process.env.VUE_APP_BASE_API + '/files',
|
fileViewUrl: process.env.VUE_APP_BASE_API + '/files',
|
||||||
deleteFileList: [],
|
deleteFileList: [],
|
||||||
uploadOuterVisible: false,
|
uploadOuterVisible: false,
|
||||||
diplomaList: [{ name: '注册建造师' }, { name: '项目经理B证' }], // 资格证书列表
|
diplomaList: [
|
||||||
|
{ name: '注册建造师', value: '注册建造师' },
|
||||||
|
{ name: '项目经理B证', value: '项目经理B证' },
|
||||||
|
], // 资格证书列表
|
||||||
addAndEditForm: {
|
addAndEditForm: {
|
||||||
userName: '', // 姓名
|
userName: '', // 姓名
|
||||||
idCard: '', // 身份证号码
|
idCard: '', // 身份证号码
|
||||||
|
|
@ -344,7 +351,7 @@ export default {
|
||||||
diplomaNum: '',
|
diplomaNum: '',
|
||||||
level: '',
|
level: '',
|
||||||
diplomaImg: [],
|
diplomaImg: [],
|
||||||
diplomaList: [{ name: '注册建造师' }, { name: '项目经理B证' }],
|
diplomaList: [],
|
||||||
},
|
},
|
||||||
], // 资格证书列表
|
], // 资格证书列表
|
||||||
},
|
},
|
||||||
|
|
@ -700,15 +707,16 @@ export default {
|
||||||
watch: {
|
watch: {
|
||||||
editRow: {
|
editRow: {
|
||||||
handler(newVal) {
|
handler(newVal) {
|
||||||
if (newVal && Object.keys(newVal).length > 0) {
|
if (newVal) {
|
||||||
Object.assign(this.addAndEditForm, { ...newVal })
|
Object.assign(this.addAndEditForm, { ...newVal })
|
||||||
|
|
||||||
|
this.addAndEditForm = JSON.parse(JSON.stringify(this.addAndEditForm))
|
||||||
|
|
||||||
if (this.addAndEditForm.certificateList.length > 0) {
|
if (this.addAndEditForm.certificateList.length > 0) {
|
||||||
this.addAndEditForm.certificateList.forEach((item, index) => {
|
this.addAndEditForm.certificateList.forEach((item, index) => {
|
||||||
this.$set(this.addAndEditForm.certificateList[index], 'diplomaList', this.diplomaList)
|
this.$set(item, 'diplomaList', this.diplomaList)
|
||||||
|
if (!item.diplomaList.some((j) => j.name === item.diploma)) {
|
||||||
if (!this.diplomaList.includes(item.diploma)) {
|
item.diplomaList.push({
|
||||||
this.addAndEditForm.certificateList[index].diplomaList.push({
|
|
||||||
name: item.diploma,
|
name: item.diploma,
|
||||||
value: item.diploma,
|
value: item.diploma,
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
<el-input v-model.trim="queryParams.title" placeholder="请输入职称" clearable> </el-input>
|
<el-input v-model.trim="queryParams.title" placeholder="请输入职称" clearable> </el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<!-- <el-col :span="4">
|
<!-- <el-col :span="4">
|
||||||
<el-form-item prop="diploma">
|
<el-form-item prop="diploma">
|
||||||
<el-input v-model.trim="queryParams.diploma" placeholder="请输入资格证书" clearable> </el-input>
|
<el-input v-model.trim="queryParams.diploma" placeholder="请输入资格证书" clearable> </el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
@ -134,7 +134,7 @@ export default {
|
||||||
total: 0, // 总条数
|
total: 0, // 总条数
|
||||||
formType: 1, // 1新增 2详情 3编辑
|
formType: 1, // 1新增 2详情 3编辑
|
||||||
timeValue: [], // 时间选择器
|
timeValue: [], // 时间选择器
|
||||||
editRow: {}, // 编辑行
|
editRow: null, // 编辑行
|
||||||
// 弹窗配置
|
// 弹窗配置
|
||||||
dialogConfig: {
|
dialogConfig: {
|
||||||
outerTitle: '新增',
|
outerTitle: '新增',
|
||||||
|
|
@ -224,7 +224,7 @@ export default {
|
||||||
tbFileSourceVoList,
|
tbFileSourceVoList,
|
||||||
certificateList,
|
certificateList,
|
||||||
} = row
|
} = row
|
||||||
Object.assign(this.editRow, {
|
this.editRow = {
|
||||||
userName,
|
userName,
|
||||||
idCard,
|
idCard,
|
||||||
age,
|
age,
|
||||||
|
|
@ -240,7 +240,7 @@ export default {
|
||||||
id,
|
id,
|
||||||
tbFileSourceVoList,
|
tbFileSourceVoList,
|
||||||
certificateList,
|
certificateList,
|
||||||
})
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
this.dialogConfig.outerVisible = true
|
this.dialogConfig.outerVisible = true
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue