From a2ddd3bec584b6eb91ab8845353fdb40c9b37ebe Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 02 九月 2024 17:22:17 +0800
Subject: [PATCH] 初步完成
---
src/pages/checkin/index.vue | 139 ++++++++++++++++++++++++++++++---------------
1 files changed, 92 insertions(+), 47 deletions(-)
diff --git a/src/pages/checkin/index.vue b/src/pages/checkin/index.vue
index 0569b48..69ab5c1 100644
--- a/src/pages/checkin/index.vue
+++ b/src/pages/checkin/index.vue
@@ -3,36 +3,37 @@
<up-sticky>
<view class="coreshop-ff content c-p-10">
<up-search placeholder="璇风偣鍑婚�夋嫨鏃ユ湡" @clickIcon='clickIcon' v-model="wordDate" search-icon="calendar"
- @custom='PostMyComDakaListPage'></up-search>
+ @custom='PostMyDakaListPage'></up-search>
</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'>
<view class="coreshop-ff chuany-bradius20">
- <view class="bgblue c-p-18 chuany-flex chuany-justify-between chuany-font34 chuany-text-bold">
+ <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=''>
- 鏃ユ湡锛歿{item.workDate}}
+ 鏃ユ湡锛歿{$util.formatDate(item.workDate)}}
</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,25 +42,28 @@
鏂瑰紡锛歿{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 v-if="item.isShenPiName!=='宸茬粨绠�'" 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">
+ <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"
+ v-if="item.isShenPiName!=='宸茬粨绠�'" @click.stop='saveDakaDetail(item)'
type="warning"></up-button>
</view>
</view>
@@ -67,22 +71,22 @@
</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">
- <!-- <text class="c-p-r-20">
+ <text class="c-p-r-20">
- </text> -->
+ </text>
<up-tag class='c-m-r-10' text="鏈粨绠�" shape="circle" type="warning" plain plainFill
size='mini'></up-tag>
<up-tag text="鏈‘璁�" shape="circle" type="warning" plain plainFill size='mini'></up-tag>
@@ -91,9 +95,9 @@
<view class="c-p-t-20">
鎵撳崱璁板綍锛�08:00-12:00 13:00-17:00
</view>
- <!-- <view class="chuany-flex chuany-justify-between c-p-t-20">
+ <view class="chuany-flex chuany-justify-between c-p-t-20">
- </view> -->
+ </view>
<view class="chuany-flex chuany-justify-between chuany-flex-wrap c-p-t-20">
<text class="chuany-width50">
宸ヤ綔鏃堕暱锛�8灏忔椂
@@ -126,15 +130,13 @@
</view>
</view>
</view>
- </view>
+ </view> -->
<up-loadmore :status="loadStatus" />
</view>
<view v-else>
<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>
@@ -154,42 +156,81 @@
}
},
onLoad() {
- this.PostMyComDakaListPage();
+ this.PostMyDakaListPage();
},
- onReachBottom(){
+ onReachBottom() {
if (this.loadStatus != 'nomore') {
- this.PostMyComDakaListPage();
+ this.PostMyDakaListPage();
}
+ },
+ onPullDownRefresh() {
+ this.pageIndex = 1
+ this.pageSize = 20
+ this.wordDate = ''
+ this.isJieSuan = ''
+ this.loadStatus = 'loadmore'
+ this.PostMyDakaListPage();
},
methods: {
sectionChange(val) {
- switch (val) {
- case 0:
- this.isJieSuan = ''
- break;
- case 1:
- this.isJieSuan = true
- break;
- case 2:
- this.isJieSuan = false
- break;
- }
- this.PostMyComDakaListPage()
+ this.isJieSuan = val
+ this.PostMyDakaListPage()
},
- PostMyComDakaListPage() {
+ saveDakaDetail(item) {
+ if (item.workerType == 1 && !item.workCount) {
+ this.$util.showToast({
+ title: '璇峰～鍐欐暟閲忥紒',
+ icon: 'error'
+ })
+ return
+ }
+ let obj = {
+ orderBiddingDetailId: item.orderBiddingDetailId, //鎷涘伐鎵撳崱Id
+ workTime: item.workTime, //宸ヤ綔鏃堕暱
+ todaySalary: item.todaySalary //褰撴棩宸ヨ祫
+ }
+ if (item.workCount) {
+ obj.workCount = item.workCount
+ }
+ this.$api.saveDakaDetail(obj).then(res => {
+ if (res.code == 1) {
+ this.$util.showToast({
+ title: '鐢虫姤鎴愬姛锛�',
+ icon: 'success'
+ })
+ }
+ })
+ },
+ PostMyDakaListPage() {
let data = {
pageIndex: this.pageIndex,
pageSize: this.pageSize,
- isJieSuan: this.isJieSuan,
- wordDate: this.wordDate
}
- this.$api.PostMyComDakaListPage(data).then(res => {
+ if (this.wordDate) {
+ data.wordDate = this.wordDate
+ }
+ 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
+ }
+ this.$api.PostMyDakaListPage(data).then(res => {
if (res.code == 1) {
if (this.pageIndex == 1) {
this.viewList = res.data.items
} 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 +248,12 @@
},
clickIcon() {
this.datePickerShow = true
+ },
+ jumpWorkDetail(item) {
+ uni.navigateTo({
+ url: `/pages/checkin/workdetail?id=${item.orderBiddingDetailId}`
+ })
}
-
}
}
</script>
--
Gitblit v1.9.1