|
@@ -83,7 +83,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="warehouse_name" label="仓库名称">
|
|
|
<template slot-scope="scope">
|
|
|
- {{ warehouseName(scope.row.order_vo.warehouse_id) }}
|
|
|
+ {{ warehouseName(scope.row.warehouse_id) }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="" label="配送方式">
|
|
@@ -355,13 +355,12 @@ export default {
|
|
|
warehouseName(val) {
|
|
|
let name = [];
|
|
|
this.warehouseList.map((el) => {
|
|
|
- val.map((e) => {
|
|
|
- if (el.id == e) {
|
|
|
+ if (el.id == val) {
|
|
|
return name.push(el.name);
|
|
|
}
|
|
|
- });
|
|
|
+
|
|
|
});
|
|
|
- return name.join("/");
|
|
|
+ return name;
|
|
|
},
|
|
|
//获取订单状态大小写转换.toUpperCase()
|
|
|
typeName(val) {
|