From c9c0ad7517b72d81d35cbbc365986d3c60863ad5 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Sun, 9 Oct 2022 08:58:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E6=8C=89=E9=92=AE=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=BC=B9=E7=AA=97=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../homeApplication/proposerLite.vue          | 12 +++--
 .../homestead/paidExit/paidExitDetail.vue     | 48 ++++++++++++++++++-
 2 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
index 576ca92b..e4608844 100644
--- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
+++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
@@ -2803,7 +2803,11 @@ export default {
           this.auditProposer(true);
           break;
         case 'reject':
-          this.auditProposer(false);
+          this.$dialog.confirm({
+            message: '是否确认驳回此条申请',
+          }).then(() => {
+            this.auditProposer(false);
+          });
           break;
         case 'start':
           this.startProposerApply();
@@ -3941,16 +3945,16 @@ export default {
         return "说明不能为空";
       }
       if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.approveLeader)) {
-        return "其他部门签名不能为空";
+        return "住建部门签名不能为空";
       }
       if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.theGeomPoint)) {
-        return "其他部门现场定位不能为空";
+        return "住建部门现场定位不能为空";
       }
       if(this.$refs.pictureUploadApplyingTHouseApproveOther && this.$refs.pictureUploadApplyingTHouseApproveOther.isValid()) {
         this.submitHouseApproveOtherOptions();
       } else {
         if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.otherPlan)) {
-          return "其他部门现场拍照不能为空";
+          return "住建部门现场拍照不能为空";
         }
       }
       return false;
diff --git a/src/views/onlineHome/homestead/paidExit/paidExitDetail.vue b/src/views/onlineHome/homestead/paidExit/paidExitDetail.vue
index f404a341..0b676e65 100644
--- a/src/views/onlineHome/homestead/paidExit/paidExitDetail.vue
+++ b/src/views/onlineHome/homestead/paidExit/paidExitDetail.vue
@@ -160,7 +160,7 @@ export default {
         this.notify("请填写审批意见", 'danger');
         return false;
       }
-      let data = {
+      /*let data = {
         taskId: this.approval.taskId,
         instanceId: this.approval.instanceId,
         variables: JSON.stringify({
@@ -177,7 +177,51 @@ export default {
         this.$router.back();
       }).catch(e => {
         this.notify("操作失败!", 'danger');
-      });
+      });*/
+      if (pass) {
+        let data = {
+          taskId: this.approval.taskId,
+          instanceId: this.approval.instanceId,
+          variables: JSON.stringify({
+            pass: "true",
+            comment: this.approval.comment ? this.approval.comment : "同意",
+          }),
+        };
+        request({
+          url: "/activiti/process/complete",
+          method: "post",
+          params: data,
+        }).then((response) => {
+          this.notify("操作成功", 'success');
+          this.$router.back();
+        }).catch(e => {
+          this.notify("操作失败!", 'danger');
+        });
+      } else {
+        let _this = this;
+        _this.$dialog.confirm({
+          message: '是否确认驳回此条申请',
+        }).then(() => {
+          let data = {
+            taskId: _this.approval.taskId,
+            instanceId: _this.approval.instanceId,
+            variables: JSON.stringify({
+              pass: "false",
+              comment: _this.approval.comment ? _this.approval.comment : "驳回",
+            }),
+          };
+          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) {