fe / yoho-shop-manage · Commits

Go to a project

Authored by lzhy
Commit bb61cd428117d7a8173b26dbadd62e4024b06400 2 parents 80771404 bee5453b

Merge branch 'feature/shop-order' into develop

Inline Side-by-side
Showing 2 changed files with 5 additions and 18 deletions
@@ -13,9 +13,6 @@ @@ -13,9 +13,6 @@
13 <filter-item label="收货人"> 13 <filter-item label="收货人">
14 <Input v-model.trim="query.consigneeName" /> 14 <Input v-model.trim="query.consigneeName" />
15 </filter-item> 15 </filter-item>
16 - <filter-item label="商品名称">  
17 - <Input v-model.trim="query.productName" />  
18 - </filter-item>  
19 <filter-item label="订单状态"> 16 <filter-item label="订单状态">
20 <Select v-model.trim="query.orderStatus" clearable> 17 <Select v-model.trim="query.orderStatus" clearable>
21 <Option v-for="(option, key) in orderStatusArr" :key="key" :value="key"> 18 <Option v-for="(option, key) in orderStatusArr" :key="key" :value="key">
@@ -52,7 +49,6 @@ export default { @@ -52,7 +49,6 @@ export default {
52 orderCode: '', 49 orderCode: '',
53 productSkn: '', 50 productSkn: '',
54 productSku: '', 51 productSku: '',
55 - prodName: '',  
56 consigneeName: '', 52 consigneeName: '',
57 orderStatus: '', 53 orderStatus: '',
58 pageSize: 20, 54 pageSize: 20,
@@ -93,9 +89,7 @@ export default { @@ -93,9 +89,7 @@ export default {
93 this.query.orderCode = ''; 89 this.query.orderCode = '';
94 this.query.productSkn = ''; 90 this.query.productSkn = '';
95 this.query.productSku = ''; 91 this.query.productSku = '';
96 - this.query.prodName = '';  
97 - this.query.nickName = '';  
98 - this.query.userName = ''; 92 + this.query.consigneeName = '';
99 this.query.orderStatus = ''; 93 this.query.orderStatus = '';
100 this.query.pageSize = 20; 94 this.query.pageSize = 20;
101 this.query.pageNo = 1; 95 this.query.pageNo = 1;
@@ -11,10 +11,7 @@ @@ -11,10 +11,7 @@
11 <Input v-model.trim="query.productSku" /> 11 <Input v-model.trim="query.productSku" />
12 </filter-item> 12 </filter-item>
13 <filter-item label="收货人"> 13 <filter-item label="收货人">
14 - <Input v-model.trim="query.userName" />  
15 - </filter-item>  
16 - <filter-item label="商品名称">  
17 - <Input v-model.trim="query.prodName" /> 14 + <Input v-model.trim="query.consigneeName" />
18 </filter-item> 15 </filter-item>
19 <filter-item label="售后状态"> 16 <filter-item label="售后状态">
20 <Select v-model.trim="query.shopStatus"> 17 <Select v-model.trim="query.shopStatus">
@@ -26,7 +23,7 @@ @@ -26,7 +23,7 @@
26 </filter-item> 23 </filter-item>
27 <filter-item> 24 <filter-item>
28 <Button type="primary" @click="search">筛选</Button> 25 <Button type="primary" @click="search">筛选</Button>
29 - <Button @click="reset">清空条件</Button> 26 + <Button @click="reset">全部</Button>
30 </filter-item> 27 </filter-item>
31 </layout-filter> 28 </layout-filter>
32 <layout-list> 29 <layout-list>
@@ -52,9 +49,7 @@ export default { @@ -52,9 +49,7 @@ export default {
52 orderCode: '', 49 orderCode: '',
53 productSkn: '', 50 productSkn: '',
54 productSku: '', 51 productSku: '',
55 - prodName: '',  
56 - nickName: '',  
57 - userName: '', 52 + consigneeName: '',
58 pageSize: 20, 53 pageSize: 20,
59 pageNo: 1, 54 pageNo: 1,
60 queryType: 1, 55 queryType: 1,
@@ -90,9 +85,7 @@ export default { @@ -90,9 +85,7 @@ export default {
90 this.query.orderCode = ''; 85 this.query.orderCode = '';
91 this.query.productSkn = ''; 86 this.query.productSkn = '';
92 this.query.productSku = ''; 87 this.query.productSku = '';
93 - this.query.prodName = '';  
94 - this.query.nickName = '';  
95 - this.query.userName = ''; 88 + this.query.consigneeName = '';
96 this.query.orderStatus = 0; 89 this.query.orderStatus = 0;
97 this.query.pageSize = 20; 90 this.query.pageSize = 20;
98 this.query.pageNo = 1; 91 this.query.pageNo = 1;