From 38130802e3fd55080f518f4128ef20ddfdd907c3 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期二, 10 九月 2024 17:11:14 +0800
Subject: [PATCH] -
---
src/pages/checkin/index.vue | 74 +++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 27 deletions(-)
diff --git a/src/pages/checkin/index.vue b/src/pages/checkin/index.vue
index 4f4f342..24c3056 100644
--- a/src/pages/checkin/index.vue
+++ b/src/pages/checkin/index.vue
@@ -1,8 +1,12 @@
<template>
<view class="full-page">
<up-sticky>
+ <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="璇疯緭鍏ュ叕鍙稿悕绉�" :show-action="false" v-model="Suppliername" @clear='PostMyDakaListPage' @search='PostMyDakaListPage'></up-search>
+ </view>
<view class="coreshop-ff content c-p-10">
- <up-search placeholder="璇风偣鍑婚�夋嫨鎵撳崱鏃ユ湡" @click='clickIcon' disabled v-model="wordDate" search-icon="calendar"
+ <up-search placeholder="璇风偣鍑婚�夋嫨鎵撳崱鏃ユ湡" @click='clickIcon' @clear='PostMyDakaListPage' disabled v-model="wordDate" search-icon="calendar" @search='PostMyDakaListPage'
@custom='PostMyDakaListPage'></up-search>
</view>
<up-subsection :list="list" activeColor="#f9ae3d" @change="sectionChange"></up-subsection>
@@ -16,10 +20,10 @@
鎵撳崱鏃ユ湡锛歿{$util.formatDate(item.workDate)}}
</text>
</view>
- <view class="c-p-26">
+ <view class="c-p-20">
<view class="chuany-flex chuany-justify-between">
<text class="chuany-font34 ">
- {{item.orderName}}
+ {{item.suppliername}}
</text>
<view class="chuany-flex chuany-justify-between">
<!-- <text class="c-p-r-20">
@@ -30,22 +34,23 @@
<!-- <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="c-p-t-10">
+ <!-- 鎵撳崱璁板綍锛� -->
+ {{item.dakaMingxi}}
</view>
- <view class="chuany-flex chuany-justify-between chuany-flex-wrap c-p-t-14">
- <text class="chuany-width50">
+ <view class="chuany-flex chuany-justify-between chuany-flex-wrap c-p-t-10">
+ <text class="chuany-width48">
鏃堕暱锛歿{item.workTime}}
</text>
- <view class="chuany-width50">
+ <!-- <view class="chuany-width48">
<text>
鏂瑰紡锛歿{item.workerTypeName}}
</text>
- </view>
- <text class="chuany-width50 c-p-t-14">
+ </view> -->
+ <text class="chuany-width48">
宸ヤ环锛歿{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 c-p-t-10" v-if="item.workerType==1">
<text>
鏁伴噺锛�
</text>
@@ -55,16 +60,16 @@
v-model="item.workCount"></up-input>
<text v-else>{{item.workCount}}</text>
</view>
- <view class="chuany-width50 c-p-t-14">
+ <view class="chuany-width48 c-p-t-10">
<text>
宸ヨ祫锛歿{item.todaySalary}}鍏�
</text>
</view>
- <view class="chuany-width50 c-p-t-14">
+ <view class="chuany-width48 c-p-t-10">
<view class="chuany-width10">
<!-- v-if="item.isShenPiName!=='宸茬粨绠�'" -->
- <up-button class="button-layout__item" text="宸ヨ祫鐢虫姤" size="mini" :loading='item.isLoading'
- loadingText="鐢虫姤涓�" v-if="item.isShenPiName!=='宸茬粨绠�'"
+ <up-button class="button-layout__item" text="宸ヨ祫鐢虫姤" size="mini"
+ :loading='item.isLoading' loadingText="鐢虫姤涓�" v-if="item.isShenPiName!=='宸茬粨绠�'"
@click.stop='saveDakaDetail(item)' type="warning"></up-button>
</view>
</view>
@@ -100,29 +105,29 @@
</view>
<view class="chuany-flex chuany-justify-between chuany-flex-wrap c-p-t-20">
- <text class="chuany-width50">
+ <text class="chuany-width48">
宸ヤ綔鏃堕暱锛�8灏忔椂
</text>
- <view class="chuany-width50">
+ <view class="chuany-width48">
<text>
鏂瑰紡锛氳浠�
</text>
</view>
- <text class="chuany-width50 c-p-t-20">
+ <text class="chuany-width48 c-p-t-20">
宸ヤ环锛�0.5鍏�/浠�
</text>
- <view class="chuany-width50 chuany-flex c-p-t-20">
+ <view class="chuany-width48 chuany-flex c-p-t-20">
<text>
鏁伴噺锛�
</text>
<up-input style="padding: 0;" size='mini' border="surround"></up-input>
</view>
- <view class="chuany-width50 c-p-t-20">
+ <view class="chuany-width48 c-p-t-20">
<text>
褰撴棩宸ヨ祫锛�136鍏�
</text>
</view>
- <view class="chuany-width50 c-p-t-20">
+ <view class="chuany-width48 c-p-t-20">
<view class="chuany-width10">
<up-button class="button-layout__item" text="宸ヨ祫鐢虫姤" size="mini"
type="warning"></up-button>
@@ -138,8 +143,11 @@
<up-empty text='鏆傛棤' icon="/static/order.png">
</up-empty>
</view>
- <fui-date-picker :show="datePickerShow" :value="$util.formatDate(new Date())" type="3" @change="changePicker"
- @cancel="cancel"></fui-date-picker>
+ <fui-date-picker :show="datePickerShow" range :value="$util.formatDate(new Date())" type="3"
+ @change="changePicker" @cancel="cancel"></fui-date-picker>
+ <view class="tabbtns">
+ 鍚堣锛歿{heji}} 鍏�
+ </view>
</view>
</template>
@@ -149,13 +157,17 @@
return {
pageIndex: 1,
pageSize: 20,
+ Suppliername: '',
wordDate: '',
isJieSuan: '',
list: ['鍏ㄩ儴', '鏈粨绠�', '宸茬粨绠�'],
datePickerShow: false,
viewList: [],
loadStatus: 'loadmore',
- isLoading: false
+ isLoading: false,
+ heji: '',
+ WordDateStart: '', //宸ヤ綔鏃ユ湡寮�濮�
+ WordDateEnd: '' //宸ヤ綔鏃ユ湡缁撴潫
}
},
onLoad() {
@@ -217,7 +229,11 @@
pageSize: this.pageSize,
}
if (this.wordDate) {
- data.wordDate = this.wordDate
+ data.WordDateStart = this.WordDateStart //宸ヤ綔鏃ユ湡寮�濮�
+ data.WordDateEnd = this.WordDateEnd //宸ヤ綔鏃ユ湡缁撴潫
+ }
+ if (this.Suppliername) {
+ data.Suppliername = this.Suppliername
}
if (this.isJieSuan) {
switch (this.isJieSuan) {
@@ -235,13 +251,14 @@
}
this.$api.PostMyDakaListPage(data).then(res => {
if (res.code == 1) {
+ this.heji = res.data.heji
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');
- this.viewList.forEach(item=>{
+ this.viewList.forEach(item => {
item.isLoading = false
})
// totalPages.value = res.data.totalCount
@@ -257,8 +274,11 @@
})
},
changePicker(val) {
- this.wordDate = val.result
+ this.wordDate = val.startDate.result + '鑷�' + val.endDate.result
+ this.WordDateStart = new Date(val.startDate.result) //宸ヤ綔鏃ユ湡寮�濮�
+ this.WordDateEnd = new Date(val.endDate.result) //宸ヤ綔鏃ユ湡缁撴潫
this.datePickerShow = false
+ console.log(this.wordDate, this.WordDateStart, this.WordDateEnd, this.Suppliername);
},
cancel() {
this.datePickerShow = false
--
Gitblit v1.9.1