diff --git a/src/saas/AppConflictMediation/Content.vue b/src/saas/AppConflictMediation/Content.vue
index ab0ab4c1..c59cb65c 100644
--- a/src/saas/AppConflictMediation/Content.vue
+++ b/src/saas/AppConflictMediation/Content.vue
@@ -2,18 +2,18 @@
   <div class="Transfer">
     <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 == 0">
+        <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-form-item>
-        <u-form-item label="事件分类" prop="groupName" required :border-bottom="false" right-icon="arrow-right" v-if="status != 0">
+        <u-form-item label="事件分类" prop="groupName" required :border-bottom="false" right-icon="arrow-right" v-if="status != 2">
 
           <span @click="show = true" class="right-span" :style="forms.groupName ? '' : 'color:#999;'">{{forms.groupName || '请选择事件分类'}}</span>
 
           <u-select v-model="show" :list="myList" value-name="id" label-name="groupName" @confirm="selectStatus"></u-select>
         </u-form-item>
 
-        <u-form-item :label="status == 1 ? '办结意见':'办理意见'" prop="content" required :border-bottom="false" label-position="top" class="contents">
-          <u-input v-model="forms.content" :placeholder="status == 1 ? '请写下你的办结意见…' : '请写下你的办理意见...'" type="textarea" auto-height height="100" maxlength="200" />
+        <u-form-item :label="status == 2 ? '办结意见':'办理意见'" prop="content" required :border-bottom="false" label-position="top" class="contents">
+          <u-input v-model="forms.content" :placeholder="status == 2 ? '请写下你的办结意见…' : '请写下你的办理意见...'" type="textarea" auto-height height="100" maxlength="200" />
         </u-form-item>
 
         <div class="limit">{{ forms.content.length }}/200</div>
@@ -27,11 +27,11 @@
       </u-form>
     </div>
 
-    <div class="btn" v-if="this.status == 0" @click="confirm">
+    <div class="btn" v-if="this.status == 4" @click="confirm">
       <span>转交事件</span>
     </div>
 
-    <div class="btn" v-if="this.status == 1" @click="confirm">
+    <div class="btn" v-if="this.status == 2" @click="confirm">
       <span>确定</span>
     </div>
   </div>
@@ -53,11 +53,11 @@ export default {
       },
       flag: false,
       show: false,
-      status: '',  //0转交  1办结  
+      status: '',  //4转交  2我已办结  
       myList: [],
       id: '',
       selectUser: {},
-      titleList: ['转交事件', '我已办结']
+      titleList: ['', '转交事件', '我已办结']
     }
   },
   onLoad(option) {
@@ -96,20 +96,20 @@ export default {
     },
 
     confirm() {
-      if(this.status == 0 && !this.forms.name) {
+      if(this.status == 4 && !this.forms.name) {
         return this.$u.toast('请选择转交对象')
       }
-      if(this.status != 0 && !this.forms.groupName) {
+      if(this.status != 4 && !this.forms.groupName) {
         return this.$u.toast('请选择分类')
       }
-      if(this.status != 0 && !this.forms.content) {
+      if(this.status != 4 && !this.forms.content) {
         return this.$u.toast('请输入意见')
       }
       this.submit()
     },
-    submit() {  //status 0转交  1办结
+    submit() {  //status 4转交  2我已办结
       var url = '', successText= '', params= ''
-      if(this.status == 0) {
+      if(this.status == 4) {
         url = `/app/appclapeventinfo/transfer`
         successText = '转交成功'
         params = {
@@ -123,7 +123,7 @@ export default {
           params.girdMemberName = this.selectUser.name
         }
       }
-      if(this.status == 1) {
+      if(this.status == 2) {
         url = `/app/appclapeventinfo/finishByGirdMember`
         successText = '办结成功'
         params = {...this.forms}
@@ -135,11 +135,11 @@ export default {
           uni.$emit('updateDeatil')
           uni.$emit('getListInit')
           setTimeout(() => {
-            // if(this.status == 1) {
-            //   uni.navigateBack({delta: 2})
-            // }else {
+            if(this.status == 4) {
+              uni.navigateBack({delta: 2})
+            }else {
               uni.navigateBack()
-            // }
+            }
           },600)
         }
       })
diff --git a/src/saas/AppConflictMediation/detail.vue b/src/saas/AppConflictMediation/detail.vue
index f4882027..0784c54a 100644
--- a/src/saas/AppConflictMediation/detail.vue
+++ b/src/saas/AppConflictMediation/detail.vue
@@ -56,7 +56,8 @@
             <div class="cardss-left">
               <span>
                 <!-- {{ item.systemExplain }} -->
-                {{ item.girdMemberName && item.girdMemberName.substring(item.girdMemberName.length, item.girdMemberName.length - 2) }}
+                <!-- {{ item.girdMemberName && item.girdMemberName.substring(item.girdMemberName.length, item.girdMemberName.length - 2) }} -->
+                <AiOpenData v-if="item.openId" type="userName" :openid="item.openId" style="display: inline-block;"/>
               </span>
 
               <img src="./components/1.png" class="avatarIcon" alt="" />
@@ -90,7 +91,7 @@
 
     <div class="fixedBtn">
       <div class="status00" v-if="data.eventStatus == 0">
-        <div class="columns border-r" @click="toContent(0)">
+        <div class="columns border-r" @click="toContent(4)">
           <!-- <img src="./components/img/zhuanjiao.png" alt="" /> -->
           <span class="hint">转交事件</span>
         </div>
@@ -99,7 +100,7 @@
       </div>
     </div>
 
-    <u-modal v-model="doItShow" :mask-close-able="true" z-index="99" content="确定受理该事件?" :show-cancel-button="true" @confirm="toContent(1)"></u-modal>
+    <u-modal v-model="doItShow" :mask-close-able="true" z-index="99" content="确定受理该事件?" :show-cancel-button="true" @confirm="toContent(2)"></u-modal>
   </div>
 </template>