From 40d572d46627f36d9f10147a731bf09458e6cd66 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 18 Mar 2022 09:44:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E6=96=87=E6=B5=81=E8=BD=AC=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppDocumentFlow/AppDocumentFlow.vue       |  4 ++
 .../shandong10086/AppDocumentFlow/detail.vue  | 52 +++++++++++++------
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/project/shandong10086/AppDocumentFlow/AppDocumentFlow.vue b/src/project/shandong10086/AppDocumentFlow/AppDocumentFlow.vue
index 6e8824fa..ccd55a6d 100644
--- a/src/project/shandong10086/AppDocumentFlow/AppDocumentFlow.vue
+++ b/src/project/shandong10086/AppDocumentFlow/AppDocumentFlow.vue
@@ -50,6 +50,10 @@ export default {
   },
   onLoad() {
     this.$dict.load("officialDocumentName")
+    uni.$on('updateList', () => {
+      this.current = 1
+      this.getList()
+    })
   },
   methods: {
     tag(status) {
diff --git a/src/project/shandong10086/AppDocumentFlow/detail.vue b/src/project/shandong10086/AppDocumentFlow/detail.vue
index b565cb46..957994a0 100644
--- a/src/project/shandong10086/AppDocumentFlow/detail.vue
+++ b/src/project/shandong10086/AppDocumentFlow/detail.vue
@@ -84,7 +84,8 @@
       </div>
       <div class="footer" v-if="detail.flowRight==1 && detail.readType==0">
         <div @click="handleClick(0)">批示</div>
-        <div @click="handleClick(1)">流转</div>
+        <div @click="handleClick(1)" style="background-color: #1365DD;color: #FFFFFF">流转</div>
+        <div @click="end()" style="background-color: #f46;color: #FFFFFF">结束</div>
       </div>
       <div class="footer" v-if="detail.readType==1 && detail.flowRight==1" @click="read"
            style="background-color: #1365DD;color: #FFFFFF">我已阅完
@@ -182,6 +183,19 @@ export default {
       } else {
         this.userSelect = true
       }
+    },
+    end() {
+      this.$confirm('确定结束该公文流转？').then(() => {
+        this.$http.post(`/app/appofficialdocumentinfo/finishById?id=${this.id}`).then(res => {
+          if (res.code == 0) {
+            this.$u.toast('操作成功')
+            uni.$emit('updateList')
+            setTimeout(() => {
+              uni.navigateBack()
+            })
+          }
+        })
+      })
     }
   },
   onShow() {
@@ -403,25 +417,29 @@ export default {
 
     & > div {
       color: #333333;
+      flex: 1;
+      height: 112px;
+      text-align: center;
+      line-height: 112px;
     }
 
-    & > div:first-child {
-      width: 50%;
-      height: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
+    // & > div:first-child {
+    //   width: 50%;
+    //   height: 100%;
+    //   display: flex;
+    //   align-items: center;
+    //   justify-content: center;
+    // }
 
-    & > div:last-child {
-      width: 50%;
-      height: 100%;
-      color: #FFFFFF;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      background-color: #1365DD;
-    }
+    // & > div:last-child {
+    //   width: 50%;
+    //   height: 100%;
+    //   color: #FFFFFF;
+    //   display: flex;
+    //   align-items: center;
+    //   justify-content: center;
+    //   background-color: #1365DD;
+    // }
 
     & > label {
       display: flex;