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

src/components/Template/Step.vue

@@ -75,6 +75,7 @@ import Mj from "./StepComponents/ry/mj.vue";//溶液-灭菌
 import Fs from "./StepComponents/ry/fs.vue";//溶液-复苏
 import Fb from "./StepComponents/ry/fb.vue";//溶液-封板
 import Zlfz from "./StepComponents/ry/zlfz.vue";//溶液-质量分装
+import dr from "./StepComponents/ry/dr.vue";//溶液-定容
 
 //罗开凡新增
 import kbyq from "./StepComponents/ry/kbyq.vue";//溶液-空白仪器
@@ -444,6 +445,7 @@ export default {
 		Fs,
 		Fb,
 		Zlfz,
+		dr,
 		//罗开凡新增
 		kbyq,
 		kbsjgsp,
@@ -644,6 +646,7 @@ export default {
 					'fs': 'Fs',
 					'fb': 'Fb',
 					'zlfz': 'Zlfz',
+					'dr': 'dr',
 
 					//罗开凡新增
 					'kbyq': 'kbyq',

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

@@ -0,0 +1,91 @@
+<!-- 定容 -->
+<template>
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_dr'" @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: 'dr',
+		},
+	},
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            return [{
+                config: {
+                    text1: {
+                        label: "使用",
+                        type: "text",
+                    },
+                    yqmc: {
+                        fillType: "preFill",
+                        type: "input",
+                    },
+                    yyq: {
+                        fillType: "actFill",
+                        type: "yq",
+                    },
+                    text3: {
+                        label: "，取",
+                        type: "text",
+                    },
+                    mry: {
+                        fillType: "preFill",
+                        type: "input",
+                    },
+                    sjry:{
+                        fillType: "actFill",
+                        type: "sj",
+                        ylCode: "sjtj",
+                        dwCode: "sjtjdw",
+                    },
+                    text4:{
+                        label: "，预计定容至",
+                        type: "text",
+                    },
+                    yjtj:{
+                        fillType: "preFill",
+                        type: "inputNumber",
+                    },
+                    yjtjdw:{
+                        fillType: "preFill",
+                        type: "select",
+                        selectTo: "sjtjdw",
+                        options:this.getDictOptions('business_tjdw'),  
+                    },
+                    text5:{
+                        label: "，实际定容至",
+                        type: "text",
+                    },
+                    sjtj:{
+                        fillType: "actFill",
+                        type: "inputNumber",
+                        compareTo:"yjtj",
+                        copyFrom:"yjtj"
+                    },
+                    sjtjdw:{
+                        fillType: "preFill",
+                        type: "select",
+                        options: this.getDictOptions('business_tjdw'),  
+                    },
+                    text6:{
+                        label: "。",
+                        type: "text",
+                    },
+                }
+            }]
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/business/comps/template/dialog/SelectInstrumentDialog.vue

@@ -130,11 +130,16 @@ export default {
             this.$emit('cancel');
         },
         onSubmit() {
-            let row = this.currentRow;
+            let row = this.otherChecked ? {bh: this.otherReagent}:this.currentRow;
             const selectedValue = this.otherChecked ? this.otherReagent : this.selectedId;
 
             this.$emit('submit', selectedValue,row);
-            const selectInfo = this.otherChecked ?{}: {
+            const selectInfo = this.otherChecked ?{
+                mc: "",
+                bh: row.bh,
+                xh: "",
+                jzrq: "",
+            }: {
                 mc: row.mc,
                 bh: row.bh,
                 xh: row.xh,

src/views/business/comps/template/dialog/SelectMixReagentDialog.vue

@@ -179,9 +179,23 @@ export default {
             this.$emit('cancel');
         },
         onSubmit() {
-            let row = this.currentRow;
+            let row = this.otherChecked ? {bh: this.otherReagent}:this.currentRow;
             const selectedValue = this.otherChecked ? this.otherReagent : this.selectedId;
-            const selectInfo = this.otherChecked ?{}:{
+            const selectInfo = this.otherChecked ?{
+                mc: "",
+                bh: row.bh,
+                nd: "",
+                ly: "",
+                nddw: "",
+                sxrq: "",
+                yxq: "",
+                ndz: "",
+                type: Number(this.selectType),
+                kc: "",
+                kcdw: "",
+                gg: "",
+                ggdw: "",
+            }:{
                 mc: row.mc,
                 bh: row.bh,
                 nd: row.nd,