From ef5da2578de2a80522139cf42e841f2aea93a8a9 Mon Sep 17 00:00:00 2001 From: luojie <125330818@qq.com> Date: Tue, 3 Mar 2026 16:15:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][qxb?= =?UTF-8?q?dType]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Template/CustomTable.vue | 3 +++ src/components/Template/HandleFormItem.vue | 2 ++ src/components/Template/mixins/formPackageMixins.js | 1 + src/views/business/comps/template/dialog/SelectMixReagentDialog.vue | 6 ++++++ 4 files changed, 12 insertions(+) diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue index 9b23c64..2ba3008 100644 --- a/src/components/Template/CustomTable.vue +++ b/src/components/Template/CustomTable.vue @@ -777,6 +777,9 @@ export default { if (col.bodyDisabled) { item.disabled = col.bodyDisabled; } + if (col.qxbdType) { + item.qxbdType = col.qxbdType; + } // 支持动态checkboxLabel - 从行数据中获取 const dynamicLabelKey = col.prop + 'Label'; if (currentItem && currentItem[dynamicLabelKey]) { diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue index 58dc9b4..d1ca91a 100644 --- a/src/components/Template/HandleFormItem.vue +++ b/src/components/Template/HandleFormItem.vue @@ -636,6 +636,8 @@ export default { }; if (type === "mix") { params.mixType = true; + }else if(item.qxbdType){ + params.qxbdType = item.qxbdType; } } EventBus.$emit(eventName, params) diff --git a/src/components/Template/mixins/formPackageMixins.js b/src/components/Template/mixins/formPackageMixins.js index ed74c6d..17b7357 100644 --- a/src/components/Template/mixins/formPackageMixins.js +++ b/src/components/Template/mixins/formPackageMixins.js @@ -75,6 +75,7 @@ export default { fillType: item.subFillType || item.fillType, parentLabel: item.label, filledCodes: item.filledCodes, + qxbdType: item.qxbdType, } }, diff --git a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue index 72b56a5..6b6b13d 100644 --- a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue +++ b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue @@ -99,6 +99,7 @@ export default { mixType: false,//是否是混合试剂 title:"选择试剂", currentType: '1',//当前选择的类型 + qxbdType:"",//前序表单类型 } }, computed: { @@ -119,6 +120,7 @@ export default { this.currentType = type; if(type==15){ this.selectedCode = 'id' + this.qxbdType = data.qxbdType || ''; } this.mixType = mixType; this.sourceFrom = sourceFrom; @@ -173,6 +175,10 @@ export default { ndz: (row.nd||"")+(row.nddw||""), type: Number(this.selectType), } + if(this.qxbdType && row.templateSn !== this.qxbdType){ + this.$message.error(`请选择正确前序表单`); + return + } this.$emit('submit', selectedValue, row); // 触发eventBus事件 EventBus.$emit("onMixReagentSubmit", { selectInfo, uuid: this.uuid, selectedId: selectedValue, row,selectType:this.selectType });