From 94384dcf5066aa1a7b2e37874fe331e148bc9249 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期日, 29 九月 2024 17:27:03 +0800
Subject: [PATCH] 工人工资查询

---
 src/pages/checkin/index.vue |  141 ++++++++++++++++++++++++++++-------------------
 1 files changed, 84 insertions(+), 57 deletions(-)

diff --git a/src/pages/checkin/index.vue b/src/pages/checkin/index.vue
index 4f4f342..4f431ee 100644
--- a/src/pages/checkin/index.vue
+++ b/src/pages/checkin/index.vue
@@ -1,14 +1,24 @@
 <template>
-	<view class="full-page">
+	<scroll-view class="full-page" scroll-y using-sticky>
 		<up-sticky>
-			<view class="coreshop-ff content c-p-10">
-				<up-search placeholder="璇风偣鍑婚�夋嫨鎵撳崱鏃ユ湡" @click='clickIcon' disabled v-model="wordDate" search-icon="calendar"
-					@custom='PostMyDakaListPage'></up-search>
+			<view class="coreshop-ff content c-p-l-10 c-p-t-10 c-p-r-10">
+				<up-search placeholder="璇风偣鍑婚�夋嫨鎵撳崱鏃ユ湡" @click='clickIcon' :show-action="false" @clear='PostMyDakaListPage'
+					disabled v-model="wordDate" search-icon="calendar" @search='PostMyDakaListPage'></up-search>
+				<!-- <up-input shape="round" class="u-search__content__input"></up-input> -->
+				<!-- <up-search placeholder="璇疯緭鍏ュ叕鍙稿悕绉�" :show-action="false" v-model="Suppliername" @clear='PostMyDakaListPage'
+					@search='PostMyDakaListPage'></up-search> -->
 			</view>
-			<up-subsection :list="list" activeColor="#f9ae3d" @change="sectionChange"></up-subsection>
+			<view class="coreshop-ff content c-p-10">
+				<up-search placeholder="璇疯緭鍏ュ叕鍙稿悕绉�" v-model="Suppliername" @clear='PostMyDakaListPage'
+					@custom='PostMyDakaListPage' @search='PostMyDakaListPage'></up-search>
+				<!-- <up-search placeholder="璇风偣鍑婚�夋嫨鎵撳崱鏃ユ湡" @click='clickIcon' @clear='PostMyDakaListPage' disabled
+					v-model="wordDate" search-icon="calendar" @search='PostMyDakaListPage'
+					@custom='PostMyDakaListPage'></up-search> -->
+			</view>
+			<up-subsection :list="list" current='1' activeColor="#f9ae3d" @change="sectionChange"></up-subsection>
 		</up-sticky>
-		<view class="" v-if="viewList&&viewList.length>0">
-			<view class="listrecord c-p-18" v-for="item in viewList" :key='item.id'>
+		<view class="full-page-content c-p-b-100" v-if="viewList&&viewList.length>0">
+			<view class="listrecord c-p-t-28 c-p-l-28 c-p-r-28" v-for="item in viewList" :key='item.id'>
 				<view class="coreshop-ff chuany-bradius20">
 					<view @click='jumpWorkDetail(item)'
 						class="bgblue c-p-l-18 c-p-r-18 c-p-t-10 c-p-b-10 chuany-flex chuany-justify-between chuany-font30">
@@ -16,56 +26,57 @@
 							鎵撳崱鏃ユ湡锛歿{$util.formatDate(item.workDate)}}
 						</text>
 					</view>
-					<view class="c-p-26">
+					<view class="c-p-20">
 						<view class="chuany-flex chuany-justify-between">
-							<text class="chuany-font34 ">
-								{{item.orderName}}
+							<text class="chuany-font32">
+								{{item.suppliername}}
 							</text>
 							<view class="chuany-flex chuany-justify-between">
 								<!-- <text class="c-p-r-20">
 									
 								</text> -->
-								<up-tag class='c-m-r-10' :text="item.isShenPiName" shape="circle" type="success" plain
-									plainFill size='mini'></up-tag>
+								<!-- <up-tag class='c-m-r-10' :text="item.isShenPiName" shape="circle" type="success" plain
+									plainFill size='mini'></up-tag> -->
+								<up-text type="success" :text="item.isShenPiName" size='14'></up-text>
 								<!-- <up-tag text="宸茬‘璁�" shape="circle" type="success" plain plainFill size='mini'></up-tag> -->
 							</view>
 						</view>
-						<view class="c-p-t-14">
+						<view class="text-69 chuany-font28 c-p-t-8">
 							鎵撳崱璁板綍锛歿{item.dakaMingxi}}
 						</view>
-						<view class="chuany-flex chuany-justify-between chuany-flex-wrap c-p-t-14">
-							<text class="chuany-width50">
+						<view class="chuany-flex chuany-justify-between chuany-flex-wrap c-p-t-8 text-69 chuany-font28">
+							<text class="chuany-width48">
 								鏃堕暱锛歿{item.workTime}}
 							</text>
-							<view class="chuany-width50">
+							<!-- <view class="chuany-width48">
 								<text>
 									鏂瑰紡锛歿{item.workerTypeName}}
 								</text>
-							</view>
-							<text class="chuany-width50 c-p-t-14">
+							</view> -->
+							<text class="chuany-width48 ">
 								宸ヤ环锛歿{item.workPrice}}{{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}
 							</text>
-							<view class="chuany-width50 chuany-flex c-p-t-14" v-if="item.workerType==1">
+							<view class="chuany-width48 chuany-flex c-p-t-8" v-if="item.workerType==1">
 								<text>
 									鏁伴噺锛�
 								</text>
-								<up-input v-if="item.isShenPiName!=='宸茬粨绠�'" type="digit" style="padding: 0;" size='mini'
+								<up-input v-if="item.isShenPi==0" type="digit" style="padding: 0;" size='mini'
 									border="surround"
 									@blur='(val) => {item.todaySalary=$util.roundToTwo(item.workCount*item.workPrice)}'
 									v-model="item.workCount"></up-input>
 								<text v-else>{{item.workCount}}</text>
 							</view>
-							<view class="chuany-width50 c-p-t-14">
+							<view class="chuany-width48 c-p-t-8">
 								<text>
 									宸ヨ祫锛歿{item.todaySalary}}鍏�
 								</text>
 							</view>
-							<view class="chuany-width50 c-p-t-14">
-								<view class="chuany-width10">
+							<view class="chuany-width48 c-p-t-8">
+								<view class="chuany-width10" v-if="item.isShenPi==0">
 									<!-- v-if="item.isShenPiName!=='宸茬粨绠�'" -->
-									<up-button class="button-layout__item" text="宸ヨ祫鐢虫姤" size="mini" :loading='item.isLoading'
-										loadingText="鐢虫姤涓�" v-if="item.isShenPiName!=='宸茬粨绠�'"
-										@click.stop='saveDakaDetail(item)' type="warning"></up-button>
+									<up-button class="button-layout__item" text="宸ヨ祫鐢虫姤" size="mini"
+										:loading='item.isLoading' loadingText="鐢虫姤涓�" @click.stop='saveDakaDetail(item)'
+										type="warning"></up-button>
 								</view>
 							</view>
 						</view>
@@ -81,7 +92,7 @@
 					</view>
 					<view class="c-p-26">
 						<view class="chuany-flex chuany-justify-between">
-							<text class="chuany-font34 ">
+							<text class="chuany-font32 ">
 								涓存椂宸�
 							</text>
 							<view class="chuany-flex chuany-justify-between">
@@ -100,29 +111,29 @@
 							
 						</view>
 						<view class="chuany-flex chuany-justify-between chuany-flex-wrap c-p-t-20">
-							<text class="chuany-width50">
+							<text class="chuany-width48">
 								宸ヤ綔鏃堕暱锛�8灏忔椂
 							</text>
-							<view class="chuany-width50">
+							<view class="chuany-width48">
 								<text>
 									鏂瑰紡锛氳浠�
 								</text>
 							</view>
-							<text class="chuany-width50 c-p-t-20">
+							<text class="chuany-width48 c-p-t-20">
 								宸ヤ环锛�0.5鍏�/浠�
 							</text>
-							<view class="chuany-width50 chuany-flex c-p-t-20">
+							<view class="chuany-width48 chuany-flex c-p-t-20">
 								<text>
 									鏁伴噺锛�
 								</text>
 								<up-input style="padding: 0;" size='mini' border="surround"></up-input>
 							</view>
-							<view class="chuany-width50 c-p-t-20">
+							<view class="chuany-width48 c-p-t-20">
 								<text>
 									褰撴棩宸ヨ祫锛�136鍏�
 								</text>
 							</view>
-							<view class="chuany-width50 c-p-t-20">
+							<view class="chuany-width48 c-p-t-20">
 								<view class="chuany-width10">
 									<up-button class="button-layout__item" text="宸ヨ祫鐢虫姤" size="mini"
 										type="warning"></up-button>
@@ -138,9 +149,12 @@
 			<up-empty text='鏆傛棤' icon="/static/order.png">
 			</up-empty>
 		</view>
-		<fui-date-picker :show="datePickerShow" :value="$util.formatDate(new Date())" type="3" @change="changePicker"
-			@cancel="cancel"></fui-date-picker>
-	</view>
+		<fui-date-picker :show="datePickerShow" range :value="$util.formatDate(new Date())" type="3"
+			@change="changePicker" @cancel="cancel"></fui-date-picker>
+		<view class="tabbtns">
+			鍚堣锛歿{heji}} 鍏�
+		</view>
+	</scroll-view>
 </template>
 
 <script>
@@ -149,13 +163,17 @@
 			return {
 				pageIndex: 1,
 				pageSize: 20,
+				Suppliername: '',
 				wordDate: '',
-				isJieSuan: '',
+				isJieSuan: false,
 				list: ['鍏ㄩ儴', '鏈粨绠�', '宸茬粨绠�'],
 				datePickerShow: false,
 				viewList: [],
 				loadStatus: 'loadmore',
-				isLoading: false
+				isLoading: false,
+				heji: '',
+				WordDateStart: '', //宸ヤ綔鏃ユ湡寮�濮�
+				WordDateEnd: '' //宸ヤ綔鏃ユ湡缁撴潫
 			}
 		},
 		onLoad() {
@@ -170,14 +188,27 @@
 			this.pageIndex = 1
 			this.pageSize = 20
 			this.wordDate = ''
-			this.isJieSuan = ''
+			this.isJieSuan = false
 			this.loadStatus = 'loadmore'
+			this.WordDateStart = '' //宸ヤ綔鏃ユ湡寮�濮�
+			this.WordDateEnd = '' //宸ヤ綔鏃ユ湡缁撴潫
+			this.Suppliername = ''
 			this.PostMyDakaListPage();
 			uni.stopPullDownRefresh();
 		},
 		methods: {
 			sectionChange(val) {
-				this.isJieSuan = val
+				switch (val) {
+					case 0:
+						this.isJieSuan = null
+						break;
+					case 1:
+						this.isJieSuan = false
+						break;
+					case 2:
+						this.isJieSuan = true
+						break;
+				}
 				this.PostMyDakaListPage()
 			},
 			saveDakaDetail(item) {
@@ -215,33 +246,25 @@
 				let data = {
 					pageIndex: this.pageIndex,
 					pageSize: this.pageSize,
+					isJieSuan: this.isJieSuan
 				}
 				if (this.wordDate) {
-					data.wordDate = this.wordDate
+					data.WordDateStart = this.WordDateStart //宸ヤ綔鏃ユ湡寮�濮�
+					data.WordDateEnd = this.WordDateEnd //宸ヤ綔鏃ユ湡缁撴潫
 				}
-				if (this.isJieSuan) {
-					switch (this.isJieSuan) {
-						case 0:
-							this.isJieSuan = ''
-							break;
-						case 1:
-							this.isJieSuan = false
-							break;
-						case 2:
-							this.isJieSuan = true
-							break;
-					}
-					data.isJieSuan = this.isJieSuan
+				if (this.Suppliername) {
+					data.Suppliername = this.Suppliername
 				}
 				this.$api.PostMyDakaListPage(data).then(res => {
 					if (res.code == 1) {
+						this.heji = res.data.heji
 						if (this.pageIndex == 1) {
 							this.viewList = res.data.items
 						} else {
-							this.viewList.concat(...res.data.items)
+							this.viewList = this.viewList.concat(...res.data.items)
 						}
 						console.log(this.viewList, this.viewList.length, 'this.viewList');
-						this.viewList.forEach(item=>{
+						this.viewList.forEach(item => {
 							item.isLoading = false
 						})
 						// totalPages.value = res.data.totalCount
@@ -257,8 +280,12 @@
 				})
 			},
 			changePicker(val) {
-				this.wordDate = val.result
+				this.wordDate = val.startDate.result + '鑷�' + val.endDate.result
+				this.WordDateStart = new Date(val.startDate.result) //宸ヤ綔鏃ユ湡寮�濮�
+				this.WordDateEnd = new Date(val.endDate.result) //宸ヤ綔鏃ユ湡缁撴潫
 				this.datePickerShow = false
+				this.PostMyDakaListPage()
+				console.log(this.wordDate, this.WordDateStart, this.WordDateEnd, this.Suppliername);
 			},
 			cancel() {
 				this.datePickerShow = false

--
Gitblit v1.9.1