From 28dadb29d4ded9ddd917346d36e0a63d4e63f22a Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 16 Feb 2022 09:25:51 +0800
Subject: [PATCH 1/6] 27430

---
 src/apps/AppIntegralAudit/detail.vue      | 2 +-
 src/saas/AppConflictMediation/Content.vue | 2 +-
 src/saas/AppConflictMediation/add.vue     | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/apps/AppIntegralAudit/detail.vue b/src/apps/AppIntegralAudit/detail.vue
index 7291607c..f327b9c0 100644
--- a/src/apps/AppIntegralAudit/detail.vue
+++ b/src/apps/AppIntegralAudit/detail.vue
@@ -9,7 +9,7 @@
         <div class="time">2020-05-06 13:45</div>
         <div class="address">
           <img src="./img/address.png" alt="">
-          <div>新港镇三联村</div>
+          <span>新港镇三联村</span>
         </div>
       </div>
       <div class="detail-text">
diff --git a/src/saas/AppConflictMediation/Content.vue b/src/saas/AppConflictMediation/Content.vue
index 4ee0702d..def4b5cb 100644
--- a/src/saas/AppConflictMediation/Content.vue
+++ b/src/saas/AppConflictMediation/Content.vue
@@ -76,7 +76,7 @@ export default {
     })
   },
   onShow() {
-    document.title = this.titleList[this.status]
+    document.title = '矛盾调解'
   },
   methods: {
 
diff --git a/src/saas/AppConflictMediation/add.vue b/src/saas/AppConflictMediation/add.vue
index dde6f949..21d8eaec 100644
--- a/src/saas/AppConflictMediation/add.vue
+++ b/src/saas/AppConflictMediation/add.vue
@@ -259,6 +259,7 @@ export default {
           this.flag = false
           if (res.code == 0) {
             uni.$emit('update')
+            this.$forceUpdate()
             setTimeout(() => {
               uni.navigateBack()
             }, 600)
@@ -412,5 +413,9 @@ export default {
     text-align: center;
     color: #ffffff;
   }
+  ::v-deep AiUploader {
+    width: 80px;
+    height: 80px;
+  }
 }
 </style>

From a642efd76423604066438c9ced5aaa56158f6051 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 16 Feb 2022 09:44:36 +0800
Subject: [PATCH 2/6] 27431

---
 src/saas/AppConflictMediation/Content.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/saas/AppConflictMediation/Content.vue b/src/saas/AppConflictMediation/Content.vue
index def4b5cb..afb9e6ac 100644
--- a/src/saas/AppConflictMediation/Content.vue
+++ b/src/saas/AppConflictMediation/Content.vue
@@ -3,7 +3,12 @@
     <div class="contents">
       <u-form :model="forms" ref="uForm" label-width="auto" :border-bottom="false">
         <u-form-item label="转交给" prop="status" required :border-bottom="false" right-icon="arrow-right" class="first-form" v-if="status == 4">
-          <u-input v-model="forms.name" placeholder="请选择转交对象" @click="toSelectUser" disabled />
+          <!-- <u-input v-model="forms.name" placeholder="请选择转交对象" @click="toSelectUser" disabled /> -->
+          <div @click="toSelectUser" style="width: 100%; text-align: right;">
+            <span v-if="!forms.name" style="color:#999;">请选择</span>
+            <AiOpenData v-if="forms.name" type="userName" :openid="forms.name" style="display:inline-block;"/>
+          </div>
+          
         </u-form-item>
         <u-form-item label="事件分类" prop="groupName" required :border-bottom="false" right-icon="arrow-right" v-if="status != 2">
 
@@ -148,6 +153,7 @@ export default {
       this.forms.groupId = e[0].value
     },
     toSelectUser() {
+      console.log(111);
       uni.navigateTo({ url: './SelectUser' })
     },
   },

From e061bb4ab253edab9a0ceef0960846398d309606 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 16 Feb 2022 09:48:19 +0800
Subject: [PATCH 3/6] 27435

---
 src/components/pages/selectGird.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/pages/selectGird.vue b/src/components/pages/selectGird.vue
index 3c9b8c62..c928db2c 100644
--- a/src/components/pages/selectGird.vue
+++ b/src/components/pages/selectGird.vue
@@ -219,7 +219,7 @@ export default {
         .imges {
           display: flex;
           align-items: center;
-          // width: 200px;
+          width: 158px;
           .imgselect {
             width: 48px;
             height: 48px;

From 918e75bbb02ccd92d60bf1af3de2d54fe81bb625 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 16 Feb 2022 09:59:38 +0800
Subject: [PATCH 4/6] 27436

---
 src/saas/AppConflictMediation/Content.vue | 5 +++--
 src/saas/AppConflictMediation/List.vue    | 1 +
 src/saas/AppConflictMediation/add.vue     | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/saas/AppConflictMediation/Content.vue b/src/saas/AppConflictMediation/Content.vue
index afb9e6ac..de7ecd63 100644
--- a/src/saas/AppConflictMediation/Content.vue
+++ b/src/saas/AppConflictMediation/Content.vue
@@ -62,7 +62,8 @@ export default {
       myList: [],
       id: '',
       selectUser: {},
-      titleList: ['', '转交事件', '我已办结']
+      titleList: ['', '事件处理', '', '事件转交'],
+
     }
   },
   onLoad(option) {
@@ -81,7 +82,7 @@ export default {
     })
   },
   onShow() {
-    document.title = '矛盾调解'
+    document.title = this.titleList[this.status]
   },
   methods: {
 
diff --git a/src/saas/AppConflictMediation/List.vue b/src/saas/AppConflictMediation/List.vue
index 983ca954..ffc08d8c 100644
--- a/src/saas/AppConflictMediation/List.vue
+++ b/src/saas/AppConflictMediation/List.vue
@@ -165,6 +165,7 @@ export default {
             this.staticName[2].value = res.data['已办数']
             this.staticName[3].value = res.data['今日办结']
           })
+          this.$forceUpdate()
         }
       })
     },
diff --git a/src/saas/AppConflictMediation/add.vue b/src/saas/AppConflictMediation/add.vue
index 21d8eaec..067406bc 100644
--- a/src/saas/AppConflictMediation/add.vue
+++ b/src/saas/AppConflictMediation/add.vue
@@ -120,7 +120,7 @@
 import { mapState } from 'vuex'
 
 export default {
-  appName: '矛盾调解',
+  appName: '新增事件',
   data() {
     return {
       isShowType: false,

From 60e8def629722d8c00939b7dc3d2a93d5ca03171 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 16 Feb 2022 10:10:18 +0800
Subject: [PATCH 5/6] bug

---
 src/components/AiOpenData.vue             | 2 +-
 src/saas/AppConflictMediation/Content.vue | 3 +--
 src/saas/AppConflictMediation/add.vue     | 4 ++++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/AiOpenData.vue b/src/components/AiOpenData.vue
index 3a19f0ab..c4d5ed6b 100644
--- a/src/components/AiOpenData.vue
+++ b/src/components/AiOpenData.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :type="type" :openid="oid"/>
+  <div :type="type" :openid="oid" v-text="oid"/>
 </template>
 
 <script>
diff --git a/src/saas/AppConflictMediation/Content.vue b/src/saas/AppConflictMediation/Content.vue
index de7ecd63..72572f66 100644
--- a/src/saas/AppConflictMediation/Content.vue
+++ b/src/saas/AppConflictMediation/Content.vue
@@ -62,7 +62,7 @@ export default {
       myList: [],
       id: '',
       selectUser: {},
-      titleList: ['', '事件处理', '', '事件转交'],
+      titleList: ['', '', '事件处理', '', '事件转交'],
 
     }
   },
@@ -154,7 +154,6 @@ export default {
       this.forms.groupId = e[0].value
     },
     toSelectUser() {
-      console.log(111);
       uni.navigateTo({ url: './SelectUser' })
     },
   },
diff --git a/src/saas/AppConflictMediation/add.vue b/src/saas/AppConflictMediation/add.vue
index 067406bc..00d141c9 100644
--- a/src/saas/AppConflictMediation/add.vue
+++ b/src/saas/AppConflictMediation/add.vue
@@ -151,6 +151,10 @@ export default {
     ...mapState(['user']),
   },
 
+  onShow() {
+    document.title = '新增事件'
+  },
+
   onLoad() {
     this.getDict()
     this.form.phone = this.user.phone

From 1088b0f4d955295e9b5f563765421b8e15b7165c Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 16 Feb 2022 10:18:54 +0800
Subject: [PATCH 6/6] 27432

---
 src/saas/AppConflictMediation/SelectUser.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/saas/AppConflictMediation/SelectUser.vue b/src/saas/AppConflictMediation/SelectUser.vue
index 28a541c8..0eda9fdd 100644
--- a/src/saas/AppConflictMediation/SelectUser.vue
+++ b/src/saas/AppConflictMediation/SelectUser.vue
@@ -252,13 +252,12 @@ export default {
         .rightes {
           width: calc(100% - 160px);
           display: flex;
-          justify-content: space-between;
           align-items: center;
           margin-left: 32px;
           border-bottom: 1px solid #e4e5e6;
 
           .applicationNames {
-            max-width: calc(100% - 80px);
+            width: 460px;
             font-size: 36px;
             font-weight: 500;
             color: #333333;