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

src/components/Template/HandleFormItem.vue

@@ -82,6 +82,7 @@
                 type="datetimerange"
                 range-separator="至"
                 :class="getFillTypeStyle() + (orangeBg ? ' orange-bg' : '')" 
+                :disabled="getDisabled()"
                 :picker-options="pickerOptions"
                 @change="(val) => onDateChange(val, 'yyyy/MM/DD HH:mm:ss')"
                 start-placeholder="开始日期"

src/components/Template/Step.vue

@@ -145,6 +145,9 @@ import jz_spyjzzb from './StepComponents/spyjzzb/jz_spyjzzb.vue';//色谱匀浆
 //全血稳定性-恒温平衡：使用溶液-恒温混匀
 import qxfz from './StepComponents/qxwdx/qxfz.vue';//全血稳定性-全血分装
 import qxjz from './StepComponents/qxwdx/qxjz.vue';//全血稳定性-全血静置
+import qxlx from './StepComponents/qxwdx/qxlx.vue';//全血稳定性-全血离心
+//全血稳定性-全血取样：使用全血稳定性-全血静置
+//全血稳定性-静置后离心：使用全血稳定性-全血离心
 
 import { public_templateStepList } from '@/api/business/public/public';
 
@@ -285,6 +288,7 @@ export default {
 		//全血稳定性
 		qxfz,
 		qxjz,
+		qxlx,
 	},
 	computed: {
 		stepComponentMap() {
@@ -392,6 +396,9 @@ export default {
 					'hwph':'Hwhy',
 					'qxfz':'qxfz',
 					'qxjz':'qxjz',
+					'qxlx':'qxlx',
+					'qxqy':'qxjz',
+					'jzhlx':'qxlx',
 					
 				}
 			}

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

@@ -24,7 +24,7 @@ export default {
             let config = [{
                 config: {
                     text1: {
-                        label: "将样品分装后的第",
+                        label: this.sn==='qxqy'?"将离心完成后的第":"将样品分装后的第",
                         type: "text",
                     },
                     sort: {
@@ -32,7 +32,7 @@ export default {
                         fillType: "preFill",
                     },
                     text2: {
-                        label: "份，立即放置于",
+                        label: this.sn==='qxqy'?"份，取上层血浆放置于":"份，立即放置于",
                         type: "text",
                     },
                     yjwd: {
@@ -66,26 +66,38 @@ export default {
                         compareTo: "yjhj",
                     },
                     text6: {
-                        label: "条件下静置，即稳定性",
+                        label: this.sn==='qxqy'?"条件下暂存，作为":"条件下静置，即稳定性",
                         type: "text",
                     },
-                    startDate: {
-                        type: "input",
-                        fillType: "actFill",
-                        disabled: true,
-                    },
-                    button1:{
-                        type:"button",
-                        buttonName:"开始",
-                    },
-                    text9: {
-                        type: "text",
-                        label: "。",
-                    },
-                    
-
                 }
             }]
+            if(this.sn==='qxjz'){
+                config[0].config.startDate = {
+                    type: "input",
+                    fillType: "actFill",
+                    disabled: true,
+                }
+                config[0].config.button1 = {
+                    type:"button",
+                    buttonName:"开始",
+                }
+                config[0].config.text9 = {
+                    type: "text",
+                    label: "。",
+                }
+            }
+            if(this.sn==='qxqy'){
+                config[0].config.ccwz = {
+                    type: "select",
+                    options: this.getDictOptions("business_ccwz"),
+                    fillType: "actFill",
+                    otherCode: "ccwzOther",
+                }
+                config[0].config.text9 = {
+                    type: "text",
+                    label: "样品。",
+                }
+            }
             return config
         }
     },

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

@@ -0,0 +1,145 @@
+<!-- 全血离心 -->
+<template>
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'qxwdx_qxlx'" @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: 'qxlx',
+		},
+	},
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            let config = [{
+                config: {
+                    text0: {
+                        label: "将样品分装后的第",
+                        type: "text",
+                    },
+                    count: {
+                        type: "inputNumber",
+                        fillType: "preFill",
+                    },
+                    text1: {
+                        label: this.sn==='qxlx'?"份，立即使用离心机":"份放置结束后立即使用离心机",
+                        type: "text",
+                    },
+                    yq: {
+                        type: "yq",
+                        fillType: "actFill",
+                    },
+                    text2: {
+                        label: "仪器，设置预计温度为",
+                        type: "text",
+                    },
+                    rm: {
+                        type: "inputNumber",
+                        fillType: "preFill",
+                    },
+                    text3: {
+                        label: "°C，实际设置温度为",
+                        type: "text",
+                    },
+                    rxry: {
+                        type: "inputNumber",
+                        fillType: "actFill",
+                        compareTo:"rm",
+                        copyFrom:"rm"
+                    },
+                  
+                    text4: {
+                        label: "°C，设置预计转速为",
+                        type: "text",
+                    },
+                    sjjrl: {
+                        type: "inputNumber",
+                        fillType: "preFill",
+                    },
+                    sjjrldw: {
+                        type: "select",
+                        options: this.getDictOptions("business_zsdw"),
+                        selectTo: "sjzsdw",
+                        fillType: "preFill",
+                    },
+
+                    text5: {
+                        label: "°C，实际设置转速为",
+                        type: "text",
+                    },
+                    jxry: {
+                        type: "inputNumber",
+                        fillType: "actFill",
+                        compareTo:"sjjrl",
+                        copyFrom:"sjjrl"
+                    },
+                    sjzsdw: {
+                        type: "select",
+                        options: this.getDictOptions("business_zsdw"),
+                        fillType: "preFill",
+                    },
+                  
+                    text6: {
+                        label: "，设置预计时长为",
+                        type: "text",
+                    },
+                    sjjrl1: {
+                        type: "inputNumber",
+                        fillType: "preFill",
+                    },
+                    yqsc: {
+                        type: "select",
+                        options: this.getDictOptions("business_yqscdw"),
+                        selectTo: "sjscdw",
+                        fillType: "preFill",
+                    },
+                    text7: {
+                        label: "，实际设置时长为",
+                        type: "text",
+                    },
+                    sjsc: {
+                        type: "inputNumber",
+                        fillType: "actFill",
+                        compareTo:"sjjrl1",
+                        copyFrom:"sjjrl1"
+                    },
+                    sjscdw: {
+                        type: "select",
+                        options: this.getDictOptions("business_yqscdw"),
+                        fillType: "preFill",
+                    },
+                    text8: {
+                        label: this.sn==='qxlx'?"，进行离心。离心":"，进行离心。离心（即稳定性结束时间）",
+                        type: "text",
+                    },
+                    startDate: {
+                        type: "input",
+                        fillType: "actFill",
+                        disabled: true,
+                    },
+                    button1: {
+                        type: "button",
+                        buttonName: "开始",
+                    },
+                    text9: {
+                        label: "。",
+                        type: "text",
+                    },
+                }
+            }]
+            return config
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -39,7 +39,7 @@ export default {
                         fillType: "preFill",
                     },
                     text3: {
-                        label: "°C，实际温度为",
+                        label: "°C，实际设置温度为",
                         type: "text",
                     },
                     rxry: {
@@ -65,7 +65,7 @@ export default {
                     },
 
                     text5: {
-                        label: "°C，实际转速为",
+                        label: "°C，实际设置转速为",
                         type: "text",
                     },
                     jxry: {
@@ -95,7 +95,7 @@ export default {
                         fillType: "preFill",
                     },
                     text7: {
-                        label: "，实际时长为",
+                        label: "，实际设置时长为",
                         type: "text",
                     },
                     sjsc: {