From 492802e4fc1b371ba21a2a490c8dcd67d7c8b29c Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 22 六月 2026 14:03:40 +0800
Subject: [PATCH] fix: 出差和请假审批新增开始与结束日期
---
src/views/collaborativeApproval/approvalProcess/index.vue | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index 9e5a1ce..6677c48 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -186,6 +186,8 @@
// 鍔ㄦ�佽〃鏍煎垪閰嶇疆锛屾牴鎹鎵圭被鍨嬬敓鎴愬垪
const tableColumnCopy = computed(() => {
const isLeaveType = currentApproveType.value === 2; // 璇峰亣绠＄悊
+ const isBusinessTripType = currentApproveType.value === 3; // 鍑哄樊绠＄悊
+ const showDateRange = isLeaveType || isBusinessTripType; // 鏄惁鏄剧ず鏃堕棿娈�
const isReimburseType = currentApproveType.value === 4; // 鎶ラ攢绠＄悊
const isQuotationType = currentApproveType.value === 6; // 鎶ヤ环瀹℃壒
const isPurchaseType = currentApproveType.value === 5; // 閲囪喘瀹℃壒
@@ -261,20 +263,36 @@
});
}
- // 鏃ユ湡鍒楋紙鏍规嵁绫诲瀷鍔ㄦ�侀厤缃級
+ // 鍩虹鏃ユ湡鍒�
baseColumns.push(
{
- label: isLeaveType ? "寮�濮嬫棩鏈�" : "鐢宠鏃ユ湡",
- prop: isLeaveType ? "startDate" : "approveTime",
- width: 200,
+ label: "鐢宠鏃ユ湡",
+ prop: "approveTime",
+ width: 160,
},
{
- label: "缁撴潫鏃ユ湡",
- prop: isLeaveType ? "endDate" : "approveOverTime",
- width: 120,
+ label: "瀹℃壒鏃ユ湡",
+ prop: "approveOverTime",
+ width: 160,
}
);
+ // 寮�濮嬪拰缁撴潫鏃ユ湡鍒�
+ if (showDateRange) {
+ baseColumns.push(
+ {
+ label: "寮�濮嬫棩鏈�",
+ prop: "startDate",
+ width: 120,
+ },
+ {
+ label: "缁撴潫鏃ユ湡",
+ prop: "endDate",
+ width: 120,
+ }
+ );
+ }
+
// 褰撳墠瀹℃壒浜哄垪
baseColumns.push({
label: "褰撳墠瀹℃壒浜�",
--
Gitblit v1.9.3