From 6490919117a07022a506420d001d2c6cc84d44e5 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Wed, 28 Jan 2026 16:56:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][upd?=
 =?UTF-8?q?ate]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/CustomTable.vue            |   4 +-
 src/components/Template/Step.vue                   |  42 +++++++-
 src/components/Template/StepComponents/ry/bdtj.vue |   4 +-
 src/components/Template/StepComponents/ry/bdzl.vue |   4 +-
 src/components/Template/StepComponents/ry/clcz.vue |   6 +-
 .../Template/StepComponents/ry/clfcz.vue           |   4 +-
 src/components/Template/StepComponents/ry/cs.vue   |  99 +++++++++++++++++
 src/components/Template/StepComponents/ry/czdd.vue |   2 +-
 src/components/Template/StepComponents/ry/czhj.vue |   6 +-
 src/components/Template/StepComponents/ry/dc.vue   |  58 ++++++++++
 src/components/Template/StepComponents/ry/ddhy.vue |  50 +++++++++
 src/components/Template/StepComponents/ry/hwhy.vue | 120 +++++++++++++++++++++
 src/components/Template/StepComponents/ry/jb.vue   |  82 ++++++++++++++
 src/components/Template/StepComponents/ry/jrjb.vue | 100 +++++++++++++++++
 src/components/Template/StepComponents/ry/jrry.vue |   4 +-
 src/components/Template/StepComponents/ry/lx.vue   |  16 ++-
 src/components/Template/StepComponents/ry/qywz.vue |   2 +-
 src/components/Template/StepComponents/ry/sy.vue   |  70 ++++++++++++
 .../Template/StepComponents/ry/tjphcz.vue          |   2 +-
 .../Template/StepComponents/ry/tjphfcz.vue         |   2 +-
 .../Template/StepComponents/ry/tpjydd.vue          |   2 +-
 .../Template/StepComponents/ry/tpjysd.vue          |   2 +-
 src/components/Template/StepComponents/ry/wxhy.vue |  40 +++++++
 src/components/Template/StepComponents/ry/xzrq.vue |   2 +-
 src/components/Template/StepComponents/ry/ym.vue   |   4 +-
 src/components/Template/StepComponents/ry/zy.vue   |  40 +++++++
 src/components/Template/StepComponents/ry/zyhy.vue | 106 ++++++++++++++++++
 src/components/Template/mixins/stepMixins.js       |   3 +
 .../Template/operation/TableOpertaion.vue          |  12 +++
 29 files changed, 863 insertions(+), 25 deletions(-)
 create mode 100644 src/components/Template/StepComponents/ry/cs.vue
 create mode 100644 src/components/Template/StepComponents/ry/dc.vue
 create mode 100644 src/components/Template/StepComponents/ry/ddhy.vue
 create mode 100644 src/components/Template/StepComponents/ry/hwhy.vue
 create mode 100644 src/components/Template/StepComponents/ry/jb.vue
 create mode 100644 src/components/Template/StepComponents/ry/jrjb.vue
 create mode 100644 src/components/Template/StepComponents/ry/sy.vue
 create mode 100644 src/components/Template/StepComponents/ry/wxhy.vue
 create mode 100644 src/components/Template/StepComponents/ry/zy.vue
 create mode 100644 src/components/Template/StepComponents/ry/zyhy.vue

diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue
index f3bbf45..c2b189a 100644
--- a/src/components/Template/CustomTable.vue
+++ b/src/components/Template/CustomTable.vue
@@ -226,7 +226,7 @@ export default {
 				const { stepTableFormData = [], headerSelectFields = {} } = newData;
 				this.updateDataSource(stepTableFormData);
 				this.headerSelectFields = JSON.parse(JSON.stringify(headerSelectFields));
-
+				console.log(stepTableFormData,"stepTableFormData")
 				// 在数据加载后检查 compareTo 逻辑
 				this.checkCompareToOnDataLoad();
 			}
@@ -577,7 +577,7 @@ export default {
 				options: col.bodySubOptions,
 				maxlength: col.bodySubMaxlength || 10,
 				label: "",
-				placeholder: col.bodySubPlaceholder || "请输入",
+				placeholder: col.bodySubPlaceholder || (col.bodySubType === 'select' ? '请选择' : '请输入'),
 				precision: col.subPrecision,
 				compareTo: col.bodySubCompareTo, // 添加 compareTo 字段
 				type: col.bodySubType || "input",
diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue
index d1fed3b..ed5865d 100644
--- a/src/components/Template/Step.vue
+++ b/src/components/Template/Step.vue
@@ -47,8 +47,16 @@ import Bdzl from './StepComponents/ry/bdzl.vue';//标定（质量）
 import Tjphcz from './StepComponents/ry/tjphcz.vue';//调节PH(传值)
 import Tjphfcz from './StepComponents/ry/tjphfcz.vue';//调节PH(非传值)
 import Lx from './StepComponents/ry/lx.vue';//离心
-
-
+import Hwhy from './StepComponents/ry/hwhy.vue';//溶液-恒温混匀
+import Zyhy from './StepComponents/ry/zyhy.vue';//溶液-振摇混匀
+import Wxhy from "./StepComponents/ry/wxhy.vue";//溶液-涡旋混匀
+import Ddhy from "./StepComponents/ry/ddhy.vue";//溶液-颠倒混匀
+import Ym from "./StepComponents/ry/ym.vue";//溶液-研磨
+import Jb from "./StepComponents/ry/jb.vue";//溶液-搅拌
+import Jrjb from "./StepComponents/ry/jrjb.vue";//溶液-加热搅拌
+import Cs from "./StepComponents/ry/cs.vue";//溶液-超声
+import Sy from "./StepComponents/ry/sy.vue";//溶液-水浴
+import Dc from "./StepComponents/ry/dc.vue";//溶液-氮吹
 
 
 
@@ -67,6 +75,16 @@ const stepTypes = [
 	{ label: '调节PH(传值)', value: 'tjphcz' },
 	{ label: '调节PH(非传值)', value: 'tjphfcz' },
 	{ label: '离心', value: 'lx' },
+	{ label: '恒温混匀', value: 'hwhy' },
+	{ label: '振摇混匀', value: 'zyhy' },
+	{ label: '涡旋混匀', value: 'wxhy' },
+	{ label: '颠倒混匀', value: 'ddhy' },
+	{ label: '研磨', value: 'ym' },
+	{ label: '搅拌', value: 'jb' },
+	{ label: '加热搅拌', value: 'jrjb' },
+	{ label: '超声', value: 'cs' },
+	{ label: '水浴', value: 'sy' },
+	{ label: '氮吹', value: 'dc' },
 	
 ];
 
@@ -107,6 +125,16 @@ export default {
 		Tjphcz,
 		Tjphfcz,
 		Lx,
+		Hwhy,
+		Zyhy,
+		Wxhy,
+		Ddhy,
+		Ym,
+		Jb,
+		Jrjb,
+		Cs,
+		Sy,
+		Dc,
 	},
 	computed: {
 		stepComponentMap() {
@@ -126,6 +154,16 @@ export default {
 					'tjphcz': 'Tjphcz',
 					'tjphfcz': 'Tjphfcz',
 					'lx': 'Lx',
+					'hwhy': 'Hwhy',
+					'zyhy': 'Zyhy',
+					'wxhy': 'Wxhy',
+					'ddhy': 'Ddhy',
+					'ym': 'Ym',
+					'jb': 'Jb',
+					'jrjb': 'Jrjb',
+					'sy': 'Sy',
+					'cs': 'Cs',
+					'dc': 'Dc',
 				}
 			}
 			return this.componentMap
diff --git a/src/components/Template/StepComponents/ry/bdtj.vue b/src/components/Template/StepComponents/ry/bdtj.vue
index 69886ea..2c53c56 100644
--- a/src/components/Template/StepComponents/ry/bdtj.vue
+++ b/src/components/Template/StepComponents/ry/bdtj.vue
@@ -1,6 +1,6 @@
 <!-- 标定(体积) -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
@@ -61,6 +61,8 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                         sjbdtj:{
                             type:"inputNumber",
                             fillType:"actFill",
+                            compareTo:"bdtj",
+                            copyFrom:"bdtj"
                         },
                         sjbdtjdw:{
                             type:"select",
diff --git a/src/components/Template/StepComponents/ry/bdzl.vue b/src/components/Template/StepComponents/ry/bdzl.vue
index 01a23da..3e36573 100644
--- a/src/components/Template/StepComponents/ry/bdzl.vue
+++ b/src/components/Template/StepComponents/ry/bdzl.vue
@@ -1,6 +1,6 @@
 <!-- 标定(质量) -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
@@ -46,6 +46,8 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                         sjbdtj:{
                             type:"inputNumber",
                             fillType:"actFill",
+                            compareTo:"rm",
+                            copyFrom:"rm"
                         },
                         button1:{
                             type:"button",
diff --git a/src/components/Template/StepComponents/ry/clcz.vue b/src/components/Template/StepComponents/ry/clcz.vue
index 5977e0f..ddd4b5b 100644
--- a/src/components/Template/StepComponents/ry/clcz.vue
+++ b/src/components/Template/StepComponents/ry/clcz.vue
@@ -1,6 +1,6 @@
 <!-- 称量（非传值） -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
@@ -50,7 +50,9 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             label:"，实际质量为"
                         },
                         sjcz:{
-                            type:"span"
+                            type:"span",
+                            compareTo:"wzsul",
+                            copyFrom:"wzsul"
                         },
                     }
                 }]
diff --git a/src/components/Template/StepComponents/ry/clfcz.vue b/src/components/Template/StepComponents/ry/clfcz.vue
index 3d32432..f0b48fb 100644
--- a/src/components/Template/StepComponents/ry/clfcz.vue
+++ b/src/components/Template/StepComponents/ry/clfcz.vue
@@ -1,6 +1,6 @@
 <!-- 称量（传值） -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
@@ -53,6 +53,8 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                         sjcz:{
                             type:"inputNumber",
                             fillType:"actFill",
+                            compareTo:"wzsul",
+                            copyFrom:"wzsul"
                         },
                          wzsuldw1:{
                             type:"select",
diff --git a/src/components/Template/StepComponents/ry/cs.vue b/src/components/Template/StepComponents/ry/cs.vue
new file mode 100644
index 0000000..3b2fe39
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/cs.vue
@@ -0,0 +1,99 @@
+<!-- 超声 -->
+<template>
+    <StepFormPackage ref = "stepFormPackageRef" @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",
+                        },
+                        yq:{
+                            type:"instrument",
+                            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_tjdw"),
+                            selectTo: "sjscdw",
+                            fillType: "preFill",
+                        },
+                        text5:{
+                            label:"，实际时长为",
+                            type:"text",
+                        },
+                         sjsc:{
+                            type:"inputNumber",
+                            fillType:"preFill",
+                            compareTo:"yjsc",
+                            copyFrom:"yjsc",
+                        },
+                        sjscdw:{
+                            type:"select",
+                            options: this.getDictOptions("business_tjdw"),
+                            fillType: "preFill",
+                        },
+                        text6:{
+                            label:"，进行",
+                            type:"text",
+                        },
+                        cssr:{
+                            type:"input",
+                            fillType:"preFill",
+                        },
+                        text7:{
+                            label:"超声，超声",
+                            type:"text",
+                        },
+                        button1:{
+                            type:"button",
+                            buttonName:"开始"
+                        }
+                    }
+                }]
+            }
+        },
+    }
+</script>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/czdd.vue b/src/components/Template/StepComponents/ry/czdd.vue
index 92a190f..eeff93c 100644
--- a/src/components/Template/StepComponents/ry/czdd.vue
+++ b/src/components/Template/StepComponents/ry/czdd.vue
@@ -1,6 +1,6 @@
 <!-- 操作地点 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/czhj.vue b/src/components/Template/StepComponents/ry/czhj.vue
index c0cd755..ff3f1db 100644
--- a/src/components/Template/StepComponents/ry/czhj.vue
+++ b/src/components/Template/StepComponents/ry/czhj.vue
@@ -1,6 +1,6 @@
 <!-- 操作环境 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -46,7 +46,9 @@ export default {
                         fillType: "actFill",
                         type: "select",
                         options: this.getDictOptions('business_czhj'),
-                        otherCode: "sjczhjOther"
+                        otherCode: "sjczhjOther",
+                        compareTo:"ytczhj",
+                        copyFrom:"ytczhj"
                     },
                     text4: {
                         label: "条件下操作下述步骤",
diff --git a/src/components/Template/StepComponents/ry/dc.vue b/src/components/Template/StepComponents/ry/dc.vue
new file mode 100644
index 0000000..6eb0b11
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/dc.vue
@@ -0,0 +1,58 @@
+<!-- 氮吹 -->
+<template>
+    <StepFormPackage ref = "stepFormPackageRef" @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",
+                        },
+                        yq:{
+                            type:"instrument",
+                            fillType:"actFill",
+                        },
+                        text2:{
+                            label:"仪器，设置预计温度为",
+                            type:"text",
+                        },
+                        temp:{
+                            type:"inputNumber",
+                            fillType:"preFill",
+                        },
+                        text3:{
+                            label:"°C，实际温度为",
+                            type:"text",
+                        },
+                        actTemp:{
+                            type:"inputNumber",
+                            fillType:"actFill",
+                            compareTo:"temp",
+                            copyFrom:"temp",
+                        },
+                        text4:{
+                            label:"°C，进行氮吹",
+                            type:"text",
+                        }
+                    }
+                }]
+            }
+        },
+    }
+</script>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/ddhy.vue b/src/components/Template/StepComponents/ry/ddhy.vue
new file mode 100644
index 0000000..1a8d496
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/ddhy.vue
@@ -0,0 +1,50 @@
+<!-- 颠倒混匀 -->
+<template>
+    <StepFormPackage ref = "stepFormPackageRef" @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",
+                        },
+                        ddcs1:{
+                            type:"inputNumber",
+                            fillType:"preFill",
+                        },
+                        text2:{
+                            label:"次，实际颠倒",
+                            type:"text",
+                        },
+                        ddcs2:{
+                            type:"inputNumber",
+                            fillType:"actFill",
+                            compareTo:"ddcs1",
+                            copyFrom:"ddcs1"
+                        },
+                        text3:{
+                            label:"次",
+                            type:"text",
+                        }
+                    }
+                }]
+            }
+        },
+    }
+</script>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/hwhy.vue b/src/components/Template/StepComponents/ry/hwhy.vue
new file mode 100644
index 0000000..5eaa366
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/hwhy.vue
@@ -0,0 +1,120 @@
+<!-- 恒温混匀 -->
+<template>
+    <StepFormPackage ref = "stepFormPackageRef" @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",
+                        },
+                        yq1:{
+                            type:"instrument",
+                            fillType:"actFill",
+                        },
+                        text2:{
+                            label:"仪器，设置预计温度为",
+                            type:"text",
+                        },
+                        yjzs:{
+                            type:"inputNumber",
+                            fillType:"preFill",
+                        },
+                        text3:{
+                            label:"°C，实际温度为",
+                            type:"text",
+                        },
+                        sjwd:{
+                            type:"inputNumber",
+                            fillType:"actFill",
+                            compareTo:"yjzs",
+                            copyFrom:"yjzs"
+                        },
+                        text4:{
+                            label:"°C，设置预计转速为",
+                            type:"text",
+                        },
+                        yjzs2:{
+                            type:"inputNumber",
+                            fillType:"preFill",
+                        },
+                        yjzsdw:{
+                            type:"select",
+                            options:this.getDictOptions("business_zsdw"),
+                            selectTo:"sjzsdw",
+                            fillType:"preFill", 
+                        },
+                        text8:{
+                            label:"实际转速为",
+                            type:"text",
+                        },
+                        sjzs:{
+                            type:"inputNumber",
+                            fillType:"actFill",
+                            compareTo:"yjzs2",
+                            copyFrom:"yjzs2"
+                        },
+                        sjzsdw:{
+                            type:"select",
+                            options:this.getDictOptions("business_zsdw"),
+                            fillType:"preFill",
+                        },
+                        text7:{
+                            label:"，设置预计时长为",
+                            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",
+                        },
+                        button1:{
+                            type:"button",
+                            buttonName:"开始"
+                        }
+                    }
+                }]
+            }
+        },
+    }
+</script>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/jb.vue b/src/components/Template/StepComponents/ry/jb.vue
new file mode 100644
index 0000000..1af9a33
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/jb.vue
@@ -0,0 +1,82 @@
+<!-- 搅拌 -->
+<template>
+    <StepFormPackage ref = "stepFormPackageRef" @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",
+                        },
+                        yq:{
+                            type:"instrument",
+                            fillType:"actFill",
+                        },
+                        text4:{
+                            label:"，设置预计转速为",
+                            type:"text",
+                        },
+                        yjzs2:{
+                            type:"inputNumber",
+                            fillType:"preFill",
+                        },
+                        yjzsdw:{
+                            type:"select",
+                            options: this.getDictOptions("business_zsdw"),
+                            selectTo:"sjzsdw",
+                            fillType:"preFill", 
+                        },
+                        text5:{
+                            label:"实际转速为",
+                            type:"text",
+                        },
+                        sjzs:{
+                            type:"inputNumber",
+                            fillType:"actFill",
+                            compareTo:"yjzs2",
+                            copyFrom:"yjzs2"
+                        },
+                         sjzsdw:{
+                            type:"select",
+                            options: this.getDictOptions("business_zsdw"),
+                            fillType:"preFill", 
+                        },
+                        text6:{
+                            label:"进行搅拌，搅拌",
+                            type:"text",
+                        },
+                        button1:{
+                            type:"button",
+                            buttonName:"开始",
+                        },
+                        text7:{
+                            label:"搅拌",
+                            type:"text",
+                        },
+                         button2:{
+                            type:"button",
+                            buttonName:"结束",
+                        },
+                        
+                    }
+                }]
+            }
+        },
+    }
+</script>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/jrjb.vue b/src/components/Template/StepComponents/ry/jrjb.vue
new file mode 100644
index 0000000..e8212b1
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/jrjb.vue
@@ -0,0 +1,100 @@
+<!-- 加热搅拌 -->
+<template>
+    <StepFormPackage ref = "stepFormPackageRef" @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",
+                        },
+                        yq:{
+                            type:"instrument",
+                            fillType:"actFill",
+                        },
+                        text2:{
+                            label:"仪器,设置预计温度为",
+                            type:"text",
+                        },
+                        yjwd:{
+                            type:"inputNumber",
+                            fillType:"preFill",
+                        },
+                        text3:{
+                            label:"°C，实际温度为",
+                            type:"text",
+                        },
+                        sjwd:{
+                            type:"inputNumber",
+                            fillType:"actFill",
+                            compareTo:"yjwd",
+                            copyFrom:"yjwd"
+                        },
+                        text4:{
+                            label:"，设置预计转速为",
+                            type:"text",
+                        },
+                        yjzs2:{
+                            type:"inputNumber",
+                            fillType:"preFill",
+                        },
+                        yjzsdw:{
+                            type:"select",
+                            options: this.getDictOptions("business_zsdw"),
+                            selectTo:"sjzsdw",
+                            fillType:"preFill", 
+                        },
+                        text5:{
+                            label:"实际转速为",
+                            type:"text",
+                        },
+                        sjzs:{
+                            type:"inputNumber",
+                            fillType:"actFill",
+                            compareTo:"yjzs2",
+                            copyFrom:"yjzs2"
+                        },
+                         sjzsdw:{
+                            type:"select",
+                            options: this.getDictOptions("business_zsdw"),
+                            fillType:"preFill", 
+                        },
+                        text6:{
+                            label:"进行搅拌，搅拌",
+                            type:"text",
+                        },
+                        button1:{
+                            type:"button",
+                            buttonName:"开始",
+                        },
+                        text7:{
+                            label:"搅拌",
+                            type:"text",
+                        },
+                         button2:{
+                            type:"button",
+                            buttonName:"结束",
+                        },
+                        
+                    }
+                }]
+            }
+        },
+    }
+</script>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/jrry.vue b/src/components/Template/StepComponents/ry/jrry.vue
index 291db60..57136e1 100644
--- a/src/components/Template/StepComponents/ry/jrry.vue
+++ b/src/components/Template/StepComponents/ry/jrry.vue
@@ -1,6 +1,6 @@
 <!-- 加入溶液 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -61,6 +61,8 @@ export default {
                     sjsr2:{
                         fillType: "actFill",
                         type: "inputNumber",
+                        compareTo:"ytsr1",
+                        copyFrom:"ytsr1"
                     },
                     sjsrdw2:{
                         fillType: "preFill",
diff --git a/src/components/Template/StepComponents/ry/lx.vue b/src/components/Template/StepComponents/ry/lx.vue
index 98031c5..1d972ea 100644
--- a/src/components/Template/StepComponents/ry/lx.vue
+++ b/src/components/Template/StepComponents/ry/lx.vue
@@ -1,6 +1,6 @@
 <!-- 离心 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -39,6 +39,8 @@ export default {
                     rxry: {
                         type: "inputNumber",
                         fillType: "actFill",
+                        compareTo:"rm",
+                        copyFrom:"rm"
                     },
                   
                     text4: {
@@ -46,14 +48,14 @@ export default {
                         type: "text",
                     },
                     sjjrl: {
-                        type: "input",
-                        fillType: "actFill",
+                        type: "inputNumber",
+                        fillType: "preFill",
                     },
                     sjjrldw: {
                         type: "select",
                         options: this.getDictOptions("business_zsdw"),
                         selectTo: "sjzsdw",
-                        fillType: "actFill",
+                        fillType: "preFill",
                     },
 
                     text5: {
@@ -63,11 +65,13 @@ export default {
                     jxry: {
                         type: "inputNumber",
                         fillType: "actFill",
+                        compareTo:"sjjrl",
+                        copyFrom:"sjjrl"
                     },
                     sjzsdw: {
                         type: "select",
                         options: this.getDictOptions("business_zsdw"),
-                        fillType: "actFill",
+                        fillType: "preFill",
                     },
                   
                     text6: {
@@ -91,6 +95,8 @@ export default {
                     sjsc: {
                         type: "inputNumber",
                         fillType: "actFill",
+                        compareTo:"sjjrl1",
+                        copyFrom:"sjjrl1"
                     },
                     sjscdw: {
                         type: "select",
diff --git a/src/components/Template/StepComponents/ry/qywz.vue b/src/components/Template/StepComponents/ry/qywz.vue
index 13071f5..0f1c148 100644
--- a/src/components/Template/StepComponents/ry/qywz.vue
+++ b/src/components/Template/StepComponents/ry/qywz.vue
@@ -1,6 +1,6 @@
 <!-- 取用物质 -->
 <template>
-    <StepFormPackage @onDialogSubmit="onDialogSubmit" ref = "stepFormPackageRef" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage @onDialogSubmit="onDialogSubmit" ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/sy.vue b/src/components/Template/StepComponents/ry/sy.vue
new file mode 100644
index 0000000..796e946
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/sy.vue
@@ -0,0 +1,70 @@
+<!-- 水浴 -->
+<template>
+    <StepFormPackage ref = "stepFormPackageRef" @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",
+                        },
+                        yq:{
+                            type:"instrument",
+                            fillType:"actFill",
+                        },
+                        text2:{
+                            label:"仪器，设置预计温度为",
+                            type:"text",
+                        },
+                        temp:{
+                            type:"inputNumber",
+                            fillType:"preFill",
+                        },
+                        text3:{
+                            label:"°C，实际温度为",
+                            type:"text",
+                        },
+                        actTemp:{
+                            type:"inputNumber",
+                            fillType:"actFill",
+                            compareTo:"temp",
+                            copyFrom:"temp",
+                        },
+                        text4:{
+                            label:"°C，进行水浴，水浴",
+                            type:"text",
+                        },
+                        button1:{
+                            type:"button",
+                            buttonName:"开始"
+                        },
+                        text5:{
+                            label:"水浴",
+                            type:"text",
+                        },
+                        button2:{
+                            type:"button",
+                            buttonName:"结束"
+                        }
+                    }
+                }]
+            }
+        },
+    }
+</script>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/tjphcz.vue b/src/components/Template/StepComponents/ry/tjphcz.vue
index db74b52..402da1a 100644
--- a/src/components/Template/StepComponents/ry/tjphcz.vue
+++ b/src/components/Template/StepComponents/ry/tjphcz.vue
@@ -1,6 +1,6 @@
 <!-- 调节PH(传值) -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/tjphfcz.vue b/src/components/Template/StepComponents/ry/tjphfcz.vue
index bd2006c..85cd403 100644
--- a/src/components/Template/StepComponents/ry/tjphfcz.vue
+++ b/src/components/Template/StepComponents/ry/tjphfcz.vue
@@ -1,6 +1,6 @@
 <!-- 调节PH(非传值) -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/tpjydd.vue b/src/components/Template/StepComponents/ry/tpjydd.vue
index c0de841..eb5874e 100644
--- a/src/components/Template/StepComponents/ry/tpjydd.vue
+++ b/src/components/Template/StepComponents/ry/tpjydd.vue
@@ -1,7 +1,7 @@
 <!-- 天平校验(单点) -->
 <template>
     <StepFormPackage 
-        ref = "stepFormPackageRef" 
+        ref = "stepFormPackageRef" @resetRecord = "resetRecord" 
         @clickButton="handleClickButton"
         :form-config="formConfig" :formData = "formData" />
 </template>
diff --git a/src/components/Template/StepComponents/ry/tpjysd.vue b/src/components/Template/StepComponents/ry/tpjysd.vue
index 8dda79b..3910b82 100644
--- a/src/components/Template/StepComponents/ry/tpjysd.vue
+++ b/src/components/Template/StepComponents/ry/tpjysd.vue
@@ -1,7 +1,7 @@
 <!-- 天平校验(双点) -->
 <template>
     <StepFormPackage 
-        ref = "stepFormPackageRef" 
+        ref = "stepFormPackageRef" @resetRecord = "resetRecord" 
         @clickButton="handleClickButton"
         :form-config="formConfig" :formData = "formData" />
 </template>
diff --git a/src/components/Template/StepComponents/ry/wxhy.vue b/src/components/Template/StepComponents/ry/wxhy.vue
new file mode 100644
index 0000000..f144101
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/wxhy.vue
@@ -0,0 +1,40 @@
+<!-- 涡旋混匀 -->
+<template>
+    <StepFormPackage ref = "stepFormPackageRef" @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",
+                        },
+                        yq1:{
+                            type:"instrument",
+                            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/ry/xzrq.vue b/src/components/Template/StepComponents/ry/xzrq.vue
index 1641544..5c1b1ac 100644
--- a/src/components/Template/StepComponents/ry/xzrq.vue
+++ b/src/components/Template/StepComponents/ry/xzrq.vue
@@ -1,6 +1,6 @@
 <!-- 选择容器 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/ym.vue b/src/components/Template/StepComponents/ry/ym.vue
index f2ebf47..678cbe2 100644
--- a/src/components/Template/StepComponents/ry/ym.vue
+++ b/src/components/Template/StepComponents/ry/ym.vue
@@ -1,6 +1,6 @@
 <!-- 研磨 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
@@ -69,6 +69,8 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                         ry3:{
                             type:"input",
                             fillType:"actFill",
+                            compareTo:"ry2",
+                            copyFrom:"ry2"
                         },
                         sjrytjdw:{
                             type:"select",
diff --git a/src/components/Template/StepComponents/ry/zy.vue b/src/components/Template/StepComponents/ry/zy.vue
new file mode 100644
index 0000000..1616d7a
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/zy.vue
@@ -0,0 +1,40 @@
+<!-- 正压 -->
+<template>
+    <StepFormPackage ref = "stepFormPackageRef" @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",
+                        },
+                        yq:{
+                            type:"instrument",
+                            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/ry/zyhy.vue b/src/components/Template/StepComponents/ry/zyhy.vue
new file mode 100644
index 0000000..8574815
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/zyhy.vue
@@ -0,0 +1,106 @@
+<!-- 振摇混匀 -->
+<template>
+    <StepFormPackage ref = "stepFormPackageRef" @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",
+                        },
+                        yq:{
+                            type:"input",
+                            fillType:"preFill",
+                        },
+                        yq1:{
+                            type:"instrument",
+                            fillType:"actFill",
+                        },
+                        text2:{
+                            label:"，设置预计转速",
+                            type:"text",
+                        },
+                        yjzs:{
+                            type:"inputNumber",
+                            fillType:"preFill",
+                        },
+                        yjzsdw:{
+                            type:"select",
+                            options:this.getDictOptions("business_zsdw"),
+                            selectTo:"sjzsdw",
+                            fillType:"preFill",
+                        },
+                        text3:{
+                            label:"，实际转速为",
+                            type:"text",
+                        },
+                        sjzs:{
+                            type:"inputNumber",
+                            fillType:"actFill",
+                            compareTo:"yjzs",
+                            copyFrom:"yjzs"
+                        },
+                        sjzsdw:{
+                            type:"select",
+                            options:this.getDictOptions("business_zsdw"),
+                            fillType:"preFill",
+                        },
+                        text4:{
+                            label:"，预计时长为",
+                            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",
+                        },
+                        button1:{
+                            type:"button",
+                            buttonName:"开始"
+                        }
+                    }
+                }]
+            }
+        },
+    }
+</script>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/Template/mixins/stepMixins.js b/src/components/Template/mixins/stepMixins.js
index 09194fb..9ba48da 100644
--- a/src/components/Template/mixins/stepMixins.js
+++ b/src/components/Template/mixins/stepMixins.js
@@ -17,5 +17,8 @@ export default {
         getDictOptions(dictType) {
             return this.dict.type[dictType] || []
         },
+        resetRecord() {
+            this.$refs.stepFormPackageRef.resetRecord();
+        }
     },
 }
\ No newline at end of file
diff --git a/src/components/Template/operation/TableOpertaion.vue b/src/components/Template/operation/TableOpertaion.vue
index 1491a75..3e036cb 100644
--- a/src/components/Template/operation/TableOpertaion.vue
+++ b/src/components/Template/operation/TableOpertaion.vue
@@ -76,6 +76,18 @@ export default {
         },
         // 配置完成
         onConfigComplete() {
+            // const isComplete = Object.values(this.innerRow).every((val)=>{
+            //     // 0 算有值
+            //     if (val === 0) return true;
+            //     if (val === "0") return true;
+            //     // 其他情况：非 null、非 undefined、非空字符串
+            //     return val != null && val != undefined && val != "";
+            // });
+            // if(!isComplete){
+            //     this.$message.error("表单内容未填完，请填写完成后才能配制完成")
+            //     return
+            // }
+            console.log(this.columns,"columns")
             this.$emit("configComplete", { rowData: this.innerRow, rowIndex: this.rowIndex, headerSelectFields: this.columns.headerSelectFields })
         },
         // 打印标签