diff --git a/src/components/Template/SelectTable.vue b/src/components/Template/SelectTable.vue
index cadf057..105b1b3 100644
--- a/src/components/Template/SelectTable.vue
+++ b/src/components/Template/SelectTable.vue
@@ -56,7 +56,7 @@ export default {
         },
         
         selectedId: {
-            type: String,
+            type: [String,Number],
             default: "",
         },
         selectedCode: {
@@ -71,6 +71,10 @@ export default {
             type: [String,Number],
             default: "",
         },
+        studyId: {
+            type: [String,Number],
+            default: "",
+        },
     },
     data() {
         return {
@@ -111,6 +115,7 @@ export default {
             }
             this.listParams = {...this.listParams}
             this.listParams.studyFormId = this.studyFormId || ''
+            this.listParams.studyId = this.studyId || ''
         },
         async getList() {
             const res = await this.listApi(this.listParams);
diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue
index c835625..a6cb6dd 100644
--- a/src/views/business/comps/template/TemplateTable.vue
+++ b/src/views/business/comps/template/TemplateTable.vue
@@ -7,7 +7,7 @@
     <TagPrintDialog ref="tagPrintDialogRef"></TagPrintDialog>
     <SelectReagentDialog ref="selectReagentDialogRef" />
     <SelectInstrumentDialog ref="selectInstrumentDialogRef" />
-    <SelectMixReagentDialog ref="selectMixReagentDialogRef" />
+    <SelectMixReagentDialog ref="selectMixReagentDialogRef" :selectedCode="selectedCode" />
     <EditSign ref="editSignRef" @cancel="handleEditSignCancel" @callback="handleEditSignCallback" />
   </div>
 </template>
@@ -244,6 +244,8 @@ export default {
       currentEditSignUuid: null, // 当前请求EditSign的HandleFormItem的uuid
       latestParams: {},//用于存储最新的params
       hasCustomTable: false,//是否有自定义表格
+
+      selectedCode:'bh'
     };
   },
   created() {
@@ -269,7 +271,11 @@ export default {
     })
     //选择试剂/供试品/给药制剂弹窗
     EventBus.$on("showSelectMixReagentDialog", (data) => {
-      this.$refs.selectMixReagentDialogRef.show(data.studyFormId, data)
+      debugger
+      if(data.type==15){
+        this.selectedCode = 'id'
+      }
+      this.$refs.selectMixReagentDialogRef.show(data.studyFormId, data,this.templateData.studyId)
     })
     EventBus.$on("hideSelectMixReagentDialog", (data) => {
       this.$refs.selectMixReagentDialogRef.hide()
diff --git a/src/views/business/comps/template/comps/yp/YP002.vue b/src/views/business/comps/template/comps/yp/YP002.vue
index 801b97f..ca5b926 100644
--- a/src/views/business/comps/template/comps/yp/YP002.vue
+++ b/src/views/business/comps/template/comps/yp/YP002.vue
@@ -9,7 +9,9 @@
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
 
 					<BaseInfoFormPackage fieldItemLabel="template.yp.yp002.swypyjjlbxx" label="template.yp.yp002.swypyjjlbxx"
-						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData" />
+						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData"
+						@onRegentSubmit="onRegentSubmit"
+						@beforeReagentSubmit="beforeReagentSubmit" />
 
 					<BaseInfoFormPackage fieldItemLabel="template.yp.yp002.qbjsxx" label="template.yp.yp002.qbjsxx"
 						ref="ypjsInfoRef" :formConfig="ypjsInfoFormConfig" :formData="formData" />
@@ -190,6 +192,14 @@ export default {
 			this.yqResourceTmp = []
 			return this.resourceTmp;
 		},
+		onRegentSubmit(val,val1,val2){
+			debugger
+			this.$refs.swypyjInfoRef.updateFormData("qxbd", val.selectInfo.row.bdmc);
+		},
+		beforeReagentSubmit(val,val1,val2){
+			debugger
+			this.$refs.swypyjInfoRef.updateFormData("qxbd", val.selectData.row.bdmc);
+		},
 		//保存
 		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 13b6420..bad6815 100644
--- a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue
+++ b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue
@@ -8,7 +8,7 @@
             <el-radio-button label="3">给药制剂列表</el-radio-button>
         </el-radio-group>
         <SelectTable ref="selectSjRef" :columns="columns" :selectedId="selectedId" :searchForm="searchForm"
-            :studyFormId="studyFormId" :listApi="listApi" :selectedCode="selectedCode" @radioSelect="handleSelect" />
+            :studyFormId="studyFormId" :studyId="studyId" :listApi="listApi" :selectedCode="selectedCode" @radioSelect="handleSelect" />
 
         <!-- 只有步骤才会又这个选项 -->
         <div v-if="sourceFrom === 'step'" class="other-reagent">
@@ -92,6 +92,7 @@ export default {
             bzList: [],
             depart: "",
             studyFormId: '',//有个studyFormId需要从外面动态传过来
+            studyId:'',//有个studyId需要从外面动态传过来
             uuid: '',//为了标识eventBus的事件id,
             selectType: '1',//默认选择试剂列表
             listApi: public_sjList,
@@ -112,7 +113,7 @@ export default {
         }
     },
     methods: {
-        show(studyFormId, data) {
+        show(studyFormId, data,studyId) {
             if (data && data.uuid) {//为了标识eventBus的事件id
                 this.uuid = data.uuid
             }
@@ -121,6 +122,7 @@ export default {
             this.mixType = mixType;
             this.sourceFrom = sourceFrom;
             this.studyFormId = studyFormId;
+            this.studyId = studyId || '';
             this.visible = true;
             this.handleShowTableInfo(type);