From f0e20994a2df9ef21757432e22f1017636b84611 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 19 Oct 2022 11:17:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E5=88=86=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppReportAiWill/components/Detail.vue     | 54 +++++++++++--------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/packages/conv/AppReportAiWill/components/Detail.vue b/packages/conv/AppReportAiWill/components/Detail.vue
index 63df74e0..c0504260 100644
--- a/packages/conv/AppReportAiWill/components/Detail.vue
+++ b/packages/conv/AppReportAiWill/components/Detail.vue
@@ -12,31 +12,34 @@
     </template>
     <template #content>
       <div class="detail-content__wrapper">
-        <ai-card class="detail-content__wrapper--left" title="基础信息">
-          <template #content>
-            <ai-wrapper>
-              <ai-info-item label="上报人员" :value="detail.name"></ai-info-item>
-              <ai-info-item label="当前状态" :value="dict.getLabel('clapEventStatus', detail.eventStatus)"></ai-info-item>
-              <ai-info-item label="联系方式">{{ detail.phone }}</ai-info-item>
-              <ai-info-item label="上报时间">{{ detail.createTime }}</ai-info-item>
-              <ai-info-item label="事件类型">{{ detail.groupName }}</ai-info-item>
-              <ai-info-item label="事件描述" isLine>{{ detail.content }}</ai-info-item>
-              <ai-info-item label="现场照片" isLine>
-                <ai-uploader :instance="instance" disabled v-model="detail.files"></ai-uploader>
-              </ai-info-item>
-              <ai-info-item label="所属网格">{{ detail.girdName }}</ai-info-item>
-              <ai-info-item label="事件位置" isLine>
-                <div id="map" style="width: 500px; height: 280px;"></div>
-              </ai-info-item>
-            </ai-wrapper>
-          </template>
-        </ai-card>
+        <div class="detail-content__wrapper--left">
+          <ai-card title="基础信息">
+            <template #content>
+              <ai-wrapper>
+                <ai-info-item label="上报人员" :value="detail.name"></ai-info-item>
+                <ai-info-item label="当前状态" :value="dict.getLabel('clapEventStatus', detail.eventStatus)"></ai-info-item>
+                <ai-info-item label="联系方式">{{ detail.phone }}</ai-info-item>
+                <ai-info-item label="上报时间">{{ detail.createTime }}</ai-info-item>
+                <ai-info-item label="事件类型">{{ detail.groupName }}</ai-info-item>
+                <ai-info-item label="事件描述" isLine>{{ detail.content }}</ai-info-item>
+                <ai-info-item label="现场照片" isLine>
+                  <ai-uploader :instance="instance" disabled v-model="detail.files"></ai-uploader>
+                </ai-info-item>
+                <ai-info-item label="所属网格">{{ detail.girdName }}</ai-info-item>
+                <ai-info-item label="事件位置" isLine>
+                  <div id="map" style="width: 500px; height: 280px;"></div>
+                </ai-info-item>
+              </ai-wrapper>
+            </template>
+          </ai-card>
+          <ai-evaluation :bid="form.id" :info.sync="evaluation"/>
+        </div>
         <div class="rightZone">
           <ai-card title="办理进度">
             <template #content>
               <el-steps direction="vertical" :active="1">
                 <el-step
-                    v-for="(item, i) in processList"
+                    v-for="(item, i) in process"
                     :key="i"
                     :title="item.systemExplain"
                     :description="item.doTime">
@@ -190,12 +193,18 @@ export default {
         groupName: '',
         content: [],
         eventStatus: '2'
-      }
+      },
+      evaluation: {}
     }
   },
 
   computed: {
-    ...mapState(['user'])
+    ...mapState(['user']),
+    process: v => [v.processList, v.evaluation.id ? {
+      systemExplain: `${v.evaluation.createUserName}完成评价 (${v.evaluation.score}星评价)`,
+      doTime: v.evaluation.createTime,
+      doExplain: v.evaluation.rateText
+    } : null].flat().filter(Boolean)
   },
 
   created() {
@@ -501,6 +510,7 @@ export default {
   .detail-content__wrapper {
     display: flex;
     width: 100%;
+    flex-wrap: wrap;
 
     .detail-content__wrapper--left {
       flex: 1;