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/components/approvalDia.vue | 1 -
src/views/collaborativeApproval/approvalProcess/index.vue | 10 +++++++---
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue | 3 +--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index 9d5c19c..847f4c4 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -158,7 +158,6 @@
const { form } = toRefs(data);
// 鑺傜偣鏍囬
const getNodeTitle = (index, len) => {
- if (index === 0) return '鍙戣捣';
if (index === len - 1) return '缁撴潫';
return '瀹℃壒';
};
diff --git a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
index 3c5520d..3aa58c5 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -54,8 +54,7 @@
style="margin-right: 30px; text-align: center; margin-bottom: 10px;"
>
<div>
- <span v-if="index === 0">鍙戣捣</span>
- <span v-else>瀹℃壒</span>
+ <span>瀹℃壒浜�</span>
鈫�
</div>
<el-select
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index c2b4fc8..9398a1b 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -69,6 +69,8 @@
return "瀹℃牳涓�";
} else if (params == 2) {
return "瀹℃牳瀹屾垚";
+ } else if (params == 4) {
+ return "宸查噸鏂版彁浜�";
} else {
return '涓嶉�氳繃';
}
@@ -78,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';
}
@@ -132,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: "瀹℃牳",
@@ -140,7 +144,7 @@
clickFun: (row) => {
openApprovalDia("approval", row);
},
- disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2 || row.approveStatus == 3 || row.approveUserCurrentId !== userStore.id
+ disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2 || row.approveStatus == 3 || row.approveStatus == 4 || row.approveUsercurrentId !== userStore.id
},
{
name: "璇︽儏",
--
Gitblit v1.9.3