From 36e08ff599fc1fa2d25790014555b1e0d911e2d9 Mon Sep 17 00:00:00 2001 From: luojie <125330818@qq.com> Date: Fri, 23 Jan 2026 19:26:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][upd?= =?UTF-8?q?ate]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/comps/template/TemplateTable.vue | 11 ++++++-- .../comps/template/comps/sp/SWYPBQGZYZBB.vue | 6 ++-- .../comps/template/dialog/TagPrintDialog.vue | 32 ++++++++++++++++++++-- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue index cf40746..838d9de 100644 --- a/src/views/business/comps/template/TemplateTable.vue +++ b/src/views/business/comps/template/TemplateTable.vue @@ -3,6 +3,7 @@ + @@ -29,12 +30,13 @@ import Demo from "./comps/sp/Demo.vue"; //供试品 import SYWZPZJHB from "./comps/gsp/SYWZPZJHB.vue"; import MJYLQSQD from "./comps/gsp/MJYLQSQD.vue"; -import SubPackageDialog from "./dialog/SubPackageDialog.vue" +import SubPackageDialog from "./dialog/SubPackageDialog.vue";//分装弹窗 +import TagPrintDialog from "./dialog/TagPrintDialog.vue";//标签打印弹窗 export default { name: "TemplateTable", components: { - SubPackageDialog, + SubPackageDialog,TagPrintDialog, //供试品 MJYLQSQD, SYWZPZJHB, //色谱 @@ -107,7 +109,6 @@ export default { } if (v.zdgxjl) { this.fieldCheckObj = JSON.parse(v.zdgxjl) || {}; - console.log(this.fieldCheckObj,v.zdgxjl,"v.zdgxjl") } } } @@ -154,11 +155,15 @@ export default { EventBus.$on("showSubPackageDialog",(data)=>{ this.$refs.subPackageDialogRef.show(data) }) + EventBus.$on("showTagPrintDialog",(data)=>{ + this.$refs.tagPrintDialogRef.show(data) + }) }, beforeDestroy() { // 记得移除监听,避免内存泄漏 EventBus.$off('onModifyRecord'); EventBus.$off("showSubPackageDialog"); + EventBus.$off("showTagPrintDialog"); }, methods: { async getFormData() { diff --git a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue index c1a10f6..c780701 100644 --- a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue @@ -270,8 +270,10 @@ export default { bodyFillType: "preFill", width: 280, myCodeFields: ["targetSolutionCode", "subTargetSolutionCode"],//分装的母液编号字段 - maxVolumeField: "actSolutionVolume",//分装的最大量字段 - maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段 + // maxVolumeField: "actSolutionVolume",//分装的最大量字段 + // maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段 + maxVolumeField: "targetSolutionVolume,targetDiluentVolume",//分装的最大量字段 + maxVolumeFieldUnit: "targetSolutionVolumeUnit,targetDiluentVolumeUnit",//分装的最大量单位字段 }, { label: "起始溶液编号", diff --git a/src/views/business/comps/template/dialog/TagPrintDialog.vue b/src/views/business/comps/template/dialog/TagPrintDialog.vue index af1e801..731339b 100644 --- a/src/views/business/comps/template/dialog/TagPrintDialog.vue +++ b/src/views/business/comps/template/dialog/TagPrintDialog.vue @@ -1,12 +1,38 @@