diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue
index e39c44e..2401b1a 100644
--- a/src/components/Template/Step.vue
+++ b/src/components/Template/Step.vue
@@ -82,6 +82,11 @@ import kbsjgsp from "./StepComponents/ry/kbsjgsp.vue";//溶液-空白（试剂/
 import kb from "./StepComponents/ry/kb.vue";//溶液-空白
 import jr from "./StepComponents/ry/jr.vue";//溶液-加热
 import fz from "./StepComponents/ry/fz.vue";//溶液-分装
+//溶液-样品分装：使用溶液-分装
+//溶液-给药制剂分装：使用溶液-分装
+//溶液-供试品样品分装：使用溶液-分装
+import csqx from "./StepComponents/ry/csqx.vue";//溶液-超声清洗
+import rj from "./StepComponents/ry/rj.vue";//溶液-融解
 //罗开凡新增
 
 //表配制
@@ -445,6 +450,8 @@ export default {
 		kb,
 		jr,
 		fz,
+		csqx,
+		rj,
 		//罗开凡新增
 
 		//表配制
@@ -644,6 +651,11 @@ export default {
 					'kb': 'kb',
 					'jr': 'jr',
 					'fz': 'fz',
+					'ypfz': 'fz',
+					'gyzjfz': 'fz',
+					'gspypfz': 'fz',
+					'csqx': 'csqx',
+					'rj': 'rj',
 					//罗开凡新增
 
 					//标配配制
diff --git a/src/components/Template/StepComponents/ry/csqx.vue b/src/components/Template/StepComponents/ry/csqx.vue
new file mode 100644
index 0000000..d340eb1
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/csqx.vue
@@ -0,0 +1,93 @@
+<!-- 超声清洗 -->
+<template>
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_csqx'" @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: 'csqx',
+		},
+	},
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            let config = [{
+                config: {
+                    text1: {
+                        label: "使用超声波清洗机",
+                        type: "text",
+                    },
+                    yq: {
+                        type: "yq",
+                        fillType: "actFill",
+                    },
+                    text2: {
+                        label: "仪器，设置预计频率为",
+                        type: "text",
+                    },
+                    yjpl: {
+                        type: "inputNumber",
+                        fillType: "preFill",
+                    },
+                    text3: {
+                        label: "Hz，实际设置频率为",
+                        type: "text",
+                    },
+                    sjpl: {
+                        type: "inputNumber",
+                        fillType: "actFill",
+                        compareTo: "yjpl",
+                        copyFrom: "yjpl",
+                    },
+                    text4: {
+                        label: "Hz，设置预计时长为",
+                        type: "text",
+                    },
+                    yjsc: {
+                        type: "inputNumber",
+                        fillType: "preFill",
+                    },
+                    yjscdw: {
+                        type: "select",
+                        options: this.getDictOptions("business_yqscdw"),
+                        selectTo: "sjscdw",
+                        fillType: "preFill",
+                    },
+                    text5: {
+                        label: "，实际设置时长为",
+                        type: "text",
+                    },
+                    sjsc: {
+                        type: "inputNumber",
+                        fillType: "actFill",
+                        compareTo: "yjsc",
+                        copyFrom: "yjsc",
+                    },
+                    sjscdw: {
+                        type: "select",
+                        options: this.getDictOptions("business_yqscdw"),
+                        fillType: "preFill",
+                    },
+                    text6: {
+                        label: "，进行超声。",
+                        type: "text",
+                    },
+                }
+            }]
+            return config
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/rj.vue b/src/components/Template/StepComponents/ry/rj.vue
new file mode 100644
index 0000000..e1431e9
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/rj.vue
@@ -0,0 +1,109 @@
+<!-- 融解  -->
+<template>
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_rj'" @resetRecord="resetRecord" :form-config="formConfig"
+        @select="select"
+        :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: 'rj',
+        },
+    },
+
+    components: {
+        StepFormPackage
+    },
+    methods: {
+        select(data) {
+            const {value,key} = data;
+            if(key==='sjccwz'){
+                this.updateWcData("sjwd",value);
+            }
+        }
+    },
+    computed: {
+        formConfig() {
+            let config = [{
+                config: {
+                    text1: {
+                        label: "将",
+                        type: "text",
+                    },
+                    ypmc:{
+                        type:"input",
+                        fillType:"preFill",
+                    },
+                    sj:{
+                        type:"sj",
+                        fillType:"actFill",
+                    },
+                    text2: {
+                        label: "预计放置于",
+                        type: "text",
+                    },
+                    ccwz: {
+                        type: "input",
+                        // options: this.getDictOptions("business_ccwz"),
+                        fillType: "preFill",
+                        otherCode: "ccwzOther",
+                    },
+                    text3: {
+                        label: "实际放置于",
+                        type: "text",
+                    },
+                    sjccwz: {
+                        type: "select",
+                        options: this.getDictOptions("business_ccwz"),
+                        fillType: "actFill",
+                        otherCode: "sjccwzOther",
+                        compareTo: "ccwz",
+                    },
+                    text4: {
+                        label: "位置，其环境条件预计为",
+                        type: "text",
+                    },
+                    yjwd: {
+                        type: "select",
+                        options: this.getDictOptions("business_cctj"),
+                        multiple: true,
+                        fillType: "preFill",
+                        otherCode: "yjwdOther",
+                    },
+                    text5: {
+                        label: "，实际条件为",
+                        type: "text",
+                    },
+                    sjwd: {
+                        type: "select",
+                        options: this.getDictOptions("business_cctj"),
+                        multiple: true,
+                        fillType: "actFill",
+                        otherCode: "sjwdOther",
+                        compareTo: "yjwd",
+                    },
+                     text6: {
+                        label: "进行融解",
+                        type: "text",
+                    },
+                    text9: {
+                        type: "text",
+                        label: "。",
+                    },
+
+                }
+            }]
+            return config
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file