diff --git a/src/views/projectFront/projectSummary/cooperationUnit.vue b/src/views/projectFront/projectSummary/cooperationUnit.vue index 356859ca..4d2a8a45 100644 --- a/src/views/projectFront/projectSummary/cooperationUnit.vue +++ b/src/views/projectFront/projectSummary/cooperationUnit.vue @@ -343,7 +343,7 @@ - @@ -355,7 +355,7 @@ - @@ -460,7 +460,7 @@ - @@ -497,19 +497,18 @@ - + - {{ $t('message.laborMange.clickOnTheUpload') }} - @@ -517,7 +516,7 @@ - @@ -748,16 +747,6 @@ export default { this.getDictionaryByStructure(); this.getDicProjectTypeList(); }, - watch: { - addEnterpriseDialog: { - handler(newVal) { - this.$nextTick(() => { - this.$refs['enterpriseForm'] && this.$refs['enterpriseForm'].clearValidate(); - }) - }, - deep:true, - } - }, methods: { //获取经纬度 toGetLocalFn() { @@ -951,7 +940,7 @@ export default { enterpriseEmail: '', //企业邮箱 enterpriseLegalPerson: '', //法定代表人 enterpriseName: '', //企业名称 - companyTypeName: "", + companyTypeName: this.enterpriseForm.companyTypeName, enterpriseProperty: '', //单位性质 1.国有企业 2三资企业 3集体企业 4私营企业 enterpriseQualificationUrl: '', //企业资质图片地址 enterpriseSafeAllow: '', //企业安全生产许可证 @@ -996,7 +985,7 @@ export default { 'message.laborMange.theNewEnterprise' ) this.addEnterpriseDialog = true - // this.enterpriseForm.enterpriseTypeId = Number(this.checkedId) + this.enterpriseForm.enterpriseTypeId = Number(this.checkedId) }, //编辑按钮 editBtn(value) { @@ -1015,7 +1004,6 @@ export default { this.aptitudeFileList = [] this.logoFileList = [] this.enterpriseForm = { ...JSON.parse(JSON.stringify(value)) } - this.enterpriseForm.enterpriseTypeId = !value.enterpriseTypeId || value.enterpriseTypeId == 0 ? '' : value.enterpriseTypeId; let aptitude = this.enterpriseForm.enterpriseQualificationUrl ? this.enterpriseForm.enterpriseQualificationUrl.split(',') : [] @@ -1048,11 +1036,11 @@ export default { this.enterpriseForm.projectEnterprise = { ...projectEnterprise }; - this.layoutImageList = this.enterpriseForm.projectEnterprise.layoutImage && this.enterpriseForm.projectEnterprise.layoutImage != 'null' ? JSON.parse(this.enterpriseForm.projectEnterprise.layoutImage) : []; - this.constructionMapUrlList = this.enterpriseForm.projectEnterprise.constructionMapUrl && this.enterpriseForm.projectEnterprise.constructionMapUrl != 'null' ? JSON.parse(this.enterpriseForm.projectEnterprise.constructionMapUrl) : []; + this.layoutImageList = JSON.parse(this.enterpriseForm.projectEnterprise.layoutImage); + this.constructionMapUrlList = JSON.parse(this.enterpriseForm.projectEnterprise.constructionMapUrl); } }).finally(() => { - this.addEnterpriseDialog = true; + this.addEnterpriseDialog = true }) }, @@ -1081,8 +1069,8 @@ export default { } } - if (this.enterpriseForm.projectEnterprise.projectTel) { - if (!checkPhone(this.enterpriseForm.projectEnterprise.projectTel)) { + if (this.enterpriseForm.projectTel) { + if (!checkPhone(this.enterpriseForm.projectTel)) { this.$message.error('请输入正确的联系电话') return } @@ -1292,7 +1280,7 @@ export default { //文件上传成功 handleSuccess(file, type) { this.$message.success(this.$t('message.laborMange.uploadSuccessful')) - let data = { name: file.data[0].fileInfo.originalFilename ? file.data[0].fileInfo.originalFilename : file.data[0].filename, url: file.data[0].imageUrl } + let data = { name: file.data[0].filename, url: file.data[0].imageUrl } console.log(file); if (type == 1) { this.aptitudeFileList.push(data)