diff --git a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue index 6234f951..5a86655e 100644 --- a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue +++ b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue @@ -6,7 +6,7 @@ 未搜索到原材料,点击添加
未搜索到原材料
-
{{ item.rawMaterialName }} @@ -117,7 +117,9 @@ export default { } }, mounted() { - this.options = this.rawMaterialList; + if (this.rawMaterialList.length < 0) { + this.$store.dispatch('category/getRawMaterialMap') + } }, computed: { ...mapGetters(['rawMaterialList']) diff --git a/klp-ui/src/views/wms/print/components/CodeRenderer.vue b/klp-ui/src/views/wms/print/components/CodeRenderer.vue index 257138fd..bf54245f 100644 --- a/klp-ui/src/views/wms/print/components/CodeRenderer.vue +++ b/klp-ui/src/views/wms/print/components/CodeRenderer.vue @@ -3,7 +3,7 @@
- +
diff --git a/klp-ui/src/views/wms/print/index.vue b/klp-ui/src/views/wms/print/index.vue index 9f5ca690..b863ab44 100644 --- a/klp-ui/src/views/wms/print/index.vue +++ b/klp-ui/src/views/wms/print/index.vue @@ -9,13 +9,13 @@ 清空所有 - + 添加二维码 @@ -142,11 +142,19 @@ + + + + + + + + @@ -251,10 +259,9 @@ export default { itemId: b.itemId, batchNo: b.batchNo || 'auto', quantity: b.count || 1, - unit: b.unit || '', recordType: 1, }), - count: 1, + count: b.totalCount, textTpl: b.text || '二维码' })); } @@ -263,7 +270,7 @@ export default { // 物料选择变更 onItemChange(item, idx) { if (item && this.drawerBarcodeData[idx]) { - this.drawerBarcodeData[idx].unit = item.unit; + // this.drawerBarcodeData[idx].unit = item.unit; // 如果未设置数量,默认设置为1 if (!this.drawerBarcodeData[idx].count) { this.drawerBarcodeData[idx].count = 1; @@ -316,6 +323,7 @@ export default { itemId: undefined, batchNo: 'auto', count: 1, // 默认数量1 + totalCount: 1, // 默认数量1 unit: '', text: '二维码', // 默认文字 hovered: false // 新增hover状态,用于交互反馈 @@ -368,18 +376,7 @@ export default { }, // 打印预览 - 增加加载状态提示 handlePrintPreview() { - const printLoading = this.$loading({ - lock: true, - text: '正在准备打印预览...', - spinner: 'el-icon-loading', - background: 'rgba(255, 255, 255, 0.8)' - }); - - // 模拟预览准备时间(实际项目可替换为真实接口请求) - setTimeout(() => { - window.print(); - printLoading.close(); - }, 1000); + document.querySelector('#previewIframe').contentWindow.print(); }, // 验证单个配置是否有效 isConfigValid(cfg) { diff --git a/klp-ui/src/views/wms/print/read.vue b/klp-ui/src/views/wms/print/read.vue index db289d62..3f14f15a 100644 --- a/klp-ui/src/views/wms/print/read.vue +++ b/klp-ui/src/views/wms/print/read.vue @@ -1,49 +1,35 @@