|
|
@@ -569,54 +569,7 @@ export default {
|
|
|
},
|
|
|
],
|
|
|
activeNames: [],
|
|
|
- orderList: [
|
|
|
- {
|
|
|
- orderNum: 'D2323523532',
|
|
|
- createTime: '2020-08-06 15:08:08',
|
|
|
- state: '待确认',
|
|
|
- productDetail: [
|
|
|
- {
|
|
|
- productName: '外墙平油',
|
|
|
- productNum: '1',
|
|
|
- price: '100',
|
|
|
- },
|
|
|
- {
|
|
|
- productName: '外墙平油',
|
|
|
- productNum: '1',
|
|
|
- price: '100',
|
|
|
- },
|
|
|
- {
|
|
|
- productName: '外墙平油',
|
|
|
- productNum: '1',
|
|
|
- price: '100',
|
|
|
- },
|
|
|
- ],
|
|
|
- },
|
|
|
- {
|
|
|
- orderNum: 'D2323523532',
|
|
|
- createTime: '2020-08-06 15:08:08',
|
|
|
- state: '已签收',
|
|
|
- productDetail: [
|
|
|
- {
|
|
|
- productName: '外墙平油',
|
|
|
- productNum: '1',
|
|
|
- price: '100',
|
|
|
- },
|
|
|
- ],
|
|
|
- },
|
|
|
- {
|
|
|
- orderNum: 'D2323523532',
|
|
|
- createTime: '2020-08-06 15:08:08',
|
|
|
- state: '已签收',
|
|
|
- productDetail: [
|
|
|
- {
|
|
|
- productName: '外墙平油',
|
|
|
- productNum: '1',
|
|
|
- price: '100',
|
|
|
- },
|
|
|
- ],
|
|
|
- },
|
|
|
- ],
|
|
|
+ orderList: [],
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -1500,26 +1453,30 @@ export default {
|
|
|
getStoreOrderList(storeCode) {
|
|
|
getOrderByStoreCode({ storeCode: storeCode }).then((res) => {
|
|
|
if (res.code == 200) {
|
|
|
- let orderList = res.data.ORDERS;
|
|
|
- let orderMap = new Map();
|
|
|
- for (let i = 0; i < orderList.length; i++) {
|
|
|
- if (orderMap.has(orderList[i].ORDERID)) {
|
|
|
- orderMap.get(orderList[i].ORDERID).productDetail.push(orderList[i]);
|
|
|
- } else {
|
|
|
- let orderObj = {
|
|
|
- ORDERID: orderList[i].ORDERID,
|
|
|
- ORDERDATE: orderList[i].ORDERDATE,
|
|
|
- STATUS_DESCR: orderList[i].STATUS_DESCR,
|
|
|
- productDetail: [orderList[i]],
|
|
|
- };
|
|
|
- orderMap.set(orderList[i].ORDERID, orderObj);
|
|
|
+ let orderList = res.data.ORDERS || [];
|
|
|
+ if (orderList.length) {
|
|
|
+ let orderMap = new Map();
|
|
|
+ for (let i = 0; i < orderList.length; i++) {
|
|
|
+ if (orderMap.has(orderList[i].ORDERID)) {
|
|
|
+ orderMap.get(orderList[i].ORDERID).productDetail.push(orderList[i]);
|
|
|
+ } else {
|
|
|
+ let orderObj = {
|
|
|
+ ORDERID: orderList[i].ORDERID,
|
|
|
+ ORDERDATE: orderList[i].ORDERDATE,
|
|
|
+ STATUS_DESCR: orderList[i].STATUS_DESCR,
|
|
|
+ productDetail: [orderList[i]],
|
|
|
+ };
|
|
|
+ orderMap.set(orderList[i].ORDERID, orderObj);
|
|
|
+ }
|
|
|
}
|
|
|
+ let orderListArr = [];
|
|
|
+ for (let value of orderMap.values()) {
|
|
|
+ orderListArr.push(value);
|
|
|
+ }
|
|
|
+ this.orderList = orderListArr;
|
|
|
+ } else {
|
|
|
+ this.orderList = [];
|
|
|
}
|
|
|
- let orderListArr = [];
|
|
|
- for (let value of orderMap.values()) {
|
|
|
- orderListArr.push(value);
|
|
|
- }
|
|
|
- this.orderList = orderListArr;
|
|
|
}
|
|
|
});
|
|
|
},
|