From a28050ebbe7f5d7dd328508121e2b28b1ca89b53 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 7 Nov 2023 18:01:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppPatrolReport/Add.vue                 | 10 +++++++---
 src/apps/AppPatrolReport/Content.vue             |  6 +++---
 src/apps/AppPatrolReport/Detail.vue              | 16 ++++++++--------
 src/apps/AppPatrolReport/List.vue                |  4 ++--
 src/apps/AppPatrolReport/SelectUser.vue          |  2 +-
 .../lulong/AppHandSnapshot/SelectUser.vue        |  2 +-
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/apps/AppPatrolReport/Add.vue b/src/apps/AppPatrolReport/Add.vue
index 5bd7f9f3..4200068f 100644
--- a/src/apps/AppPatrolReport/Add.vue
+++ b/src/apps/AppPatrolReport/Add.vue
@@ -59,7 +59,9 @@ export default {
         girdName: '',
         files: [],
         name: '',
-        phone: ''
+        phone: '',
+        girdMemberId: '',
+        girdMemberName: ''
       },
       flag: false,
       show: false,
@@ -78,13 +80,15 @@ export default {
     this.forms.phone = this.user.phone
     this.forms.girdId = this.user.girdId
     this.forms.girdName = this.user.girdName
+    this.forms.girdMemberId = this.user.girdMemberId
+    this.forms.girdMemberName = this.user.name
     uni.$on('chooseLat', res => {
       this.forms.mapInfo = {...res}
     })
   },
   methods: {
     typeList() {
-      this.$http.post(`/app/apppatrolreportgroup/list`, null, {
+      this.$http.post(`/app/apppatrolreportgroupv2/list`, null, {
         params: {
           size: 9999,
         },
@@ -128,7 +132,7 @@ export default {
         return this.$u.toast('请输入手机号')
       }
       this.flag = true
-      this.$http.post(`/app/apppatrolreportinfo/addByGirdMember`, {...this.forms, ...this.forms.mapInfo}).then((res) => {
+      this.$http.post(`/app/apppatrolreportinfov2/addByGirdMember`, {...this.forms, ...this.forms.mapInfo}).then((res) => {
         if (res.code == 0) {
           this.$u.toast('事件添加成功')
           uni.$emit('getListInit')
diff --git a/src/apps/AppPatrolReport/Content.vue b/src/apps/AppPatrolReport/Content.vue
index 8f6f177e..28e695d5 100644
--- a/src/apps/AppPatrolReport/Content.vue
+++ b/src/apps/AppPatrolReport/Content.vue
@@ -83,7 +83,7 @@ export default {
   },
   methods: {
     typeList() {
-      this.$http.post(`/app/apppatrolreportgroup/list`, null, {
+      this.$http.post(`/app/apppatrolreportgroupv2/list`, null, {
         params: {
           size: 9999,
         },
@@ -127,12 +127,12 @@ export default {
         // }
       }
       if (this.status == 2) {
-        url = `/app/apppatrolreportinfo/finishByGirdMember`
+        url = `/app/apppatrolreportinfov2/finish`
         successText = '拒绝成功'
         params = {...this.forms, eventStatus: 0}
       }
       if (this.status == 3) {
-        url = `/app/apppatrolreportinfo/finishByGirdMember`
+        url = `/app/apppatrolreportinfov2/finish`
         successText = '办结成功'
         params = {...this.forms, eventStatus: 1}
       }
diff --git a/src/apps/AppPatrolReport/Detail.vue b/src/apps/AppPatrolReport/Detail.vue
index 5fc2c6e7..6a55a009 100644
--- a/src/apps/AppPatrolReport/Detail.vue
+++ b/src/apps/AppPatrolReport/Detail.vue
@@ -95,29 +95,29 @@
 
     <div class="fixedBtn" v-if="isShowBtn">
       <div class="status00" v-if="data.eventStatus == 0">
-        <div class="columns border-r" @click="toContent(1)">
+        <div class="columns border-r" v-if="data.powerTransmit" @click="toContent(1)">
           <img src="./components/img/zhuanjiao.png" alt="" />
           <span class="hint">转交事件</span>
         </div>
 
-        <div class="columns" @click="toContent(2)">
+        <div class="columns" v-if="data.powerHandle" @click="toContent(2)">
           <img src="./components/img/jujue.png" alt="" />
           <span class="hint">拒绝受理</span>
         </div>
 
         <div class="doIt" @click="toContent(3)">我来受理</div>
       </div>
-      <div class="status00" v-if="data.eventStatus == 1 && data.girdMemberId == user.girdMemberId">
-        <div class="columns border-r" @click="toContent(1)">
+      <div class="status00" v-if="data.eventStatus == 1">
+        <div class="columns border-r" v-if="data.powerTransmit" @click="toContent(1)">
           <img src="./components/img/zhuanjiao.png" alt="" />
           <span class="hint">转交事件</span>
         </div>
-        <div class="columns" @click="toContent(2)">
+        <div class="columns" v-if="data.powerHandle"  @click="toContent(2)">
           <img src="./components/img/jujue.png" alt="" />
           <span class="hint">拒绝受理</span>
         </div>
 
-        <div class="doIt" @click="toContent(3)">前往办理</div>
+        <div class="doIt" v-if="data.powerHandle" @click="toContent(3)">前往办理</div>
       </div>
 
       <!-- <div class="endDoIt" v-if="data.eventStatus == 1 && data.rightType == 0" @click="toContent(3)">前往办理</div> -->
@@ -187,7 +187,7 @@ export default {
   },
   methods: {
     getDetail() {
-      this.$http.post(`/app/apppatrolreportinfo/queryDetailById?id=${this.id}`).then((res) => {
+      this.$http.post(`/app/apppatrolreportinfov2/queryDetailById?id=${this.id}`).then((res) => {
         if (res?.data) {
           this.data = res.data
         }
@@ -199,7 +199,7 @@ export default {
     },
 
     doThings() {
-      this.$http.post(`/app/appresidentreportinfo/finishByGirdMember`, {
+      this.$http.post(`/app/appresidentreportinfov2/finivsh`, {
         id: this.id,
         eventStatus: 1
       }).then((res) => {
diff --git a/src/apps/AppPatrolReport/List.vue b/src/apps/AppPatrolReport/List.vue
index 2b8b930e..22c8c70f 100644
--- a/src/apps/AppPatrolReport/List.vue
+++ b/src/apps/AppPatrolReport/List.vue
@@ -113,7 +113,7 @@ export default {
     },
     getList() {
       let {current, eventStatus, searchGrid: {id: girdId}} = this
-      this.$http.post(`/app/apppatrolreportinfo/listByGirdMember`, null, {
+      this.$http.post(`/app/apppatrolreportinfov2/listByGirdMember`, null, {
         params: {
           size: 10,
           current, 
@@ -170,7 +170,7 @@ export default {
     },
 
     getIsAdd() {
-      this.$http.post(`/app/apppatrolreportinfo/checkGirdMemberUser`).then((res) => {
+      this.$http.post(`/app/apppatrolreportinfov2/checkGirdMemberUser`).then((res) => {
         if (res.code == 0) {
           this.isAdd = res.data
         }
diff --git a/src/apps/AppPatrolReport/SelectUser.vue b/src/apps/AppPatrolReport/SelectUser.vue
index cc09a1fd..3c217612 100644
--- a/src/apps/AppPatrolReport/SelectUser.vue
+++ b/src/apps/AppPatrolReport/SelectUser.vue
@@ -74,7 +74,7 @@ export default {
   methods: {
     getTree() {
       this.slectList = []
-      this.$http.post(`/app/apppatrolreportinfo/listGirdInfoByTransfer?id=${this.detailId}`).then((res) => {
+      this.$http.post(`/app/apppatrolreportinfov2/listGirdInfoByTransfer?id=${this.detailId}`).then((res) => {
         if (res?.data) {
           this.allData = res.data
           this.treeInit()
diff --git a/src/project/lulong/AppHandSnapshot/SelectUser.vue b/src/project/lulong/AppHandSnapshot/SelectUser.vue
index cc09a1fd..5b2eafaf 100644
--- a/src/project/lulong/AppHandSnapshot/SelectUser.vue
+++ b/src/project/lulong/AppHandSnapshot/SelectUser.vue
@@ -53,7 +53,7 @@
 
 <script>
 export default {
-  name: 'SelectUser',
+  name: 'AppPatrolReport',
   data() {
     return {
       selectUser: {},