8-2-1

src/views/order/orderList.vue

@@ -12,8 +12,16 @@
 			<!-- 搜索区域 -->
 			<el-row>
 				<el-col>
+					 
 					<div class="flex" style="justify-content: flex-end;padding-bottom: 20px;">
-						<div class="redr">
+						<el-select v-model="queryInfo.status" placeholder="请选择订单状态">
+						   <el-option
+						     v-for="item in options"
+						     :label="item.label"
+						     :value="item.value">
+						   </el-option>
+						 </el-select>
+						<div class="redr" style="margin-left: 20px;">
 							<el-button>重新导入</el-button>
 							<input type="file" ref="fileInputt" @change="readTxtFile('fileInputt')" class="dr-int" />
 						</div>
@@ -94,17 +102,15 @@
 									@click="getExpressDelivery(scope.row)">查看物流</el-button> -->
 									<el-button v-if="scope.row.status == 1">待签收</el-button>
 									<el-button v-if="scope.row.status == 2" @click="batchOrder(scope.row)">待签收</el-button>
-									<el-button v-if="scope.row.status == 3" @click="batchOrder(scope.row)">申请退货</el-button>
+									<el-button v-if="scope.row.status == 3">已签收</el-button>
 									<el-button v-if="scope.row.status == 5" >理赔中</el-button>
 									<el-button v-if="scope.row.status == 6" >结算中</el-button>
 									<el-button v-if="scope.row.status == 7" >已完成</el-button>
-								<!-- showBtn -->
-								<template v-if="scope.row.status == 4">
-									<el-button v-if="showBtn(scope.row.refund_time_check) && scope.row.refund_status == 0"
+									<el-button v-if="showBtn(scope.row.confirm_time_check) && scope.row.status == 3"
 										@click="handleOrder('您确定立即申请退货？',scope.row)" type="primary">申请退货</el-button>
-									<el-button v-else-if="showBtn(scope.row.refund_time_check) && scope.row.refund_status == 1" type="danger">等待商家审核</el-button>
-									<el-button v-else type="danger">申请退货</el-button>
-								</template>
+									<el-button v-if="scope.row.status ==4 && scope.row.refund_status == 0" type="danger">等待商家审核</el-button>
+									
+								
 							</div>
 
 
@@ -174,6 +180,33 @@
 		name: 'Order',
 		data() {
 			return {
+				options: [{
+				          value: -1,
+				          label: '全部'
+				        }, {
+				          value: 1,
+				          label: '待发货',
+				        }, {
+				          value: 2,
+				          label: '待收货'
+				        }, {
+				          value: 3,
+				          label: '已收货'
+				        }, {
+				          value: 4,
+				          label: '退款中'
+				        }, {
+				          value: 5,
+				          label: '理赔中'
+				        },
+						{
+						  value: 6,
+						  label: '结算中'
+						},
+						{
+						  value: 7,
+						  label: '已完成'
+						}],
 				today: new Date(new Date().setHours(0,0,0,0)-0*24*60*60*1000).getTime(),
 				newTime: new Date().getTime(),
 				yjloading: false,
@@ -187,6 +220,7 @@
 				},
 				dialogTableVisible: false,
 				queryInfo: {
+					status: -1,
 					token: '',
 					page: 1,
 					limit: 10
@@ -198,11 +232,20 @@
 				num: 0,
 			}
 		},
+		watch: {
+			showStatus(n,o){
+				// console.log(n);
+				this.getList('reload')
+			}
+		},
 		created() {
 
 		},
 		computed: {
-			...mapState(['orderToken'])
+			...mapState(['orderToken']),
+			showStatus() {
+				return this.queryInfo.status
+			}
 		},
 		mounted() {
 			if (this.orderToken.length == 0) {