From 0a07c88b19cae8ef719b7b8908b1b89639416974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Mon, 13 Feb 2023 22:48:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8D=95=E6=8D=AE=E5=85=B3?= =?UTF-8?q?=E8=81=94=E8=B7=B3=E8=BD=AC=E7=9A=84=E6=97=B6=E5=80=99=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97=E7=B2=BE=E5=BA=A6?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-web/src/views/bill/dialog/LinkBillList.vue | 6 +++--- jshERP-web/src/views/bill/modules/PurchaseBackModal.vue | 4 ++-- jshERP-web/src/views/bill/modules/PurchaseInModal.vue | 4 ++-- jshERP-web/src/views/bill/modules/RetailBackModal.vue | 2 +- jshERP-web/src/views/bill/modules/SaleBackModal.vue | 4 ++-- jshERP-web/src/views/bill/modules/SaleOutModal.vue | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jshERP-web/src/views/bill/dialog/LinkBillList.vue b/jshERP-web/src/views/bill/dialog/LinkBillList.vue index 3f40f317..4cef26c4 100644 --- a/jshERP-web/src/views/bill/dialog/LinkBillList.vue +++ b/jshERP-web/src/views/bill/dialog/LinkBillList.vue @@ -127,7 +127,7 @@ selectType: 'list', linkNumber: '', organId: '', - discount: '', + discountMoney: '', deposit: '', remark: '', queryParam: { @@ -261,7 +261,7 @@ let record = this.selectBillRows[0] this.linkNumber = record.number this.organId = record.organId - this.discount = record.discount + this.discountMoney = record.discountMoney this.deposit = record.changeAmount - record.finishDeposit this.remark = record.remark this.loadDetailData(1) @@ -269,7 +269,7 @@ } else { if(this.selectedDetailRowKeys.length) { this.getSelectBillDetailRows() - this.$emit('ok', this.selectBillDetailRows, this.linkNumber, this.organId, this.discount, this.deposit, this.remark) + this.$emit('ok', this.selectBillDetailRows, this.linkNumber, this.organId, this.discountMoney, 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 ce382bc8..188b8547 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -379,7 +379,7 @@ this.$refs.linkBillList.show('入库', '采购', '供应商', "1") this.$refs.linkBillList.title = "选择采购入库" }, - linkBillListOk(selectBillDetailRows, linkNumber, organId, discount, deposit, remark) { + linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark) { this.rowCanEdit = false this.backStatus = false this.materialTable.columns[1].type = FormTypes.normal @@ -405,7 +405,7 @@ this.materialTable.dataSource = listEx ///给优惠后金额重新赋值 allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0 - let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0 + let discount = (discountMoney/allTaxLastMoney*100).toFixed(2)-0 let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0 this.$nextTick(() => { this.form.setFieldsValue({ diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index 35b570c5..6a446d19 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -424,7 +424,7 @@ this.$refs.linkBillList.show('其它', '采购订单', '供应商', "1,3") this.$refs.linkBillList.title = "选择采购订单" }, - linkBillListOk(selectBillDetailRows, linkNumber, organId, discount, deposit, remark) { + linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark) { this.rowCanEdit = false this.materialTable.columns[1].type = FormTypes.normal this.changeFormTypes(this.materialTable.columns, 'preNumber', 1) @@ -449,7 +449,7 @@ this.materialTable.dataSource = listEx ///给优惠后金额重新赋值 allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0 - let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0 + let discount = (discountMoney/allTaxLastMoney*100).toFixed(2)-0 let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0 let changeAmount = discountLastMoney if(deposit) { diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue index 85924c09..c1227035 100644 --- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue @@ -375,7 +375,7 @@ this.$refs.linkBillList.show('出库', '零售', '会员', "1") this.$refs.linkBillList.title = "选择零售出库" }, - linkBillListOk(selectBillDetailRows, linkNumber, organId, discount, deposit, remark) { + linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark) { this.rowCanEdit = false this.materialTable.columns[1].type = FormTypes.normal this.changeFormTypes(this.materialTable.columns, 'preNumber', 1) diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index a08f9c95..87ac9419 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -390,7 +390,7 @@ this.$refs.linkBillList.show('出库', '销售', '客户', "1") this.$refs.linkBillList.title = "选择销售出库" }, - linkBillListOk(selectBillDetailRows, linkNumber, organId, discount, deposit, remark) { + linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark) { this.rowCanEdit = false this.backStatus = false this.materialTable.columns[1].type = FormTypes.normal @@ -416,7 +416,7 @@ this.materialTable.dataSource = listEx ///给优惠后金额重新赋值 allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0 - let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0 + let discount = (discountMoney/allTaxLastMoney*100).toFixed(2)-0 let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0 this.$nextTick(() => { this.form.setFieldsValue({ diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index dcebfb18..0dd5b840 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -442,7 +442,7 @@ this.$refs.linkBillList.show('其它', '销售订单', '客户', "1,3") this.$refs.linkBillList.title = "选择销售订单" }, - linkBillListOk(selectBillDetailRows, linkNumber, organId, discount, deposit, remark) { + linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark) { this.rowCanEdit = false this.materialTable.columns[1].type = FormTypes.normal this.changeFormTypes(this.materialTable.columns, 'preNumber', 1) @@ -467,7 +467,7 @@ this.materialTable.dataSource = listEx ///给优惠后金额重新赋值 allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0 - let discountMoney = (discount*allTaxLastMoney/100).toFixed(2)-0 + let discount = (discountMoney/allTaxLastMoney*100).toFixed(2)-0 let discountLastMoney = (allTaxLastMoney - discountMoney).toFixed(2)-0 let changeAmount = discountLastMoney if(deposit) {