From 4b3024e8fa2ce27a2e0b408778d4e62cc570b8b4 Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期四, 10 七月 2025 17:00:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- src/views/collaborativeApproval/approvalProcess/index.vue | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue index 7e51ea4..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 "寰呭鏍�"; @@ -89,6 +92,7 @@ { label: "鐢宠閮ㄩ棬", prop: "approveDeptName", + width: 220 }, { label: "瀹℃壒浜嬬敱", @@ -97,11 +101,12 @@ }, { label: "鐢宠浜�", - prop: "approveUser", + prop: "approveUserName", }, { label: "鐢宠鏃ユ湡", prop: "approveTime", + width: 120 }, { label: "缁撴潫鏃ユ湡", @@ -110,7 +115,7 @@ }, { label: "褰撳墠瀹℃壒浜�", - prop: "checkCompany", + prop: "approveUserCurrentName", width: 120 }, { @@ -126,6 +131,7 @@ clickFun: (row) => { openForm("edit", row); }, + disabled: (row) => row.approveStatus == 2 || row.approveStatus == 1 }, { name: "瀹℃牳", @@ -133,6 +139,7 @@ clickFun: (row) => { openApprovalDia("approval", row); }, + disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2 }, { name: "璇︽儏", -- Gitblit v1.9.3