From f6fa90bd5c4ff2deb6ce6b65278243d17777bd64 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Thu, 26 Feb 2026 10:07:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=20YP002=E5=BE=85=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/en/template/yp.js                         |  1 +
 src/lang/zh/template/yp.js                         |  1 +
 .../business/comps/template/comps/yp/YP002.vue     | 26 +++++++++++++---------
 .../template/dialog/SelectMixReagentDialog.vue     |  2 +-
 .../comps/template/formConfig/formConfig.js        |  4 ++++
 .../comps/template/mixins/templateMixin.js         |  3 ++-
 6 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/lang/en/template/yp.js b/src/lang/en/template/yp.js
index 9348a2c..29d1349 100644
--- a/src/lang/en/template/yp.js
+++ b/src/lang/en/template/yp.js
@@ -7,6 +7,7 @@ export default {
     qxbd: 'Related Earlier Form',
     xzbd: '请选表单',
     bdmc: 'Record Name',
+    bdbh: 'Record ID',
     cjr: 'Creator',
     cjsj: 'Creation Date',
     bdzt: 'Status',
diff --git a/src/lang/zh/template/yp.js b/src/lang/zh/template/yp.js
index 1051021..fcaab6f 100644
--- a/src/lang/zh/template/yp.js
+++ b/src/lang/zh/template/yp.js
@@ -7,6 +7,7 @@ export default {
     qxbd: '前序表单',
     xzbd: '请选表单',
     bdmc: '表单名称',
+    bdbh: '表单编号',
     cjr: '创建人',
     cjsj: '创建时间',
     bdzt: '表单状态',
diff --git a/src/views/business/comps/template/comps/yp/YP002.vue b/src/views/business/comps/template/comps/yp/YP002.vue
index 167ce50..876f8dc 100644
--- a/src/views/business/comps/template/comps/yp/YP002.vue
+++ b/src/views/business/comps/template/comps/yp/YP002.vue
@@ -10,6 +10,8 @@
 
 					<BaseInfoFormPackage fieldItemLabel="template.yp.yp002.swypyjjlbxx" label="template.yp.yp002.swypyjjlbxx"
 						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData"
+						@onRegentSubmit="onRegentSubmit"
+						@beforeReagentSubmit="beforeReagentSubmit"
 						/>
 
 					<BaseInfoFormPackage fieldItemLabel="template.yp.yp002.qbjsxx" label="template.yp.yp002.qbjsxx"
@@ -93,11 +95,6 @@ export default {
 							label: 'template.yp.yp002.qxbd',
 							type: 'qxbd',
 							fillType: 'actFill',
-
-							// span:1,
-							// label: 'template.yp.yp002.jsdd',
-							// type: 'input',
-							// fillType: 'actFill',
 						},
 					}
 				},
@@ -120,14 +117,16 @@ export default {
 					}
 				},
 				{
-					type: "cellItem",
+					type: "conditionItem",
 					label: 'template.yp.yp002.jsscftj',
 					config: {
-						jsdd: {
+						jsscftj: {
 							label: 'template.yp.yp002.jsscftj',
-							type: 'input',
+							type: 'select',
+							multiple: true,
 							fillType: 'actFill',
-							maxlength: 200
+							options: this.getDictOptions('business_cftj'),
+							otherCode: 'jsscftjOther',
 						},
 					}
 				},
@@ -135,7 +134,7 @@ export default {
 					type: "cellItem",
 					label: 'template.yp.yp002.jssj',
 					config: {
-						jsdd: {
+						jssj: {
 							label: 'template.yp.yp002.jssj',
 							type: 'input',
 							fillType: 'actFill',
@@ -191,7 +190,12 @@ export default {
 			this.yqResourceTmp = []
 			return this.resourceTmp;
 		},
-	
+		onRegentSubmit(val,val1,val2){
+			debugger
+		},
+		beforeReagentSubmit(val,val1,val2){
+			debugger
+		},
 		//保存
 		async onSave() {
 			const formData = this.getStepResource();
diff --git a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue
index f45e838..41619a3 100644
--- a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue
+++ b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue
@@ -177,7 +177,7 @@ export default {
         handleSelect(code, row) {
             this.selectedId = code;
             if(this.currentType==15){//如果是前序表单，那么选中的id是bdmc
-                this.selectedId = row.bdmc
+                this.selectedId = row.bdmc+'('+row.bdbh+')'
             }
             this.currentRow = row;
         },
diff --git a/src/views/business/comps/template/formConfig/formConfig.js b/src/views/business/comps/template/formConfig/formConfig.js
index bf6344b..e5712cb 100644
--- a/src/views/business/comps/template/formConfig/formConfig.js
+++ b/src/views/business/comps/template/formConfig/formConfig.js
@@ -206,6 +206,10 @@ export const getQxbdSearchForm = () => {
 export const getQxbdColumns = () => {
   return [
     {
+      prop: 'bdbh',
+      label: 'template.yp.yp002.bdbh'
+    },
+    {
       prop: 'bdmc',
       label: 'template.yp.yp002.bdmc'
     },
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js
index 1955227..7e6945f 100644
--- a/src/views/business/comps/template/mixins/templateMixin.js
+++ b/src/views/business/comps/template/mixins/templateMixin.js
@@ -30,7 +30,8 @@ export default {
 		'business_sp_cbydb', //色谱-编号-储备液对比
 		'business_pcr_gzy', 	// PCR-编号-工作液
 
-		'business_lba_jg' // LBA006-结果
+		'business_lba_jg', // LBA006-结果
+		'business_cftj' // 存放条件
 	],
 	props: {
 		templateData: {