diff --git a/src/saas/AppConflictMediation/List.vue b/src/saas/AppConflictMediation/List.vue
index e0a877cb..1bde1518 100644
--- a/src/saas/AppConflictMediation/List.vue
+++ b/src/saas/AppConflictMediation/List.vue
@@ -141,7 +141,8 @@ export default {
             current: this.current,
             searchType: this.currentTabs == 1 ? '1' : '0',
             eventStatus: this.eventStatus,
-            girdId: this.girdId
+            girdId: this.girdId,
+            openId:this.eventStatus== 4 ? this.user.openId : ""
           },
         })
         .then((res) => {
@@ -171,9 +172,13 @@ export default {
     },
     // 切换类型
     changeType(e) {
-      this.status = e[0].label
+      if(e[0].value!=1){
+        this.status = e[0].label
+        this.eventStatus = e[0].value
+      }else{
+       this.eventStatus = 4
+      }
       this.datas = []
-      this.eventStatus = e[0].value
       this.getList()
     },
 
diff --git a/src/saas/AppConflictMediation/SelectUser.vue b/src/saas/AppConflictMediation/SelectUser.vue
index 38d14710..28a541c8 100644
--- a/src/saas/AppConflictMediation/SelectUser.vue
+++ b/src/saas/AppConflictMediation/SelectUser.vue
@@ -1,10 +1,9 @@
 <template>
   <div class="SelectUser">
     <div class="header-middle">
-      <!-- 去掉网格名称 -->
-      <!-- <div class="hint">
+      <div class="hint">
         <span v-for="(item, index) in slectList" :key="index"><span v-if="index" style="margin:0 4px;">/</span><span style="color:#3F8DF5" @click="girdNameClick(item, index)">{{item.girdName}}</span></span>
-      </div> -->
+      </div>
 
       <div class="showTypes" v-if="!userList.length">
         <div v-if="treeList.length > 0">
@@ -37,7 +36,7 @@
             </div>
 
             <div class="rights">
-              <div class="applicationNames">{{ e.name }}</div>
+              <div class="applicationNames"><AiOpenData v-if="e.name" type="userName" :openid="e.name" style="display: block;"/></div>
               <div class="idNumbers">{{ e.phone }}</div>
             </div>
           </div>
@@ -209,7 +208,10 @@ export default {
       box-shadow: 0px 1px 0px 0px #e4e5e6;
       font-size: 30px;
       font-weight: 500;
-      word-break: break-all;
+      // word-break: break-all;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
     }
 
     .showTypes {
@@ -223,13 +225,12 @@ export default {
         align-items: center;
         height: 120px;
         line-height: 120px;
-        // background: pink;
         padding: 0 0 0 32px;
 
         .imges {
           display: flex;
           align-items: center;
-          // width: 200px;
+
           .imgselect {
             width: 48px;
             height: 48px;
@@ -249,16 +250,21 @@ export default {
           border-radius: 8px;
         }
         .rightes {
-          width: 100%;
+          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);
             font-size: 36px;
             font-weight: 500;
             color: #333333;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
           }
           .imgs {
             width: 40px;
@@ -275,7 +281,6 @@ export default {
         align-items: center;
         height: 120px;
         line-height: 120px;
-        // background: pink;
         padding: 0 0 0 32px;
 
         .imges {
@@ -296,7 +301,7 @@ export default {
         }
 
         .rights {
-          width: 100%;
+          width: 70%;
           display: flex;
           justify-content: space-between;
           align-items: center;
@@ -307,6 +312,9 @@ export default {
             font-size: 36px;
             font-weight: 500;
             color: #333333;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
           }
           .idNumbers {
             color: #666;
diff --git a/src/saas/AppConflictMediation/add.vue b/src/saas/AppConflictMediation/add.vue
index 59d06f9d..5ed74b52 100644
--- a/src/saas/AppConflictMediation/add.vue
+++ b/src/saas/AppConflictMediation/add.vue
@@ -90,7 +90,7 @@
               <h2>办理结果</h2>
             </div>
             <div class="form-item__right">
-              <textarea v-model="form.result" :maxlength="500" placeholder="请简要描述事件…"></textarea>
+              <textarea v-model="form.result" :maxlength="500" placeholder="请输入办理结果信息"></textarea>
             </div>
           </div>
         </div>
@@ -256,9 +256,7 @@
           if (res.code == 0) {
             uni.$emit('update')
             setTimeout(() => {
-              uni.navigateTo({
-                url: './List'
-              })
+              uni.navigateBack()
             }, 600)
           }
           this.$hideLoading()