Commit 11e3b56c authored by 黄卓's avatar 黄卓

Merge remote-tracking branch 'origin/dev' into dev

parents c7e6fe87 2986cd8f
...@@ -317,7 +317,7 @@ export default { ...@@ -317,7 +317,7 @@ export default {
/** 表格订单号点击 */ /** 表格订单号点击 */
orderClick(row) { orderClick(row) {
orderTagList({ orderId: row.orderId }).then((res) => { orderTagList({ orderId: row.orderId }).then((res) => {
const { data = [] } = res; const { data = {} } = res;
this.orderList = []; this.orderList = [];
// 取最长的list // 取最长的list
let dataLength = data.loadList.length; let dataLength = data.loadList.length;
......
...@@ -74,6 +74,7 @@ export default { ...@@ -74,6 +74,7 @@ export default {
}; };
}, },
created() { created() {
this.getBoxInfo();
// 仓库 // 仓库
getWarehouseList().then((r) => { getWarehouseList().then((r) => {
this.warehouseList = r.data; this.warehouseList = r.data;
...@@ -99,9 +100,6 @@ export default { ...@@ -99,9 +100,6 @@ export default {
this.allUsers = data.list ?? []; this.allUsers = data.list ?? [];
}); });
}, },
activated() {
this.getBoxInfo();
},
methods: { methods: {
/* 获取仓库 */ /* 获取仓库 */
importCityName(id) { importCityName(id) {
......
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