人员库问题修改
This commit is contained in:
parent
51cd2b7ce5
commit
049bde5457
|
|
@ -169,13 +169,12 @@ export default {
|
||||||
watch: {
|
watch: {
|
||||||
fileList: {
|
fileList: {
|
||||||
handler(newVal) {
|
handler(newVal) {
|
||||||
if (this.files.length === 0 && newVal.length > 0) {
|
if (newVal.length > 0) {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.files = this.formatFileList(newVal)
|
this.files = this.formatFileList(newVal)
|
||||||
this.handlePreviewFromExternal(newVal)
|
this.handlePreviewFromExternal(newVal)
|
||||||
})
|
})
|
||||||
}
|
}else{
|
||||||
if(newVal.length === 0){
|
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.files = [];
|
this.files = [];
|
||||||
this.handlePreviewFromExternal(newVal)
|
this.handlePreviewFromExternal(newVal)
|
||||||
|
|
|
||||||
|
|
@ -344,6 +344,7 @@ export default {
|
||||||
this.isProjectChiefEngineer ? Promise.resolve(EMPTY_OBJECT) : this.qualificationInfoRef?.validate?.() || Promise.resolve(EMPTY_OBJECT),
|
this.isProjectChiefEngineer ? Promise.resolve(EMPTY_OBJECT) : this.qualificationInfoRef?.validate?.() || Promise.resolve(EMPTY_OBJECT),
|
||||||
this.$refs.otherInfoPersonnel.validate()
|
this.$refs.otherInfoPersonnel.validate()
|
||||||
])
|
])
|
||||||
|
console.log(basicInfoData, qualificationData, otherData);
|
||||||
|
|
||||||
// 组装完整数据
|
// 组装完整数据
|
||||||
const formData = this.assembleFormData(basicInfoData, qualificationData, otherData)
|
const formData = this.assembleFormData(basicInfoData, qualificationData, otherData)
|
||||||
|
|
|
||||||
|
|
@ -359,6 +359,8 @@ export default {
|
||||||
this.$set(this.personnelCertificateId, 0, this.getFormData(item.fileUploadType, 'personnelCertificateId'));
|
this.$set(this.personnelCertificateId, 0, this.getFormData(item.fileUploadType, 'personnelCertificateId'));
|
||||||
} else if (Object.keys(item).length > 0 && item.fileUploadType !== fileUploadType) { // 安全考核B证、安全考核C证、其他人员证书
|
} else if (Object.keys(item).length > 0 && item.fileUploadType !== fileUploadType) { // 安全考核B证、安全考核C证、其他人员证书
|
||||||
this.form.fileList2 = this.getFileList(item.fileUploadType);
|
this.form.fileList2 = this.getFileList(item.fileUploadType);
|
||||||
|
console.log(this.form.fileList2);
|
||||||
|
|
||||||
this.form.registerProfessional = this.getFormData(item.fileUploadType, 'registerProfessional');
|
this.form.registerProfessional = this.getFormData(item.fileUploadType, 'registerProfessional');
|
||||||
this.form.certificateCode2 = this.getFormData(item.fileUploadType, 'certificateCode');
|
this.form.certificateCode2 = this.getFormData(item.fileUploadType, 'certificateCode');
|
||||||
this.form.certificateValidityPeriod2 = this.getFormData(item.fileUploadType, 'certificateValidityPeriod').split(' - ');
|
this.form.certificateValidityPeriod2 = this.getFormData(item.fileUploadType, 'certificateValidityPeriod').split(' - ');
|
||||||
|
|
@ -453,12 +455,12 @@ export default {
|
||||||
},
|
},
|
||||||
detailData: {
|
detailData: {
|
||||||
handler(newVal) {
|
handler(newVal) {
|
||||||
console.log(newVal);
|
|
||||||
|
|
||||||
if (Object.keys(newVal).length > 0) {
|
if (Object.keys(newVal).length > 0) {
|
||||||
const { enterprisePersonnel: { personnelPosition } = {} } = newVal;
|
const { enterprisePersonnel: { personnelPosition } = {} } = newVal;
|
||||||
if (personnelPosition !== 'project_chief_engineer') {
|
if (personnelPosition !== 'project_chief_engineer') {
|
||||||
|
this.$nextTick(() => {
|
||||||
this.setFormData();
|
this.setFormData();
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue