From aa2d6ba77f6a2db21d500ddfca8f863797b9f9bb Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Tue, 31 Mar 2026 22:04:50 +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/StepComponents/JcbComp.vue |   6 +-
 .../Template/StepComponents/jcb/fyxks.vue          | 122 +++++++++++----------
 .../Template/StepComponents/jcb/js_jcb.vue         |  13 ++-
 .../Template/StepComponents/jcb/ycfyks.vue         |   9 +-
 .../Template/StepComponents/jcb/ycks.vue           |   9 +-
 src/components/Template/StepFormPackage.vue        |   2 +-
 src/components/Template/mixins/stepMixins.js       |   2 +
 7 files changed, 96 insertions(+), 67 deletions(-)

diff --git a/src/components/Template/StepComponents/JcbComp.vue b/src/components/Template/StepComponents/JcbComp.vue
index a5f8adc..bdb847d 100644
--- a/src/components/Template/StepComponents/JcbComp.vue
+++ b/src/components/Template/StepComponents/JcbComp.vue
@@ -37,6 +37,10 @@ export default {
         item:{
             type: Object,
             default: () => { },
+        },
+        type:{
+            type: String,
+            default: 'qb',
         }
     },
     data() {
@@ -56,7 +60,7 @@ export default {
                     width: '200px',
                     bodyType: "jcb",
                     bodyKey: "clpClick",
-                    bodyFillType: "preFill",
+                    bodyFillType: this.type==="qb"?"preFill":"detail",
                 },
                 {
                     label: '时间',
diff --git a/src/components/Template/StepComponents/jcb/fyxks.vue b/src/components/Template/StepComponents/jcb/fyxks.vue
index c899f8c..58a42aa 100644
--- a/src/components/Template/StepComponents/jcb/fyxks.vue
+++ b/src/components/Template/StepComponents/jcb/fyxks.vue
@@ -1,69 +1,75 @@
 <!-- 孵育箱开始 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_fyxks'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex + '_' + 'jcb_fyxks'" @resetRecord="resetRecord"
+        :form-config="formConfig" :formData="localFormData" />
 </template>
 
 <script>
 import StepFormPackage from '@/components/Template/StepFormPackage.vue';
-import stepMixins from '@/components/Template/mixins/stepMixins.js';    
+import stepMixins from '@/components/Template/mixins/stepMixins.js';
 
-    export default {
-        mixins: [stepMixins],
-        props: {
-            sn: {
-                type: String,
-                default: 'fyxks',
-            },
+export default {
+    mixins: [stepMixins],
+    props: {
+        sn: {
+            type: String,
+            default: 'fyxks',
         },
-        components: {
-            StepFormPackage
-        },
-        computed: {
-            formConfig() {
-                let config = [{
-                    config:{
-                        text1:{
-                            label:"将检测板放置于孵育箱",
-                            type:"text",
-                        },
-                        yq:{
-                            type:"yq",
-                            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",
-                        },
-                        time:{
-                            fillType: "preFill",
-                            type: "input",
-                        },
+    },
+    components: {
+        StepFormPackage
+    },
+    mounted() {
+        this.commonHandleJcbUpdate();
+    },
+    computed: {
+        formConfig() {
+            let config = [{
+                config: {
+                    text1: {
+                        label: "将检测板放置于孵育箱",
+                        type: "text",
+                    },
+                    yq: {
+                        type: "yq",
+                        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",
+                    },
+                    time: {
+                        fillType: "preFill",
+                        type: "input",
+                    },
+                    jcb: {
+                        type: "dcjcb",
+                        buttonName: "开始"
                     }
-                }]
-                return config
-            }
-        },
-    }
+                }
+            }]
+            return config
+        }
+    },
+}
 </script>
 
-<style lang="scss" scoped>
-
-</style>
\ No newline at end of file
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/jcb/js_jcb.vue b/src/components/Template/StepComponents/jcb/js_jcb.vue
index a9b57a5..5cf6524 100644
--- a/src/components/Template/StepComponents/jcb/js_jcb.vue
+++ b/src/components/Template/StepComponents/jcb/js_jcb.vue
@@ -1,6 +1,6 @@
 <!-- 结束 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_js_jcb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_js_jcb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="localFormData" />
 </template>
 
 <script>
@@ -18,14 +18,17 @@ export default {
     components: {
         StepFormPackage
     },
+    mounted() {
+        this.commonHandleJcbUpdate();
+    },
     computed: {
         formConfig() {
             let config =  [{
                 config: {
-                    text1: {
-                        label: "待处理。。。。",
-                        type: "text",
-                    },
+                    jcb:{
+                        type:"dcjcb",
+                        buttonName:"结束"
+                    }
                 }
             }]
             return config
diff --git a/src/components/Template/StepComponents/jcb/ycfyks.vue b/src/components/Template/StepComponents/jcb/ycfyks.vue
index 21fef78..2fdfa60 100644
--- a/src/components/Template/StepComponents/jcb/ycfyks.vue
+++ b/src/components/Template/StepComponents/jcb/ycfyks.vue
@@ -1,6 +1,6 @@
 <!-- 摇床孵育开始 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_ycfyks'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_ycfyks'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="localFormData" />
 </template>
 
 <script>
@@ -18,6 +18,9 @@ export default {
     components: {
         StepFormPackage
     },
+    mounted() {
+        this.commonHandleJcbUpdate();
+    },
     computed: {
         formConfig() {
             let config = [{
@@ -87,6 +90,10 @@ export default {
                         fillType: "preFill",
                         type: "input",
                     },
+                    jcb:{
+                        type:"dcjcb",
+                        buttonName:"开始"
+                    }
                 }
             }]
             return config
diff --git a/src/components/Template/StepComponents/jcb/ycks.vue b/src/components/Template/StepComponents/jcb/ycks.vue
index 698793d..06de3ec 100644
--- a/src/components/Template/StepComponents/jcb/ycks.vue
+++ b/src/components/Template/StepComponents/jcb/ycks.vue
@@ -1,6 +1,6 @@
 <!-- 摇床开始 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_ycks'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_ycks'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="localFormData" />
 </template>
 
 <script>
@@ -18,6 +18,9 @@ export default {
     components: {
         StepFormPackage
     },
+    mounted() {
+        this.commonHandleJcbUpdate();
+    },
     computed: {
         formConfig() {
             let config = [{
@@ -68,6 +71,10 @@ export default {
                         fillType: "preFill",
                         type: "input",
                     },
+                    jcb:{
+                        type:"dcjcb",
+                        buttonName:"开始"
+                    }
                 }
             }]
             return config
diff --git a/src/components/Template/StepFormPackage.vue b/src/components/Template/StepFormPackage.vue
index 2bc757f..1515bde 100644
--- a/src/components/Template/StepFormPackage.vue
+++ b/src/components/Template/StepFormPackage.vue
@@ -54,7 +54,7 @@
                         :stepIndex="stepIndex" :prefixKey="prefixKey+'_'+index" @update="(data)=>onSubPackageUpdate(data,key)" :subData = "formFields[key]" :ref="'zlSubPackageRef_'+key" />
                 </template>
                 <template v-else-if="sItem.type === 'qb' || (sItem.type === 'dcjcb' && templateFillType === 'actFill')">
-                    <JcbComp @update="(data)=>onJcbUpdate(data,key)"  :ref="'jcbComp_'+key" :stepIndex="stepIndex" :prefixKey="prefixKey+'_'+index" @resetRecord = "resetRecord" :item="sItem" :formData="formData[key]" />
+                    <JcbComp @update="(data)=>onJcbUpdate(data,key)" :type = "sItem.type" :ref="'jcbComp_'+key" :stepIndex="stepIndex" :prefixKey="prefixKey+'_'+index" @resetRecord = "resetRecord" :item="sItem" :formData="formData[key]" />
                 </template>
             
                 <div v-show="isShowOther(formFields[key])" class="flex flex1">
diff --git a/src/components/Template/mixins/stepMixins.js b/src/components/Template/mixins/stepMixins.js
index 153d787..7826209 100644
--- a/src/components/Template/mixins/stepMixins.js
+++ b/src/components/Template/mixins/stepMixins.js
@@ -58,8 +58,10 @@ export default {
 		//处理jcb更新
 		commonHandleJcbUpdate(){
 			this.localFormData = this.formData;
+			console.log(this.formData,"fff")
 			if(!this.formData.jcb){
 				const qbData = this.getQbData();
+				console.log(qbData,"qbData")
 				this.localFormData = {...this.localFormData, jcb: qbData};
 				justUpdateFilledFormData();
 			}