diff --git a/src/views/common/UploadFile.vue b/src/views/common/UploadFile.vue index 3ecefb7..b6573fb 100644 --- a/src/views/common/UploadFile.vue +++ b/src/views/common/UploadFile.vue @@ -169,13 +169,12 @@ export default { watch: { fileList: { handler(newVal) { - if (this.files.length === 0 && newVal.length > 0) { + if (newVal.length > 0) { this.$nextTick(() => { this.files = this.formatFileList(newVal) this.handlePreviewFromExternal(newVal) }) - } - if(newVal.length === 0){ + }else{ this.$nextTick(() => { this.files = []; this.handlePreviewFromExternal(newVal) diff --git a/src/views/enterpriseLibrary/personnel/components/PersonnelForm.vue b/src/views/enterpriseLibrary/personnel/components/PersonnelForm.vue index 6ac1f66..296757c 100644 --- a/src/views/enterpriseLibrary/personnel/components/PersonnelForm.vue +++ b/src/views/enterpriseLibrary/personnel/components/PersonnelForm.vue @@ -344,7 +344,8 @@ export default { this.isProjectChiefEngineer ? Promise.resolve(EMPTY_OBJECT) : this.qualificationInfoRef?.validate?.() || Promise.resolve(EMPTY_OBJECT), this.$refs.otherInfoPersonnel.validate() ]) - + console.log(basicInfoData, qualificationData, otherData); + // 组装完整数据 const formData = this.assembleFormData(basicInfoData, qualificationData, otherData) diff --git a/src/views/enterpriseLibrary/personnel/components/child/QualificationInfo.vue b/src/views/enterpriseLibrary/personnel/components/child/QualificationInfo.vue index 9bd164f..26402f1 100644 --- a/src/views/enterpriseLibrary/personnel/components/child/QualificationInfo.vue +++ b/src/views/enterpriseLibrary/personnel/components/child/QualificationInfo.vue @@ -359,6 +359,8 @@ export default { this.$set(this.personnelCertificateId, 0, this.getFormData(item.fileUploadType, 'personnelCertificateId')); } else if (Object.keys(item).length > 0 && item.fileUploadType !== fileUploadType) { // 安全考核B证、安全考核C证、其他人员证书 this.form.fileList2 = this.getFileList(item.fileUploadType); + console.log(this.form.fileList2); + this.form.registerProfessional = this.getFormData(item.fileUploadType, 'registerProfessional'); this.form.certificateCode2 = this.getFormData(item.fileUploadType, 'certificateCode'); this.form.certificateValidityPeriod2 = this.getFormData(item.fileUploadType, 'certificateValidityPeriod').split(' - '); @@ -366,7 +368,7 @@ export default { } }) console.log(this.form); - + }, getFileList(businessType) { @@ -453,12 +455,12 @@ export default { }, detailData: { handler(newVal) { - console.log(newVal); - if (Object.keys(newVal).length > 0) { const { enterprisePersonnel: { personnelPosition } = {} } = newVal; if (personnelPosition !== 'project_chief_engineer') { - this.setFormData(); + this.$nextTick(() => { + this.setFormData(); + }) } } },