|
@@ -3,7 +3,7 @@
|
|
<el-row class="order_tab">
|
|
<el-row class="order_tab">
|
|
<el-col :span="15">
|
|
<el-col :span="15">
|
|
<div class="tab_list">
|
|
<div class="tab_list">
|
|
- <div class="tab_item" @click="tab_ac=i" :class="{'tab_item_ac':tab_ac==i?true:false}" v-for="(item,i) in tab_list" :key="i">
|
|
|
|
|
|
+ <div class="tab_item" @click="change_tab(i,item.status)" :class="{'tab_item_ac':tab_ac==i?true:false}" v-for="(item,i) in tab_list" :key="i">
|
|
<div class="point" v-show="item.num">{{item.num}}</div>
|
|
<div class="point" v-show="item.num">{{item.num}}</div>
|
|
<span>{{item.name}}</span>
|
|
<span>{{item.name}}</span>
|
|
<div class="tab_line"></div>
|
|
<div class="tab_line"></div>
|
|
@@ -13,7 +13,7 @@
|
|
<el-col :span="9">
|
|
<el-col :span="9">
|
|
<div class="header_serch">
|
|
<div class="header_serch">
|
|
<div class="search_inp">
|
|
<div class="search_inp">
|
|
- <el-input class="inp" v-model="input" placeholder="请输入手机号/姓名/地址/订单编号"></el-input>
|
|
|
|
|
|
+ <el-input class="inp" v-model="params.searchKey" placeholder="请输入手机号/姓名/地址/订单编号"></el-input>
|
|
<div class="btn"><i class="el-icon-search"></i></div>
|
|
<div class="btn"><i class="el-icon-search"></i></div>
|
|
</div>
|
|
</div>
|
|
<div class="Manual">手动发单</div>
|
|
<div class="Manual">手动发单</div>
|
|
@@ -23,12 +23,12 @@
|
|
|
|
|
|
<el-row class="order_list">
|
|
<el-row class="order_list">
|
|
<el-col :span="18">
|
|
<el-col :span="18">
|
|
- <order-list></order-list>
|
|
|
|
|
|
+ <order-list :list='orderList' :tabNum='tab_ac'></order-list>
|
|
</el-col>
|
|
</el-col>
|
|
- <el-col :span="6">
|
|
|
|
|
|
+ <el-col :span="6" v-if="orderList.length">
|
|
<div class="order_detail">
|
|
<div class="order_detail">
|
|
<div class="detail_title">
|
|
<div class="detail_title">
|
|
- <div class="detail_txt" @click="orderDetailStutus=0" :class="{'detail_txt_ac':orderDetailStutus==0?true:false}">订单跟踪</div>
|
|
|
|
|
|
+ <div class="detail_txt" @click="orderDetailStutus=0" v-if="needTrack" :class="{'detail_txt_ac':orderDetailStutus==0?true:false}">订单跟踪</div>
|
|
<div class="detail_txt" @click="orderDetailStutus=1" :class="{'detail_txt_ac':orderDetailStutus==1?true:false}">订单详情</div>
|
|
<div class="detail_txt" @click="orderDetailStutus=1" :class="{'detail_txt_ac':orderDetailStutus==1?true:false}">订单详情</div>
|
|
</div>
|
|
</div>
|
|
<order-detail :tabNum='tab_ac' v-if="orderDetailStutus==1"></order-detail>
|
|
<order-detail :tabNum='tab_ac' v-if="orderDetailStutus==1"></order-detail>
|
|
@@ -46,21 +46,30 @@
|
|
import orderMap from './orderComponents/orderAMap.vue';
|
|
import orderMap from './orderComponents/orderAMap.vue';
|
|
import OrderList from './orderComponents/orderList.vue';
|
|
import OrderList from './orderComponents/orderList.vue';
|
|
import orderTrack from './orderComponents/orderTrack.vue'
|
|
import orderTrack from './orderComponents/orderTrack.vue'
|
|
|
|
+ import { getOrderList} from '../api/order.js';
|
|
export default {
|
|
export default {
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
|
|
+ orderList:[],
|
|
tab_list:[
|
|
tab_list:[
|
|
- {name:'新订单',num:6},
|
|
|
|
- {name:'预约单',num:0},
|
|
|
|
- {name:'待接单',num:0},
|
|
|
|
- {name:'取货中',num:0},
|
|
|
|
- {name:'配送中',num:0},
|
|
|
|
- {name:'异常单',num:0},
|
|
|
|
- {name:'已取消',num:0}
|
|
|
|
|
|
+ {name:'新订单',num:6,status:0},
|
|
|
|
+ {name:'预约单',num:0,status:10},
|
|
|
|
+ {name:'待接单',num:0,status:1},
|
|
|
|
+ {name:'取货中',num:0,status:2},
|
|
|
|
+ {name:'配送中',num:0,status:3},
|
|
|
|
+ {name:'异常单',num:0,status:-2},
|
|
|
|
+ {name:'已取消',num:0,status:-1}
|
|
],
|
|
],
|
|
tab_ac:0,
|
|
tab_ac:0,
|
|
- orderDetailStutus:0,
|
|
|
|
- input:''
|
|
|
|
|
|
+ orderDetailStutus:1,
|
|
|
|
+ params:{
|
|
|
|
+ status: 0,
|
|
|
|
+ searchType: 0,
|
|
|
|
+ searchKey:'',
|
|
|
|
+ pageNum: 1,
|
|
|
|
+ pageSize: 10
|
|
|
|
+ },
|
|
|
|
+ needTrack:false
|
|
}
|
|
}
|
|
},
|
|
},
|
|
components: {
|
|
components: {
|
|
@@ -70,19 +79,39 @@
|
|
orderMap,
|
|
orderMap,
|
|
orderTrack
|
|
orderTrack
|
|
},
|
|
},
|
|
|
|
+ mounted() {
|
|
|
|
+ this.getOrder();
|
|
|
|
+ console.log(this.$tool.eosFormatTime2("2017-07-10 16:00:00",2.5))
|
|
|
|
+ },
|
|
methods: {
|
|
methods: {
|
|
sendOrder() {
|
|
sendOrder() {
|
|
this.$refs.sendOrderPopup.init();
|
|
this.$refs.sendOrderPopup.init();
|
|
},
|
|
},
|
|
-
|
|
|
|
- saveRule(t, i) {
|
|
|
|
- let obj = {
|
|
|
|
- id: i + 2,
|
|
|
|
- rule: t,
|
|
|
|
- content: ''
|
|
|
|
|
|
+ change_tab(i,status){
|
|
|
|
+ if(i==2||i==3||i==4||i==5||i==6){
|
|
|
|
+ this.needTrack = true;
|
|
|
|
+ }else{
|
|
|
|
+ this.needTrack = false;
|
|
}
|
|
}
|
|
- this.ruleList.push( obj )
|
|
|
|
- }
|
|
|
|
|
|
+ this.tab_ac = i;
|
|
|
|
+ this.params.status = status;
|
|
|
|
+ this.orderList = [];
|
|
|
|
+ this.params.pageNum = 1;
|
|
|
|
+ this.getOrder();
|
|
|
|
+ },
|
|
|
|
+ getOrder() {
|
|
|
|
+ let _this = this;
|
|
|
|
+ getOrderList(this.params).then(res => {
|
|
|
|
+ res.data.data.forEach(element => {
|
|
|
|
+ if(_this.tab_ac = 1){
|
|
|
|
+ element.timeTxt = _this.$tool.eosFormatTime2(element.exceptTime,element.delayTime);
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ this.orderList.push(element)
|
|
|
|
+ });
|
|
|
|
+ console.log(this.orderList);
|
|
|
|
+ })
|
|
|
|
+ },
|
|
}
|
|
}
|
|
}
|
|
}
|
|
</script>
|
|
</script>
|