From 208b5a9f559dd2c7298759fdfe37d07c926cbd4d Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 23 九月 2024 17:09:21 +0800
Subject: [PATCH] 完善提现
---
src/pages/company/index.vue | 121 ++++++++++++++++++++++++++++-----------
1 files changed, 86 insertions(+), 35 deletions(-)
diff --git a/src/pages/company/index.vue b/src/pages/company/index.vue
index 9a0179f..7a24b95 100644
--- a/src/pages/company/index.vue
+++ b/src/pages/company/index.vue
@@ -2,23 +2,23 @@
<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>
</up-sticky>
<view class="" v-if="viewList&&viewList.length>0">
- <view class="listrecord c-p-18" v-for="item in viewList" :key='item.id' @click='jumpWorkDetail(item)'>
+ <view class="listrecord c-p-18" v-for="item in viewList" :key='item.id'>
<view class="coreshop-ff chuany-bradius20">
- <view
+ <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">
+ <view class="c-p-18 chuany-font28">
<view class="chuany-flex chuany-justify-between">
- <text class="chuany-font34 ">
+ <text class="chuany-font32">
{{item.orderName}}
</text>
<view class="chuany-flex chuany-justify-between">
@@ -30,37 +30,62 @@
<!-- <up-tag text="宸茬‘璁�" shape="circle" type="success" plain plainFill size='mini'></up-tag> -->
</view>
</view>
- <view class="c-p-t-14">
- 鎵撳崱璁板綍锛歿{item.dakaMingxi}}
+ <view class="text-69">
+ <view class="c-p-t-8">
+ 濮撳悕锛歿{item.workerUserName}}
+ </view>
+ <view class="c-p-t-8">
+ 鎵撳崱璁板綍锛歿{item.dakaMingxi}}
+ </view>
</view>
- <view class="chuany-flex chuany-justify-between chuany-flex-wrap c-p-t-14">
- <text class="chuany-width50">
- 宸ヤ綔鏃堕暱锛歿{item.workTime}}
- </text>
- <view class="chuany-width50">
+
+ <view class="chuany-flex chuany-justify-between chuany-flex-wrap text-69 c-p-t-8">
+ <view class="chuany-width48">
<text>
鏂瑰紡锛歿{item.workerTypeName}}
</text>
</view>
- <text class="chuany-width50 c-p-t-14">
- 宸ヤ环锛歿{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">
+ <text>
+ 宸ヤ环锛歿{item.workPrice}}{{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}
+ </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-8">
+ <text>
+ 鏃堕暱锛�
+ </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-8" v-if="item.workerType==1">
<text>
鏁伴噺锛�
</text>
- <up-input style="padding: 0;" size='mini' border="surround"
- v-model="workCount"></up-input>
+ <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>
</view>
- <view class="chuany-width50 c-p-t-14">
+ <view class="chuany-width48 chuany-flex c-p-t-8">
<text>
- 褰撴棩宸ヨ祫锛歿{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-width50 c-p-t-14">
+ <view class="chuany-width48 c-p-t-8">
<view class="chuany-width10">
- <up-button class="button-layout__item" text="纭" size="mini"
- @click.stop='saveDakaDetail(item)' type="warning"></up-button>
+ <up-button class="button-layout__item" :text="item.isShenPiName!=='宸茬粨绠�'?'纭':'淇敼'"
+ size="mini" :loading='item.isLoading'
+ :loadingText="item.isShenPiName!=='宸茬粨绠�'?'纭涓�':'淇敼涓�'"
+ @tap.stop='saveDakaDetailCompany(item)' type="warning"></up-button>
</view>
</view>
</view>
@@ -73,7 +98,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>
@@ -105,15 +131,17 @@
this.pageSize = 20
this.wordDate = ''
this.isJieSuan = ''
+ this.loadStatus = 'loadmore'
this.PostMyComDakaListPage();
+ uni.stopPullDownRefresh();
},
methods: {
sectionChange(val) {
this.isJieSuan = val
this.PostMyComDakaListPage()
},
- saveDakaDetail(item) {
- if (item.workerType == 1 && this.workCount) {
+ saveDakaDetailCompany(item) {
+ if (item.workerType == 1 && !item.workCount) {
this.$util.showToast({
title: '璇峰～鍐欐暟閲忥紒',
icon: 'error'
@@ -125,11 +153,24 @@
workTime: item.workTime, //宸ヤ綔鏃堕暱
todaySalary: item.todaySalary //褰撴棩宸ヨ祫
}
- if (this.workCount) {
- obj.workCount = this.workCount
+ if (item.workCount) {
+ obj.workCount = item.workCount
}
- this.$api.saveDakaDetail(obj).then(res => {
- console.log(res, '----');
+ item.isLoading = true
+ console.log(item.isShenPiName, 'item.isShenPiName鈥�');
+ this.$api.saveDakaDetailCompany(obj).then(res => {
+ if (res.code == 1) {
+ this.$util.showToast({
+ title: item.isShenPiName == '宸茬粨绠�' ? '淇敼鎴愬姛锛�' : '纭鎴愬姛锛�',
+ icon: 'success'
+ })
+ this.PostMyComDakaListPage();
+ } else {
+ this.$util.showToast({
+ title: res.error ? res.error : '澶辫触锛�'
+ })
+ }
+ item.isLoading = false
})
},
PostMyComDakaListPage() {
@@ -146,10 +187,10 @@
this.isJieSuan = ''
break;
case 1:
- this.isJieSuan = true
+ this.isJieSuan = false
break;
case 2:
- this.isJieSuan = false
+ this.isJieSuan = true
break;
}
data.isJieSuan = this.isJieSuan
@@ -159,9 +200,12 @@
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 => {
+ item.isLoading = false
+ })
// totalPages.value = res.data.totalCount
// 鏍规嵁count鏁伴噺鍒ゆ柇鏄惁杩樻湁鏁版嵁
if (res.data.totalCount > this.viewList.length) {
@@ -176,13 +220,20 @@
},
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/checkin/workdetail?id=${item.orderBiddingDetailId}`
+ url: `/pages/company/record?id=${item.orderBiddingDetailId}`
})
}
}
--
Gitblit v1.9.1