From b3d13f8710994a896fe8b5d93e29933cd18c893f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 14 七月 2025 14:38:28 +0800
Subject: [PATCH] 1.协同审批优化

---
 src/views/collaborativeApproval/approvalProcess/index.vue |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index 60f0c1a..9398a1b 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -45,9 +45,10 @@
 import {ElMessageBox} from "element-plus";
 import InfoFormDia from "@/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue";
 import ApprovalDia from "@/views/collaborativeApproval/approvalProcess/components/approvalDia.vue";
-import {approveProcessDelete, approveProcessListPage} from "../../../api/collaborativeApproval/approvalProcess.js";
+import {approveProcessDelete, approveProcessListPage} from "@/api/collaborativeApproval/approvalProcess.js";
 import useUserStore from "@/store/modules/user";
 const userStore = useUserStore();
+
 
 const data = reactive({
   searchForm: {
@@ -68,6 +69,8 @@
         return "瀹℃牳涓�";
       } else if (params == 2) {
         return "瀹℃牳瀹屾垚";
+      } else if (params == 4) {
+        return "宸查噸鏂版彁浜�";
       } else {
         return '涓嶉�氳繃';
       }
@@ -77,8 +80,10 @@
         return "warning";
       } else if (params == 1) {
         return "primary";
-      }  else if (params == 2) {
+      } else if (params == 2) {
         return "success";
+      } else if (params == 4) {
+        return "";
       } else {
         return 'danger';
       }
@@ -131,7 +136,7 @@
         clickFun: (row) => {
           openForm("edit", row);
         },
-				disabled: (row) => row.approveStatus == 2 || row.approveStatus == 1
+				disabled: (row) => row.approveStatus == 2 || row.approveStatus == 1 || row.approveStatus == 4
       },
       {
         name: "瀹℃牳",
@@ -139,7 +144,7 @@
         clickFun: (row) => {
           openApprovalDia("approval", row);
         },
-				disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2
+				disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2 || row.approveStatus == 3 || row.approveStatus == 4 || row.approveUsercurrentId !== userStore.id
       },
       {
         name: "璇︽儏",

--
Gitblit v1.9.3