From 13a3e9076db851cd84bdc62a34f617b1abe1d3df Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Mon, 13 Apr 2026 15:20:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20[=E9=80=89=E6=8B=A9=E5=99=A8]=20?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=85=B6=E4=BB=96=E4=B9=9F=E8=BF=94=E5=9B=9E?= =?UTF-8?q?1=E4=B8=AAbh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comps/template/dialog/SelectInstrumentDialog.vue | 9 +++++++-- .../comps/template/dialog/SelectMixReagentDialog.vue | 18 ++++++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) 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,