From 2d43a1df3f5ba42710e6d21c27d1e13bdb8dfd56 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 24 三月 2025 09:23:08 +0800
Subject: [PATCH] -

---
 src/pages/reimbursement/reimbursement.vue |   52 ++++++++++++++++++++++++++++++++++------------------
 1 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/pages/reimbursement/reimbursement.vue b/src/pages/reimbursement/reimbursement.vue
index f5792b5..d5cf31b 100644
--- a/src/pages/reimbursement/reimbursement.vue
+++ b/src/pages/reimbursement/reimbursement.vue
@@ -4,12 +4,12 @@
 			<up-sticky bgColor="#fff">
 				<view class="coreshop-ff content c-p-10">
 					<up-search placeholder="璇风偣鍑婚�夋嫨鏃ユ湡" @clear='clear' @click='clickTime' disabled @custom='init'
-						v-model="workTime" search-icon="calendar" @search='init'></up-search>
+						:show-action="false" v-model="workTime" search-icon="calendar" @search='init'></up-search>
 				</view>
 				<view class="coreshop-ff content c-p-10">
-					<up-search placeholder="璇疯緭鍏ュ伐浜哄悕瀛�" v-model="workerUserName" @custom='init'
-						@clear='init' @search='init'></up-search>
-				<!-- <up-search placeholder="璇风偣鍑婚�夋嫨鎵撳崱鏃ユ湡" @click='clickIcon' @clear='PostMyComDakaListPage' disabled
+					<up-search placeholder="璇疯緭鍏ュ伐浜哄悕瀛�" v-model="workerUserName" @custom='init' @clear='init'
+						@search='init'></up-search>
+					<!-- <up-search placeholder="璇风偣鍑婚�夋嫨鎵撳崱鏃ユ湡" @click='clickIcon' @clear='PostMyComDakaListPage' disabled
 						v-model="wordDate" search-icon="calendar" @search='PostMyComDakaListPage'
 						@custom='PostMyComDakaListPage'></up-search> -->
 				</view>
@@ -22,19 +22,28 @@
 					<view class="listrecord c-p-t-20" v-for="(item,index) in listO.orderList" :key="item.id"
 						@click="pageToDetail(item)">
 						<view class="coreshop-ff chuany-bradius20">
-							<view class="c-p-24 chuany-font32">
+							<view class="c-p-20 chuany-font26">
 								<view class="chuany-flex chuany-justify-between">
-									<text class="chuany-width10">{{index+1}}</text>
-									<text class="chuany-width45">
-										{{item.planContent}}
-									</text>
+									<text class="chuany-width8">{{index+1}}</text>
+									<view class="chuany-width13" v-if="item.sentStaff">
+										{{item.sentStaff.name}}
+									</view>
+									<view class="chuany-width25">
+										{{$util.formatDate(item.planStartTime)}}
+									</view>
 									<view class="chuany-width30">
 										{{item.planMoney}} 鍏�
 									</view>
-									<u-text
-										:type="item.evaluationStatus=='Reimbursed'?'success':'warning'"
-										:text="item.evaluationStatus=='Reimbursed'?'宸叉姤閿�':'鏈姤閿�'">
-									</u-text>
+									<view class="chuany-width15">
+										<u-text align="right" size='14'
+											:type="item.evaluationStatus=='Reimbursed'?'success':'warning'"
+											:text="item.evaluationStatus=='Reimbursed'?'宸蹭粯娆�':'鏈粯娆�'">
+										</u-text>
+									</view>
+
+								</view>
+								<view class="c-p-t-8">
+									<u--text :lines="1" :text="item.planContent"></u--text>
 								</view>
 							</view>
 						</view>
@@ -78,7 +87,7 @@
 		pageIndex: 1,
 		pageSize: 20,
 	})
-	const list = ['鍏ㄩ儴', '鏈姤閿�', '宸叉姤閿�']
+	const list = ['鍏ㄩ儴', '鏈粯娆�', '宸蹭粯娆�']
 	let workTime = ref('')
 	let datePickerShow = ref(false)
 	let loadStatus = ref('loadmore')
@@ -106,6 +115,9 @@
 		// workTime.value = getFirstDayOfMonth() + '鑷�' + $util.formatDate(new Date())
 		// state.planStartTimeStart = getFirstDayOfMonth() //宸ヤ綔寮�濮嬫椂闂�
 		// state.planStartTimeEnd = $util.formatDate(new Date())
+
+	})
+	onShow(() => {
 		getcaiwuplanelist()
 	})
 	const getFirstDayOfMonth = () => {
@@ -124,9 +136,9 @@
 			case 2:
 				evaluationStatus.value = 'Reimbursed'
 				break;
-			// case 3:
-			// 	evaluationStatus.value = 'Yes'
-			// 	break;
+				// case 3:
+				// 	evaluationStatus.value = 'Yes'
+				// 	break;
 		}
 		init()
 	}
@@ -181,6 +193,9 @@
 		if (state.planStartTimeEnd) {
 			data.planStartTimeEnd = state.planStartTimeEnd
 		}
+		if (workerUserName.value) {
+			data.staffName = workerUserName.value
+		}
 		loadStatus.value = 'loading';
 		$api.getcaiwuplanelist(data).then(res => {
 			console.log(res, res.code, '-----------123鈥�');
@@ -214,8 +229,9 @@
 		// 	data.planStartTimeEnd = state.planStartTimeEnd
 		// }
 		uni.navigateTo({
-			url: `/pages/reimbursement/index?planId=${item.keyid}`
+			url: `/pages/reimbursement/payment?detailId=${item.keyid}`
 		});
+
 		// $db.set('detailItem',JSON.stringify(item))
 	}
 </script>

--
Gitblit v1.9.1