From ea87c908fb6cdfc3e227a584a53e6730efb8262a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十月 2023 13:41:12 +0800
Subject: [PATCH] 小程序代码

---
 minipro_standard/pages/plannedProgress/plannedProgress.vue |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/minipro_standard/pages/plannedProgress/plannedProgress.vue b/minipro_standard/pages/plannedProgress/plannedProgress.vue
index fe0ae90..5eb0919 100644
--- a/minipro_standard/pages/plannedProgress/plannedProgress.vue
+++ b/minipro_standard/pages/plannedProgress/plannedProgress.vue
@@ -195,11 +195,9 @@
 			async onRefresh() {
 				if (this.isLoading) return;
 				this.isLoading = true;
-				this.finished = false;
-				this.loading = false;
-				this.refreshing = false;
-				this.getLists();
-				// await this.pageCounts()
+				await this.getLists()
+				await this.pageCounts()
+				this.isLoading = false;
 			},
 			// 閲嶇疆
 			reset() {
@@ -265,7 +263,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()
@@ -333,8 +331,8 @@
 						capacity: this.listData.capacity,
 						model: {
 							mixParam: this.listData.mixParam,
-							planDateStartDate: this.listData.startDate,
-							planDateEndDate: this.listData.endDate,
+							startDate: this.listData.startDate,
+							endDate: this.listData.endDate,
 							procedureIdList: this.listData.procedureIds ? this.listData.procedureIds : [],
 							factoryId: this.listData.departIds,
 							statusList: this.listData.cateIds
@@ -349,7 +347,6 @@
 						]
 					}).then(res => {
 						this.loading = false
-						this.isLoading = false;
 						this.listData.total = res.data.total
 						if (this.refreshing) {
 							this.lists = []
@@ -367,7 +364,6 @@
 					}).catch(err => {
 						this.loading = false
 						this.finished = true
-						this.isLoading = false;
 						if (this.refreshing) {
 							this.lists = []
 							this.refreshing = false;

--
Gitblit v1.9.3