From 0deedde0ed4413c5b5d00e1aa72404ed160cf053 Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Wed, 29 May 2024 23:43:23 +0800
Subject: [PATCH] 1

---
 .../projectSummary/cooperationUnit.vue        | 84 +++++++++----------
 .../projectSummary/cooperatorDatails.vue      | 48 +++++++++--
 2 files changed, 82 insertions(+), 50 deletions(-)

diff --git a/src/views/projectFront/projectSummary/cooperationUnit.vue b/src/views/projectFront/projectSummary/cooperationUnit.vue
index f0508c40..4dce9a1f 100644
--- a/src/views/projectFront/projectSummary/cooperationUnit.vue
+++ b/src/views/projectFront/projectSummary/cooperationUnit.vue
@@ -35,7 +35,7 @@
         <span>{{ enterpriseTypeName }}</span>
         <span class="right_value">
           <span>{{ enterpriseTypeName
-            }}{{ $t('message.cooperationUnit.sum') }}：</span>
+          }}{{ $t('message.cooperationUnit.sum') }}：</span>
           <span class="value">{{ listData.length }}</span></span>
       </div>
       <div class="content">
@@ -54,8 +54,7 @@
             </el-form-item>-->
             <el-form-item>
               <el-button v-permission="{ key: 'hzdw_delete_pl', menuPath: '/project/summary/cooperationUnit' }"
-                type="primary" style="height: 32px" :disabled="checkedDeleteList.length == 0"
-                @click="deleteInBatches">{{
+                type="primary" style="height: 32px" :disabled="checkedDeleteList.length == 0" @click="deleteInBatches">{{
                   $t('message.cooperationUnit.deleteInBatches') }}</el-button>
             </el-form-item>
             <!-- <el-form-item>
@@ -74,8 +73,8 @@
           <el-form v-permission="{ key: 'hzdw_inquiry', menuPath: '/project/summary/cooperationUnit' }" :inline="true"
             class="demo-form-inline" size="small">
             <el-form-item>
-              <el-input :placeholder="$t('message.laborMange.placeholder1')" v-model="enterpriseName"
-                style="width: 260px" clearable>
+              <el-input :placeholder="$t('message.laborMange.placeholder1')" v-model="enterpriseName" style="width: 260px"
+                clearable>
                 ></el-input>
             </el-form-item>
             <el-form-item>
@@ -187,9 +186,8 @@
               <!-- 企业类型 -->
               <el-col :span="12">
                 <el-form-item :label="$t('message.laborMange.formOfBusiness')" prop="companyTypeName">
-                  <el-select v-model="enterpriseForm.companyTypeName"
-                    :placeholder="$t('message.laborMange.pleaseChoose')" style="width: 100%"
-                    :disabled="enterpriseTypeName == '全部' ? false : true">
+                  <el-select v-model="enterpriseForm.companyTypeName" :placeholder="$t('message.laborMange.pleaseChoose')"
+                    style="width: 100%" :disabled="enterpriseTypeName == '全部' ? false : true">
                     <el-option v-for="item in companyTypeList" :key="item.id" :label="item.companyTypeName"
                       :value="item.companyTypeName"></el-option>
                   </el-select>
@@ -302,7 +300,7 @@
                     :placeholder="$t('message.laborMange.pleaseChoose')" style="width: 100%">
                     <el-option :label="$t('message.laborMange.stateOwnedBusiness')" :value="1"></el-option>
                     <el-option :label="$t('message.laborMange.overseasInvestedEnterprises')
-                      " :value="2"></el-option>
+                    " :value="2"></el-option>
                     <el-option :label="$t('message.laborMange.collectiveEnterprises')" :value="3"></el-option>
                     <el-option :label="$t('message.laborMange.privateEnterprise')" :value="4"></el-option>
                   </el-select>
@@ -315,9 +313,9 @@
                 <el-form-item :label="$t('message.projectInfo.theParentCompany')" prop="parentEnterpriseId">
                   <el-select v-model="enterpriseForm.parentEnterpriseId" :placeholder="$t('message.projectInfo.pleaseChoose') +
                     $t('message.projectInfo.theParentCompany')
-                    " filterable clearable style="width: 100%">
-                    <el-option v-for="(item, index) in parentEnterpriseList" :label="item.enterpriseName"
-                      :value="item.id" :key="index">
+                  " filterable clearable style="width: 100%">
+                    <el-option v-for="(item, index) in parentEnterpriseList" :label="item.enterpriseName" :value="item.id"
+                      :key="index">
                     </el-option>
                   </el-select>
                 </el-form-item>
@@ -325,8 +323,7 @@
               <el-col :span="12">
                 <!-- 排序 -->
                 <el-form-item :label="$t('message.projectInfo.sort')" prop="num">
-                  <el-input-number v-model="enterpriseForm.sortNum" @change="handleChangeNum"
-                    :min="0"></el-input-number>
+                  <el-input-number v-model="enterpriseForm.sortNum" @change="handleChangeNum" :min="0"></el-input-number>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -336,20 +333,20 @@
                 <el-form-item :label="$t('message.projectInfo.departmentType')" prop="departmentType">
                   <!-- 否 -->
                   <el-radio v-model="enterpriseForm.departmentType" :label="1">{{ $t('message.laborDev.whetherList')[0]
-                    }}</el-radio>
+                  }}</el-radio>
                   <!-- 是 -->
                   <el-radio v-model="enterpriseForm.departmentType" :label="2">{{ $t('message.laborDev.whetherList')[1]
-                    }}</el-radio>
+                  }}</el-radio>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item :label="$t('message.laborMange.photosOfQualification')" prop="enterpriseQualificationUrl">
-                  <el-upload class="upload-demo" limit="1" :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 1)
-                    " :on-success="(file) => handleSuccess(file, 1)" :on-error="(file) => handleError(file, 1)"
-                    :on-preview="(file) => handlePreview(file, 1)"
-                    :before-upload="(file) => handleBeforeUpload(file, 1)" name="files" :file-list="aptitudeFileList">
+                  <el-upload class="upload-demo"  :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 1)
+                  " :on-success="(file) => handleSuccess(file, 1)" :on-error="(file) => handleError(file, 1)"
+                    :on-preview="(file) => handlePreview(file, 1)" :before-upload="(file) => handleBeforeUpload(file, 1)"
+                    name="files" :file-list="aptitudeFileList">
                     <el-button size="small" type="primary">{{
                       $t('message.laborMange.clickOnTheUpload')
                     }}</el-button>
@@ -358,10 +355,10 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="logo" prop="logo">
-                  <el-upload class="upload-demo" limit="1" :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 2)
-                    " :on-success="(file) => handleSuccess(file, 2)" :on-error="(file) => handleError(file, 2)"
-                    :on-preview="(file) => handlePreview(file, 2)"
-                    :before-upload="(file) => handleBeforeUpload(file, 2)" name="files" :file-list="logoFileList">
+                  <el-upload class="upload-demo" :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 2)
+                  " :on-success="(file) => handleSuccess(file, 2)" :on-error="(file) => handleError(file, 2)"
+                    :on-preview="(file) => handlePreview(file, 2)" :before-upload="(file) => handleBeforeUpload(file, 2)"
+                    name="files" :file-list="logoFileList">
                     <el-button size="small" type="primary">{{
                       $t('message.laborMange.clickOnTheUpload')
                     }}</el-button>
@@ -488,8 +485,8 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="施工阶段" prop="constructionStage">
-                  <el-select v-model="enterpriseForm.projectEnterprise.constructionStage" placeholder="请选择施工阶段"
-                    filterable clearable style="width: 100%">
+                  <el-select v-model="enterpriseForm.projectEnterprise.constructionStage" placeholder="请选择施工阶段" filterable
+                    clearable style="width: 100%">
                     <el-option v-for="(item, index) in constructionStageList" :label="item.name"
                       :value="Number(item.data)" :key="index">
                     </el-option>
@@ -505,11 +502,10 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="现场施工图" prop="constructionMapUrl">
-                  <el-upload class="upload-demo" limit="1" :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 4)
-                    " :on-success="(file) => handleSuccess(file, 4)" :on-error="(file) => handleError(file, 4)"
-                    :on-preview="(file) => handlePreview(file, 4)"
-                    :before-upload="(file) => handleBeforeUpload(file, 4)" lis name="files"
-                    :file-list="constructionMapUrlList">
+                  <el-upload class="upload-demo" :limit="1" :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 4)
+                  " :on-success="(file) => handleSuccess(file, 4)" :on-error="(file) => handleError(file, 4)"
+                    :on-preview="(file) => handlePreview(file, 4)" :before-upload="(file) => handleBeforeUpload(file, 4)"
+                    lis name="files" :file-list="constructionMapUrlList">
                     <el-button size="small" type="primary">{{
                       $t('message.laborMange.clickOnTheUpload')
                     }}</el-button>
@@ -520,10 +516,10 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="现场布置图" prop="layoutImage">
-                  <el-upload class="upload-demo" limit="1" :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 3)
-                    " :on-success="(file) => handleSuccess(file, 3)" :on-error="(file) => handleError(file, 3)"
-                    :on-preview="(file) => handlePreview(file, 3)"
-                    :before-upload="(file) => handleBeforeUpload(file, 3)" name="files" :file-list="layoutImageList">
+                  <el-upload class="upload-demo" :limit="1" :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 3)
+                  " :on-success="(file) => handleSuccess(file, 3)" :on-error="(file) => handleError(file, 3)"
+                    :on-preview="(file) => handlePreview(file, 3)" :before-upload="(file) => handleBeforeUpload(file, 3)"
+                    name="files" :file-list="layoutImageList">
                     <el-button size="small" type="primary">{{
                       $t('message.laborMange.clickOnTheUpload')
                     }}</el-button>
@@ -533,9 +529,8 @@
             </el-row>
           </el-form>
           <div class="dialog-footer addpage">
-            <el-button class="cancleBtn" @click="addEnterpriseDialog = false" icon="el-icon-circle-close"
-              size="medium">{{
-                $t('message.laborMange.cancel') }}</el-button>
+            <el-button class="cancleBtn" @click="addEnterpriseDialog = false" icon="el-icon-circle-close" size="medium">{{
+              $t('message.laborMange.cancel') }}</el-button>
             <el-button type="primary" icon="el-icon-circle-check" @click="saveEnterpriseFn('enterpriseForm')"
               size="medium">{{
                 $t('message.laborMange.confirm') }}</el-button>
@@ -543,14 +538,14 @@
         </div>
       </vue-scroll>
     </el-dialog>
-    <el-dialog :modal-append-to-body="false" :title="$t('message.projectInfo.batchMobile')"
-      :close-on-click-modal="false" :visible.sync="moveEnterpriseDialog" width="750px">
+    <el-dialog :modal-append-to-body="false" :title="$t('message.projectInfo.batchMobile')" :close-on-click-modal="false"
+      :visible.sync="moveEnterpriseDialog" width="750px">
       <el-form :inline="true" size="medium" ref="selectForm">
         <!-- 目标企业类型 -->
         <el-form-item :label="$t('message.projectInfo.targetCompanyType')" prop="enterpriseType">
           <el-select v-model="enterpriseType" :placeholder="$t('message.projectInfo.pleaseChoose') +
             $t('message.projectInfo.targetCompanyType')
-            " filterable clearable>
+          " filterable clearable>
             <el-option v-for="(item, index) in enterpriseTypeList" :label="item.companyTypeName" :value="item.id"
               :key="index">
             </el-option>
@@ -1030,6 +1025,7 @@ export default {
       if (this.enterpriseForm.parentEnterpriseId == 0) {
         this.enterpriseForm.parentEnterpriseId = ''
       }
+      console.log(this.aptitudeFileList);
       getEnterpriseInfoByIdApi({
         enterpriseId: value.id,
         projectSn: this.$store.state.projectSn,
@@ -1353,9 +1349,6 @@ export default {
       // color: #282e49;
       border-bottom: 2px #ebf0fc solid;
       font-weight: 600;
-      overflow: hidden; //超出的文本隐藏
-      text-overflow: ellipsis; //溢出用省略号显示
-      white-space: nowrap; //溢出不换行
     }
 
     .el-menu-item2 {
@@ -1434,6 +1427,9 @@ export default {
             opacity: 1;
             font-size: 15px;
             font-weight: 600;
+            overflow: hidden; //超出的文本隐藏
+            text-overflow: ellipsis; //溢出用省略号显示
+            white-space: nowrap; //溢出不换行
           }
 
           .btn_wrap {
diff --git a/src/views/projectFront/projectSummary/cooperatorDatails.vue b/src/views/projectFront/projectSummary/cooperatorDatails.vue
index 2e28df7e..12792f05 100644
--- a/src/views/projectFront/projectSummary/cooperatorDatails.vue
+++ b/src/views/projectFront/projectSummary/cooperatorDatails.vue
@@ -56,7 +56,25 @@
           <el-table-column prop="value2" min-width="35%">
             <template slot-scope="scope">
               <div
-                v-if="scope.row.value2 && typeof(scope.row.value2) == 'string' && scope.row.value2.indexOf('http://') >= 0"
+                v-if="scope.row.value2 instanceof Array && scope.row.value2.length > 0"
+                class="showImg_wrap"
+              >
+                <!-- <img
+                  v-for="(item, index) in getUrl(scope.row.value2, 1)"
+                  :key="index"
+                  :src="item"
+                  class="showImg"
+                  @click="showImgBtn(item)"
+                /> -->
+                <img
+                  v-for="item in scope.row.value2"
+                  :src="item.url"
+                  class="showImg"
+                  @click="showImgBtn(item.url)"
+                />
+              </div>
+              <div
+                v-else-if="scope.row.value2 && typeof(scope.row.value2) == 'string' && scope.row.value2.indexOf('http://') >= 0"
                 class="showImg_wrap"
               >
                 <!-- <img
@@ -444,8 +462,13 @@ export default {
               fieldName2: this.$t("message.laborMange.photosOfQualification"),
               value: res.result.enterpriseName,
               value2:
-                res.result.enterpriseQualificationUrl &&
-                res.result.enterpriseQualificationUrl,
+                res.result.enterpriseQualificationUrl &&  res.result.enterpriseQualificationUrl.split(',').length > 0? 
+                res.result.enterpriseQualificationUrl.split(',').map(item => {
+                  return {
+                    name: item.split('*')[0],
+                    url: this.$store.state.FILEURL + item.split('*')[1],
+                  }
+                }) : res.result.enterpriseQualificationUrl.indexOf('http://') >= 0 ? res.result.enterpriseQualificationUrl:  res.result.enterpriseQualificationUrl,
             },
             {
               fieldName: this.$t("message.laborMange.formOfBusiness"),
@@ -510,7 +533,14 @@ export default {
               fieldName: this.$t("message.laborMange.laborCertificateNo"),
               fieldName2: this.$t("message.laborMange.safetyProductionLicense"),
               value: res.result.qualificationNumber,
-              value2: res.result.enterpriseSafeAllow ? this.$store.state.FILEURL + res.result.enterpriseSafeAllow : '',
+              value2: res.result.enterpriseSafeAllow && res.result.enterpriseSafeAllow.split(',').length > 0 ?  res.result.enterpriseSafeAllow.split(',').map(item => {
+                  return {
+                    name: item.split('*')[0],
+                    url: this.$store.state.FILEURL + item.split('*')[1],
+                  }
+                }) : res.result.enterpriseSafeAllow.indexOf('http://') >= 0 || !res.result.enterpriseSafeAllow ? res.result.enterpriseQualificationUrl : this.$store.state.FILEURL + res.result.enterpriseSafeAllow
+              
+              // res.result.enterpriseSafeAllow ? this.$store.state.FILEURL + res.result.enterpriseSafeAllow : '',
             },
             {
               fieldName: this.$t("message.laborMange.natureOfUnit"),
@@ -523,7 +553,13 @@ export default {
                   : res.result.enterpriseProperty == 3
                   ? this.$t("message.laborMange.collectiveEnterprises")
                   : this.$t("message.laborMange.privateEnterprise"),
-              value2: res.result.logo ? this.$store.state.FILEURL +res.result.logo : "",
+              value2: res.result.logo && res.result.logo.split(',').length > 0 ?  res.result.logo.split(',').map(item => {
+                  return {
+                    name: item.split('*')[0],
+                    url: this.$store.state.FILEURL + item.split('*')[1],
+                  }
+                }) : res.result.logo.indexOf('http://') >= 0 || !res.result.logo ? res.result.logo : this.$store.state.FILEURL + res.result.logo 
+              // res.result.logo ? this.$store.state.FILEURL +res.result.logo : "",
             },
             {
               fieldName: this.$t("message.projectInfo.projectLeader"),
@@ -565,7 +601,7 @@ export default {
               fieldName: "项目面积(m²)",
               fieldName2: "工程状态",
               value: res.result.projectEnterprise.projectAcreage ? res.result.projectEnterprise.projectAcreage:"",
-              value2: res.result.projectEnterprise.bulidStatus ? res.result.projectEnterprise.bulidStatus:"",
+              value2: this.$t('message.companyDiagram.BUILDSTATUS')[res.result.projectEnterprise.bulidStatus].name,
             },
             {
               fieldName: "开工日期",