From 8440693bbd592211a57218d3ef7e1550e59c1c43 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 9 Feb 2022 09:21:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=9B=E7=9B=BE=E8=B0=83=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppReportAiWill/components/Detail.vue     | 19 ++++++++++++++-----
 .../apps/AppReportAiWill/components/List.vue  | 13 +++++++++++--
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/project/sass/apps/AppReportAiWill/components/Detail.vue b/project/sass/apps/AppReportAiWill/components/Detail.vue
index 65d9d1ba..95a49f93 100644
--- a/project/sass/apps/AppReportAiWill/components/Detail.vue
+++ b/project/sass/apps/AppReportAiWill/components/Detail.vue
@@ -1,14 +1,16 @@
 <template>
   <ai-detail class="reportAtWillDetail" v-loading="isLoading">
     <template #title>
-      <ai-title title="事件上报详情" isShowBack isShowBottomBorder  @onBackClick="cancel(false)"></ai-title>
+      <ai-title title="矛盾调解详情" isShowBack isShowBottomBorder  @onBackClick="cancel(false)"></ai-title>
     </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="上报人员">
+                <ai-open-data type="userName" :openid="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>
@@ -35,7 +37,8 @@
                   :description="item.doTime">
                   <template #title>
                     <h2 class="step-title" style="font-weight: 500; font-size: 14px;">
-                      {{ item.systemExplain }}
+                      <ai-open-data type="userName" :openid="item.user" />
+                      {{ item.title }}
                     </h2>
                   </template>
                   <template #description>
@@ -64,7 +67,8 @@
     data() {
       return {
         isLoading: true,
-        detail: {}
+        detail: {},
+        processList: []
       }
     },
 
@@ -85,7 +89,12 @@
         }).then(res => {
           if (res?.data) {
             this.detail = res.data
-            this.processList = res.data.processList
+            this.processList = res.data.processList.map(item => {
+              item.user = /\$(.+?)\$/g.exec(item.systemExplain)[1]
+              item.title = item.systemExplain.replace(/\$(.+?)\$/g, '')
+
+              return item
+            })
 
             this.$nextTick(() => {
               this.initMap()
diff --git a/project/sass/apps/AppReportAiWill/components/List.vue b/project/sass/apps/AppReportAiWill/components/List.vue
index 92f90e9c..b26aa37e 100644
--- a/project/sass/apps/AppReportAiWill/components/List.vue
+++ b/project/sass/apps/AppReportAiWill/components/List.vue
@@ -1,7 +1,7 @@
 <template>
   <ai-list>
     <template #title>
-      <ai-title title="事件上报" isShowBottomBorder></ai-title>
+      <ai-title title="矛盾调解" isShowBottomBorder></ai-title>
     </template>
     <template #content>
       <ai-search-bar>
@@ -79,7 +79,7 @@
           { prop: 'content', label: '内容描述', width: '300px' },
           { prop: 'groupName', label: '事件类型', align: 'center' },
           { prop: 'girdName', label: '所属网格', align: 'center' },
-          { prop: 'name', label: '上报居民', align: 'center' },
+          { prop: 'openId', label: '上报人', align: 'center', openType: 'userName' },
           { slot: 'options' }
         ]
       }
@@ -89,6 +89,8 @@
       this.dict.load('clapEventStatus').then(() => {
         this.getList()
       })
+
+      this.getGirdList()
     },
 
     methods: {
@@ -105,6 +107,13 @@
         })
       },
 
+      getGirdList () {
+        // this.instance.post(`/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser`).then(res => {
+        //   if (res.code == 0) {
+        //   }
+        // })
+      },
+
       toDetail (id) {
         this.$emit('change', {
           type: 'Detail',