From ca73a173f008c8d7a9d700bad897ca24fe2d2203 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 16 十月 2023 09:29:57 +0800
Subject: [PATCH] 111
---
minipro_standard/pages/plannedProgress/plannedProgress.vue | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/minipro_standard/pages/plannedProgress/plannedProgress.vue b/minipro_standard/pages/plannedProgress/plannedProgress.vue
index 5b72386..fe0ae90 100644
--- a/minipro_standard/pages/plannedProgress/plannedProgress.vue
+++ b/minipro_standard/pages/plannedProgress/plannedProgress.vue
@@ -102,7 +102,9 @@
</scroll-view>
</view>
<!-- 閫夋嫨鏃ユ湡 -->
- <u-calendar :show="timeShow" mode="range" @confirm="timeConfirm"></u-calendar>
+ <!-- <u-calendar :show="timeShow" mode="range" @confirm="timeConfirm" @close="timeShow = false"></u-calendar> -->
+ <l-calendar :lunar="false" v-model="timeShow" @change="timeConfirm" :isRange="true" activeBgColor="#305ED5"
+ rangeColor="#305ED5" rangeBgColor="rgba(48, 80, 213, 0.1)"></l-calendar>
</view>
</template>
@@ -193,9 +195,11 @@
async onRefresh() {
if (this.isLoading) return;
this.isLoading = true;
- await this.getLists()
- await this.pageCounts()
- this.isLoading = false;
+ this.finished = false;
+ this.loading = false;
+ this.refreshing = false;
+ this.getLists();
+ // await this.pageCounts()
},
// 閲嶇疆
reset() {
@@ -217,8 +221,8 @@
},
// 鏃ユ湡纭畾
timeConfirm(val) {
- this.listData.startDate = val[0]
- this.listData.endDate = val[val.length - 1]
+ this.listData.startDate = val.startDate
+ this.listData.endDate = val.endDate
this.timeShow = false
},
// 鍒囨崲宸ュ巶
@@ -247,7 +251,8 @@
},
// 鐐瑰嚮鏍囩鎼滅储
clickTag(ids) {
- this.listData.cateIds = ids
+ // ids ? ids.split(',') : []
+ this.listData.cateIds = ids ? ids.split(',') : []
this.listData.page = 0
this.finished = false
this.lists = []
@@ -260,7 +265,7 @@
procedureIdList: this.listData.procedureIds ? this.listData.procedureIds : [],
startDate: this.listData.startDate,
endDate: this.listData.endDate,
- statusList: this.listData.cateIds
+ // statusList: this.listData.cateIds
}).then(res => {
if (res.code === 200 && res.data) {
this.tagList[0].num = res.data.allNum.toString()
@@ -328,11 +333,12 @@
capacity: this.listData.capacity,
model: {
mixParam: this.listData.mixParam,
- startDate: this.listData.startDate,
- endDate: this.listData.endDate,
+ planDateStartDate: this.listData.startDate,
+ planDateEndDate: this.listData.endDate,
procedureIdList: this.listData.procedureIds ? this.listData.procedureIds : [],
factoryId: this.listData.departIds,
- statusList: this.listData.cateIds ? this.listData.cateIds.split(',') : []
+ statusList: this.listData.cateIds
+ // this.listData.cateIds ? this.listData.cateIds.split(',') : []
},
page: this.listData.page,
sorts: [
@@ -343,6 +349,7 @@
]
}).then(res => {
this.loading = false
+ this.isLoading = false;
this.listData.total = res.data.total
if (this.refreshing) {
this.lists = []
@@ -360,6 +367,7 @@
}).catch(err => {
this.loading = false
this.finished = true
+ this.isLoading = false;
if (this.refreshing) {
this.lists = []
this.refreshing = false;
--
Gitblit v1.9.3