From 8c3bb82fce3f033387fadad5b337dba6522662cd Mon Sep 17 00:00:00 2001 From: tangxuan <2233783319@qq.com> Date: Wed, 29 Mar 2023 16:03:11 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=AF=95=E5=89=82=E7=AE=A1=E7=90=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=B2=A1=E6=9C=89=E5=B1=95=E7=A4=BA=E6=95=88=E6=9C=9F?= =?UTF-8?q?=E5=88=97=202.=E8=AF=95=E5=89=82=E7=AE=A1=E7=90=86=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=E6=9C=89=E7=AE=A1=E7=90=86=E5=88=86=E7=B1=BB=EF=BC=8C?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=B6=E6=B2=A1=E6=9C=89=E8=BF=99=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=203.=E7=A7=B0=E9=87=8D=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=A9=BA=E7=93=B6=E6=97=B6=E4=BD=99=E9=87=8F=E8=A6=81=E5=8F=98?= =?UTF-8?q?=E4=B8=BA0=EF=BC=8C=E5=B9=B6=E4=B8=94=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=A9=BA=E7=93=B6=E6=97=B6=E4=B9=9F=E8=A6=81=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E7=94=A8=E9=87=8F=EF=BC=8C=E6=8F=90=E7=A4=BA=E7=9A=84=E7=94=A8?= =?UTF-8?q?=E9=87=8F=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E5=9C=A8=E4=BC=9A=E5=87=BA=E7=8E=B0=E5=BE=88?= =?UTF-8?q?=E9=95=BF=E4=B8=80=E4=B8=B2=E6=95=B0=E5=AD=97=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5=204.=E6=99=AE=E9=80=9A=E5=8D=B1=E5=8C=96=E5=93=81?= =?UTF-8?q?=E9=A2=86=E7=94=A8=E6=97=B6=E4=BC=9A=E5=BC=B9=E5=87=BA=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E7=94=A8=E9=87=8F=E4=BA=8B=E7=94=B1=E6=A1=86=EF=BC=8C?= =?UTF-8?q?=E8=BF=99=E4=B8=AA=E5=BC=B9=E5=87=BA=E6=9D=A1=E4=BB=B6=E8=A6=81?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=B8=80=E4=B8=8B=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E5=B0=B1=E6=98=AF?= =?UTF-8?q?=E8=BF=99=E7=93=B6=E8=AF=95=E5=89=82=E9=82=A3=E5=B0=B1=E4=B8=8D?= =?UTF-8?q?=E7=94=A8=E5=BC=B9=E4=BA=86=EF=BC=8C=E4=B8=8D=E7=84=B6=E7=A7=B0?= =?UTF-8?q?=E9=87=8D=E6=97=B6=E4=B9=9F=E5=9C=A8=E5=BC=B9=E4=BC=9A=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E6=97=A0=E6=B3=95=E7=A7=B0=E9=87=8D=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5=205.=E5=BA=93=E5=AD=98=E6=8A=A5=E8=A1=A8=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=E6=B6=88=E8=80=97=E6=95=B0=E9=87=8F=E4=B8=80=E7=9B=B4?= =?UTF-8?q?=E4=B8=BA0=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E4=BA=86=E5=A5=BD=E5=87=A0=E4=B8=AA=E6=8A=A5=E8=A1=A8=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=97=A0=E6=95=88=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ReagentForm/index.vue | 6 +++++ src/views/reagent/management/data/index.vue | 12 +++++++++ .../reagent/receivingandreturn/index.vue | 25 ++++++++++++++++--- src/views/reagent/report/record/index.vue | 4 +-- src/views/reagent/warehousing/index.vue | 5 ++++ 5 files changed, 47 insertions(+), 5 deletions(-) diff --git a/src/components/ReagentForm/index.vue b/src/components/ReagentForm/index.vue index b1f05a4..4dd13aa 100644 --- a/src/components/ReagentForm/index.vue +++ b/src/components/ReagentForm/index.vue @@ -95,6 +95,11 @@ + + + + + + + @@ -249,6 +260,7 @@ > + diff --git a/src/views/reagent/receivingandreturn/index.vue b/src/views/reagent/receivingandreturn/index.vue index 9d5ad87..dcc7070 100644 --- a/src/views/reagent/receivingandreturn/index.vue +++ b/src/views/reagent/receivingandreturn/index.vue @@ -217,6 +217,9 @@ export default { getCode(code) { var that =this if (that.is_wait){ + if (this.infoData.bar_code == code) { + return + } this.barCode = code if (this.$store.state.app.title=='危化品'){ this.is_wait =false @@ -231,7 +234,7 @@ export default { if(value){ // 领用先进先出判断 get_check_last_drug(stringify(this.infoData)).then(res_is_last => { - this.check_last_medicament(res_is_last).then((check_res) => { + this.check_last_medicament(res_is_last.data).then((check_res) => { // 继续领用当前试剂 if (check_res) { use(stringify({ 'bar_code': this.barCode,notes: value})).then(res => { @@ -360,6 +363,22 @@ export default { } set_drug_empty_bottle(stringify(data)).then(res => { this.$message.success(res.msg) + // 归还弹框提示用量 + if (this.$route.name === 'standardSendBack'){ + const h = this.$createElement; + var msg = "" + if (res.data.is_liquid){ + msg += `用量：${res.data.use_quality}, 液体 体积用量：${res.data.use_volum} ${res.data.net_weight_unit}` + } else { + msg += `当次用量：${res.data.use_quality} ${res.data.net_weight_unit}` + } + + this.$notify({ + title: '本次使用用量', + message: h('i', { style: 'color: teal'}, msg) + }); + } + }) } else { this.$message.warning('请选择试剂！') @@ -384,12 +403,12 @@ export default { this.getList() this.dialogVisible = false this.$message.success('归还成功！') - // 危化品归还弹框提示用量 + // 归还弹框提示用量 if (this.$route.name === 'standardSendBack'){ const h = this.$createElement; var msg = "" if (res.data.is_liquid){ - msg += `液体, 体积用量：${res.data.use_volum} ${res.data.net_weight_unit}` + msg += `用量：${res.data.use_quality}, 液体 体积用量：${res.data.use_volum} ${res.data.net_weight_unit}` } else { msg += `当次用量：${res.data.use_quality} ${res.data.net_weight_unit}` } diff --git a/src/views/reagent/report/record/index.vue b/src/views/reagent/report/record/index.vue index 3007d3c..416266d 100644 --- a/src/views/reagent/report/record/index.vue +++ b/src/views/reagent/report/record/index.vue @@ -68,8 +68,8 @@ - - + +