diff --git a/src/views/business/comps/select/SelectTemplate.vue b/src/views/business/comps/select/SelectTemplate.vue
index 526d5dc..939a303 100644
--- a/src/views/business/comps/select/SelectTemplate.vue
+++ b/src/views/business/comps/select/SelectTemplate.vue
@@ -29,6 +29,10 @@ export default {
       type: Number,
       default: 0
     },
+    studyType: {
+      type: Number,
+      default: null
+    },
   },
   watch: {
     value: {
@@ -57,7 +61,7 @@ export default {
   methods: {
     showSelectTemplate(){
       if(!this.disabled){
-        this.$refs.selectTemplateDialog.show({needPre:this.needPre})
+        this.$refs.selectTemplateDialog.show({needPre:this.needPre,studyType:this.studyType})
       }
     },
     handleChange(obj) {
diff --git a/src/views/business/comps/select/SelectTemplateDialog.vue b/src/views/business/comps/select/SelectTemplateDialog.vue
index 751aceb..18387f2 100644
--- a/src/views/business/comps/select/SelectTemplateDialog.vue
+++ b/src/views/business/comps/select/SelectTemplateDialog.vue
@@ -74,6 +74,7 @@ export default {
       this.selectedId = row.id
     },
     show(val) {
+      debugger
       this.searchForm=_.merge({}, this.searchForm, val)
       this.selectedId=null
       this.search()
diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue
index f8ac4da..9464b14 100644
--- a/src/views/business/comps/template/TemplateTable.vue
+++ b/src/views/business/comps/template/TemplateTable.vue
@@ -41,8 +41,11 @@ import SP017 from "./comps/sp/SWYPFXFFXYPZBB/SP017.vue";
 import SP018 from "./comps/sp/SWYPFXFFXYPZBB/SP018.vue";
 import Demo from "./comps/sp/Demo.vue";
 //供试品
+
+//试验物质配制计划表/麻精药领取申请单/毒麻药品配制记录表
 import SYWZPZJHB from "./comps/gsp/SYWZPZJHB.vue";
 import MJYLQSQD from "./comps/gsp/MJYLQSQD.vue";
+import DMYPPZJLB from "./comps/gsp/DMYPPZJLB.vue";
 
 // PCR
 import PCR001 from "./comps/pcr/PCR001.vue";
@@ -53,8 +56,9 @@ export default {
   components: {
     Demo,
     SubPackageDialog, TagPrintDialog, SelectReagentDialog, SelectInstrumentDialog, SelectMixReagentDialog, EditSign,
+    //试验物质配制计划表/麻精药领取申请单/毒麻药品配制记录表
+    MJYLQSQD, SYWZPZJHB, DMYPPZJLB,
     //供试品
-    MJYLQSQD, SYWZPZJHB,
     //色谱
     SP001, SP002, SP003, SP00456, SP008, SP009, SP010, SP011, SP012, SP013, SP014, SP015, SP016, SP017, SP018,
     // PCR
diff --git a/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue b/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue
new file mode 100644
index 0000000..f12a6f9
--- /dev/null
+++ b/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue
@@ -0,0 +1,201 @@
+<!-- 毒麻药品配制记录表 -->
+<template>
+	<div>
+		<div class="detail-container">
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{formData.bdmc || $t('template.gsp.DMYPPZJLB.title')}}<img
+					src="@/assets/images/detail-title.png" /></div>
+			<div class="detail-content">
+				<div class="content">
+					<BaseInfoFormPackage label="template.common.baseInfo" ref="baseInfoRef" :formConfig="baseInfoFormConfig"
+						:formData="formData" />
+					<LineLabel label="template.gsp.SYWZPZJHB.jhxx" />
+					<div class="template-form-item">
+						<BaseInfoFormPackage  ref="stepFormPackageRef" :formConfig="stepFormConfig" @blur="onHandleBlur"
+							:formData="formData" />
+						<CustomTable @blur="onHandleTableBlur" :showHeaderSelect="fillType === 'actFill'" :showAddRow="fillType === 'actFill'" :showOperation="fillType === 'actFill'" ref="stepTableRef" :columns="stepColumns"
+							:formData="formData" >
+							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+								<TableOpertaionDelete  :row="row" :rowIndex="rowIndex" :columns="columns"  @deleteRow="deleteRow" ></TableOpertaionDelete>
+							</template>
+						</CustomTable>
+					</div>
+					<BaseInfoFormPackage label="template.gsp.SYWZPZJHB.tbsm" ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
+import LineLabel from "@/components/Template/LineLabel";
+import templateMixin from "../../mixins/templateMixin";
+import CustomTable from '@/components/Template/CustomTable.vue';
+import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete.vue"
+
+export default {
+	name: "DMYPPZJLB",
+	components: { BaseInfoFormPackage, LineLabel, CustomTable, TableOpertaionDelete },		
+	mixins: [templateMixin],
+	props: {
+		value: {
+			type: {},
+			default: () => { },
+		},
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+	},
+	watch: {
+		value: {
+			immediate: true,
+			handler(v) {
+
+			}
+		},
+		fillType: {
+			immediate: true,
+			handler(v) {
+				console.log(v,"fillType")
+			}
+		},
+	},
+	computed: {
+		// 备注表单配置
+		remarkConig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						remark: {
+							label: "",
+							type: "textarea",
+							fillType: "actFill",
+							span: 1,
+							placeholder: "template.common.remarkPlaceholder",
+							maxlength: 1000,
+							rows: 5
+						}
+					}
+				}
+			]
+		},
+		// 试验基本信息表单配置
+		baseInfoFormConfig() {
+			return [
+				{
+					type: "cardItem",
+					config: {
+						studyMc: {
+							label: "template.common.testName",
+							type: "input",
+							disabled: true,
+						},
+						studySn: {
+							label: "template.common.testNumber",
+							type: "input",
+							disabled: true,
+						},
+
+					}
+				},
+			]
+		},
+		// 操作步骤表单配置
+		stepFormConfig() {
+			return [
+				{
+					type: "step",
+					config: {
+						drawTime: {
+							label: "template.gsp.SYWZPZJHB.lqsj",
+							type: "input",
+							fillType: "actFill",
+						},
+						analyzeTime: {
+							label: "template.gsp.SYWZPZJHB.fxsj",
+							type: "input",
+							fillType: "actFill",
+						},
+						testSubstance: {
+							label: "template.gsp.SYWZPZJHB.sywz",
+							type: "input",
+							fillType: "actFill",
+						},
+						configFrequency: {
+							label: "template.gsp.SYWZPZJHB.pzpl",
+							type: "input",
+							fillType: "actFill",
+						},
+					}
+				}
+			]
+		},
+		// 步骤表格列配置
+		stepColumns() {
+			return [
+				{
+					label: "template.gsp.SYWZPZJHB.gyzjhzb", 
+					prop: "startSolutionCode",
+					width: 280,
+					bodyType: "input",
+					bodyFillType: "actFill",
+					bodyMaxlength: 10,
+				},
+				{
+					label: "template.gsp.SYWZPZJHB.pznd", 
+					prop: "preparationConcentration",
+					width: 280,
+					headerSelectKey: "preparationConcentrationUnit",
+					fillType: "actFill",
+					headerOptions: this.getDictOptions('business_nddw'),
+					defaultValue: "mg",
+					bodyType: "inputNumber",
+					bodyFillType: "actFill",
+					bodyMaxlength: 10,
+				},
+				{
+					label: "template.gsp.SYWZPZJHB.pztj", 
+					prop: "preparationVolume",
+					width: 280,
+					headerSelectKey: "preparationVolumeUnit",
+					fillType: "actFill",
+					headerOptions: this.getDictOptions('business_tjdw'),
+					bodyType: "inputNumber",
+					bodyFillType: "actFill",
+					bodyMaxlength: 10,
+				},
+			]
+		},
+	},
+	data() {
+		return {
+			selectReagentVisible: false,
+			subSolutionVisible: false,
+			currentSubKey: "",//当前点击的子项key
+			dataSource: [],
+			stepTableDataSource: [],
+		};
+	},
+	mounted() {
+	
+	},
+	methods: {
+		//获取已填写的表单数据
+		getFilledFormData(){
+			return this.getFilledFormDataByRefs(["baseInfoRef","stepFormPackageRef",  "remarkRef","stepTableRef"])
+		},
+		//获取填写完成的表单数据
+		async getFormData() {
+			return await this.validFormFields(["baseInfoRef", "stepFormPackageRef","stepTableRef","remarkRef"]);
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.mt-20 {
+	margin-top: 20px;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/business/form/drug/comp/tbbdList.vue b/src/views/business/form/drug/comp/tbbdList.vue
index 739eea0..dbd6621 100644
--- a/src/views/business/form/drug/comp/tbbdList.vue
+++ b/src/views/business/form/drug/comp/tbbdList.vue
@@ -330,6 +330,7 @@ export default {
       let params = caesarCipher(JSON.stringify({
         url: this.$route.fullPath,
         studyId: this.searchForm.studyId,
+        studyType: 10,
         formId: null
       }))
       this.$tab.openPage(this.$t('page.business.study.studyFormFill.xzbd'), '/drug/formFillBj/' + params)
diff --git a/src/views/business/form/drug/comp/ytbdList.vue b/src/views/business/form/drug/comp/ytbdList.vue
index aa37866..7bf6db7 100644
--- a/src/views/business/form/drug/comp/ytbdList.vue
+++ b/src/views/business/form/drug/comp/ytbdList.vue
@@ -291,7 +291,7 @@ export default {
     checkRole,
     copy() {
       this.$modal.loading()
-      studyFormPre_studyList().then(response => {
+      studyFormPre_studyList({type:10}).then(response => {
         this.studyList = response.data
         this.formXz.studyId = null
         this.formXz.formPreId = null
@@ -303,7 +303,7 @@ export default {
       })
     },
     previewFzbd() {
-        this.$modal.loading()
+      this.$modal.loading()
       studyFormPre_info({ id: this.formXz.formPreId }).then(response => {
         this.formDatePreview = _.merge({}, response.data, {
           studySn: this.searchForm.studySn,
@@ -402,6 +402,7 @@ export default {
         studySn: this.searchForm.studySn,
         studyMc: this.searchForm.studyMc,
         studyId: this.searchForm.studyId,
+        studyType: 10,
         permitForSecectUser: 'business:drugFormPre:sh'
       })
     },
diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue
index 4c671a7..4f7e7cc 100644
--- a/src/views/business/study/comp/tbbd/Bj.vue
+++ b/src/views/business/study/comp/tbbd/Bj.vue
@@ -42,7 +42,7 @@
               <el-col :span="24">
                 <el-form-item :label="bdmbTitle" prop="templateId">
                   <SelectTemplate v-model="form.templateId" :disabled="form.id && form.id !== ''"
-                    :name="form.templateMc" @change="selectTemplateChange" :needPre="1" />
+                    :name="form.templateMc" :studyType="studyType" @change="selectTemplateChange" :needPre="1" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -348,7 +348,8 @@ export default {
           trigger: 'blur'
         }]
       },
-      templateData: {}
+      templateData: {},
+      studyType:null
     }
   },
   computed: {
@@ -409,6 +410,7 @@ export default {
         let params = null
         try {
           params = JSON.parse(caesarDecipher(this.$route.params.key))
+          this.studyType = params.studyType||null
         } catch (e) {
           console.log('参数错误')
         }
diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue
index 3752c49..d4cec22 100644
--- a/src/views/business/study/comp/ytbd/Bj.vue
+++ b/src/views/business/study/comp/ytbd/Bj.vue
@@ -42,7 +42,7 @@
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.form.bdmb')" prop="templateId">
                   <SelectTemplate v-model="form.templateId" :disabled="form.id && form.id !== ''" :needPre="10"
-                    :name="form.templateMc" @change="selectTemplateChange" />
+                    :name="form.templateMc" :studyType="studyType" @change="selectTemplateChange" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -185,7 +185,8 @@ export default {
         }]
 
       },
-      templateData: {}
+      templateData: {},
+      studyType:null
     }
   },
   computed: {
@@ -263,6 +264,7 @@ export default {
     edit(row) {
       this.reset()
       this.permitForSecectUser = row.permitForSecectUser
+      this.studyType = row.studyType||null
       if (row && row.id) {
         this.showIndex = 2
         this.$modal.loading()
@@ -311,7 +313,6 @@ export default {
       let content = await this.$refs.templateTable.getFormData()
       if (content) {
         this.form.bdnr = JSON.stringify(content)
-        debugger
         this.openSubmit = true
       }
     },