From 2b1e6f6f93cfa3c6a488dfaa308f422c976adc7d Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 29 Feb 2024 17:19:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biaopin/AppPatrolReport/Content.vue       | 18 ++++++++---------
 .../biaopin/AppPatrolReport/Detail.vue        | 20 +++----------------
 src/project/biaopin/AppPatrolReport/List.vue  |  5 ++++-
 3 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/src/project/biaopin/AppPatrolReport/Content.vue b/src/project/biaopin/AppPatrolReport/Content.vue
index 58735c84..683f33d5 100644
--- a/src/project/biaopin/AppPatrolReport/Content.vue
+++ b/src/project/biaopin/AppPatrolReport/Content.vue
@@ -12,9 +12,9 @@
           <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 == 4 ? '办结意见' : status == 3 ? '拒绝受理意见' : '办理意见'" prop="content" required :border-bottom="false" label-position="top"
+        <u-form-item :label="status == 3 ? '办结意见' : status == 4 ? '拒绝受理意见' : '办理意见'" prop="content" required :border-bottom="false" label-position="top"
                      class="contents">
-          <u-input v-model="forms.content" :placeholder="status == 3 ? '请写下拒绝受理意见…' : '请写下你的办结意见...'" type="textarea" auto-height height="100" maxlength="500"/>
+          <u-input v-model="forms.content" :placeholder="status == 4 ? '请写下拒绝受理意见…' : '请写下你的办结意见...'" type="textarea" auto-height height="100" maxlength="500"/>
         </u-form-item>
 
         <div class="line"></div>
@@ -30,11 +30,11 @@
       <span>转交事件</span>
     </div>
 
-    <div class="btn" v-if="this.status == 2" @click="confirm">
+    <div class="btn" v-if="this.status == 3" @click="confirm">
       <span>拒绝受理</span>
     </div>
 
-    <div class="btn" v-if="this.status == 3" @click="confirm">
+    <div class="btn" v-if="this.status == 4" @click="confirm">
       <span>我已办结</span>
     </div>
   </div>
@@ -56,11 +56,11 @@ export default {
       },
       flag: false,
       show: false,
-      status: '',  //1转交  2拒绝受理  3我已办结
+      status: '',  //1转交  3拒绝受理  4我已办结
       myList: [],
       id: '',
       selectUser: {},
-      titleList: ['', '转交事件', '', '拒绝受理', '我已办结']
+      titleList: ['', '转交事件', '', '我已办结', '拒绝受理']
     }
   },
   onLoad(option) {
@@ -110,7 +110,7 @@ export default {
       this.flag = true
       this.submit()
     },
-    submit() {  //status 1转交  3拒绝受理  4我已办结
+    submit() {  //status 1转交  4拒绝受理  3我已办结
       var url = '', successText = '', params = ''
       if (this.status == 1) {
         url = `/app/appclapeventinfoweiyang/transfer`
@@ -126,12 +126,12 @@ export default {
         //   params.girdMemberName = this.selectUser.name
         // }
       }
-      if (this.status == 3) {
+      if (this.status == 4) {
         url = `/app/appclapeventinfoweiyang/finish`
         successText = '拒绝成功'
         params = {...this.forms, eventStatus: this.status}
       }
-      if (this.status == 4) {
+      if (this.status == 3) {
         url = `/app/appclapeventinfoweiyang/finish`
         successText = '办结成功'
         params = {...this.forms, eventStatus: this.status}
diff --git a/src/project/biaopin/AppPatrolReport/Detail.vue b/src/project/biaopin/AppPatrolReport/Detail.vue
index b2a51b31..881b3095 100644
--- a/src/project/biaopin/AppPatrolReport/Detail.vue
+++ b/src/project/biaopin/AppPatrolReport/Detail.vue
@@ -160,10 +160,9 @@
 
 
     <div class="fixedBtn" v-if="data.rightType < 3 && data.rightType != null">
-
       <div class="flex-btn" v-if="data.rightType == 0">
-        <div class="refuse" @click="toContent(3)">拒绝受理</div>
-        <div class="confirm" @click="toContent(4)">我来受理</div>
+        <div class="refuse" @click="toContent(4)">拒绝受理</div>
+        <div class="confirm" @click="toContent(3)">我来受理</div>
       </div>
 
       <div class="change-btn" v-if="data.rightType == 1" @click="toContent(2)">前往办理</div>
@@ -172,19 +171,6 @@
         <div @click="toContent(1)">转交事件</div>
         <div class="confirm" @click="toContent(5)">前往办理</div>
       </div>
-
-      <!-- <div class="endDoIt" v-if="data.rightType == 1" @click="toContent(3)">前往办理</div>
-
-      <div class="status00" v-if="data.rightType == 2">
-        <div class="columns border-r" @click="toContent(1)">
-          <img src="./components/img/zhuanjiao.png" alt="" />
-          <span class="hint">转交事件</span>
-        </div>
-        <div class="doIt" @click="toContent(3)">前往办理</div>
-      </div> -->
-      
-
-      
     </div>
     <AiEvaluation v-show="false" v-model="evaluation" :bid="data.id"/>
     <u-modal v-model="doItShow" :mask-close-able="true" z-index="99" content="确定受理该事件?" :show-cancel-button="true" @confirm="doThings"></u-modal>
@@ -277,7 +263,7 @@ export default {
       })
     },
 
-    toContent(status) {  // 1转交，2研判，3拒绝，4办结，5调解
+    toContent(status) {  // 1转交，2研判, 3办结, 4拒绝，5调解
       // if(status == 3 && !this.data.doRight) {
       //   return this.$u.toast('没有办理权限')
       // }
diff --git a/src/project/biaopin/AppPatrolReport/List.vue b/src/project/biaopin/AppPatrolReport/List.vue
index 63de39bf..a6563e18 100644
--- a/src/project/biaopin/AppPatrolReport/List.vue
+++ b/src/project/biaopin/AppPatrolReport/List.vue
@@ -15,7 +15,7 @@
         <div class="tab-item" @click="showType = true">
           <AiMore v-model="eventStatusText" icon="arrow-down" placeholder="办件状态"/>
         </div>
-        <u-select v-model="showType" :list="$dict.getDict('weiyangEventStatus')" value-name="dictValue" label-name="dictName" @confirm="confirm"></u-select>
+        <u-select v-model="showType" :list="eventStatusList" value-name="dictValue" label-name="dictName" @confirm="confirm"></u-select>
       </div>
     </AiTopFixed>
     <template>
@@ -80,6 +80,7 @@ export default {
       eventStatus: '',
       eventStatusText: '',
       isAdd: true,
+      eventStatusList: []
     }
   },
   computed: {
@@ -96,6 +97,8 @@ export default {
   },
   created() {
     this.$dict.load('weiyangEventStatus', 'weiyangEventType', 'weiyangRiskLevel').then(() => {
+      this.eventStatusList = this.$dict.getDict('weiyangEventStatus')
+      this.eventStatusList.unshift({dictName: '全部', dictValue: ''})
       this.getList()
       // this.getIsAdd()
     })