From 93a986bc80abdef75923054b9df9adb6e1ccff52 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期二, 08 十月 2024 16:44:08 +0800
Subject: [PATCH] -
---
src/pages/checkin/index.vue | 82 +++++++++++++++++++++++------------------
1 files changed, 46 insertions(+), 36 deletions(-)
diff --git a/src/pages/checkin/index.vue b/src/pages/checkin/index.vue
index 929ee2e..978bdd6 100644
--- a/src/pages/checkin/index.vue
+++ b/src/pages/checkin/index.vue
@@ -1,18 +1,24 @@
<template>
- <view class="full-page">
+ <view class="full-page" scroll-y using-sticky>
<up-sticky>
<view class="coreshop-ff content c-p-l-10 c-p-t-10 c-p-r-10">
+ <up-search placeholder="璇风偣鍑婚�夋嫨鎵撳崱鏃ユ湡" @click='clickIcon' :show-action="false" @clear='PostMyDakaListPage'
+ disabled v-model="wordDate" search-icon="calendar" @search='PostMyDakaListPage'></up-search>
<!-- <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>
+ <!-- <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' @clear='PostMyDakaListPage' disabled v-model="wordDate" search-icon="calendar" @search='PostMyDakaListPage'
- @custom='PostMyDakaListPage'></up-search>
+ <up-search placeholder="璇疯緭鍏ュ叕鍙稿悕绉�" v-model="Suppliername" @clear='PostMyDakaListPage'
+ @custom='PostMyDakaListPage' @search='PostMyDakaListPage'></up-search>
+ <!-- <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>
+ <up-subsection :list="list" current='1' 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'>
+ <view class="full-page-content c-p-b-100" v-if="viewList&&viewList.length>0">
+ <view class="listrecord c-p-t-28 c-p-l-28 c-p-r-28" v-for="item in viewList" :key='item.id'>
<view class="coreshop-ff chuany-bradius20">
<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">
@@ -29,8 +35,9 @@
<!-- <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-text type="success" :text="item.isShenPiName" size='14'></up-text>
<!-- <up-tag text="宸茬‘璁�" shape="circle" type="success" plain plainFill size='mini'></up-tag> -->
</view>
</view>
@@ -53,7 +60,7 @@
<text>
鏁伴噺锛�
</text>
- <up-input v-if="item.isShenPiName!=='宸茬粨绠�'" type="digit" style="padding: 0;" size='mini'
+ <up-input v-if="item.isShenPi==0" 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>
@@ -65,11 +72,11 @@
</text>
</view>
<view class="chuany-width48 c-p-t-8">
- <view class="chuany-width10">
+ <view class="chuany-width10" v-if="item.isShenPi==0">
<!-- 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>
+ :loading='item.isLoading' loadingText="鐢虫姤涓�" @click.stop='saveDakaDetail(item)'
+ type="warning"></up-button>
</view>
</view>
</view>
@@ -158,7 +165,7 @@
pageSize: 20,
Suppliername: '',
wordDate: '',
- isJieSuan: '',
+ isJieSuan: false,
list: ['鍏ㄩ儴', '鏈粨绠�', '宸茬粨绠�'],
datePickerShow: false,
viewList: [],
@@ -178,18 +185,33 @@
}
},
onPullDownRefresh() {
- this.pageIndex = 1
- this.pageSize = 20
this.wordDate = ''
- this.isJieSuan = ''
- this.loadStatus = 'loadmore'
- this.PostMyDakaListPage();
+ this.WordDateStart = '' //宸ヤ綔鏃ユ湡寮�濮�
+ this.WordDateEnd = '' //宸ヤ綔鏃ユ湡缁撴潫
+ this.Suppliername = ''
+ this.init()
uni.stopPullDownRefresh();
},
methods: {
+ init() {
+ this.pageIndex = 1
+ this.pageSize = 20
+ this.loadStatus = 'loadmore'
+ this.PostMyDakaListPage();
+ },
sectionChange(val) {
- this.isJieSuan = val
- this.PostMyDakaListPage()
+ switch (val) {
+ case 0:
+ this.isJieSuan = null
+ break;
+ case 1:
+ this.isJieSuan = false
+ break;
+ case 2:
+ this.isJieSuan = true
+ break;
+ }
+ this.init()
},
saveDakaDetail(item) {
if (item.workerType == 1 && !item.workCount) {
@@ -226,6 +248,7 @@
let data = {
pageIndex: this.pageIndex,
pageSize: this.pageSize,
+ isJieSuan: this.isJieSuan
}
if (this.wordDate) {
data.WordDateStart = this.WordDateStart //宸ヤ綔鏃ユ湡寮�濮�
@@ -234,27 +257,13 @@
if (this.Suppliername) {
data.Suppliername = this.Suppliername
}
- 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) {
this.heji = res.data.heji
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 => {
@@ -277,6 +286,7 @@
this.WordDateStart = new Date(val.startDate.result) //宸ヤ綔鏃ユ湡寮�濮�
this.WordDateEnd = new Date(val.endDate.result) //宸ヤ綔鏃ユ湡缁撴潫
this.datePickerShow = false
+ this.PostMyDakaListPage()
console.log(this.wordDate, this.WordDateStart, this.WordDateEnd, this.Suppliername);
},
cancel() {
--
Gitblit v1.9.1