Commit 08516282 authored by zhengke's avatar zhengke

修改

parent 873da45b
...@@ -79,11 +79,9 @@ ...@@ -79,11 +79,9 @@
</div> </div>
<div> <div>
<el-tabs style="margin-top:20px" v-model="activeName" @tab-click="handleClick"> <el-tabs style="margin-top:20px" v-model="activeName" @tab-click="handleClick">
<el-tab-pane :dataId="0" label="全部" name="first" :key="0"></el-tab-pane> <el-tab-pane :dataId="0" label="全部" name="first" :key="0"></el-tab-pane>
<el-tab-pane v-for="item in orderStatusList" v-if="item.Id!=2" :key="item.Id" :dataId="item.Id"           <el-tab-pane v-for="item in orderStatusList" :key="item.Id" :dataId="item.Id" :name="item.Id.toString()" :label="item.Name">
:name="item.Id.toString()" :label="item.Name">           </el-tab-pane>
</el-tab-pane>
<el-tab-pane :dataId="8" label="回收站" :key="8" name="8"></el-tab-pane>
</el-tabs> </el-tabs>
<div class="app-order-title"> <div class="app-order-title">
<div style="width: 55%;">订单信息</div> <div style="width: 55%;">订单信息</div>
...@@ -1385,22 +1383,11 @@ ...@@ -1385,22 +1383,11 @@
this.getList(); this.getList();
}, },
getOrderStatus() { getOrderStatus() {
this.apipost("/api/order/GetOrderStatusEnumList", {}, res => {         this.apipost("/api/Reserve/GetReserveBaseInfo", {}, res => {
var newArray = [];           if (res.data.resultCode == 1) {
var tempArray = res.data.data;             this.orderStatusList = res.data.data.OrderStateList;
tempArray.forEach(item => {           }
if (item.Id != 2) {         })
var currentObj = this.OrderStateList.find(sitem => {
return sitem.Id === item.Id; //筛选出匹配数据
});
if (currentObj) {
item.Name = currentObj.Name;
}
newArray.push(item);
}
});
this.orderStatusList = newArray;
})
}, },
getDelivery() { getDelivery() {
this.apipost("/api/order/GetOrderDeliveryMethodEnumList", {}, res => { this.apipost("/api/order/GetOrderDeliveryMethodEnumList", {}, res => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment