From 94ed6835efd865e88398afbde66e967e7b41f0b4 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 10 七月 2025 15:22:05 +0800
Subject: [PATCH] 1.协同审批页面联调
---
src/views/collaborativeApproval/approvalProcess/index.vue | 6 ++++++
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue | 1 -
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
index e02d3ee..a71d689 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -182,7 +182,6 @@
approverNodes.value = [
{ id: 1, userId: null }
]
- console.log(userStore)
form.value.approveUser = userStore.id;
form.value.approveTime = getCurrentDate();
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index 10fbf29..60f0c1a 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -46,6 +46,8 @@
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 useUserStore from "@/store/modules/user";
+const userStore = useUserStore();
const data = reactive({
searchForm: {
@@ -58,6 +60,7 @@
label: "瀹℃壒鐘舵��",
prop: "approveStatus",
dataType: "tag",
+ width: 100,
formatData: (params) => {
if (params == 0) {
return "寰呭鏍�";
@@ -103,6 +106,7 @@
{
label: "鐢宠鏃ユ湡",
prop: "approveTime",
+ width: 120
},
{
label: "缁撴潫鏃ユ湡",
@@ -127,6 +131,7 @@
clickFun: (row) => {
openForm("edit", row);
},
+ disabled: (row) => row.approveStatus == 2 || row.approveStatus == 1
},
{
name: "瀹℃牳",
@@ -134,6 +139,7 @@
clickFun: (row) => {
openApprovalDia("approval", row);
},
+ disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2
},
{
name: "璇︽儏",
--
Gitblit v1.9.3