|
|
@@ -27,7 +27,7 @@
|
|
|
{{ formData.brandNo }}|{{ formData.model }}</el-descriptions-item
|
|
|
>
|
|
|
|
|
|
- <el-descriptions-item label="子批次号">{{
|
|
|
+ <el-descriptions-item label="批次号">{{
|
|
|
formData.batchNo
|
|
|
}}</el-descriptions-item>
|
|
|
|
|
|
@@ -56,6 +56,8 @@
|
|
|
:selection.sync="selection"
|
|
|
@update:selection="handleSelectionChange"
|
|
|
tool-class="ele-toolbar-actions"
|
|
|
+ height="360px"
|
|
|
+
|
|
|
>
|
|
|
<template v-slot:toolbar>
|
|
|
<div class="toolbar_box">
|
|
|
@@ -116,33 +118,48 @@
|
|
|
},
|
|
|
{
|
|
|
prop: 'code',
|
|
|
- label: 'BOM编码',
|
|
|
+ label: '编码',
|
|
|
showOverflowTooltip: true
|
|
|
},
|
|
|
{
|
|
|
prop: 'name',
|
|
|
- label: 'BOM名称',
|
|
|
+ label: '名称',
|
|
|
showOverflowTooltip: true
|
|
|
},
|
|
|
+
|
|
|
{
|
|
|
- prop: 'categoryCode',
|
|
|
- label: '产品编码',
|
|
|
+ prop: 'dosage',
|
|
|
+ label: '用量',
|
|
|
showOverflowTooltip: true
|
|
|
},
|
|
|
+
|
|
|
+
|
|
|
{
|
|
|
- prop: 'categoryName',
|
|
|
- label: '产品名称',
|
|
|
+ prop: 'unit',
|
|
|
+ label: '计量单位',
|
|
|
showOverflowTooltip: true
|
|
|
},
|
|
|
+
|
|
|
+
|
|
|
{
|
|
|
- prop: 'dosage',
|
|
|
- label: '用量',
|
|
|
+ prop: 'brandNo',
|
|
|
+ label: '牌号',
|
|
|
+ align: 'center',
|
|
|
showOverflowTooltip: true
|
|
|
},
|
|
|
|
|
|
{
|
|
|
- prop: 'measuringUnit',
|
|
|
- label: '计量单位',
|
|
|
+ prop: 'specification',
|
|
|
+ label: '规格',
|
|
|
+ align: 'center',
|
|
|
+ minWidth: 150,
|
|
|
+
|
|
|
+ showOverflowTooltip: true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ prop: 'model',
|
|
|
+ label: '型号',
|
|
|
+ align: 'center',
|
|
|
showOverflowTooltip: true
|
|
|
},
|
|
|
{
|
|
|
@@ -190,7 +207,7 @@
|
|
|
size: -1
|
|
|
};
|
|
|
getBom(params).then((res) => {
|
|
|
- this.bomList = res?.list || [];
|
|
|
+ this.bomList = res?.bomList || [];
|
|
|
(this.baseCount = res.baseCount),
|
|
|
(this.unit = res.unit),
|
|
|
(this.visible = true);
|
ysy