From 0b49a1bc6330ab68d501d59e852b8aa39b70b331 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Tue, 14 Mar 2023 16:59:55 +0800
Subject: [PATCH] =?UTF-8?q?2023-3-14=20=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=20=E4=BC=9A=E5=91=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/oms/order/index1.vue            | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/mallplusui-web-admin/src/views/oms/order/index1.vue b/mallplusui-web-admin/src/views/oms/order/index1.vue
index 6c34617..9655d28 100644
--- a/mallplusui-web-admin/src/views/oms/order/index1.vue
+++ b/mallplusui-web-admin/src/views/oms/order/index1.vue
@@ -70,7 +70,7 @@
 				<div style="margin-top: 15px">
 					<el-form :inline="true" :model="listQuery" size="small" label-width="140px">
 						<el-form-item label="订单编号：">
-							<el-input v-model="listQuery.id" class="input-width" placeholder="编号"></el-input>
+							<el-input v-model="listQuery.orderSn" class="input-width" placeholder="编号"></el-input>
 						</el-form-item>
 						<!-- <el-form-item label="订单分类：">
 							<el-select v-model="listQuery.orderType" class="input-width" placeholder="全部" clearable>
@@ -236,11 +236,9 @@
 	const defaultListQuery = {
 		pageNum: 1,
 		pageSize: 10,
+		status: 0,
 		orderSn: null,
-		receiverKeyword: null,
-		status: null,
-		orderType: null,
-		sourceType: null,
+		receiverPhone: null,
 		createTime: null
 	};
 
@@ -602,6 +600,14 @@
 				this.listLoading = true;
 				if (this.listQuery.status == 0)
 					this.listQuery.status = null
+
+				if (this.listQuery.orderSn == "")
+					this.listQuery.orderSn = null
+
+				if (this.listQuery.receiverPhone == "")
+					this.listQuery.receiverPhone = null
+
+
 				console.log("listQuery", this.listQuery)
 				fetchList(this.listQuery).then(response => {
 					this.listLoading = false;
@@ -637,9 +643,9 @@
 				});
 			},
 			covertOrder(order) {
-				let address =  order.receiverRegion + order
+				let address = order.receiverRegion + order
 					.receiverDetailAddress;
-					
+
 				let listItem = {
 					orderId: order.id,
 					orderSn: order.orderSn,