From 91a6d368073912a2e54bbd8c8a39c44d783881d8 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期三, 28 八月 2024 17:03:00 +0800
Subject: [PATCH] 打卡相关
---
src/pages/checkin/index.vue | 82 +++++++++++++++++++++++++++-------------
1 files changed, 55 insertions(+), 27 deletions(-)
diff --git a/src/pages/checkin/index.vue b/src/pages/checkin/index.vue
index 0569b48..c911751 100644
--- a/src/pages/checkin/index.vue
+++ b/src/pages/checkin/index.vue
@@ -7,32 +7,33 @@
</view>
<up-subsection :list="list" activeColor="#f9ae3d" @change="sectionChange"></up-subsection>
</up-sticky>
- <view class="" v-if='viewList.lenght>0'>
- <view class="listrecord c-p-20" v-for="item in viewList" :key='item.id'>
+ <view class="" v-if="viewList&&viewList.length>0">
+ <view class="listrecord c-p-18" v-for="item in viewList" :key='item.id' @click='jumpWorkDetail'>
<view class="coreshop-ff chuany-bradius20">
- <view class="bgblue c-p-18 chuany-flex chuany-justify-between chuany-font34 chuany-text-bold">
+ <view
+ 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=''>
- 鏃ユ湡锛歿{item.workDate}}
+ 鏃ユ湡锛歿{$util.formatDate(item.workDate,true)}}
</text>
</view>
<view class="c-p-26">
<view class="chuany-flex chuany-justify-between">
- <text class="chuany-font34 chuany-text-bold">
+ <text class="chuany-font34 ">
{{item.orderName}}
</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-tag text="宸茬‘璁�" shape="circle" type="success" plain plainFill size='mini'></up-tag> -->
</view>
</view>
- <view class="c-p-t-20">
+ <view class="c-p-t-14">
鎵撳崱璁板綍锛歿{item.dakaMingxi}}
</view>
- <view class="chuany-flex chuany-justify-between c-p-t-20">
+ <view class="chuany-flex chuany-justify-between chuany-flex-wrap c-p-t-14">
<text class="chuany-width50">
宸ヤ綔鏃堕暱锛歿{item.workTime}}
</text>
@@ -41,42 +42,41 @@
鏂瑰紡锛歿{item.workerTypeName}}
</text>
</view>
- </view>
- <view class="chuany-flex chuany-justify-between c-p-t-20">
- <text class="chuany-width50">
+ <text class="chuany-width50 c-p-t-14">
宸ヤ环锛歿{item.workPrice}}{{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}
</text>
- <view class="chuany-width50 chuany-flex c-p-t-20">
+ <view class="chuany-width50 chuany-flex c-p-t-14" v-if="item.workerType==1">
<text>
鏁伴噺锛�
</text>
- <up-input style="padding: 0;" size='mini' border="surround"></up-input>
+ <up-input style="padding: 0;" size='mini' border="surround"
+ v-model="workCount"></up-input>
</view>
- <view class="chuany-width50">
+ <view class="chuany-width50 c-p-t-14">
<text>
褰撴棩宸ヨ祫锛歿{item.todaySalary}}鍏�
</text>
</view>
- <view class="chuany-width50 c-p-t-20">
+ <view class="chuany-width50 c-p-t-14">
<view class="chuany-width10">
<up-button class="button-layout__item" text="宸ヨ祫鐢虫姤" size="mini"
- type="warning"></up-button>
+ @click.stop='saveDakaDetail(item)' type="warning"></up-button>
</view>
</view>
</view>
</view>
</view>
</view>
- <view class="listrecord c-p-20">
+ <view class="listrecord c-p-18">
<view class="coreshop-ff chuany-bradius20">
- <view class="bgblue c-p-18 chuany-flex chuany-justify-between chuany-font34 chuany-text-bold">
+ <view class="bgblue c-p-18 chuany-flex chuany-justify-between chuany-font30">
<text class=''>
鏃ユ湡锛�2024-08-12
</text>
</view>
<view class="c-p-26">
<view class="chuany-flex chuany-justify-between">
- <text class="chuany-font34 chuany-text-bold">
+ <text class="chuany-font34 ">
涓存椂宸�
</text>
<view class="chuany-flex chuany-justify-between">
@@ -133,8 +133,6 @@
<up-empty text='鏆傛棤' icon="/static/order.png">
</up-empty>
</view>
-
-
<fui-date-picker :show="datePickerShow" type="3" @change="changePicker" @cancel="cancel"></fui-date-picker>
</view>
</template>
@@ -150,16 +148,24 @@
list: ['鍏ㄩ儴', '鏈粨绠�', '宸茬粨绠�'],
datePickerShow: false,
viewList: [],
- loadStatus: 'loadmore'
+ loadStatus: 'loadmore',
+ workCount: '', //璁′欢鏁伴噺
}
},
onLoad() {
this.PostMyComDakaListPage();
},
- onReachBottom(){
+ onReachBottom() {
if (this.loadStatus != 'nomore') {
this.PostMyComDakaListPage();
}
+ },
+ onPullDownRefresh() {
+ this.pageIndex = 1
+ this.pageSize = 20
+ this.wordDate = ''
+ this.isJieSuan = ''
+ this.PostMyComDakaListPage();
},
methods: {
sectionChange(val) {
@@ -176,12 +182,29 @@
}
this.PostMyComDakaListPage()
},
+ saveDakaDetail(item) {
+ let obj = {
+ orderBiddingDetailId: item.orderBiddingDetailId, //鎷涘伐鎵撳崱Id
+ workTime: item.workTime, //宸ヤ綔鏃堕暱
+ todaySalary: item.todaySalary //褰撴棩宸ヨ祫
+ }
+ if (this.workCount) {
+ obj.workCount = this.workCount
+ }
+ this.$api.saveDakaDetail(obj).then(res => {
+ console.log(res,'----');
+ })
+ },
PostMyComDakaListPage() {
let data = {
pageIndex: this.pageIndex,
pageSize: this.pageSize,
- isJieSuan: this.isJieSuan,
- wordDate: this.wordDate
+ }
+ if (this.wordDate) {
+ data.wordDate = this.wordDate
+ }
+ if (this.isJieSuan) {
+ data.isJieSuan = this.isJieSuan
}
this.$api.PostMyComDakaListPage(data).then(res => {
if (res.code == 1) {
@@ -190,6 +213,7 @@
} else {
this.viewList.concat(...res.data.items)
}
+ console.log(this.viewList, this.viewList.length, 'this.viewList');
// totalPages.value = res.data.totalCount
// 鏍规嵁count鏁伴噺鍒ゆ柇鏄惁杩樻湁鏁版嵁
if (res.data.totalCount > this.viewList.length) {
@@ -207,8 +231,12 @@
},
clickIcon() {
this.datePickerShow = true
+ },
+ jumpWorkDetail() {
+ uni.navigateTo({
+ url: '/pages/checkin/workdetail'
+ })
}
-
}
}
</script>
--
Gitblit v1.9.1