From 604ea9fbcfcaea6eb64e6d1ff2e38fd862dc0bd3 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 09 十二月 2025 14:29:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_food' into dev_food
---
src/views/collaborativeApproval/approvalProcess/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index f3424bf..8b95df1 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -130,13 +130,13 @@
width: 120
},
{
- label: "鐢宠鏃ユ湡",
- prop: "approveTime",
+ label: props.approveType === 2 ? "寮�濮嬫棩鏈�" : "鐢宠鏃ユ湡",
+ prop: props.approveType === 2 ? "startDate" : "approveTime",
width: 200
},
{
label: "缁撴潫鏃ユ湡",
- prop: "approveOverTime",
+ prop: props.approveType === 2 ? "endDate" : "approveOverTime",
width: 120
},
{
--
Gitblit v1.9.3