From ec434b0b4fa56ce740863486496ca1cbc83a2856 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Tue, 10 Mar 2026 10:46:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E6=AD=A5=E9=AA=A4=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=20=E6=A0=B7=E5=93=81=E5=88=86=E5=8F=96=E6=AD=A5=E9=AA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/Step.vue                   |  15 +++
 .../Template/StepComponents/qxwdx/qxjz.vue         |  10 +-
 .../Template/StepComponents/ypfq/fq2.vue           | 120 +++++++++++++++++++++
 src/components/Template/StepComponents/ypfq/hh.vue |  67 ++++++++++++
 4 files changed, 211 insertions(+), 1 deletion(-)
 create mode 100644 src/components/Template/StepComponents/ypfq/fq2.vue
 create mode 100644 src/components/Template/StepComponents/ypfq/hh.vue

diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue
index 22e2934..756dc7f 100644
--- a/src/components/Template/Step.vue
+++ b/src/components/Template/Step.vue
@@ -149,6 +149,12 @@ import qxlx from './StepComponents/qxwdx/qxlx.vue';//全血稳定性-全血离
 //全血稳定性-全血取样：使用全血稳定性-全血静置
 //全血稳定性-静置后离心：使用全血稳定性-全血离心
 
+
+//样品分取
+import fq2 from './StepComponents/ypfq/fq2.vue';//样品分取-分取2
+//样品分取-分取3：使用样品分取-分取2
+import hh from './StepComponents/ypfq/hh.vue';//样品分取-混合
+
 import { public_templateStepList } from '@/api/business/public/public';
 
 
@@ -289,6 +295,10 @@ export default {
 		qxfz,
 		qxjz,
 		qxlx,
+
+		//样品分取
+		fq2,
+		hh,
 	},
 	computed: {
 		stepComponentMap() {
@@ -399,6 +409,11 @@ export default {
 					'qxlx':'qxlx',
 					'qxqy':'qxjz',
 					'jzhlx':'qxlx',
+
+					//样品分取
+					'fq2':'fq2',
+					'fq3':'fq2',
+					'hh':'hh',
 					
 				}
 			}
diff --git a/src/components/Template/StepComponents/qxwdx/qxjz.vue b/src/components/Template/StepComponents/qxwdx/qxjz.vue
index c80c673..85b3735 100644
--- a/src/components/Template/StepComponents/qxwdx/qxjz.vue
+++ b/src/components/Template/StepComponents/qxwdx/qxjz.vue
@@ -66,7 +66,7 @@ export default {
                         compareTo: "yjhj",
                     },
                     text6: {
-                        label: this.sn==='qxqy'?"条件下暂存，作为":"条件下静置，即稳定性",
+                        label: this.sn==='qxqy'?"条件下暂存至":"条件下静置，即稳定性",
                         type: "text",
                     },
                 }
@@ -93,6 +93,14 @@ export default {
                     fillType: "actFill",
                     otherCode: "ccwzOther",
                 }
+                config[0].config.text8 = {
+                    type: "text",
+                    label: "作为",
+                }
+                config[0].config.yp = {
+                    type: "input",
+                    fillType: "actFill",
+                }
                 config[0].config.text9 = {
                     type: "text",
                     label: "样品。",
diff --git a/src/components/Template/StepComponents/ypfq/fq2.vue b/src/components/Template/StepComponents/ypfq/fq2.vue
new file mode 100644
index 0000000..cf24a01
--- /dev/null
+++ b/src/components/Template/StepComponents/ypfq/fq2.vue
@@ -0,0 +1,120 @@
+<!-- 分取2 -->
+<template>
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ypfq_fq2'" @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: 'fq2',
+		},
+	},
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            let config = [{
+                config: {
+                    text1: {
+                        label: "使用移液器",
+                        type: "text",
+                    },
+                    yq: {
+                        type: "yq",
+                        fillType: "actFill",
+                    },
+                    text2: {
+                        label: "将",
+                        type: "text",
+                    },
+                    xqxj: {
+                        type: "input",
+                        fillType: "preFill",
+                    },
+                    text3: {
+                        label: this.sn==='fq2'?"分为2管，第1管预计放入":this.sn==='fq3'?"分为3管，第1管预计放入":'',
+                        type: "text",
+                    },
+                    yjfr: {
+                        type: "inputNumber",
+                        fillType: "preFill",
+                    },
+                    yjfrdw:{
+                        type:"select",
+                        options:this.getDictOptions("business_tjdw"),
+                        selectTo:"sjfrdw",
+                        fillType:"preFill",
+                    },
+                    text4: {
+                        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==='fq2'){
+                config[0].config.text5 =  {
+                    label: "，剩余放入第2管。",
+                    type: "text",
+                }
+            }
+            if(this.sn==='fq3'){
+                config[0].config.text5 =  {
+                    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.text6 =  {
+                    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.text7 =  {
+                    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/ypfq/hh.vue b/src/components/Template/StepComponents/ypfq/hh.vue
new file mode 100644
index 0000000..9273c07
--- /dev/null
+++ b/src/components/Template/StepComponents/ypfq/hh.vue
@@ -0,0 +1,67 @@
+<!-- 混合 -->
+<template>
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ypfq_hh'" @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: 'hh',
+		},
+	},
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            let config = [{
+                config: {
+                    text1: {
+                        label: "将同一动物的胎仔血预计各取",
+                        type: "text",
+                    },
+                    yjfr: {
+                        type: "inputNumber",
+                        fillType: "preFill",
+                    },
+                    yjfrdw:{
+                        type:"select",
+                        options:this.getDictOptions("business_tjdw"),
+                        selectTo:"sjfrdw",
+                        fillType:"preFill",
+                    },
+                    text4: {
+                        label: "，实际各取",
+                        type: "text",
+                    },
+                    sjfr: {
+                        type: "inputNumber",
+                        fillType: "actFill",
+                        compareTo:"yjfr",
+                        copyFrom:"yjfr"
+                    },
+                    sjfrdw:{
+                        type:"select",
+                        options:this.getDictOptions("business_tjdw"),
+                        fillType:"preFill",
+                    },
+                    text5: {
+                        label: "混匀。",
+                        type: "text",
+                    },
+                }
+            }]
+            
+            return config
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file