From 93a986bc80abdef75923054b9df9adb6e1ccff52 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期二, 08 十月 2024 16:44:08 +0800
Subject: [PATCH] -

---
 src/pages/worker/salary.vue |   37 +++++++++++++++++++++++--------------
 1 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/pages/worker/salary.vue b/src/pages/worker/salary.vue
index dbebe8c..fb932ef 100644
--- a/src/pages/worker/salary.vue
+++ b/src/pages/worker/salary.vue
@@ -1,9 +1,16 @@
 <template>
-	<scroll-view class="full-page" scroll-y using-sticky>
+	<view class="full-page" scroll-y using-sticky>
 		<up-sticky bgColor="#fff">
 			<view class="coreshop-ff content c-p-10">
-				<up-search placeholder="璇风偣鍑婚�夋嫨鏃ユ湡" @clear='clear' @click='clickTime' disabled @custom='search'
-					v-model="workTime" search-icon="calendar" @search='search'></up-search>
+				<up-search placeholder="璇风偣鍑婚�夋嫨鏃ユ湡" @clear='clear' @click='clickTime' disabled @custom='PostMyListPage'
+					v-model="workTime" search-icon="calendar" @search='PostMyListPage' :show-action="false"></up-search>
+			</view>
+			<view class="coreshop-ff content c-p-10">
+				<up-search placeholder="璇疯緭鍏ュ伐浜哄悕瀛�" v-model="workerUserName" @custom='PostMyListPage'
+					@clear='PostMyListPage' @search='PostMyListPage'></up-search>
+				<!-- <up-search placeholder="璇风偣鍑婚�夋嫨鎵撳崱鏃ユ湡" @click='clickIcon' @clear='PostMyComDakaListPage' disabled
+					v-model="wordDate" search-icon="calendar" @search='PostMyComDakaListPage'
+					@custom='PostMyComDakaListPage'></up-search> -->
 			</view>
 			<!-- <up-subsection :list="list" :current="current4" activeColor="#f9ae3d"
 				@change="sectionChange"></up-subsection> -->
@@ -35,7 +42,7 @@
 		</view>
 		<fui-date-picker range :show="datePickerShow" :value="$util.formatDate(new Date())" type="3"
 			@change="changePicker" @cancel="cancel"></fui-date-picker>
-	</scroll-view>
+	</view>
 	<view class="tabbtns">
 		鍚堣锛歿{heji}} 鍏�
 	</view>
@@ -66,6 +73,7 @@
 	let workTime = ref('')
 	let datePickerShow = ref(false)
 	let loadStatus = ref('loadmore')
+	let workerUserName = ref('')
 	let totalPages = ref(0)
 	let listO = reactive({
 		orderList: []
@@ -97,18 +105,19 @@
 		PostMyListPage()
 	}
 
-	const search = (index) => {
-		console.log(index, '------鈥�');
-		if (index == 0) {
-			PostMyListPage()
-		} else {
-			PostMyListPage(index - 1)
-		}
+	// const search = (index) => {
+	// 	console.log(index, '------鈥�');
+	// 	if (index == 0) {
+	// 		PostMyListPage()
+	// 	} else {
+	// 		PostMyListPage(index - 1)
+	// 	}
 
-	}
+	// }
 	const clear = () => {
 		state.wordDateStart = ""
 		state.wordDateEnd = ""
+		PostMyListPage()
 	}
 	const clickTime = () => {
 		datePickerShow.value = !datePickerShow.value
@@ -117,11 +126,11 @@
 	const cancel = () => {
 		datePickerShow.value = !datePickerShow.value
 	}
-	const PostMyListPage = (orderStatus) => {
+	const PostMyListPage = () => {
 		let data = {
 			pageIndex: state.pageIndex,
 			pageSize: state.pageSize,
-			orderStatus
+			workerUserName: workerUserName.value
 		}
 		if (state.wordDateStart) {
 			data.wordDateStart = state.wordDateStart

--
Gitblit v1.9.1