From a3316e76b658a008cd608d276a7aa03e41063389 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sun, 23 Jul 2023 00:15:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index-home.vue          |  4 +++-
 pages/order-manage/order-manage.vue | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/pages/index/index-home.vue b/pages/index/index-home.vue
index 3bc73f6..69f9ffc 100644
--- a/pages/index/index-home.vue
+++ b/pages/index/index-home.vue
@@ -242,7 +242,9 @@
 				let waitServRes = await this.$request.qryDetailOrderPage({
 					orderStatus: 2,
 					expectTimeStart: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + " 00:00:00",
-					expectTimeEnd: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + " 23:59:59"
+					expectTimeEnd: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + " 23:59:59",
+					orderByColumn: "expectTimeStart",
+					isAsc: "desc"
 				});
 				this.waitServOrderToday = waitServRes.rows;
 			},
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index 7d392ff..480da8b 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -638,6 +638,8 @@
 				params.goodsName = this.formData.orderKeywords;
 				params.countryId = this.formData.area && this.formData.area.length > 2 ? this.formData.area[2].areaId : null;
 				params.goodsCategoryId = this.formData.category && this.formData.category.length > 2 ? this.formData.category[2].goodsCategoryId : null;
+				params.orderByColumn = "updateTime";
+				params.isAsc = "desc";
 				// 状态
 				if (this.tabCur != null) {
 					params.orderStatus = this.subStateList[this.tabCur].code;
@@ -660,11 +662,15 @@
 						params.orderStatus = 2;
 						params.expectTimeStart = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + " 00:00:00",
 						params.expectTimeEnd = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + " 23:59:59"
+						params.orderByColumn = "expectTimeStart";
+						params.isAsc = "desc";
 					} else if (this.stateList[this.stateCur].code === 101) {
 						// 明日单
 						params.orderStatus = 2;
 						params.expectTimeStart = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + (date.getDate() + 1) + " 00:00:00",
 						params.expectTimeEnd = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + (date.getDate() + 1) + " 23:59:59"
+						params.orderByColumn = "expectTimeStart";
+						params.isAsc = "desc";
 					} else if (this.stateList[this.stateCur].code === 104) {
 						// 搁置单
 						params.shelveStatus = 1;
@@ -678,6 +684,12 @@
 						// 超时单
 						params.isMonitoredOrder = true;
 						params.allSelfAssigned = 0;
+						params.orderByColumn = "createTime";
+						params.isAsc = "desc";
+					} else if (this.stateList[this.stateCur].code === 0) {
+						// 新订单
+						params.orderByColumn = "createTime";
+						params.isAsc = "desc";
 					}
 					//  else if (this.stateList[this.stateCur].code === 100) {
 					// 	// 急报单
@@ -699,6 +711,10 @@
 						// 已完成/子单
 						params.workFinishTimeExisted = true;
 						params.drawCashStatus = 2;
+					} else if (this.tabCur === 1) {
+						// 待上门
+						params.orderByColumn = "expectTimeStart";
+						params.isAsc = "desc";
 					}
 				}
 				try {