From e5a77d6a551d13e4cf74624b31b0fa3e328b304d Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期四, 23 一月 2025 17:23:39 +0800
Subject: [PATCH] -

---
 src/pages/reimbursement/myreim.vue |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/pages/reimbursement/myreim.vue b/src/pages/reimbursement/myreim.vue
index 9a81fad..0c2b153 100644
--- a/src/pages/reimbursement/myreim.vue
+++ b/src/pages/reimbursement/myreim.vue
@@ -25,19 +25,23 @@
 							<view class="c-p-20 chuany-font26">
 								<view class="chuany-flex chuany-justify-between">
 									<text class="chuany-width8">{{index+1}}</text>
-									<view class="chuany-width45">
+									<view class="chuany-width35">
 										{{$util.formatDate(item.planStartTime)}}
 									</view>
-									<view class="chuany-width30">
+									<view class="chuany-width25">
 										{{item.planMoney}} 鍏�
 									</view>
 									<u-text align="right" size='14'
-										:type="item.approvalStatus=='unApproval'?'primary':item.approvalStatus=='Yes'?'success':'warning'"
-										:text="item.approvalStatus=='unApproval'?'鏈壒澶�':item.approvalStatus=='Yes'?'鎵瑰噯':'涓嶆壒鍑�'">
+										:type="item.approvalStatus=='unApproval'?'primary':item.approvalStatus=='Yes'?'success':item.approvalStatus=='No'?'warning':'error'"
+										:text="item.approvalStatus=='unApproval'?'鏈鎵�':item.approvalStatus=='Yes'?'鎵瑰噯':item.approvalStatus=='No'?'涓嶆壒鍑�':'鏈彁浜�'">
 									</u-text>
+									<u-text align="right" size='14'
+										:type="item.evaluationStatus=='Reimbursed'?'success':'warning'"
+										v-if='item.approvalStatus=="Yes"'
+										:text="item.evaluationStatus=='Reimbursed'?'宸蹭粯娆�':'鏈粯娆�'"></u-text>
 								</view>
 								<view class="c-p-t-8">
-									鎽樿锛歿{item.planContent}}
+									<u--text :lines="1" :text="item.planContent"></u--text>
 								</view>
 							</view>
 						</view>
@@ -81,7 +85,7 @@
 		pageIndex: 1,
 		pageSize: 20,
 	})
-	const list = ['鍏ㄩ儴', '鏈壒澶�', '涓嶆壒鍑�', '鎵瑰噯']
+	const list = ['鍏ㄩ儴', '鏈彁浜�', '鏈鎵�', '涓嶆壒鍑�', '鎵瑰噯']
 	let workTime = ref('')
 	let datePickerShow = ref(false)
 	let loadStatus = ref('loadmore')
@@ -90,7 +94,7 @@
 	let listO = reactive({
 		orderList: []
 	})
-	let approvalStatus = ref('unApproval')
+	let approvalStatus = ref('Uncommitted')
 	let heji = ref(0)
 	onReachBottom(() => {
 		if (loadStatus.value != 'nomore') {
@@ -105,7 +109,7 @@
 		getworkerplanelist()
 		uni.stopPullDownRefresh();
 	})
-	onLoad(() => {
+	onShow(() => {
 		// workTime.value = getFirstDayOfMonth() + '鑷�' + $util.formatDate(new Date())
 		// state.planStartTimeStart = getFirstDayOfMonth() //宸ヤ綔寮�濮嬫椂闂�
 		// state.planStartTimeEnd = $util.formatDate(new Date())
@@ -122,12 +126,15 @@
 				approvalStatus.value = null
 				break;
 			case 1:
-				approvalStatus.value = 'unApproval'
+				approvalStatus.value = 'Uncommitted'
 				break;
 			case 2:
-				approvalStatus.value = 'No'
+				approvalStatus.value = 'unApproval'
 				break;
 			case 3:
+				approvalStatus.value = 'No'
+				break;
+			case 4:
 				approvalStatus.value = 'Yes'
 				break;
 		}

--
Gitblit v1.9.1