From b172667f354f7f00fe14809e66cbf12362fbc646 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期五, 06 九月 2024 17:19:36 +0800
Subject: [PATCH] 人脸打卡

---
 src/pages/company/index.vue |   60 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/src/pages/company/index.vue b/src/pages/company/index.vue
index 373b1fc..6ed5e73 100644
--- a/src/pages/company/index.vue
+++ b/src/pages/company/index.vue
@@ -2,7 +2,7 @@
 	<view class="full-page">
 		<up-sticky>
 			<view class="coreshop-ff content c-p-10">
-				<up-search placeholder="璇风偣鍑婚�夋嫨鏃ユ湡"  @clickIcon='clickIcon' v-model="wordDate" search-icon="calendar"
+				<up-search placeholder="璇风偣鍑婚�夋嫨鎵撳崱鏃ユ湡" @click='clickIcon' disabled v-model="wordDate" search-icon="calendar"
 					@custom='PostMyComDakaListPage'></up-search>
 			</view>
 			<up-subsection :list="list" activeColor="#f9ae3d" @change="sectionChange"></up-subsection>
@@ -13,7 +13,7 @@
 					<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">
 						<text class=''>
-							鏃ユ湡锛歿{$util.formatDate(item.workDate)}}
+							鎵撳崱鏃ユ湡锛歿{$util.formatDate(item.workDate)}}
 						</text>
 					</view>
 					<view class="c-p-26">
@@ -31,6 +31,9 @@
 							</view>
 						</view>
 						<view class="c-p-t-14">
+							濮撳悕锛歿{item.workerUserName}}
+						</view>
+						<view class="c-p-t-14">
 							鎵撳崱璁板綍锛歿{item.dakaMingxi}}
 						</view>
 						<view class="chuany-flex chuany-justify-between chuany-flex-wrap">
@@ -41,44 +44,44 @@
 							</view>
 							<view class="chuany-width48 chuany-flex c-p-t-14">
 								<text>
-									鏃堕暱锛�
+									宸ヤ环锛歿{item.workPrice}}{{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}
 								</text>
-								<up-input type="digit" v-if="item.isShenPiName!=='宸茬粨绠�'" style="padding: 0;" size='mini'
-									border="surround" v-model="item.workTime"></up-input>
-								<text v-else>{{item.workTime}}灏忔椂</text>
+								<!-- <up-input type="digit" v-if="item.isShenPiName!=='宸茬粨绠�'" style="padding: 0;" size='mini'
+									@blur='(val) => {item.todaySalary=$util.roundToTwo(item.workTime*item.workPrice)}'
+									border="surround" v-model="item.workPrice"></up-input>
+								<text v-else>{{item.workPrice}}{{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}</text> -->
 							</view>
-							
+
 							<view class="chuany-width48 chuany-flex c-p-t-14">
 								<text>
-									宸ヤ环锛�
+									鏃堕暱锛�
 								</text>
-								<up-input type="digit" v-if="item.isShenPiName!=='宸茬粨绠�'" style="padding: 0;" size='mini'
-									border="surround" v-model="item.workPrice"></up-input>
-								<text v-else>{{item.workPrice}}{{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}</text>
+								<up-input type="digit" v-if="item.workerType!=1" style="padding: 0;" size='mini'
+									@blur='(val) => {item.todaySalary=$util.roundToTwo(item.workTime*item.workPrice)}'
+									border="surround" v-model="item.workTime"></up-input>
+
 							</view>
 							<view class="chuany-width48 chuany-flex c-p-t-14" v-if="item.workerType==1">
 								<text>
 									鏁伴噺锛�
 								</text>
-								<up-input type="digit" v-if="item.isShenPiName!=='宸茬粨绠�'" style="padding: 0;" size='mini'
-									border="surround"
+								<up-input 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-width48 chuany-flex c-p-t-14">
 								<text>
 									宸ヨ祫锛�
 								</text>
-								<up-input type="digit" v-if="item.isShenPiName!=='宸茬粨绠�'" style="padding: 0;" size='mini'
-									border="surround" v-model="item.todaySalary"></up-input>
-								<text v-else>{{item.todaySalary}} 鍏�</text>
+								<up-input type="digit" style="padding: 0;" size='mini' border="surround"
+									v-model="item.todaySalary"></up-input>
+								<!-- <text v-else>{{item.todaySalary}} 鍏�</text> -->
 							</view>
 							<view class="chuany-width48 c-p-t-14">
 								<view class="chuany-width10">
 									<up-button class="button-layout__item" text="纭" size="mini"
-										v-if="item.isShenPiName!=='宸茬粨绠�'" @click.stop='saveDakaDetailCompany(item)'
-										type="warning"></up-button>
+										:loading='item.isLoading' loadingText="纭涓�"
+										@tap.stop='saveDakaDetailCompany(item)' type="warning"></up-button>
 								</view>
 							</view>
 						</view>
@@ -91,7 +94,8 @@
 			<up-empty text='鏆傛棤' icon="/static/order.png">
 			</up-empty>
 		</view>
-		<fui-date-picker :show="datePickerShow" type="3" @change="changePicker" @cancel="cancel"></fui-date-picker>
+		<fui-date-picker :show="datePickerShow" :value="$util.formatDate(new Date())" type="3" @change="changePicker"
+			@cancel="cancel"></fui-date-picker>
 	</view>
 </template>
 
@@ -148,6 +152,7 @@
 				if (item.workCount) {
 					obj.workCount = item.workCount
 				}
+				item.isLoading = true
 				this.$api.saveDakaDetailCompany(obj).then(res => {
 					if (res.code == 1) {
 						this.$util.showToast({
@@ -155,7 +160,12 @@
 							icon: 'success'
 						})
 						this.PostMyComDakaListPage();
+					}else {
+						this.$util.showToast({
+							title: res.error ? res.error : '澶辫触锛�'
+						})
 					}
+					item.isLoading = false
 				})
 			},
 			PostMyComDakaListPage() {
@@ -188,6 +198,9 @@
 							this.viewList.concat(...res.data.items)
 						}
 						console.log(this.viewList, this.viewList.length, 'this.viewList');
+						this.viewList.forEach(item=>{
+							item.isLoading = false
+						})
 						// totalPages.value = res.data.totalCount
 						// 鏍规嵁count鏁伴噺鍒ゆ柇鏄惁杩樻湁鏁版嵁
 						if (res.data.totalCount > this.viewList.length) {
@@ -202,10 +215,17 @@
 			},
 			changePicker(val) {
 				this.wordDate = val.result
+				this.datePickerShow = false
+			},
+			cancel() {
+				this.datePickerShow = false
 			},
 			clickIcon() {
 				this.datePickerShow = true
 			},
+			clickIcon1() {
+				console.log('瑙﹀彂浜唅con浜嬩欢');
+			},
 			jumpWorkDetail(item) {
 				uni.navigateTo({
 					url: `/pages/company/record?id=${item.orderBiddingDetailId}`

--
Gitblit v1.9.1