|
@@ -96,7 +96,6 @@
|
|
|
paramsType="type"
|
|
paramsType="type"
|
|
|
/>
|
|
/>
|
|
|
</el-aside>
|
|
</el-aside>
|
|
|
- =={{ rowKey }}
|
|
|
|
|
<el-main>
|
|
<el-main>
|
|
|
<el-table
|
|
<el-table
|
|
|
ref="multipleTable"
|
|
ref="multipleTable"
|
|
@@ -307,8 +306,7 @@
|
|
|
selectionList: [],
|
|
selectionList: [],
|
|
|
materialType: '',
|
|
materialType: '',
|
|
|
warehouseList: [],
|
|
warehouseList: [],
|
|
|
- dimension: '4',
|
|
|
|
|
- rowKey: 'meterielId'
|
|
|
|
|
|
|
+ dimension: '4'
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
created() {},
|
|
created() {},
|
|
@@ -339,10 +337,10 @@
|
|
|
return {
|
|
return {
|
|
|
...item,
|
|
...item,
|
|
|
minUnit: item.packingUnit,
|
|
minUnit: item.packingUnit,
|
|
|
- oid: item.stockBatchId
|
|
|
|
|
|
|
+ oid: item.stockBatchId,
|
|
|
|
|
+ assetCode: item.code
|
|
|
};
|
|
};
|
|
|
});
|
|
});
|
|
|
- this.rowKey = 'stockBatchId';
|
|
|
|
|
} else if (e == 3) {
|
|
} else if (e == 3) {
|
|
|
res = await outin.getInventoryDetails(params);
|
|
res = await outin.getInventoryDetails(params);
|
|
|
this.tableData = res.list.map((item) => {
|
|
this.tableData = res.list.map((item) => {
|
|
@@ -351,10 +349,10 @@
|
|
|
batchNo: item.batchNum,
|
|
batchNo: item.batchNum,
|
|
|
minUnit: item.packingUnit,
|
|
minUnit: item.packingUnit,
|
|
|
availableCountBase: 1,
|
|
availableCountBase: 1,
|
|
|
- oid: item.id
|
|
|
|
|
|
|
+ oid: item.id,
|
|
|
|
|
+ assetCode: item.code
|
|
|
};
|
|
};
|
|
|
});
|
|
});
|
|
|
- this.rowKey = 'id';
|
|
|
|
|
} else if (e == 4) {
|
|
} else if (e == 4) {
|
|
|
res = await outin.getMaterielDetails(params);
|
|
res = await outin.getMaterielDetails(params);
|
|
|
this.tableData = res.list.map((item) => {
|
|
this.tableData = res.list.map((item) => {
|
|
@@ -366,13 +364,11 @@
|
|
|
oid: item.meterielId
|
|
oid: item.meterielId
|
|
|
};
|
|
};
|
|
|
});
|
|
});
|
|
|
- this.rowKey = 'meterielId';
|
|
|
|
|
} else {
|
|
} else {
|
|
|
res = await outin.getRealTimeInventory(params);
|
|
res = await outin.getRealTimeInventory(params);
|
|
|
this.tableData = res.list.map((item) => {
|
|
this.tableData = res.list.map((item) => {
|
|
|
- return { ...item, oid: item.id };
|
|
|
|
|
|
|
+ return { ...item, oid: item.id, assetCode: item.code };
|
|
|
});
|
|
});
|
|
|
- this.rowKey = 'id';
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if (res) {
|
|
if (res) {
|
|
@@ -418,7 +414,7 @@
|
|
|
});
|
|
});
|
|
|
} else if (this.dimension == 2) {
|
|
} else if (this.dimension == 2) {
|
|
|
ids = arr.map((item) => {
|
|
ids = arr.map((item) => {
|
|
|
- return item.stockBatchId;
|
|
|
|
|
|
|
+ return item.recordId;
|
|
|
});
|
|
});
|
|
|
} else {
|
|
} else {
|
|
|
ids = arr.map((item) => {
|
|
ids = arr.map((item) => {
|