Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/components/Template/Step.vue

@@ -140,6 +140,12 @@ import fy_spyjzzb from './StepComponents/spyjzzb/fy_spyjzzb.vue';//色谱匀浆
 import jz_spyjzzb from './StepComponents/spyjzzb/jz_spyjzzb.vue';//色谱匀浆组织表-静置
 
 
+//全血稳定性
+//全血稳定性-颠倒混匀：使用溶液-颠倒混匀
+//全血稳定性-恒温平衡：使用溶液-恒温混匀
+import qxfz from './StepComponents/qxwdx/qxfz.vue';//全血稳定性-全血分装
+import qxjz from './StepComponents/qxwdx/qxjz.vue';//全血稳定性-全血静置
+
 import { public_templateStepList } from '@/api/business/public/public';
 
 
@@ -275,6 +281,10 @@ export default {
 		yjbc,
 		fy_spyjzzb,
 		jz_spyjzzb,
+
+		//全血稳定性
+		qxfz,
+		qxjz,
 	},
 	computed: {
 		stepComponentMap() {
@@ -375,6 +385,13 @@ export default {
 					'yjyhh':'jszz',
 					'fy_spyjzzb':'fy_spyjzzb',
 					'jz_spyjzzb':'jz_spyjzzb',
+
+
+					//全血稳定性
+					'ddhy_qxwdx': 'Ddhy',
+					'hwph':'Hwhy',
+					'qxfz':'qxfz',
+					'qxjz':'qxjz',
 					
 				}
 			}

src/components/Template/StepComponents/qxwdx/qxfz.vue

@@ -0,0 +1,75 @@
+<!-- 匀浆液分装2 -->
+<template>
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'qxwdx_qxfz'" @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: 'qxfz',
+		},
+	},
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            let config = [{
+                config: {
+                    text1: {
+                        label: "将平衡完成后的样品进行分装，分装",
+                        type: "text",
+                    },
+                    count: {
+                        type: "inputNumber",
+                        fillType: "preFill",
+                    },
+                    text2: {
+                        label: "份，每份预计分装",
+                        type: "text",
+                    },
+                    yjfz: {
+                        type: "inputNumber",
+                        fillType: "preFill",
+                    },
+                    yjfzdw:{
+                        type:"select",
+                        options:this.getDictOptions("business_tjdw"),
+                        selectTo:"sjfzdw",
+                        fillType:"preFill",
+                    },
+                    text3: {
+                        label: "，实际分装",
+                        type: "text",
+                    },
+                    sjfz: {
+                        type: "inputNumber",
+                        fillType: "actFill",
+                        compareTo:"yjfz",
+                        copyFrom:"yjfz"
+                    },
+                    sjfzdw:{
+                        type:"select",
+                        options:this.getDictOptions("business_tjdw"),
+                        fillType:"preFill",
+                    },
+                    text4: {
+                        label: "。",
+                        type: "text",
+                    },
+                }
+            }]
+            
+            return config
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>

src/components/Template/StepComponents/qxwdx/qxjz.vue

@@ -0,0 +1,95 @@
+<!-- 全血静置  -->
+<template>
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'qxwdx_qxjz'" @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: 'qxjz',
+        },
+    },
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            let config = [{
+                config: {
+                    text1: {
+                        label: "将样品分装后的第",
+                        type: "text",
+                    },
+                    sort: {
+                        type: "inputNumber",
+                        fillType: "preFill",
+                    },
+                    text2: {
+                        label: "份，立即放置于",
+                        type: "text",
+                    },
+                    yjwd: {
+                        type: "select",
+                        options: this.getDictOptions("business_wddw"),
+                        fillType: "preFill",
+                        otherCode: "yjwdOther",
+                    },
+                    yjhj: {
+                        type: "select",
+                        options: this.getDictOptions("business_hjxx"),
+                        fillType: "preFill",
+                        otherCode: "yjhjOther",
+                    },
+                    text5: {
+                        label: "，实际放置于",
+                        type: "text",
+                    },
+                    sjwd: {
+                        type: "select",
+                        options: this.getDictOptions("business_wddw"),
+                        fillType: "actFill",
+                        otherCode: "sjwdOther",
+                        compareTo: "yjwd",
+                    },
+                    sjhj: {
+                        type: "select",
+                        options: this.getDictOptions("business_hjxx"),
+                        fillType: "actFill",
+                        otherCode: "sjhjOther",
+                        compareTo: "yjhj",
+                    },
+                    text6: {
+                        label: "条件下静置，即稳定性",
+                        type: "text",
+                    },
+                    startDate: {
+                        type: "input",
+                        fillType: "actFill",
+                        disabled: true,
+                    },
+                    button1:{
+                        type:"button",
+                        buttonName:"开始",
+                    },
+                    text9: {
+                        type: "text",
+                        label: "。",
+                    },
+                    
+
+                }
+            }]
+            return config
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>

src/components/Template/StepComponents/ry/ddhy.vue

@@ -23,7 +23,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                 let config = [{
                     config:{
                         text1:{
-                            label:"将溶液进行上下颠倒，预计颠倒",
+                            label:this.sn==='ddhy_qxwdx'?"将全血样品进行轻轻上下颠倒，预计颠倒":"将溶液进行上下颠倒，预计颠倒",
                             type:"text",
                         },
                         ddcs1:{

src/components/Template/StepComponents/ry/hwhy.vue

@@ -40,7 +40,7 @@ export default {
                         fillType: "preFill",
                     },
                     text3: {
-                        label: "°C，实际温度为",
+                        label: "°C，设置实际温度为",
                         type: "text",
                     },
                     sjwd: {
@@ -64,7 +64,7 @@ export default {
                         fillType: "preFill",
                     },
                     text8: {
-                        label: "实际转速为",
+                        label: "实际设置转速为",
                         type: "text",
                     },
                     sjzs: {
@@ -93,7 +93,7 @@ export default {
                         fillType: "preFill",
                     },
                     text5: {
-                        label: "，实际时长为",
+                        label: "，实际设置时长为",
                         type: "text",
                     },
                     sjsc: {
@@ -108,7 +108,7 @@ export default {
                         fillType: "preFill",
                     },
                     text6: {
-                        label: "，进行恒温混匀，混匀",
+                        label: this.sn==='hwph'?"，进行恒温平衡，平衡": "，进行恒温混匀，混匀",
                         type: "text",
                     },
                     startDate: {