From ca2200ba53b236e8902b706c444375408c782f07 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期一, 18 九月 2023 15:58:45 +0800
Subject: [PATCH] 09-18 小程序

---
 minipro_standard/pages_adjust/pages/workOrder/workOrder.vue |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue b/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
index 789a2cb..d4c2b19 100644
--- a/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
+++ b/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
@@ -42,7 +42,7 @@
 							<span v-if="item.status === 4">宸叉姤宸�</span>
 							<span v-if="item.status === 5">宸插叆搴�</span>
 							<span v-if="item.status === 6">宸插彇娑�</span>
-							<span class="green" v-if="item.status === 7">杩涜涓�</span>
+							<span class="green" v-if="item.status === 7">鐢熶骇涓�</span>
 						</div>
 					</div>
 					<span class="f24">宸ュ崟缂栧彿: {{item.code}}</span>
@@ -162,18 +162,15 @@
 				this.searchForm = {
 					mixParam: '',
 					startDate: '',
-					endDate: gsdate(new Date()),
+					// endDate: gsdate(new Date()),
+					endDate: '',
 					statusList: []
 				}
-				this.page.page = 1
-				this.pageCounts()
-				this.loadData()
+				this.search()
 			},
 			searchInput(data) {
 				this.searchForm.mixParam = data
-				this.page.page = 1
-				this.pageCounts()
-				this.loadData()
+				this.search()
 			},
 			loadData() {
 				getList({
@@ -202,11 +199,10 @@
 			pageCounts() {
 				pageCount({
 					...this.searchForm,
-					endDate: this.searchForm.endDate || '',
+					endDate: this.searchForm.endDate || null,
 					statusList: this.searchForm.statusList.length === 0 ? this.tagList[0].id : this.searchForm
 						.statusList
 				}).then(res => {
-					console.log(res);
 					if (res.code === 200) {
 						this.tagList[0].num = String(res.data.startNum)
 						this.tagList[1].num = String(res.data.ingNum)
@@ -219,10 +215,11 @@
 				this.page.page = 1
 				this.loadData()
 			},
-			dateConfirm(v) {
+			dateConfirm(v) {
+				console.log(v);
 				this.isOpenDate = false
-				this.searchForm.startDate = v[0]
-				this.searchForm.endDate = v[v.length - 1]
+				this.searchForm.startDate = v.startDate
+				this.searchForm.endDate = v.endDate
 			},
 			getLists() {
 				this.page.page += 1
@@ -231,12 +228,12 @@
 			onRefresh() {
 				if (this.triggered) return
 				this.triggered = true;
-				this.page.page = 1
-				this.loadData()
+				this.search()
 			},
 			search() {
 				this.page.page = 1
 				this.loadData()
+				this.pageCounts()
 			},
 			jump(item) {
 				// uni.navigateTo({
@@ -375,7 +372,7 @@
 						width: 80%;
 
 						span {
-							font-size: 32rpx;
+							font-size: 24rpx;
 							font-weight: 500;
 							color: #333333;
 							overflow: hidden;

--
Gitblit v1.9.3