From d01aa78e74112094bc45bfc79140ddbad1aad00b Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 19 May 2022 16:43:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shequzhili/xiangmu/cpts/project-info.vue  | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index 7830a98d4..52933d801 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -2,7 +2,7 @@
   <div class="">
     <div class="g-page" v-show="pageType == 'info'">
       <div class="g-left">
-        <el-card>
+        <el-card style="overflow: auto">
           <h3>项目详情</h3>
 
           <div class="m-info">
@@ -59,7 +59,7 @@
                 </div>
               </fold-text>
 
-              <el-popover
+              <el-popover v-if="projectInfo.projectStatus=='pending'"
                 placement="bottom"
                 width="400"
                 height="400"
@@ -99,7 +99,7 @@
                 </div>
               </fold-text>
 
-              <el-popover
+              <el-popover v-if="projectInfo.projectStatus=='pending'"
                 placement="bottom"
                 width="400"
                 height="400"
@@ -159,6 +159,7 @@
           </div>
         </el-card>
         <el-card
+          style="overflow: auto"
           v-if="type == 'edit' && projectInfo.projectStatus == 'pending'"
         >
           <h3>处理</h3>
@@ -359,7 +360,8 @@
       <div class="g-right">
         <el-card
           class="m-card"
-          style="max-height: 90vh; overflow: auto"
+          :style="styleFullHeight"
+          style="overflow: auto"
           v-if="projectProcess.length > 0"
         >
           <h3>处理进展</h3>
@@ -383,6 +385,11 @@
                   <div class="detail-value">{{ item.departmentName }}</div>
                 </div>
 
+                <div class="detail" v-if="item.assistanceUnitName">
+                  <div class="detail-field">协办单位：</div>
+                  <div class="detail-value">{{ item.assistanceUnitName }}</div>
+                </div>
+
                 <div
                   class="detail"
                   v-if="item.processName != '转项目' && item.publicReply"
@@ -646,6 +653,18 @@ export default {
 
       return obj;
     },
+
+    styleFullHeight() {
+      return {
+        maxHeight: "calc(100vh - 120px)",
+      };
+    },
+
+    styleHalfHeight() {
+      return {
+        maxHeight: "calc((100vh - 140px) / 2)",
+      };
+    },
   },
 
   watch: {
@@ -928,7 +947,6 @@ export default {
     async getApiData() {
       await this.getProjectInfo();
       this.getProjectCate();
-      this.getCateOptions();
       this.getProjectProcess();
     },
 
@@ -1099,7 +1117,10 @@ export default {
       if (code === 0) {
         this.projectCate = data.categoryList;
         this.projectTag = data.tagList;
-        this.getTagOptions();
+        if (this.projectInfo.projectStatus == "pending") {
+          this.getCateOptions();
+          this.getTagOptions();
+        }
       } else {
         this.$message.error(msg);
       }
@@ -1176,6 +1197,7 @@ export default {
           customized: data.customized,
           defaulted: data.defaulted,
         };
+        this.selectedTagData = this.projectTag.map((item) => item.id);
       } else {
         this.$message.error(msg);
       }