From 039043931960084dc46e59e84ed0b891538cd9d6 Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Fri, 6 Jan 2023 13:04:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=95=8C=E9=9D=A2=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../palmte/work/controller/backend/ProcessController.java | 3 +++
 .../resources/templates/admin/business/process-detail.ftl | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
index 1f5c1df..b8e7c7b 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
@@ -710,6 +710,9 @@ public class ProcessController {
   @Transactional
   @PostMapping("/audit")
   public void audit(@RequestBody @Valid AuditForm form) {
+    if (form.processId == null) {
+      throw ErrorMessageException.failed("表单错误");
+    }
     ProjectProcess process = obtainProjectProcess(form.processId);
     ActApproveTypeEnum approveType = form.processStatus == ProcessStatus.audit_passed ? ActApproveTypeEnum.APPROVAL_PASSED :
                                      ActApproveTypeEnum.APPROVAL_UN_PASS;
diff --git a/src/main/resources/templates/admin/business/process-detail.ftl b/src/main/resources/templates/admin/business/process-detail.ftl
index 96b1f1f..3745af9 100644
--- a/src/main/resources/templates/admin/business/process-detail.ftl
+++ b/src/main/resources/templates/admin/business/process-detail.ftl
@@ -377,6 +377,7 @@
         auditForm: {
           processStatus: null
         },
+        processId: null,
         auditFormVisible: false,
         supplierMaterials: []
       }
@@ -531,9 +532,9 @@
             .finally(() => loading.close())
       },
 
-      auditProcess(row, scope) {
+      auditProcess() {
         this.auditForm = {
-          processId: row.id,
+          processId: this.processId,
           processStatus: null
         }
         this.auditFormVisible = true
@@ -560,7 +561,7 @@
             }).then(checkStatus).then(data => {
               // 关闭对话框
               this.auditFormVisible = false
-              this.queryTable()
+              this.backLastPage()
               this.$message({
                 showClose: true,
                 message: '审核成功',
@@ -601,6 +602,7 @@
       },
       mounted() {
         const processId = ${processId}
+        this.processId = processId
         this.loadProject(processId)
       },
       filters: {