diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue index 2401b1a..c933ee5 100644 --- a/src/components/Template/Step.vue +++ b/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', diff --git a/src/components/Template/StepComponents/ry/dr.vue b/src/components/Template/StepComponents/ry/dr.vue new file mode 100644 index 0000000..96c6b49 --- /dev/null +++ b/src/components/Template/StepComponents/ry/dr.vue @@ -0,0 +1,91 @@ + + + + + + \ No newline at end of file diff --git a/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue b/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue index 4180bdf..86d2e80 100644 --- a/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue +++ b/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, diff --git a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue index b948996..6344135 100644 --- a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue +++ b/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,