From c46bf7475742e9b50a8fdcc8d592ba3a86b2754d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 17 十一月 2025 15:02:25 +0800
Subject: [PATCH] 海川开心-添加请假管理、出差管理、公出管理页面

---
 src/pages/cooperativeOffice/collaborativeApproval/index.vue |   42 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/pages/cooperativeOffice/collaborativeApproval/index.vue b/src/pages/cooperativeOffice/collaborativeApproval/index.vue
index 8aab757..f72d200 100644
--- a/src/pages/cooperativeOffice/collaborativeApproval/index.vue
+++ b/src/pages/cooperativeOffice/collaborativeApproval/index.vue
@@ -55,6 +55,31 @@
 							<text class="detail-label">鐢宠鏃ユ湡</text>
 							<text class="detail-value">{{ item.approveTime }}</text>
 						</view>
+						
+						<!-- approveType=2 璇峰亣鐩稿叧瀛楁 -->
+						<template v-if="item.approveType === 2">
+							<view class="detail-row">
+								<text class="detail-label">璇峰亣寮�濮嬫椂闂�</text>
+								<text class="detail-value">{{ item.startDate || '-' }}</text>
+							</view>
+							<view class="detail-row">
+								<text class="detail-label">璇峰亣缁撴潫鏃堕棿</text>
+								<text class="detail-value">{{ item.endDate || '-' }}</text>
+							</view>
+						</template>
+						
+						<!-- approveType=3 鍑哄樊鐩稿叧瀛楁 -->
+						<view v-if="item.approveType === 3" class="detail-row">
+							<text class="detail-label">鍑哄樊鍦扮偣</text>
+							<text class="detail-value">{{ item.location || '-' }}</text>
+						</view>
+						
+						<!-- approveType=4 鎶ラ攢鐩稿叧瀛楁 -->
+						<view v-if="item.approveType === 4" class="detail-row">
+							<text class="detail-label">鎶ラ攢閲戦</text>
+							<text class="detail-value highlightYellow">{{ item.price ? `楼${item.price}` : '-' }}</text>
+						</view>
+						
 						<view class="detail-row">
 							<text class="detail-label">缁撴潫鏃ユ湡</text>
 							<text class="detail-value">{{ item.approveOverTime }}</text>
@@ -117,6 +142,14 @@
 	import {onShow} from "@dcloudio/uni-app";
 	import useUserStore from "@/store/modules/user";
 	
+	// 鎺ユ敹鐖剁粍浠朵紶閫掔殑 approveType 鍙傛暟
+	const props = defineProps({
+		approveType: {
+			type: Number,
+			default: 0
+		}
+	});
+	
 	const userStore = useUserStore()
 	// 鏁版嵁
 	const ledgerList = ref([]);
@@ -139,7 +172,7 @@
 			size: -1,
 		};
 		approveProcessListPage({
-				...page,approveType: 0,...searchForm.value
+				...page,approveType: props.approveType,...searchForm.value
 			})
 			.then((res) => {
 				ledgerList.value = res.data.records;
@@ -206,6 +239,7 @@
 		uni.setStorageSync('invoiceLedgerEditRow', JSON.stringify(item));
 		uni.setStorageSync('operationType', 'edit');
 		uni.setStorageSync('approveId', item.approveId);
+		uni.setStorageSync('approveType', props.approveType);
 		uni.navigateTo({
 			url: "/pages/cooperativeOffice/collaborativeApproval/detail",
 		});
@@ -214,15 +248,17 @@
 	// 娣诲姞鏂拌褰�
 	const handleAdd = () => {
 		uni.setStorageSync('operationType', 'add');
+		uni.setStorageSync('approveType', props.approveType);
 		uni.navigateTo({
-			url: "/pages/cooperativeOffice/collaborativeApproval/detail",
+			url: `/pages/cooperativeOffice/collaborativeApproval/detail?approveType=${props.approveType}`,
 		});
 	};
 	// 鐐瑰嚮瀹℃牳
 	const approve = (item) => {
 		uni.setStorageSync('approveId', item.approveId);
+		uni.setStorageSync('approveType', props.approveType);
 		uni.navigateTo({
-			url: "/pages/cooperativeOffice/collaborativeApproval/approve"
+			url: "/pages/cooperativeOffice/collaborativeApproval/approve?approveType=" + props.approveType
 		})
 	}
 

--
Gitblit v1.9.3