From 1764ee66f3111319c70370628aa788e6e1e73900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Wed, 16 Nov 2022 22:45:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8D=95=E6=8D=AE=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E7=9A=84=E6=97=B6=E5=80=99=E7=9A=84=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E4=BE=9B=E5=BA=94=E5=95=86=E5=92=8C=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecgbiz/modal/JSelectMaterialModal.vue | 8 ++-- .../src/views/bill/dialog/LinkBillList.vue | 10 +++-- .../views/bill/modules/PurchaseBackModal.vue | 27 +++++++------ .../views/bill/modules/PurchaseInModal.vue | 39 +++++++++---------- .../views/bill/modules/PurchaseOrderModal.vue | 15 ++++--- .../views/bill/modules/RetailBackModal.vue | 23 ++++++----- .../src/views/bill/modules/SaleBackModal.vue | 27 +++++++------ .../src/views/bill/modules/SaleOutModal.vue | 39 +++++++++---------- 8 files changed, 94 insertions(+), 94 deletions(-) diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue index 5e728c85..05add16a 100644 --- a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue +++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue @@ -40,9 +40,11 @@ - - - + 查询 + 重置 + + 新增 + {{ toggleSearchStatus ? '收起' : '展开' }} diff --git a/jshERP-web/src/views/bill/dialog/LinkBillList.vue b/jshERP-web/src/views/bill/dialog/LinkBillList.vue index 4df17294..727ca55f 100644 --- a/jshERP-web/src/views/bill/dialog/LinkBillList.vue +++ b/jshERP-web/src/views/bill/dialog/LinkBillList.vue @@ -259,9 +259,13 @@ this.loadDetailData(1) } } else { - this.getSelectBillDetailRows(); - this.$emit('ok', this.selectBillDetailRows, this.linkNumber, this.organId, this.discount, this.deposit, this.remark) - this.close(); + if(this.selectedDetailRowKeys.length) { + this.getSelectBillDetailRows() + this.$emit('ok', this.selectBillDetailRows, this.linkNumber, this.organId, this.discount, this.deposit, this.remark) + this.close() + } else { + this.$message.warning('抱歉，请选择单据明细！') + } } }, //查询明细列表 diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index 373c3478..57b3a603 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -393,21 +393,20 @@ } this.materialTable.dataSource = listEx ///给优惠后金额重新赋值 - if(allTaxLastMoney) { - let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0 - let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0 - this.$nextTick(() => { - this.form.setFieldsValue({ - 'organId': organId, - 'linkNumber': linkNumber, - 'discount': discount, - 'discountMoney': discountMoney, - 'discountLastMoney': discountLastMoney, - 'changeAmount': discountLastMoney, - 'remark': remark - }) + allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0 + let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0 + let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0 + this.$nextTick(() => { + this.form.setFieldsValue({ + 'organId': organId, + 'linkNumber': linkNumber, + 'discount': discount, + 'discountMoney': discountMoney, + 'discountLastMoney': discountLastMoney, + 'changeAmount': discountLastMoney, + 'remark': remark }) - } + }) } }, } diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index 4aa7060e..25f90c46 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -450,27 +450,26 @@ } this.materialTable.dataSource = listEx ///给优惠后金额重新赋值 - if(allTaxLastMoney) { - let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0 - let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0 - let changeAmount = discountLastMoney - if(deposit) { - this.depositStatus = true - changeAmount = (discountLastMoney - deposit).toFixed(2)-0 - } - this.$nextTick(() => { - this.form.setFieldsValue({ - 'organId': organId, - 'linkNumber': linkNumber, - 'discount': discount, - 'discountMoney': discountMoney, - 'discountLastMoney': discountLastMoney, - 'deposit': deposit, - 'changeAmount': changeAmount, - 'remark': remark - }) - }) + allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0 + let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0 + let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0 + let changeAmount = discountLastMoney + if(deposit) { + this.depositStatus = true + changeAmount = (discountLastMoney - deposit).toFixed(2)-0 } + this.$nextTick(() => { + this.form.setFieldsValue({ + 'organId': organId, + 'linkNumber': linkNumber, + 'discount': discount, + 'discountMoney': discountMoney, + 'discountLastMoney': discountLastMoney, + 'deposit': deposit, + 'changeAmount': changeAmount, + 'remark': remark + }) + }) } }, } diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue index 0d5c8673..1701cd82 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue @@ -398,14 +398,13 @@ }) }) //给优惠后金额重新赋值 - if(discountLastMoney) { - this.$nextTick(() => { - this.form.setFieldsValue({ - 'discountLastMoney': discountLastMoney.toFixed(2), - 'changeAmount': discountLastMoney - }) - }); - } + discountLastMoney = discountLastMoney?discountLastMoney:0 + this.$nextTick(() => { + this.form.setFieldsValue({ + 'discountLastMoney': discountLastMoney.toFixed(2), + 'changeAmount': discountLastMoney + }) + }) this.materialTable.dataSource = selectBillDetailRows } }, diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue index 9b4ab411..d4ce044e 100644 --- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue @@ -394,19 +394,18 @@ } this.materialTable.dataSource = listEx ///给优惠后金额重新赋值 - if(allTaxLastMoney) { - let discountLastMoney = (allTaxLastMoney).toFixed(2)-0 - this.$nextTick(() => { - this.form.setFieldsValue({ - 'organId': organId, - 'linkNumber': linkNumber, - 'getAmount': discountLastMoney, - 'changeAmount': discountLastMoney, - 'backAmount': 0, - 'remark': remark - }) + allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0 + let discountLastMoney = (allTaxLastMoney).toFixed(2)-0 + this.$nextTick(() => { + this.form.setFieldsValue({ + 'organId': organId, + 'linkNumber': linkNumber, + 'getAmount': discountLastMoney, + 'changeAmount': discountLastMoney, + 'backAmount': 0, + 'remark': remark }) - } + }) } }, } diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index e3ca1ed6..54724878 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -404,21 +404,20 @@ } this.materialTable.dataSource = listEx ///给优惠后金额重新赋值 - if(allTaxLastMoney) { - let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0 - let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0 - this.$nextTick(() => { - this.form.setFieldsValue({ - 'organId': organId, - 'linkNumber': linkNumber, - 'discount': discount, - 'discountMoney': discountMoney, - 'discountLastMoney': discountLastMoney, - 'changeAmount': discountLastMoney, - 'remark': remark - }) + allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0 + let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0 + let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0 + this.$nextTick(() => { + this.form.setFieldsValue({ + 'organId': organId, + 'linkNumber': linkNumber, + 'discount': discount, + 'discountMoney': discountMoney, + 'discountLastMoney': discountLastMoney, + 'changeAmount': discountLastMoney, + 'remark': remark }) - } + }) } }, } diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index 8c221b51..e3e198f0 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -468,27 +468,26 @@ } this.materialTable.dataSource = listEx ///给优惠后金额重新赋值 - if(allTaxLastMoney) { - let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0 - let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0 - let changeAmount = discountLastMoney - if(deposit) { - this.depositStatus = true - changeAmount = (discountLastMoney - deposit).toFixed(2)-0 - } - this.$nextTick(() => { - this.form.setFieldsValue({ - 'organId': organId, - 'linkNumber': linkNumber, - 'discount': discount, - 'discountMoney': discountMoney, - 'discountLastMoney': discountLastMoney, - 'deposit': deposit, - 'changeAmount': changeAmount, - 'remark': remark - }) - }) + allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0 + let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0 + let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0 + let changeAmount = discountLastMoney + if(deposit) { + this.depositStatus = true + changeAmount = (discountLastMoney - deposit).toFixed(2)-0 } + this.$nextTick(() => { + this.form.setFieldsValue({ + 'organId': organId, + 'linkNumber': linkNumber, + 'discount': discount, + 'discountMoney': discountMoney, + 'discountLastMoney': discountLastMoney, + 'deposit': deposit, + 'changeAmount': changeAmount, + 'remark': remark + }) + }) } }, }