From f80b5c6f011dfb0033a2b1a636a08793f7fabed7 Mon Sep 17 00:00:00 2001
From: zhaochengke <beyondk2000@163.com>
Date: Wed, 18 May 2022 14:59:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E4=B8=8A=E5=AE=B6=E5=9B=AD=E6=B5=81?=
 =?UTF-8?q?=E8=BD=AC=E5=92=8C=E6=8A=B5=E6=8A=BC=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/onlineHome/done.vue                 |  7 ++
 .../circulation/circulationDetail.vue         | 97 +++++++++++++++++-
 .../homestead/mortgage/mortgageDetail.vue     | 98 ++++++++++++++++++-
 3 files changed, 194 insertions(+), 8 deletions(-)

diff --git a/src/views/onlineHome/done.vue b/src/views/onlineHome/done.vue
index 291a3eec..2f52fccd 100644
--- a/src/views/onlineHome/done.vue
+++ b/src/views/onlineHome/done.vue
@@ -184,6 +184,13 @@
             case 'acceptingWLHT':
               this.$router.push({name:'proposerLite',query: {id:item.formData.applyProposerId || item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type, processKey: item.formData.processKey}})
               break;
+            case 'house_mortgage':
+              this.$router.push({name:'mortgageDetail',query: {id: item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
+              break;
+            case 'house_circulation':
+              this.$router.push({name:'circulationDetail',query: {id: item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
+              break;
+
             case 'yinnong_transfer':
               this.$router.push({name:'approvalApproval',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
               break;
diff --git a/src/views/onlineHome/homestead/circulation/circulationDetail.vue b/src/views/onlineHome/homestead/circulation/circulationDetail.vue
index 50c0e224..3e1b969f 100644
--- a/src/views/onlineHome/homestead/circulation/circulationDetail.vue
+++ b/src/views/onlineHome/homestead/circulation/circulationDetail.vue
@@ -106,11 +106,35 @@
           <van-field readonly label="所有权人意见" v-model="circulation.suyqryj" input-align="right" label-width="auto"/>
           <van-field readonly label="备注" v-model="circulation.bz" input-align="right" label-width="auto"/>
         </div>
+
+      <!-- 审批 -->
+      <template v-if="approval.type === 'todo'">
+        <div class="main_box examine_box">
+          <van-row type="flex" justify="space-between" align="center">
+            <van-col span="5">审核<br/>意见</van-col>
+            <van-col span="19">
+              <van-field required :readonly="approval.type !== 'todo'" v-model="approval.comment" rows="2" autosize type="textarea" placeholder="审核意见"/>
+            </van-col>
+          </van-row>
+        </div>
+
+        <van-row style="margin-top: 0.2rem;">
+          <van-col span="12" align="center">
+            <van-button type="info" native-type="submit" class="submitButton" @click="complete(true)">同意</van-button>
+          </van-col>
+          <van-col span="12" align="center">
+            <van-button type="danger" native-type="submit" class="submitButton" @click="complete(false)">驳回</van-button>
+          </van-col>
+        </van-row>
+        <div class="clear"></div>
+      </template>
     </div>
 </template>
 
 <script>
 import { getLz } from "@/api/onlineHome/homestead/circulation";
+import request from '@/utils/request';
+import {Notify} from "vant";
 export default {
     name: "circulationDetail",
   data() {
@@ -118,10 +142,20 @@ export default {
       value: '',
       circulation:[],
       houseApplyStatus:[],
-      circulation:[],
+      approval: {
+        taskId: null,
+        instanceId: null,
+        type: null,
+        id: null,
+        comment: '',
+      },
     };
   },
   created() {
+    this.approval.id = this.$route.query.id;
+    this.approval.instanceId = this.$route.query.instanceId;
+    this.approval.type = this.$route.query.type;
+    this.approval.taskId = this.$route.query.taskId;
     this.getDetail();
   },
   methods: {
@@ -142,7 +176,42 @@ export default {
           this.circulation.lzhfwyt = this.selectDictLabel(res.data, response.data.lzhfwyt);
         });
       });
-    }
+    },
+    complete(pass) {
+      if(!this.approval.taskId || !this.approval.instanceId || this.approval.type !== 'todo')
+      {
+        console.error("无效操作");
+        return false;
+      }
+      if(!this.approval.comment)
+      {
+        this.notify("请填写审批意见", 'danger');
+        return false;
+      }
+      let data = {
+        taskId: this.approval.taskId,
+        instanceId: this.approval.instanceId,
+        variables: JSON.stringify({
+          pass: pass ? "true" : "false",
+          comment: this.approval.comment ? this.approval.comment : (pass ? '同意' : '驳回'),
+        }),
+      };
+      request({
+        url: "/activiti/process/complete",
+        method: "post",
+        params: data,
+      }).then((response) => {
+        this.notify("操作成功", 'success');
+        this.$router.back();
+      }).catch(e => {
+        this.notify("操作失败!", 'danger');
+      });
+      return true;
+    },
+    notify(message, type) {
+      Notify.clear();
+      Notify({ type: type || 'primary', message: message });
+    },
   },
 }
 </script>
@@ -168,7 +237,27 @@ export default {
   .submitButton{
     width: 80%;
     margin: 0 auto;
-    background-color: #1D6FE9;
-
+    border-radius: 14px;
+  }
+  .examine_box{
+    background-color: #1D6FE9!important;
+    padding: 0.18rem!important;
+    padding-left: 0!important;
+    border-radius: 0.15rem!important;
+    margin-top: 0.3rem!important;
+    .van-col:first-child{
+      color: #FFF!important;
+      font-size: 0.45rem!important;
+      text-align: center!important;
+    }
+    .van-col:last-child{
+      background-color: #FFF!important;
+      border-radius: 0.15rem!important;
+      overflow: hidden!important;
+      .van-radio-group--horizontal{
+        padding: 0.2rem 0;
+        border-bottom: 1px solid #eee;
+      }
+    }
   }
 </style>
diff --git a/src/views/onlineHome/homestead/mortgage/mortgageDetail.vue b/src/views/onlineHome/homestead/mortgage/mortgageDetail.vue
index 45bf1795..8c39b7fb 100644
--- a/src/views/onlineHome/homestead/mortgage/mortgageDetail.vue
+++ b/src/views/onlineHome/homestead/mortgage/mortgageDetail.vue
@@ -73,19 +73,54 @@
           <van-field readonly label="附记" v-model="circulation.fj" input-align="right" label-width="auto"/>
           <van-field readonly label="备注" v-model="circulation.bz" input-align="right" label-width="auto"/>
         </div>
+
+      <!-- 审批 -->
+      <template v-if="approval.type === 'todo'">
+        <div class="main_box examine_box">
+          <van-row type="flex" justify="space-between" align="center">
+            <van-col span="5">审核<br/>意见</van-col>
+            <van-col span="19">
+              <van-field required :readonly="approval.type !== 'todo'" v-model="approval.comment" rows="2" autosize type="textarea" placeholder="审核意见"/>
+            </van-col>
+          </van-row>
+        </div>
+
+        <van-row style="margin-top: 0.2rem;">
+          <van-col span="12" align="center">
+            <van-button type="info" native-type="submit" class="submitButton" @click="complete(true)">同意</van-button>
+          </van-col>
+          <van-col span="12" align="center">
+            <van-button type="danger" native-type="submit" class="submitButton" @click="complete(false)">驳回</van-button>
+          </van-col>
+        </van-row>
+        <div class="clear"></div>
+      </template>
     </div>
 </template>
 
 <script>
 import { getDy } from "@/api/onlineHome/homestead/mortgage";
+import request from '@/utils/request';
+import {Notify} from "vant";
 export default {
   name: "mortgageDetail",
   data() {
     return {
-      circulation:[]
+      circulation:[],
+      approval: {
+        taskId: null,
+        instanceId: null,
+        type: null,
+        id: null,
+        comment: '',
+      },
     };
   },
   created() {
+    this.approval.id = this.$route.query.id;
+    this.approval.instanceId = this.$route.query.instanceId;
+    this.approval.type = this.$route.query.type;
+    this.approval.taskId = this.$route.query.taskId;
     this.getDetail();
   },
   methods: {
@@ -110,7 +145,42 @@ export default {
           this.circulation.qszt = this.selectDictLabel(res.data, response.data.qszt);
         });
       });
-    }
+    },
+    complete(pass) {
+      if(!this.approval.taskId || !this.approval.instanceId || this.approval.type !== 'todo')
+      {
+        console.error("无效操作");
+        return false;
+      }
+      if(!this.approval.comment)
+      {
+        this.notify("请填写审批意见", 'danger');
+        return false;
+      }
+      let data = {
+        taskId: this.approval.taskId,
+        instanceId: this.approval.instanceId,
+        variables: JSON.stringify({
+          pass: pass ? "true" : "false",
+          comment: this.approval.comment ? this.approval.comment : (pass ? '同意' : '驳回'),
+        }),
+      };
+      request({
+        url: "/activiti/process/complete",
+        method: "post",
+        params: data,
+      }).then((response) => {
+        this.notify("操作成功", 'success');
+        this.$router.back();
+      }).catch(e => {
+        this.notify("操作失败!", 'danger');
+      });
+      return true;
+    },
+    notify(message, type) {
+      Notify.clear();
+      Notify({ type: type || 'primary', message: message });
+    },
   },
 }
 </script>
@@ -137,7 +207,27 @@ export default {
   .submitButton{
     width: 80%;
     margin: 0 auto;
-    background-color: #1D6FE9;
-
+    border-radius: 14px;
+  }
+  .examine_box{
+    background-color: #1D6FE9!important;
+    padding: 0.18rem!important;
+    padding-left: 0!important;
+    border-radius: 0.15rem!important;
+    margin-top: 0.3rem!important;
+    .van-col:first-child{
+      color: #FFF!important;
+      font-size: 0.45rem!important;
+      text-align: center!important;
+    }
+    .van-col:last-child{
+      background-color: #FFF!important;
+      border-radius: 0.15rem!important;
+      overflow: hidden!important;
+      .van-radio-group--horizontal{
+        padding: 0.2rem 0;
+        border-bottom: 1px solid #eee;
+      }
+    }
   }
 </style>