DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(wms): 修复标签预览中labelType未正确设置的问题

Browse Source 
将labelType从组件属性改为使用labelRender.type，确保标签类型根据物料类型正确设置
This commit is contained in:
砂糖
2026-01-13 15:44:21 +08:00
parent ef21ef9c06
commit 396b3de4c4
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
klp-ui/src/views/wms/coil/panels/base.vue
View File

@@ -251,10 +251,10 @@
<!-- 标签预览弹窗 --> <!-- 标签预览弹窗 -->
<el-dialog title="标签预览" :visible.sync="labelRender.visible" append-to-body> <el-dialog title="标签预览" :visible.sync="labelRender.visible" append-to-body>
<label-render :content="labelRender.data" :labelType="labelType" /> <label-render :content="labelRender.data" :labelType="labelRender.type" />
</el-dialog> </el-dialog>
<label-render ref="labelRender" v-show="false" :content="labelRender.data" :labelType="labelType" /> <label-render ref="labelRender" v-show="false" :content="labelRender.data" :labelType="labelRender.type" />
<!-- 批量导出标签PDF弹窗 --> <!-- 批量导出标签PDF弹窗 -->
<el-dialog title="批量导出标签PDF" :visible.sync="batchPrint.visible" width="520px" append-to-body> <el-dialog title="批量导出标签PDF" :visible.sync="batchPrint.visible" width="520px" append-to-body>
@@ -582,15 +582,13 @@ export default {
const item = row.itemType === 'product' ? row.product : row.rawMaterial; const item = row.itemType === 'product' ? row.product : row.rawMaterial;
const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || ''; const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || '';
this.labelRender.type = row.itemType === 'product' ? '3' : '2';
this.labelRender.data = { this.labelRender.data = {
...row, ...row,
itemName: itemName, itemName: itemName,
updateTime: row.updateTime?.split(' ')[0] || '', updateTime: row.updateTime?.split(' ')[0] || '',
}; };
this.$refs.labelRender.printLabel(); this.$refs.labelRender.printLabel();
// this.labelRender.visible = true;
// this.labelRender.data = row;
// this.labelRender.type = '2';
}, },
// 处理材料类型变化 // 处理材料类型变化
handleMaterialTypeChange(value) { handleMaterialTypeChange(value) {
@@ -661,6 +659,7 @@ export default {
const item = row.itemType === 'product' ? row.product : row.rawMaterial; const item = row.itemType === 'product' ? row.product : row.rawMaterial;
const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || ''; const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || '';
this.labelRender.type = row.itemType === 'product' ? '3' : '2';
this.labelRender.data = { this.labelRender.data = {
...row, ...row,
itemName: itemName, itemName: itemName,