From 6cd4984f83e7c9fabac3daa23cc9946d9d68314b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 15 七月 2025 17:10:00 +0800
Subject: [PATCH] 1.采购管理-分页bug
---
src/views/collaborativeApproval/approvalProcess/index.vue | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index 10fbf29..9398a1b 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -45,7 +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: {
@@ -58,6 +61,7 @@
label: "瀹℃壒鐘舵��",
prop: "approveStatus",
dataType: "tag",
+ width: 100,
formatData: (params) => {
if (params == 0) {
return "寰呭鏍�";
@@ -65,6 +69,8 @@
return "瀹℃牳涓�";
} else if (params == 2) {
return "瀹℃牳瀹屾垚";
+ } else if (params == 4) {
+ return "宸查噸鏂版彁浜�";
} else {
return '涓嶉�氳繃';
}
@@ -74,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';
}
@@ -103,6 +111,7 @@
{
label: "鐢宠鏃ユ湡",
prop: "approveTime",
+ width: 120
},
{
label: "缁撴潫鏃ユ湡",
@@ -127,6 +136,7 @@
clickFun: (row) => {
openForm("edit", row);
},
+ disabled: (row) => row.approveStatus == 2 || row.approveStatus == 1 || row.approveStatus == 4
},
{
name: "瀹℃牳",
@@ -134,6 +144,7 @@
clickFun: (row) => {
openApprovalDia("approval", row);
},
+ disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2 || row.approveStatus == 3 || row.approveStatus == 4 || row.approveUsercurrentId !== userStore.id
},
{
name: "璇︽儏",
--
Gitblit v1.9.3