diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue
index ccbd164..d039871 100644
--- a/src/components/Template/Step.vue
+++ b/src/components/Template/Step.vue
@@ -126,7 +126,19 @@ import zyfc from './StepComponents/swypfx/zyfc.vue';//生物样品分析-转移
 //色谱匀浆组织表
 import jszz from './StepComponents/spyjzzb/jszz.vue';//色谱匀浆组织表-剪碎组织
 //色谱匀浆组织表-称取组织：使用色谱匀浆组织表-剪碎组织
+import jryjry from './StepComponents/spyjzzb/jryjry.vue';//色谱匀浆组织表-加入匀浆溶液
+import ymyj from './StepComponents/spyjzzb/ymyj.vue';//色谱匀浆组织表-研磨匀浆
+import yjyfz2 from './StepComponents/spyjzzb/yjyfz2.vue';//色谱匀浆组织表-匀浆液分装2
+//色谱匀浆组织表-匀浆液分装3：使用色谱匀浆组织表-匀浆液分装2
+import yjbc from './StepComponents/spyjzzb/yjbc.vue';//色谱匀浆组织表-匀浆保存
 //色谱匀浆组织表-匀浆液混合：使用色谱匀浆组织表-剪碎组织
+//色谱匀浆组织表-加入溶液：使用溶液-加入溶液
+import fy_spyjzzb from './StepComponents/spyjzzb/fy_spyjzzb.vue';//色谱匀浆组织表-孵育
+//色谱匀浆组织表-天平校验双点：使用溶液-天平校验双点
+//色谱匀浆组织表-天平校验单点：使用溶液-天平校验单点
+//色谱匀浆组织表-离心：使用溶液-离心
+import jz_spyjzzb from './StepComponents/spyjzzb/jz_spyjzzb.vue';//色谱匀浆组织表-静置
+
 
 import { public_templateStepList } from '@/api/business/public/public';
 
@@ -257,6 +269,12 @@ export default {
 
 		//色谱匀浆组织表
 		jszz,
+		jryjry,
+		ymyj,
+		yjyfz2,
+		yjbc,
+		fy_spyjzzb,
+		jz_spyjzzb,
 	},
 	computed: {
 		stepComponentMap() {
@@ -349,7 +367,14 @@ export default {
 					//色谱匀浆组织表
 					'jszz':'jszz',
 					'cqzz':'jszz',
+					'jryjry':'jryjry',
+					'ymyj':'ymyj',
+					'yjyfz2':'yjyfz2',
+					'yjyfz3':'yjyfz2',
+					'yjbc':'yjbc',
 					'yjyhh':'jszz',
+					'fy_spyjzzb':'fy_spyjzzb',
+					'jz_spyjzzb':'jz_spyjzzb',
 					
 				}
 			}
diff --git a/src/components/Template/StepComponents/ry/hwhy.vue b/src/components/Template/StepComponents/ry/hwhy.vue
index 66fe1c3..9eb60af 100644
--- a/src/components/Template/StepComponents/ry/hwhy.vue
+++ b/src/components/Template/StepComponents/ry/hwhy.vue
@@ -116,11 +116,6 @@ export default {
                         fillType: "actFill",
                         disabled: true,
                     },
-                    startDate: {
-                        type: "input",
-                        fillType: "actFill",
-                        disabled: true,
-                    },
                     button1: {
                         type: "button",
                         buttonName: "开始"
diff --git a/src/components/Template/StepComponents/spyjzzb/fy_spyjzzb.vue b/src/components/Template/StepComponents/spyjzzb/fy_spyjzzb.vue
new file mode 100644
index 0000000..15292e7
--- /dev/null
+++ b/src/components/Template/StepComponents/spyjzzb/fy_spyjzzb.vue
@@ -0,0 +1,97 @@
+<!-- 孵育 -->
+<template>
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'fy_spyjzzb'" @resetRecord="resetRecord" :form-config="formConfig"
+        :formData="formData" />
+</template>
+
+<script>
+import StepFormPackage from '@/components/Template/StepFormPackage.vue';
+import stepMixins from '@/components/Template/mixins/stepMixins.js';
+
+export default {
+    mixins: [stepMixins],
+    props: {
+        sn: {
+            type: String,
+            default: 'fy_spyjzzb',
+        },
+    },
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            let config = [{
+                config: {
+                    text1: {
+                        label: "在设置预计条件为",
+                        type: "text",
+                    },
+                    yjtj: {
+                        type: "input",
+                        fillType: "preFill",
+                    },
+                    text3: {
+                        label: "条件下，实际条件为",
+                        type: "text",
+                    },
+                    sjtj: {
+                        type: "input",
+                        fillType: "actFill",
+                        compareTo:"yjtj",
+                        copyFrom:"yjtj",
+                    },
+                    text4: {
+                        label: "条件下，进行孵育",
+                        type: "text",
+                    },
+                    fysr: {
+                        type: "input",
+                        fillType: "preFill",
+                    },
+                    text6: {
+                        label: "，孵育",
+                        type: "text",
+                    },
+                    startDate: {
+                        type: "input",
+                        fillType: "actFill",
+                        disabled: true,
+                    },
+                    button1: {
+                        type: "button",
+                        buttonName: "开始",
+                    },
+                    text8: {
+                        type: "text",
+                        label: "，孵育",
+                    },
+                    endDate: {
+                        type: "input",
+                        fillType: "actFill",
+                        disabled: true,
+                    },
+                    button2: {
+                        type: "button",
+                        buttonName: "结束",
+                    },
+                    text9: {
+                        type: "text",
+                        label: "。",
+                    },
+
+                }
+            }]
+            if(this.sn==='fy_b'){
+                config[0].config.remark = {
+                    type: "input",
+                    fillType: "actFill",
+                }
+            }
+            return config
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/spyjzzb/jryjry.vue b/src/components/Template/StepComponents/spyjzzb/jryjry.vue
new file mode 100644
index 0000000..bd6614f
--- /dev/null
+++ b/src/components/Template/StepComponents/spyjzzb/jryjry.vue
@@ -0,0 +1,42 @@
+<!-- 加入匀浆溶液 -->
+<template>
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'spyjzzb_jryjry'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+</template>
+
+<script>
+import StepFormPackage from '@/components/Template/StepFormPackage.vue';
+import stepMixins from '@/components/Template/mixins/stepMixins.js';
+
+export default {
+    mixins: [stepMixins],
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            return [{
+                config: {
+                    text1:{
+                        label:"使用",
+                        type:"text",
+                    },
+                    ddsys:{
+                        type:"input",
+                        fillType:"preFill",
+                    },
+                    yq:{
+                        type:"yq",
+                        fillType:"actFill",
+                    },
+                    text2:{
+                        label:"仪器，向匀浆管种按倍数加入匀浆溶液。",
+                        type:"text",
+                    },
+                }
+            }]
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/spyjzzb/jz_spyjzzb.vue b/src/components/Template/StepComponents/spyjzzb/jz_spyjzzb.vue
new file mode 100644
index 0000000..761bd5d
--- /dev/null
+++ b/src/components/Template/StepComponents/spyjzzb/jz_spyjzzb.vue
@@ -0,0 +1,98 @@
+<!-- 静置  -->
+<template>
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'jz_spyjzzb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+</template>
+
+<script>
+import StepFormPackage from '@/components/Template/StepFormPackage.vue';
+import stepMixins from '@/components/Template/mixins/stepMixins.js';    
+
+    export default {
+        mixins: [stepMixins],
+        props: {
+            sn: {
+                type: String,
+                default: 'jz_spyjzzb',
+            },
+        },
+        components: {
+            StepFormPackage
+        },
+        computed: {
+            formConfig() {
+                let config = [{
+                    config:{
+                        text1:{
+                            label:"将上述溶液预计放置于",
+                            type:"text",
+                        },
+                        yjwd:{
+                            type:"select",
+                            options: this.getDictOptions("business_wddw"),
+                            fillType:"preFill",
+                            otherCode:"yjwdOther"
+                        },
+                        text2:{
+                            label:"实际放置于",
+                            type:"text",
+                        },
+                        sjwd:{
+                            type:"select",
+                            options: this.getDictOptions("business_wddw"),
+                            fillType:"actFill",
+                            otherCode:"sjwdOther",
+                            compareTo: "yjwd",
+                        },
+                        text3:{
+                            label:"，条件下静置，静置",
+                            type:"text",
+                        },
+                        jzsj:{
+                            type:"input",
+                            fillType:"preFill",
+                        },
+                        text4:{
+                            type:"text",
+                            label:"静置",
+                        },
+                        startDate: {
+                            type: "input",
+                            fillType: "actFill",
+                            disabled: true,
+                        },
+                        button1:{
+                            type:"button",
+                            buttonName:"开始",
+                        },
+                        text5:{
+                            type:"text",
+                            label:"，静置",
+                        },
+                        endDate: {
+                            type: "input",
+                            fillType: "actFill",
+                            disabled: true,
+                        },
+                        button2:{
+                            type:"button",
+                            buttonName:"结束",
+                        },
+                        text6: {
+                            type: "text",
+                            label: "。",
+                        },
+                        bz:{
+                            type: "input",
+                            fillType: "actFill",
+                        },
+                    }
+                }]
+                return config
+            }
+        },
+    }
+</script>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/spyjzzb/yjbc.vue b/src/components/Template/StepComponents/spyjzzb/yjbc.vue
new file mode 100644
index 0000000..ae37414
--- /dev/null
+++ b/src/components/Template/StepComponents/spyjzzb/yjbc.vue
@@ -0,0 +1,58 @@
+<!-- 匀浆保存 -->
+<template>
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'spyjzzb_yjbc'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+</template>
+
+<script>
+import StepFormPackage from '@/components/Template/StepFormPackage.vue';
+import stepMixins from '@/components/Template/mixins/stepMixins.js';
+
+export default {
+    mixins: [stepMixins],
+    props: {
+		sn: {
+			type: String,
+			default: 'yjbc',
+		},
+	},
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            let config = [{
+                config: {
+                    text1: {
+                        label: "将样品预计放于",
+                        type: "text",
+                    },
+                    yjwd:{
+                        type:"select",
+                        options:this.getDictOptions("business_wddw"),
+                        fillType:"preFill",
+                        otherCode: "yjwdOther",
+                    },
+                    text2: {
+                        label: "实际放于",
+                        type: "text",
+                    },
+                    sjwd:{
+                        type:"select",
+                        options:this.getDictOptions("business_wddw"),
+                        fillType:"actFill",
+                        otherCode: "sjwdOther",
+                        compareTo: "yjwd",
+                    },
+                    text3: {
+                        label: "保存。",
+                        type: "text",
+                    },
+                }
+            }]
+            return config
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/spyjzzb/yjyfz2.vue b/src/components/Template/StepComponents/spyjzzb/yjyfz2.vue
new file mode 100644
index 0000000..4d1452b
--- /dev/null
+++ b/src/components/Template/StepComponents/spyjzzb/yjyfz2.vue
@@ -0,0 +1,112 @@
+<!-- 匀浆液分装2 -->
+<template>
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'spyjzzb_yjyfz2'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+</template>
+
+<script>
+import StepFormPackage from '@/components/Template/StepFormPackage.vue';
+import stepMixins from '@/components/Template/mixins/stepMixins.js';
+
+export default {
+    mixins: [stepMixins],
+    props: {
+		sn: {
+			type: String,
+			default: 'yjyfz2',
+		},
+	},
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            let config = [{
+                config: {
+                    text1: {
+                        label: "使用移液器",
+                        type: "text",
+                    },
+                    yq: {
+                        type: "yq",
+                        fillType: "actFill",
+                    },
+                    text2: {
+                        label: this.sn==='yjyfz2'?"将匀浆液分为2管，第1管预计放入":this.sn==='yjyfz3'?"将匀浆液分为3管，第1管预计放入":'',
+                        type: "text",
+                    },
+                    yjfr: {
+                        type: "inputNumber",
+                        fillType: "preFill",
+                    },
+                    yjfrdw:{
+                        type:"select",
+                        options:this.getDictOptions("business_tjdw"),
+                        selectTo:"sjfrdw",
+                        fillType:"preFill",
+                    },
+                    text3: {
+                        label: "，实际放入",
+                        type: "text",
+                    },
+                    sjfr: {
+                        type: "inputNumber",
+                        fillType: "actFill",
+                        compareTo:"yjfr",
+                        copyFrom:"yjfr"
+                    },
+                    sjfrdw:{
+                        type:"select",
+                        options:this.getDictOptions("business_tjdw"),
+                        fillType:"preFill",
+                    },
+                }
+            }]
+            if(this.sn==='yjyfz2'){
+                config[0].config.text4 =  {
+                    label: "，剩余放入第2管。",
+                    type: "text",
+                }
+            }
+            if(this.sn==='yjyfz3'){
+                config[0].config.text4 =  {
+                    label: "，2管预计放入",
+                    type: "text",
+                }
+                config[0].config.yjfr2 =  {
+                    type: "inputNumber",
+                    fillType: "preFill",
+                }
+                config[0].config.yjfrdw2 =  {
+                    type:"select",
+                    options:this.getDictOptions("business_tjdw"),
+                    selectTo:"sjfrdw2",
+                    fillType:"preFill",
+                }
+                config[0].config.text5 =  {
+                    label: "，实际放入",
+                    type: "text",
+                }
+                config[0].config.sjfr2 =  {
+                    type: "inputNumber",
+                    fillType: "actFill",
+                    compareTo:"yjfr2",
+                    copyFrom:"yjfr2"
+                }
+                config[0].config.sjfrdw2 =  {
+                    type:"select",
+                    options:this.getDictOptions("business_tjdw"),
+                    fillType:"preFill",
+                }
+                config[0].config.text6 =  {
+                    label: "，剩余放入第3管。",
+                    type: "text",
+                }
+            }
+            
+            return config
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/spyjzzb/ymyj.vue b/src/components/Template/StepComponents/spyjzzb/ymyj.vue
new file mode 100644
index 0000000..1ac1b9f
--- /dev/null
+++ b/src/components/Template/StepComponents/spyjzzb/ymyj.vue
@@ -0,0 +1,118 @@
+<!-- 研磨匀浆 -->
+<template>
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'spyjzzb_ymyj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+</template>
+
+<script>
+import StepFormPackage from '@/components/Template/StepFormPackage.vue';
+import stepMixins from '@/components/Template/mixins/stepMixins.js';
+
+export default {
+    mixins: [stepMixins],
+    props: {
+		sn: {
+			type: String,
+			default: 'ymyj',
+		},
+	},
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            let config = [{
+                config: {
+                    text1: {
+                        label: "使用均质器",
+                        type: "text",
+                    },
+                    yq: {
+                        type: "yq",
+                        fillType: "actFill",
+                    },
+                    text2: {
+                        label: "仪器，设置预计转速为",
+                        type: "text",
+                    },
+                    yjzs: {
+                        type: "inputNumber",
+                        fillType: "preFill",
+                    },
+                    text3: {
+                        label: "m/s，实际设置转速为",
+                        type: "text",
+                    },
+                    sjzs: {
+                        type: "inputNumber",
+                        fillType: "actFill",
+                        compareTo:"yjzs",
+                        copyFrom:"yjzs"
+                    },
+                    text4: {
+                        label: "m/s，设置预计运行时间为",
+                        type: "text",
+                    },
+                    yjsj: {
+                        type: "inputNumber",
+                        fillType: "preFill",
+                    },
+                    text5: {
+                        label: "s，实际设置运行时间为",
+                        type: "text",
+                    },
+                    sjsj: {
+                        type: "inputNumber",
+                        fillType: "actFill",
+                        compareTo:"yjsj",
+                        copyFrom:"yjsj"
+                    },
+                    text6: {
+                        label: "s，设置预计运行间隔为",
+                        type: "text",
+                    },
+                    yjjg: {
+                        type: "inputNumber",
+                        fillType: "preFill",
+                    },
+                    text7: {
+                        label: "s，实际设置运行间隔为",
+                        type: "text",
+                    },
+                    sjjg: {
+                        type: "inputNumber",
+                        fillType: "actFill",
+                        compareTo:"yjjg",
+                        copyFrom:"yjjg"
+                    },
+
+                    text8: {
+                        label: "s，设置预计运行",
+                        type: "text",
+                    },
+                    yjcs: {
+                        type: "inputNumber",
+                        fillType: "preFill",
+                    },
+                    text9: {
+                        label: "次，实际设置运行",
+                        type: "text",
+                    },
+                    sjcs: {
+                        type: "inputNumber",
+                        fillType: "actFill",
+                        compareTo:"yjcs",
+                        copyFrom:"yjcs"
+                    },
+                    text10: {
+                        label: "次，对上表溶液进行研磨匀浆。",
+                        type: "text",
+                    },
+                }
+            }]
+            return config
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file