Commit 6719042f authored by huhaiqing's avatar huhaiqing

解决缺陷单

parent aa035483
...@@ -100,7 +100,7 @@ export default { ...@@ -100,7 +100,7 @@ export default {
f.selected = false f.selected = false
if(f.positionList) f.positionList.forEach(g => { if(f.positionList) f.positionList.forEach(g => {
// 位置 // 位置
g.children.forEach(k => { g.children?.forEach(k => {
// 子位置 // 子位置
k.selected = false k.selected = false
}) })
...@@ -135,7 +135,7 @@ export default { ...@@ -135,7 +135,7 @@ export default {
// 区域被选,清空该区域下的位置 // 区域被选,清空该区域下的位置
if(warehouse.positionList) warehouse.positionList.forEach(g => { if(warehouse.positionList) warehouse.positionList.forEach(g => {
g.children.forEach(k => { g.children?.forEach(k => {
k.selected = false k.selected = false
}) })
}) })
...@@ -152,7 +152,7 @@ export default { ...@@ -152,7 +152,7 @@ export default {
let hasSelected = false let hasSelected = false
parentAre.positionList.forEach(g => { parentAre.positionList.forEach(g => {
// 位置 // 位置
g.children.forEach(k => { g.children?.forEach(k => {
// 子位置 // 子位置
if (k.selected) hasSelected = true if (k.selected) hasSelected = true
}) })
...@@ -187,7 +187,7 @@ export default { ...@@ -187,7 +187,7 @@ export default {
else if(f.positionList) f.positionList.forEach(g => { else if(f.positionList) f.positionList.forEach(g => {
// 位置 // 位置
if (g.selected) result.push(k.code) if (g.selected) result.push(k.code)
g.children.forEach(k => { g.children?.forEach(k => {
// 子位置 // 子位置
if (k.selected) result.push(k.code) if (k.selected) result.push(k.code)
}) })
......
...@@ -94,14 +94,18 @@ ...@@ -94,14 +94,18 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="方数(预装/已装)" align="center" prop="squareNumber" /> <el-table-column label="方数(预装/已装)" align="center" prop="">
<el-table-column label="重量(预装/已装)" align="center" prop="weight" /> <template slot-scope="{row}">
{{row.boxStatistics.volume}}/{{row.boxStatistics.loadVolume}}
<el-table-column label="状态" align="center" prop="boxStatus">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BOX_SHIPMENT_STATUS" :value="scope.row.boxStatus" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="重量(预装/已装)" align="center" prop="weight">
<template slot-scope="{row}">
{{row.boxStatistics.weight}}/{{row.boxStatistics.loadWeight}}
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="shipmentStatusText" />
<el-table-column label="日期" align="center" prop="createTime" width="180"> <el-table-column label="日期" align="center" prop="createTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
......
...@@ -74,7 +74,6 @@ export default { ...@@ -74,7 +74,6 @@ export default {
}; };
}, },
created() { created() {
this.getBoxInfo();
// 仓库 // 仓库
getWarehouseList().then((r) => { getWarehouseList().then((r) => {
this.warehouseList = r.data; this.warehouseList = r.data;
...@@ -100,6 +99,9 @@ export default { ...@@ -100,6 +99,9 @@ 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