diff --git a/src/views/projectFront/projectSummary/cooperationUnit.vue b/src/views/projectFront/projectSummary/cooperationUnit.vue index 04098f21..f0508c40 100644 --- a/src/views/projectFront/projectSummary/cooperationUnit.vue +++ b/src/views/projectFront/projectSummary/cooperationUnit.vue @@ -35,7 +35,7 @@ {{ enterpriseTypeName }} {{ enterpriseTypeName - }}{{ $t('message.cooperationUnit.sum') }}: + }}{{ $t('message.cooperationUnit.sum') }}: {{ listData.length }}
@@ -54,7 +54,8 @@ --> {{ + type="primary" style="height: 32px" :disabled="checkedDeleteList.length == 0" + @click="deleteInBatches">{{ $t('message.cooperationUnit.deleteInBatches') }} - + @@ -303,9 +301,8 @@ - + @@ -316,12 +313,11 @@ - - + " filterable clearable style="width: 100%"> + @@ -329,7 +325,8 @@ - + @@ -339,21 +336,20 @@ {{ $t('message.laborDev.whetherList')[0] - }} + }} {{ $t('message.laborDev.whetherList')[1] - }} + }} - + {{ $t('message.laborMange.clickOnTheUpload') }} @@ -362,11 +358,10 @@ - + {{ $t('message.laborMange.clickOnTheUpload') }} @@ -393,8 +388,8 @@ - + @@ -448,7 +443,8 @@ - + @@ -485,16 +481,17 @@ - + - - + + @@ -508,11 +505,11 @@ - + {{ $t('message.laborMange.clickOnTheUpload') }} @@ -523,11 +520,10 @@ - + {{ $t('message.laborMange.clickOnTheUpload') }} @@ -537,23 +533,24 @@
- + - + " filterable clearable> @@ -708,7 +705,7 @@ export default { constructionMapUrlList: [], // 现场施工图 dictionaryItemList: [], structureTypeList: [], - dictionaryItemId:"", + dictionaryItemId: "", constructionStageList: [], projectTypeList: [], //校验新增企业表单 @@ -887,7 +884,7 @@ export default { pageSize: this.pageSize, enterpriseTypeId: this.enterpriseTypeSelectId, enterpriseName: this.enterpriseName, - dictionaryItemId:this.dictionaryItemId + cbsProjectType: this.dictionaryItemId } getCooperatorListApi(data).then((res) => { if (res.code == 200) { @@ -1011,7 +1008,7 @@ export default { this.enterpriseDialogType = 2 this.aptitudeFileList = [] this.logoFileList = [] - this.enterpriseForm = {...JSON.parse(JSON.stringify(value))} + this.enterpriseForm = { ...JSON.parse(JSON.stringify(value)) } let aptitude = this.enterpriseForm.enterpriseQualificationUrl ? this.enterpriseForm.enterpriseQualificationUrl.split(',') : [] @@ -1039,7 +1036,7 @@ export default { }).then(res => { if (res.code == 200) { const projectEnterprise = res.result.projectEnterprise; - console.log('222222',projectEnterprise); + console.log('222222', projectEnterprise); this.enterpriseForm.projectEnterprise = { ...projectEnterprise }; @@ -1107,7 +1104,7 @@ export default { } this.enterpriseForm.logo = arr.join(',') } - console.log(11111111111,this.constructionMapUrlList); + console.log(11111111111, this.constructionMapUrlList); this.enterpriseForm.projectEnterprise.layoutImage = JSON.stringify(this.layoutImageList); this.enterpriseForm.projectEnterprise.constructionMapUrl = JSON.stringify(this.constructionMapUrlList); this.enterpriseForm.type = this.pageType @@ -1356,6 +1353,9 @@ export default { // color: #282e49; border-bottom: 2px #ebf0fc solid; font-weight: 600; + overflow: hidden; //超出的文本隐藏 + text-overflow: ellipsis; //溢出用省略号显示 + white-space: nowrap; //溢出不换行 } .el-menu-item2 { diff --git a/src/views/projectFront/projectSummary/cooperatorDatails.vue b/src/views/projectFront/projectSummary/cooperatorDatails.vue index 2029e5bd..2e28df7e 100644 --- a/src/views/projectFront/projectSummary/cooperatorDatails.vue +++ b/src/views/projectFront/projectSummary/cooperatorDatails.vue @@ -510,7 +510,7 @@ export default { fieldName: this.$t("message.laborMange.laborCertificateNo"), fieldName2: this.$t("message.laborMange.safetyProductionLicense"), value: res.result.qualificationNumber, - value2: res.result.enterpriseSafeAllow, + value2: res.result.enterpriseSafeAllow ? this.$store.state.FILEURL + res.result.enterpriseSafeAllow : '', }, { fieldName: this.$t("message.laborMange.natureOfUnit"), @@ -523,7 +523,7 @@ export default { : res.result.enterpriseProperty == 3 ? this.$t("message.laborMange.collectiveEnterprises") : this.$t("message.laborMange.privateEnterprise"), - value2: res.result.logo ? res.result.logo : "", + value2: res.result.logo ? this.$store.state.FILEURL +res.result.logo : "", }, { fieldName: this.$t("message.projectInfo.projectLeader"),