From a9600ae56b844289a04e1a7385cf0ccfc384cd08 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 10 七月 2025 14:42:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/collaborativeApproval/approvalProcess/index.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index 7e51ea4..10fbf29 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -89,6 +89,7 @@
{
label: "鐢宠閮ㄩ棬",
prop: "approveDeptName",
+ width: 220
},
{
label: "瀹℃壒浜嬬敱",
@@ -97,7 +98,7 @@
},
{
label: "鐢宠浜�",
- prop: "approveUser",
+ prop: "approveUserName",
},
{
label: "鐢宠鏃ユ湡",
@@ -110,7 +111,7 @@
},
{
label: "褰撳墠瀹℃壒浜�",
- prop: "checkCompany",
+ prop: "approveUserCurrentName",
width: 120
},
{
--
Gitblit v1.9.3