From 2d43a1df3f5ba42710e6d21c27d1e13bdb8dfd56 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 24 三月 2025 09:23:08 +0800
Subject: [PATCH] -
---
src/pages/company/record.vue | 74 ++++++++++++++++++++++++++-----------
1 files changed, 52 insertions(+), 22 deletions(-)
diff --git a/src/pages/company/record.vue b/src/pages/company/record.vue
index 1d2684d..821be2f 100644
--- a/src/pages/company/record.vue
+++ b/src/pages/company/record.vue
@@ -3,7 +3,7 @@
<view class="coreshop-ff">
<up-list>
<up-list-item>
- <up-cell :title="workerInfo.userWorker.name">
+ <up-cell :title="workerInfo.userWorker?workerInfo.userWorker.name:''">
<template #icon>
<up-avatar shape="square" size="35" :src="workerInfo.avatar"
customStyle="margin: -3px 5px -3px 0"></up-avatar>
@@ -12,15 +12,15 @@
</up-list-item>
<view class="c-p-20">
<view class="chuany-flex chuany-justify-between chuany-flex-wrap">
- <text class="chuany-font34 chuany-text-bold">
+ <text class="chuany-font32">
{{dakaList.orderName}}
</text>
<text class="">
- 鏃ユ湡锛歿{$util.formatDate(dakaList.workDate)}}
+ 鎵撳崱鏃ユ湡锛歿{$util.formatDate(dakaList.workDate)}}
</text>
</view>
</view>
- <view class="c-p-20">
+ <view class="c-p-l-20 c-p-r-20">
<view class="">
<text class="">
鎵撳崱璁板綍锛�
@@ -45,8 +45,16 @@
</view>
</view>
</view>
- <up-cell title="宸ヤ綔鏃堕暱" :border='false'>
- <template #right-icon>
+ <up-cell title="鏃堕暱" :border='false'>
+ <!-- <template #right-icon>
+ {{dakaList.workTime}} 灏忔椂
+ </template> -->
+ <template #right-icon v-if="dakaList.workerType!=1 && (dakaList.isShenPi!==2||dakaList.isModify)">
+ <up-input v-model="dakaList.workTime" type="digit"
+ @change='(val) => {dakaList.todaySalary=$util.roundToTwo(val*dakaList.workPrice)}'
+ border="none" placeholder="璇峰～鍐欐椂闀�"></up-input>
+ </template>
+ <template #value v-else>
{{dakaList.workTime}} 灏忔椂
</template>
</up-cell>
@@ -59,11 +67,19 @@
<template #right-icon>
{{dakaList.workPrice}} {{dakaList.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}
</template>
+ <!--
+ <template #right-icon v-if="dakaList.isShenPiName!=='宸茬粨绠�'">
+ <up-input v-model="dakaList.workPrice" type="digit"
+ border="none" placeholder="璇峰～鍐欏伐浠�"></up-input>
+ </template>
+ <template #value v-else>
+ {{dakaList.workPrice}} {{dakaList.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}
+ </template> -->
</up-cell>
<up-cell title="鏁伴噺" :border='false' v-if="dakaList.workerType==1">
- <template #right-icon v-if="dakaList.isShenPiName!=='宸茬粨绠�'">
- <up-input v-model="dakaList.workCount"
- @blur='(val) => {dakaList.todaySalary=$util.roundToTwo(dakaList.workCount*dakaList.workPrice)}'
+ <template #right-icon v-if="dakaList.isShenPiName!=='宸茬粨绠�'||isModify">
+ <up-input v-model="dakaList.workCount" type="digit"
+ @change='(val) => {dakaList.todaySalary=$util.roundToTwo(val*dakaList.workPrice)}'
border="none" placeholder="璇峰～鍐欐暟閲�"></up-input>
</template>
<template #value v-else>
@@ -71,7 +87,14 @@
</template>
</up-cell>
<up-cell title="宸ヨ祫" :border='false'>
- <template #right-icon>
+ <!-- <template #right-icon>
+ {{dakaList.todaySalary}} 鍏�
+ </template> -->
+ <template #right-icon v-if="dakaList.isShenPiName!=='宸茬粨绠�'||isModify">
+ <up-input v-model="dakaList.todaySalary" type="digit" border="none"
+ placeholder="璇峰～鍐欏伐璧�"></up-input>
+ </template>
+ <template #value v-else>
{{dakaList.todaySalary}} 鍏�
</template>
</up-cell>
@@ -79,9 +102,10 @@
<tem-steps></tem-steps>
</view> -->
</up-list>
- <view class="tabbtns">
- <up-button color='#fece01' class="text-69" text="纭" @click="saveDakaDetailCompany"
- v-if="dakaList.isShenPiName!=='宸茬粨绠�'"></up-button>
+ <view class="tabbtns" v-if="dakaList.isShenPiName!=='宸茬粨绠�'||isModify">
+ <up-button color='#fece01' :text="dakaList.isShenPiName!=='宸茬粨绠�'?'鏍稿噯宸ヨ祫':'淇敼'"
+ :loading='isLoading' :loadingText="dakaList.isShenPiName!=='宸茬粨绠�'?'鏍稿噯涓�':'淇敼涓�'"
+ @click="saveDakaDetailCompany"></up-button>
</view>
</view>
</view>
@@ -94,18 +118,18 @@
orderBiddingDetailId: '',
dakaList: {},
workCount: '',
- confirmObj: {
- orderBiddingDetailId: '', //鎷涘伐鎵撳崱Id
- workTime: '', //宸ヤ綔鏃堕暱
- workCount: '', //璁′欢鏁伴噺
- todaySalary: '' //褰撴棩宸ヨ祫
- },
- workerInfo: ''
+ workerInfo: '',
+ isLoading: false
}
},
onLoad(options) {
this.orderBiddingDetailId = options.id
this.getDakaDetail(this.orderBiddingDetailId)
+ },
+ computed: {
+ isModify() {
+ return this.$util.minutesBetweenDates(this.dakaList.shenPitime, new Date()) <= 5 ? true : false
+ }
},
methods: {
getWorkerInfo(id) {
@@ -134,7 +158,7 @@
if (this.dakaList.orderBiddingDetailCheck.length % 2 !== 0) {
this.dakaList.orderBiddingDetailCheck.push({})
}
- console.log(res, '鎵撳崱');
+ console.log(res, this.dakaList.workTime, '鎵撳崱');
})
},
saveDakaDetailCompany() {
@@ -153,14 +177,20 @@
if (this.dakaList.workCount) {
obj.workCount = this.dakaList.workCount
}
+ this.isLoading = true
this.$api.saveDakaDetailCompany(obj).then(res => {
if (res.code == 1) {
this.$util.showToast({
title: '纭鎴愬姛锛�',
icon: 'success'
})
+ this.getDakaDetail(this.orderBiddingDetailId)
+ } else {
+ this.$util.showToast({
+ title: res.error ? res.error : '澶辫触锛�'
+ })
}
- console.log(res, '----');
+ this.isLoading = false
})
},
}
--
Gitblit v1.9.1