From d0fd00436448dd7b82031f840e22d9e6aecb6053 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期二, 31 十二月 2024 15:41:22 +0800
Subject: [PATCH] -
---
src/pages/company/index.vue | 55 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/src/pages/company/index.vue b/src/pages/company/index.vue
index 4eb626a..a35890d 100644
--- a/src/pages/company/index.vue
+++ b/src/pages/company/index.vue
@@ -8,15 +8,15 @@
</view> -->
<view class="coreshop-ff content c-p-l-10 c-p-t-10 c-p-r-10">
<!-- <up-input shape="round" class="u-search__content__input"></up-input> -->
- <up-search placeholder="璇风偣鍑婚�夋嫨鎵撳崱鏃ユ湡" @click='clickIcon' @clear='PostMyComDakaListPage' disabled
- v-model="wordDate" search-icon="calendar" @search='PostMyComDakaListPage'
+ <up-search placeholder="璇风偣鍑婚�夋嫨鎵撳崱鏃ユ湡" @click='clickIcon' @clear='init' disabled
+ v-model="wordDate" search-icon="calendar" @search='init'
:show-action="false"></up-search>
<!-- <up-search placeholder="璇疯緭鍏ュ伐浜哄悕瀛�" :show-action="false" v-model="workerUserName"
@clear='PostMyComDakaListPage' @search='PostMyComDakaListPage'></up-search> -->
</view>
<view class="coreshop-ff content c-p-10">
- <up-search placeholder="璇疯緭鍏ュ伐浜哄悕瀛�" v-model="workerUserName" @custom='PostMyComDakaListPage'
- @clear='PostMyComDakaListPage' @search='PostMyComDakaListPage'></up-search>
+ <up-search placeholder="璇疯緭鍏ュ伐浜哄悕瀛�" v-model="workerUserName" @custom='init'
+ @clear='init' @search='init'></up-search>
<!-- <up-search placeholder="璇风偣鍑婚�夋嫨鎵撳崱鏃ユ湡" @click='clickIcon' @clear='PostMyComDakaListPage' disabled
v-model="wordDate" search-icon="calendar" @search='PostMyComDakaListPage'
@custom='PostMyComDakaListPage'></up-search> -->
@@ -43,7 +43,15 @@
</text> -->
<!-- <up-tag class='c-m-r-10' :text="item.isShenPiName" shape="circle" type="success" plain
plainFill size='mini'></up-tag> -->
- <up-text type="success" :text="item.isShenPiName" size='14'></up-text>
+ <!-- v-if="item.isShenPi!==2" -->
+ <view class="chuany-width10" v-if="item.isShenPiName=='鏈鏍�'||item.isModify">
+ <up-button :text="item.isShenPi!==2?'鏍稿噯宸ヨ祫':'淇敼'" size="mini"
+ :loading='item.isLoading' :loadingText="item.isShenPi!==2?'鏍稿噯涓�':'淇敼涓�'"
+ @tap.stop='saveDakaDetailCompany(item)' type="warning"></up-button>
+ </view>
+ <up-text v-else :type="item.isShenPiName=='鏈鏍�'?'info':'success'"
+ :text="item.isShenPiName" size='14'></up-text>
+
<!-- <up-tag text="宸茬‘璁�" shape="circle" type="success" plain plainFill size='mini'></up-tag> -->
</view>
</view>
@@ -55,7 +63,7 @@
鎵撳崱璁板綍锛歿{item.dakaMingxi}}
</view>
</view>
-
+
<view class="chuany-flex chuany-justify-between chuany-flex-wrap text-69 c-p-t-8">
<view class="chuany-width48">
<text>
@@ -67,18 +75,18 @@
宸ヤ环锛歿{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)}'
+ @change='(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 && item.isShenPi!==2"
- style="padding: 0;" size='mini'
- @blur='(val) => {item.todaySalary=$util.roundToTwo(item.workTime*item.workPrice)}'
+ <up-input type="digit"
+ style="padding: 0;" size='mini' v-if="item.workerType!=1 && (item.isShenPi!==2||item.isModify)"
+ @change='(val) => {item.todaySalary=$util.roundToTwo(val*item.workPrice)}'
border="surround" v-model="item.workTime"></up-input>
<text v-else>{{item.workTime}}</text>
</view>
@@ -87,8 +95,8 @@
鏁伴噺锛�
</text>
<up-input type="digit" style="padding: 0;" size='mini' border="surround"
- v-if="item.isShenPi!==2"
- @blur='(val) => {item.todaySalary=$util.roundToTwo(item.workCount*item.workPrice)}'
+ v-if="item.isShenPi!==2||item.isModify"
+ @change='(val) => {item.todaySalary=$util.roundToTwo(val*item.workPrice)}'
v-model="item.workCount"></up-input>
<text v-else>{{item.workCount}}</text>
</view>
@@ -97,17 +105,17 @@
宸ヨ祫锛�
</text>
<up-input type="digit" style="padding: 0;" size='mini' border="surround"
- v-model="item.todaySalary" v-if="item.isShenPi!==2"></up-input>
+ v-model="item.todaySalary" v-if="item.isShenPi!==2||item.isModify"></up-input>
<text v-else>{{item.todaySalary}} 鍏�</text>
</view>
- <view class="chuany-width48 c-p-t-8">
+ <!-- <view class="chuany-width48 c-p-t-8">
<view class="chuany-width10" v-if="item.isShenPi!==2">
<up-button class="button-layout__item" :text="item.isShenPi!==2?'鏍稿噯宸ヨ祫':'淇敼'"
size="mini" :loading='item.isLoading'
:loadingText="item.isShenPi!==2?'鏍稿噯涓�':'淇敼涓�'"
@tap.stop='saveDakaDetailCompany(item)' type="warning"></up-button>
</view>
- </view>
+ </view> -->
</view>
</view>
</view>
@@ -163,6 +171,11 @@
uni.stopPullDownRefresh();
},
methods: {
+ changeTime(val,item) {
+ item.workTime = val
+ item.todaySalary = this.$util.roundToTwo(item.workTime * item.workPrice)
+ console.log(val,item.todaySalary,item.workTime * item.workPrice);
+ },
init() {
this.pageIndex = 1
this.pageSize = 20
@@ -207,7 +220,7 @@
title: item.isShenPiName == '宸茬粨绠�' ? '淇敼鎴愬姛锛�' : '纭鎴愬姛锛�',
icon: 'success'
})
- this.PostMyComDakaListPage();
+ this.init();
} else {
this.$util.showToast({
title: res.error ? res.error : '澶辫触锛�'
@@ -230,10 +243,8 @@
data.WordDateEnd = this.WordDateEnd //宸ヤ綔鏃ユ湡缁撴潫
}
if (this.workerUserName) {
- data.workerUserName = this.workerUserName
+ data.WorkerUserName = this.workerUserName
}
-
- console.log(data, '---------------');
this.$api.PostMyComDakaListPage(data).then(res => {
if (res.code == 1) {
this.heji = res.data.heji
@@ -242,9 +253,11 @@
} else {
this.viewList = this.viewList.concat(...res.data.items)
}
- console.log(this.viewList, this.viewList.length, 'this.viewList');
this.viewList.forEach(item => {
item.isLoading = false
+ console.log(this.$util.minutesBetweenDates(item.shenPitime, new Date()));
+ this.$util.minutesBetweenDates(item.shenPitime, new Date()) <= 5 ? item.isModify =
+ true : item.isModify = false
})
// totalPages.value = res.data.totalCount
// 鏍规嵁count鏁伴噺鍒ゆ柇鏄惁杩樻湁鏁版嵁
--
Gitblit v1.9.1