|
@@ -17,6 +17,54 @@
|
|
|
>
|
|
>
|
|
|
<!-- 表头工具栏 -->
|
|
<!-- 表头工具栏 -->
|
|
|
<template v-slot:toolbar> </template>
|
|
<template v-slot:toolbar> </template>
|
|
|
|
|
+ <!-- 批次号 -->
|
|
|
|
|
+ <template v-slot:batchNo="{ row }">
|
|
|
|
|
+ <el-popover placement="bottom" width="800" trigger="hover">
|
|
|
|
|
+ <el-table :data="row.outInBatchDetailsVOList">
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ width="150"
|
|
|
|
|
+ property="bizNo"
|
|
|
|
|
+ label="入库单号"
|
|
|
|
|
+ ></el-table-column>
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ width="100"
|
|
|
|
|
+ property="bizType"
|
|
|
|
|
+ label="入库场景"
|
|
|
|
|
+ ></el-table-column>
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ width="120"
|
|
|
|
|
+ property="count"
|
|
|
|
|
+ label="入库数量"
|
|
|
|
|
+ ></el-table-column>
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ width="80"
|
|
|
|
|
+ property="measuringUnit"
|
|
|
|
|
+ label="计量单位"
|
|
|
|
|
+ ></el-table-column>
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ width="100"
|
|
|
|
|
+ property="packageCount"
|
|
|
|
|
+ label="包装数量"
|
|
|
|
|
+ ></el-table-column>
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ width="80"
|
|
|
|
|
+ property="packingUnit"
|
|
|
|
|
+ label="包装单位"
|
|
|
|
|
+ ></el-table-column>
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ width="330"
|
|
|
|
|
+ property="position"
|
|
|
|
|
+ label="库位"
|
|
|
|
|
+ ></el-table-column>
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ width="160"
|
|
|
|
|
+ property="createTime"
|
|
|
|
|
+ label="入库时间"
|
|
|
|
|
+ ></el-table-column>
|
|
|
|
|
+ </el-table>
|
|
|
|
|
+ <span slot="reference"> {{ row.batchNo }}</span>
|
|
|
|
|
+ </el-popover>
|
|
|
|
|
+ </template>
|
|
|
<!-- 操作列 -->
|
|
<!-- 操作列 -->
|
|
|
<template v-slot:action="{ row }">
|
|
<template v-slot:action="{ row }">
|
|
|
<el-link
|
|
<el-link
|
|
@@ -145,6 +193,7 @@
|
|
|
];
|
|
];
|
|
|
if (this.isShow) {
|
|
if (this.isShow) {
|
|
|
obj.splice(1, 0, {
|
|
obj.splice(1, 0, {
|
|
|
|
|
+ slot: 'batchNo',
|
|
|
prop: 'batchNo',
|
|
prop: 'batchNo',
|
|
|
label: '批次号',
|
|
label: '批次号',
|
|
|
showOverflowTooltip: true
|
|
showOverflowTooltip: true
|
|
@@ -208,11 +257,12 @@
|
|
|
const params = {
|
|
const params = {
|
|
|
categoryLevelId: treeId
|
|
categoryLevelId: treeId
|
|
|
};
|
|
};
|
|
|
- return getBatchDetails({
|
|
|
|
|
|
|
+ const data = getBatchDetails({
|
|
|
...params,
|
|
...params,
|
|
|
page: page,
|
|
page: page,
|
|
|
size: limit
|
|
size: limit
|
|
|
});
|
|
});
|
|
|
|
|
+ return data;
|
|
|
} else {
|
|
} else {
|
|
|
const params = {
|
|
const params = {
|
|
|
categoryLevelId: treeId
|
|
categoryLevelId: treeId
|