From af3951ada0e348d22685dbfd44c06e1c55604a90 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 15 Dec 2021 11:18:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/visual/measure/dialogInfo.vue     | 52 ++++++++++---------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/views/modules/visual/measure/dialogInfo.vue b/src/views/modules/visual/measure/dialogInfo.vue
index 7b46272c..2a50f80d 100644
--- a/src/views/modules/visual/measure/dialogInfo.vue
+++ b/src/views/modules/visual/measure/dialogInfo.vue
@@ -51,31 +51,34 @@
             </div>
           </div>
           <div class="list">
-            <div class="item">
+            <div class="item" v-if="info.serviceShowFlag">
               <span class="item-field">服务方：</span>
               <span>{{ info.serviceShowName }}</span>
             </div>
-            <div class="item">
-              <span class="item-field">实际服务时间：</span>
-              <span v-if="info.serviceStartTime"
-                >{{ info.serviceStartTime }} 至 <br />
-                {{ info.serviceEndTime }}</span
-              >
-            </div>
-            <div class="item">
-              <span class="item-field">完成情况：</span>
-              <span
-                >{{ info.finishResult == "resolved" ? "已解决" : "未解决" }}
-                <br />
-                {{ info.finishDesc }}</span
-              >
-            </div>
-            <div class="item">
-              <span class="item-field">评价：</span>
-              <span>
-                <el-rate :value="info.score" disabled></el-rate>
-              </span>
-            </div>
+            <template v-if="info.status == 'finished'">
+              <div class="item">
+                <span class="item-field">实际服务时间：</span>
+                <span v-if="info.serviceStartTime"
+                  >{{ info.serviceStartTime }} 至 <br />
+                  {{ info.serviceEndTime }}</span
+                >
+              </div>
+              <div class="item">
+                <span class="item-field">完成情况：</span>
+                <span
+                  >{{ info.finishResult == "resolved" ? "已解决" : "未解决" }}
+                  <br />
+                  {{ info.finishDesc }}</span
+                >
+              </div>
+              <div class="item">
+                <span class="item-field">评价：</span>
+                <span>
+                  <el-rate :value="info.score" disabled></el-rate>
+                </span>
+              </div>
+            </template>
+            
           </div>
         </div>
 
@@ -194,17 +197,18 @@ export default {
       if (code === 0) {
         // console.log('data-org----dict', data)
         this.info = data;
-        this.getAnalyse();
+        this.getAnalyse(demandId);
       } else {
         this.$message.error(msg);
       }
     },
-    async getAnalyse() {
+    async getAnalyse(demandId) {
       // const url = "/gov/org/customeragency/staffinagencylist";
       this.loading = true;
       const url = "/heart/userdemand/demand-research-analysis";
       let params = {
         firstCategoryCode: this.info.firstCategoryCode,
+        demandRecId: demandId,
         icResiUserId: this.info.icResiUserId,
         epmetUserIdList: [this.info.epmetUserId],
         queryOrigin: this.queryOrigin,