From 4420ffa0e19afb9044ce4f54f9d719460fc873c2 Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Wed, 29 May 2024 21:15:38 +0800
Subject: [PATCH] 1

---
 .../projectSummary/cooperationUnit.vue        | 34 +++++++++----------
 .../projectSummary/cooperatorDatails.vue      |  4 +--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/views/projectFront/projectSummary/cooperationUnit.vue b/src/views/projectFront/projectSummary/cooperationUnit.vue
index 98ef81a5..04098f21 100644
--- a/src/views/projectFront/projectSummary/cooperationUnit.vue
+++ b/src/views/projectFront/projectSummary/cooperationUnit.vue
@@ -116,7 +116,7 @@
                 }}{{ item.projectDirectorPhone }}
               </div>
               <div class="nature">
-                <!-- 项目负责人电话： -->项目类型:{{ item.projectEnterprise }}
+                <!-- 项目负责人电话： -->项目类型:{{ item.projectEnterprise.cbsProjectTypeName }}
               </div>
               <!-- <div class="nature">
                 {{ $t("message.cooperationUnit.enterpriseProperty") }}：{{
@@ -374,7 +374,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24">
+            <el-row :gutter="24" style="font-size:18px">
               承包商项目基本信息
             </el-row>
             <el-row :gutter="24">
@@ -393,7 +393,7 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="竣工日期" prop="completionDate">
-                  <el-date-picker v-model="enterpriseForm.projectEnterprise.completionDate" type="date"
+                  <el-date-picker value-format="yyyy-MM-dd" v-model="enterpriseForm.projectEnterprise.completionDate" type="date"
                     placeholder="选择日期">
                   </el-date-picker>
                 </el-form-item>
@@ -485,7 +485,7 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="开工日期" prop="enterpriseEmail">
-                  <el-date-picker v-model="enterpriseForm.projectEnterprise.startWorkDate" type="date" placeholder="选择日期">
+                  <el-date-picker value-format="yyyy-MM-dd" v-model="enterpriseForm.projectEnterprise.startWorkDate" type="date" placeholder="选择日期">
                   </el-date-picker>
                 </el-form-item>
               </el-col>
@@ -502,16 +502,8 @@
             </el-row>
             <el-row :gutter="24">
               <el-col :span="12">
-                <el-form-item label="现场布置图" prop="layoutImage">
-                  <el-upload class="upload-demo" :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>
-                  </el-upload>
+                <el-form-item label="联系电话" prop="projectTel">
+                  <el-input v-model="enterpriseForm.projectEnterprise.projectTel" placeholder="请输入联系电话"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -530,8 +522,16 @@
             </el-row>
             <el-row :gutter="24">
               <el-col :span="12">
-                <el-form-item label="联系电话" prop="projectTel">
-                  <el-input v-model="enterpriseForm.projectEnterprise.projectTel" placeholder="请输入联系电话"></el-input>
+                <el-form-item label="现场布置图" prop="layoutImage">
+                  <el-upload class="upload-demo" :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>
+                  </el-upload>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -1416,7 +1416,7 @@ export default {
 
         .list {
           width: 30%;
-          height: 150px;
+          height: 160px;
           margin: 8px 18px;
           border: 1px solid rgba(225, 232, 250, 1);
           border-radius: 3px;
diff --git a/src/views/projectFront/projectSummary/cooperatorDatails.vue b/src/views/projectFront/projectSummary/cooperatorDatails.vue
index e041dc57..2029e5bd 100644
--- a/src/views/projectFront/projectSummary/cooperatorDatails.vue
+++ b/src/views/projectFront/projectSummary/cooperatorDatails.vue
@@ -576,8 +576,8 @@ export default {
             {
               fieldName: "现场布置图",
               fieldName2: "现场施工图",
-              value: res.result.projectEnterprise.layoutImage && JSON.parse(res.result.projectEnterprise.layoutImage).length > 0? this.$store.state.FILEURL + JSON.parse(res.result.projectEnterprise.layoutImage)[0].url:"",
-              value2: res.result.projectEnterprise.constructionMapUrl&& JSON.parse(res.result.projectEnterprise.constructionMapUrl).length > 0?this.$store.state.FILEURL + JSON.parse(res.result.projectEnterprise.constructionMapUrl)[0].url:"",
+              value: res.result.projectEnterprise.layoutImage && JSON.parse(res.result.projectEnterprise.layoutImage) instanceof Array && JSON.parse(res.result.projectEnterprise.layoutImage).length > 0? this.$store.state.FILEURL + JSON.parse(res.result.projectEnterprise.layoutImage)[0].url:"",
+              value2: res.result.projectEnterprise.constructionMapUrl && JSON.parse(res.result.projectEnterprise.constructionMapUrl) instanceof Array  && JSON.parse(res.result.projectEnterprise.constructionMapUrl).length > 0?this.$store.state.FILEURL + JSON.parse(res.result.projectEnterprise.constructionMapUrl)[0].url:"",
             },
             {
               fieldName: "联系电话",