diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue
index 4cf5c6f..34b75cf 100644
--- a/src/components/Template/Step.vue
+++ b/src/components/Template/Step.vue
@@ -391,7 +391,6 @@ export default {
 	},
 	methods: {
 		getStepList(){
-			debugger
 			public_templateStepList({templateId:this.templateData.templateId}).then(response => {
 				let options = []
 				_.forEach(response.data,(item)=>{
diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue
index 25d70cc..0ecc6ad 100644
--- a/src/views/business/comps/template/TemplateTable.vue
+++ b/src/views/business/comps/template/TemplateTable.vue
@@ -32,6 +32,8 @@ import SP008 from "./comps/sp/SP008.vue";
 import SP009 from "./comps/sp/SP009.vue";
 import SP0019 from "./comps/sp/SP0019.vue";
 import SP0020 from "./comps/sp/SP0020.vue";
+import SP0021 from "./comps/sp/SP0021.vue";
+
 import Demo from "./comps/sp/Demo.vue";
 //供试品
 import GSP001 from "./comps/gsp/GSP001.vue";
@@ -118,7 +120,7 @@ export default {
     //供试品
     GSP001,GSP002, GSP003, GSP004,GSP009, GSP010,
     //色谱
-    SP001, SP003, SP00456,SP007, SP008, SP009,SP0019,SP0020,
+    SP001, SP003, SP00456,SP007, SP008, SP009,SP0019,SP0020,SP0021,
     // PCR
     PCR002, PCR003, PCR004, PCR005,PCR007,PCR009,
     //LBA
@@ -218,6 +220,7 @@ export default {
           'SP018': 'SP008',
           'SP019': 'SP0019',
           'SP020': 'SP0020',
+          'SP021': 'SP0021',
           //供试品
 
           'GSP001': 'GSP001',
diff --git a/src/views/business/comps/template/comps/sp/SP0021.vue b/src/views/business/comps/template/comps/sp/SP0021.vue
new file mode 100644
index 0000000..4c47e95
--- /dev/null
+++ b/src/views/business/comps/template/comps/sp/SP0021.vue
@@ -0,0 +1,362 @@
+<!-- 生物样品分析溶液配制表 -->
+<template>
+	<div>
+		<div class="detail-container">
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc }}<img
+					src="@/assets/images/detail-title.png" /></div>
+			<div class="detail-content">
+				<div class="content">
+					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
+						:ref="refConfig.baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
+					<TableList label="template.common.sjInfo" :columns="sjColumns" :dataSource="resourceSj" />
+					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
+					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition"
+						label="template.common.storageCondition" ref="storageConditionRef"
+						:formConfig="storageFormConfig" :formData="formData" />
+					<LineLabel label="template.common.operationSteps" />
+					<div class="template-form-item">
+						<el-button class="print-btn" v-if="fillType === 'actFill'" type="primary" @click="printTag">{{
+							$t('template.common.bqdy') }}</el-button>
+						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef"
+							:formConfig="stepFormConfig" @blur="onHandleBlur" :formData="formData" />
+					</div>
+					<Step ref="stepRef" :formData="formData.stepData"></Step>
+					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
+						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+				</div>
+			</div>
+		</div>
+		<!-- <button @click="onSave">保存</button> -->
+	</div>
+</template>
+
+<script>
+import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
+import LineLabel from "@/components/Template/LineLabel";
+import TableList from "@/components/Template/Table";
+import Step from "@/components/Template/Step";
+import templateMixin from "../../mixins/templateMixin";
+import CustomTable from '@/components/Template/CustomTable.vue';
+import { getLatestSn } from '@/api/template';
+import { EventBus } from "@/utils/eventBus";
+import { uniqeResource } from "@/utils/calUnitTools";
+import { debounce } from 'lodash-es'
+const refConfig = {
+	baseInfoRef: "baseInfoRef",
+	remarkRef: "remarkRef",
+	synrRef: "synrRef",
+	yqjgRef: "yqjgRef",
+	cjrqRef: "cjrqRef",
+	fxpsjwjRef: "fxpsjwjRef",
+}
+export default {
+	name: "SP0021",
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable },
+	mixins: [templateMixin],
+	props: {
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+		sn: {
+			type: String,
+			default: '',
+		},
+	},
+	computed: {
+		// 配置条件
+		storageFormConfig() {
+			return [
+				{
+					type: "conditionItem",
+					config: {
+						storageCondition: {
+							label: 'template.common.storageConditionLabel',
+							type: "select",
+							fillType: "preFill",
+							options: this.getDictOptions("business_cctj"),
+							otherCode: "storageConditionOther",
+						},
+					}
+				}
+			];
+		},
+		// 备注表单配置
+		remarkConig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						remark: {
+							label: "",
+							type: "textarea",
+							fillType: "actFill",
+							span: 1,
+							placeholder: 'template.common.remarkPlaceholder',
+							maxlength: 1000,
+							rows: 5
+						}
+					}
+				}
+			]
+		},
+		// 试验基本信息表单配置
+		baseInfoFormConfig() {
+			//毒理002没得方法编号和版本号
+			let baseConfig = this.sn=='DL002'?
+			{
+				studyMc: {
+					label: 'template.common.testName',
+					type: "input",
+					disabled: true,
+				},
+				studySn: {
+					label: 'template.common.testNumber',
+					type: "input",
+					disabled: true,
+				}
+			}:
+			{
+				studyMc: {
+					label: 'template.common.testName',
+					type: "input",
+					disabled: true,
+				},
+				studySn: {
+					label: 'template.common.testNumber',
+					type: "input",
+					disabled: true,
+				},
+				methodCode: {
+					label: 'template.common.methodCode',
+					type: "input",
+					fillType: "preFill",
+					maxlength: 50
+				},
+				versionNum: {
+					label: 'template.common.versionNumber',
+					type: "inputNumber",
+					fillType: "actFill",
+					prepend: "V",
+					maxlength: 50
+				},
+			}
+
+			return [
+				{
+					type: "cardItem",
+					config: baseConfig
+				},
+				{
+					type: "conditionItem",
+					label: 'template.common.testConfigurationConditions',
+					config: {
+						pre: {
+							label: 'template.common.preFill',
+							type: "select",
+							multiple: true,
+							fillType: "preFill",
+							options: this.getDictOptions('business_pztj'),
+							otherCode: "preOther",
+						},
+						act: {
+							label: 'template.common.actualFill',
+							type: "select",
+							fillType: "actFill",
+							otherCode: "actOther",
+							multiple: true,
+							compareTo: "pre",
+							options: this.getDictOptions('business_pztj')
+						}
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.common.configurationTime',
+					config: {
+						startDate: {
+							label: 'template.common.startTime',
+							type: "input",
+						},
+						endDate: {
+							label: 'template.common.endTime',
+							type: "input",
+						},
+					}
+				}
+			]
+		},
+		// 操作步骤表单配置
+		stepFormConfig() {
+			return [
+				{
+					type: "step",
+					config: {
+						targetName: {
+							label: 'template.common.targetSolutionName',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						targetCode: {
+							label: 'template.common.targetSolutionCode',
+							type: "input",
+							subType: "span",
+							fillType: "preFill",
+							subKey: "targetCodeSn",
+							maxlength: 20
+						},
+						targetPreConcentration: {
+							label: 'template.common.targetPreConcentration',
+							type: "inputNumber",
+							subType: "select",
+							subKey: "targetPreConcentrationUnit",
+							fillType: "preFill",
+							subOptions: this.getDictOptions('business_nddw'),
+							maxlength: 10,
+							selectTo: "targetActConcentrationUnit",//下拉选择后，赋值到对应字段
+						},
+						targetActConcentration: {
+							label: 'template.common.targetActConcentration',
+							type: "inputNumber",
+							subType: "select",
+							subKey: "targetActConcentrationUnit",
+							compareTo: "targetPreConcentration",//与哪个字段比较
+							fillType: "actFill",
+							subFillType: "preFill",
+							subOptions: this.getDictOptions('business_nddw'),
+							copyFrom: "targetPreConcentration",//复制哪个字段
+							maxlength: 10
+						},
+						targetPreVolume: {
+							label: 'template.common.targetPreVolume',
+							type: "inputNumber",
+							subType: "select",
+							subKey: "targetPreVolumeUnit",
+							subOptions: this.getDictOptions('business_tjdw'),
+							fillType: "preFill",
+							maxlength: 10,
+							selectTo: "targetActVolumeUnit",//下拉选择后，赋值到对应字段
+						},
+						targetActVolume: {
+							label: 'template.common.targetActVolume',
+							type: "inputNumber",
+							subType: "select",
+							subKey: "targetActVolumeUnit",
+							fillType: "actFill",
+							subFillType: "preFill",
+							subOptions: this.getDictOptions('business_tjdw'),
+							compareTo: "targetPreVolume",//与哪个字段比较
+							copyFrom: "targetPreVolume",//复制哪个字段
+							maxlength: 10
+						},
+						effectivePeriod: {
+							label: 'template.common.effectivePeriod',
+							type: "inputNumber",
+							subType: "select",
+							subKey: "effectivePeriodUnit",
+							fillType: "preFill",
+							subOptions: this.getDictOptions('business_yxqdw'),
+							maxlength: 10
+						},
+						expireDate: {
+							label: 'template.common.expireDate',
+							type: "input",
+						},
+					}
+				}
+			]
+		},
+	},
+	data() {
+		return {
+			refConfig,
+			formData: {}
+		};
+	},
+	mounted() {
+		const formData = this.getFormDataByTemplateData();
+		if (!formData.targetCodeSn && this.fillType === "actFill") {
+			this.getCode(formData);
+		}
+
+	},
+	methods: {
+		//打印标签
+		printTag() {
+			const printConfig = this.getBasePrintConfig();
+			const { storageCondition, targetCodeSn } = this.formData;
+			printConfig["存储条件"] = storageCondition;
+			printConfig["编号"] = targetCodeSn;
+
+			EventBus.$emit('showTagPrintDialog', { printConfig })
+		},
+		//获取目标溶液编号
+		getCode: debounce(async function (v) {
+			const result = await getLatestSn({
+				count: 1,
+				pre: v.targetCode,
+				type: 1
+			})
+			if (result.code == 200) {
+				this.$refs.stepFormPackageRef.updateFormData("targetCodeSn", result.data[0])
+			}
+		}, 100),
+		//获取已填写的表单数据
+		getFilledFormData() {
+			return this.getFilledFormDataByRefs(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "stepRef", "remarkRef"])
+		},
+		//获取填写完成的表单数据
+		async getFormData() {
+			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "stepRef", "remarkRef"]);
+			return content;
+		},
+		getResource() {
+			let content = this.getFilledFormData();
+			//生成resource
+			let tmpResource = []
+			if (this.fillType === "actFill") {
+				//配置的试剂
+				tmpResource.push({
+					mc: content.targetName,
+					bh: content.targetCode + content.targetCodeSn,
+					ph: '',
+					ndz: content.targetActConcentration + content.targetActConcentrationUnit,
+					nd: content.targetActConcentration,
+					nddw: content.targetActConcentrationUnit,
+					ly: 'ELN配制',
+					sxrq: content.expireDate,
+					kc: content.targetActVolume,
+					kcdw: content.targetActVolumeUnit,
+					syl: null,
+					type: null,
+					elnType: this.product,
+					syldw: content.targetActVolumeUnit,
+					yxzq: content.effectivePeriod,
+					yxzqdw: content.effectivePeriodUnit,
+				})
+			}
+			//使用的试剂、仪器
+			const stepResource = this.$refs.stepRef.getStepResource()
+			this.resourceTmp = uniqeResource(tmpResource, stepResource.sjResource || [])
+			this.yqResourceTmp = stepResource.yqResource || []
+			return this.resourceTmp;
+		},
+		//保存
+		async onSave() {
+			let content = await this.$refs.stepRef.getFormData();
+			console.log(content);
+
+		},
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.mt-20 {
+	margin-top: 20px;
+}
+
+.print-btn {
+	margin-bottom: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/business/comps/template/formConfig/sp/SP0021.js b/src/views/business/comps/template/formConfig/sp/SP0021.js
new file mode 100644
index 0000000..e69de29