|
|
@@ -167,7 +167,7 @@
|
|
|
required
|
|
|
>
|
|
|
<template slot-scope="{ row, $index }">
|
|
|
- <div @click="handleWareHouse(row, $index)">
|
|
|
+ <div v-if="isEdit" @click="handleWareHouse(row, $index)">
|
|
|
<div
|
|
|
style="color: #ff4949"
|
|
|
v-if="row.houseList.length === 0"
|
|
|
@@ -189,6 +189,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <div v-else>{{ row.position }}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table-column>
|
|
|
@@ -488,9 +489,7 @@
|
|
|
},
|
|
|
// 仓库编辑
|
|
|
handleWareHouse(row, idx) {
|
|
|
- if (this.isEdit) {
|
|
|
this.$refs.wareHouseDailogRef.open(row, idx);
|
|
|
- }
|
|
|
},
|
|
|
// 物料维度修改质检改变包装维度质检(结果和状态)
|
|
|
changeWrapResult() {
|
|
|
@@ -579,21 +578,24 @@
|
|
|
async initialize() {
|
|
|
// returnHandleNo 有单据来源说明已入库(被驳回状态)
|
|
|
let res = await getOutInBySourceBizNo(this.returnDetailsForm.returnHandleNo)
|
|
|
+ console.log(res)
|
|
|
if (this.returnDetailsForm.returnHandleNo && res.code != -1) {
|
|
|
this.isEdit = false
|
|
|
this.infoData = deepClone(res.data)
|
|
|
// 增加是否已经入库字段
|
|
|
this.infoData.isStorage = true
|
|
|
// 填充遍历数据
|
|
|
- if (this.infoData.outInDetailAddPOList?.length > 0) {
|
|
|
+ if (this.infoData.outInDetailVOList?.length > 0) {
|
|
|
this.warehousingMaterialList = []; // 物品列表
|
|
|
this.materialCodeReqList = []; // 包装列表
|
|
|
this.metaList = []; // 物料列表
|
|
|
- this.infoData.outInDetailAddPOList.forEach((goodsiItem) => {
|
|
|
+ this.infoData.outInDetailVOList.forEach((goodsiItem) => {
|
|
|
this.warehousingMaterialList.push(goodsiItem);
|
|
|
- goodsiItem.outInDetailRecordAddPOList.forEach((wrapItem) => {
|
|
|
+ goodsiItem.outInDetailRecordVOList.forEach((wrapItem) => {
|
|
|
+ wrapItem.count =
|
|
|
+ wrapItem.outInDetailRecordMaterialDetailVOList.length; // 增加包装计量数量
|
|
|
this.materialCodeReqList.push(wrapItem);
|
|
|
- wrapItem.materialDetails.forEach((materialItem) => {
|
|
|
+ wrapItem.outInDetailRecordMaterialDetailVOList.forEach((materialItem) => {
|
|
|
this.metaList.push(materialItem);
|
|
|
});
|
|
|
});
|