From 54a31ae12c6a767a9ebc64cbbf0d2500952fa122 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Wed, 1 Apr 2026 16:17:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E6=AD=A5=E9=AA=A4=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=20=E8=A7=A3=E5=86=BB=E6=94=B9=E6=88=90=E8=9E=8D=E8=A7=A3?=
 =?UTF-8?q?=EF=BC=8C=E7=A0=B4=E7=89=87=E7=A1=AE=E8=AE=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/Step.vue                   |   5 +-
 .../Template/StepComponents/swypfx/jd_swypfx.vue   | 101 +++++++++++++++++++++
 src/components/Template/StepComponents/xb/bpqr.vue |  32 ++++++-
 3 files changed, 135 insertions(+), 3 deletions(-)
 create mode 100644 src/components/Template/StepComponents/swypfx/jd_swypfx.vue

diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue
index 87effb0..3da52d8 100644
--- a/src/components/Template/Step.vue
+++ b/src/components/Template/Step.vue
@@ -106,7 +106,7 @@ import cl from './StepComponents/b/cl.vue';//表配制-称量
 
 
 //生物样品分析
-//生物样品分析-解冻：使用溶液-解冻
+import jd_swypfx from './StepComponents/swypfx/jd_swypfx.vue';//生物样品分析-解冻：生物样品分析-融解
 //生物样品分析-涡旋混匀：使用溶液-涡旋混匀
 //生物样品分析-选择容器：使用溶液-选择容器
 import jryp from './StepComponents/swypfx/jryp.vue';//生物样品分析-加入样品
@@ -441,6 +441,7 @@ export default {
 		cl,
 
 		//生物样品分析
+		jd_swypfx,
 		jryp,
 		hhspe,
 		zyfc,
@@ -657,7 +658,7 @@ export default {
 					'fr_b': 'Fr',
 
 					//生物样品分析
-					'jd_swypfx': 'Jd',
+					'jd_swypfx': 'jd_swypfx',
 					'jryp': 'jryp',
 					'ysfy': 'Lx',
 					'hhspe': 'hhspe',
diff --git a/src/components/Template/StepComponents/swypfx/jd_swypfx.vue b/src/components/Template/StepComponents/swypfx/jd_swypfx.vue
new file mode 100644
index 0000000..a363c58
--- /dev/null
+++ b/src/components/Template/StepComponents/swypfx/jd_swypfx.vue
@@ -0,0 +1,101 @@
+<!-- 解冻-改成了融解  -->
+<template>
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jd'" @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: 'jd_swypfx',
+        },
+    },
+
+    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",
+                    },
+                    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: "。",
+                    },
+                    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/xb/bpqr.vue b/src/components/Template/StepComponents/xb/bpqr.vue
index 4785a9e..2b80039 100644
--- a/src/components/Template/StepComponents/xb/bpqr.vue
+++ b/src/components/Template/StepComponents/xb/bpqr.vue
@@ -52,13 +52,43 @@ export default {
                         otherCode: "ccwzOther",
                     },
                     text3: {
-                        label: "冰冻时长为",
+                        label: "冰冻时长预计为",
                         type: "text",
                     },
                     sj: {
                         fillType: "actFill",
                         type: "input",
                     },
+                    text6:{
+                        type:"text",
+                        label:"冰冻",
+                    },
+                    startDate: {
+                        type: "input",
+                        fillType: "actFill",
+                        disabled: true,
+                    },
+                    button1:{
+                        type:"button",
+                        buttonName:"开始",
+                    },
+                    text7:{
+                        type:"text",
+                        label:"冰冻",
+                    },
+                    endDate: {
+                        type: "input",
+                        fillType: "actFill",
+                        disabled: true,
+                    },
+                    button2:{
+                        type:"button",
+                        buttonName:"结束",
+                    },
+                    text8: {
+                        type: "text",
+                        label: "。",
+                    }
                 }
             }]
             return config