From 8ca6bea4f67e7fcbc64395ae33bef70f048b3030 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Sun, 8 Mar 2026 18:51:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9step=E7=9A=84=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/HandleFormItem.vue          |  4 ++--
 .../business/comps/template/comps/pcr/PCR008.vue    |  5 ++++-
 .../template/dialog/SelectMixReagentDialog.vue      | 21 +++++++++++++++++----
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index ebaffc4..4e4a368 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -591,8 +591,8 @@ export default {
             this.inputValue = data.selectedId;
             const { filledCodes = [] } = this.item;
             console.log(filledCodes, "filledCodes")
-            const { selectInfo, row } = data;
-            if (filledCodes.length > 0) {
+            const { selectInfo, row,checkType } = data;
+            if (filledCodes.length > 0 && checkType !=="checkbox") {
                 this.inputValue = row[filledCodes[0]] + "(" + row[filledCodes[1]] + ")";
             }
             this.selectRegentInfo = data;
diff --git a/src/views/business/comps/template/comps/pcr/PCR008.vue b/src/views/business/comps/template/comps/pcr/PCR008.vue
index 6a2dc86..e017cc0 100644
--- a/src/views/business/comps/template/comps/pcr/PCR008.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR008.vue
@@ -15,7 +15,7 @@
 					<LineLabel label="template.common.operationSteps" />
 					<div class="template-form-item">
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef"
-							:formConfig="stepFormConfig" @blur="onHandleBlur" :formData="formData" />
+							:formConfig="stepFormConfig" @blur="onHandleBlur" :formData="formData" @onRegentSubmit="onRegentSubmit" />
 						<div v-if="fillType == 'preFill'">
 							<el-button type="danger" @click="onClickDelete">{{
 								$t('form.delete') }}</el-button>
@@ -230,6 +230,9 @@ export default {
 		this.onHandleTableBlur()
 	},
 	methods: {
+		onRegentSubmit(data){
+			console.log(data,"回调")
+		},
 		onClickDelete() {
 			this.$modal.confirm(this.$t('form.confirmDelete')).then(() => {
 
diff --git a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue
index 0e075c4..12aebcd 100644
--- a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue
+++ b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue
@@ -188,16 +188,29 @@ export default {
                 ndz: (row.nd||"")+(row.nddw||""),
                 type: Number(this.selectType),
             }
-            if(this.qxbdType && row.templateSn !== this.qxbdType){
-                this.$message.error(`请选择正确前序表单`);
-                return
+            const {qxbdType,checkType} = this;
+            if(qxbdType){
+                if(checkType === "radio"&& row.templateSn !== qxbdType){
+                    this.$message.error(`请选择正确前序表单`);
+                    return
+                }
+                if(checkType === "checkbox" ){
+                    const isAllType = row.every((item)=>item.templateSn === qxbdType)
+                    if(!isAllType){
+                        this.$message.error(`请选择正确前序表单`);
+                        return
+                    }
+                }
+                
             }
             this.$emit('submit', selectedValue, row);
-            let callbackData = { selectInfo, uuid: this.uuid, selectedId: selectedValue, row,selectType:this.selectType };
+            let callbackData = { selectInfo, uuid: this.uuid, selectedId: selectedValue, row,selectType:this.selectType,checkType };
             if(this.checkType === "checkbox"){
                 callbackData = {
                     uuid: this.uuid,
                     selectedRows: row,
+                    selectedId:row.map((item)=>item.bdbh).join(","),
+                    checkType
                 }
             }
             // 触发eventBus事件