From 91f01ac6616bb25d3aaba08cb57b99820ac7b382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Fri, 7 Apr 2023 14:44:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PoundlistController.java | 16 +-- .../controller/SaleorderitemController.java | 14 ++- .../scm/basicInformation/arinvoices/Form.vue | 13 +-- .../scm/basicInformation/invoices/Form.vue | 10 +- .../poundlist/PurchaseOrderForm.vue | 12 +- .../scm/basicInformation/poundlist/index.vue | 2 +- .../basicInformation/poundlist/salesForm.vue | 14 +-- .../purchaseorder/InvoicesForm.vue | 11 +- .../basicInformation/purchaseorder/index.vue | 11 +- .../saleorder/arinvoicesForm.vue | 103 ++++++++---------- 10 files changed, 99 insertions(+), 107 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java index 863ae28f..da047834 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java @@ -192,27 +192,27 @@ public class PoundlistController { poundlistListVO.setPrice(poundlistListVO.getPurchasePrice()); poundlistListVO.setRate("0"); poundlistListVO.setPountType(poundlistListVO.getPoundType()); - poundlistListVO.setAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getPrice())).toPlainString()); - poundlistListVO.setNotAmount(new BigDecimal(poundlistListVO.getAmount()).multiply(new BigDecimal("0.87")).toPlainString()); + poundlistListVO.setAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getPrice())).setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString()); + poundlistListVO.setNotAmount(new BigDecimal(poundlistListVO.getAmount()).divide(new BigDecimal("1.13"),2,BigDecimal.ROUND_HALF_UP).toPlainString()); poundlistListVO.setSaleAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getSalesPrice())).toPlainString()); switch (poundlistListVO.getSaleRate()) { case "1": - poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.91")).toPlainString()); + poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).divide(new BigDecimal("1.09"),2,BigDecimal.ROUND_HALF_UP).toPlainString()); break; case "2": - poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.94")).toPlainString()); + poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).divide(new BigDecimal("1.06"),2,BigDecimal.ROUND_HALF_UP).toPlainString()); break; case "3": - poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.95")).toPlainString()); + poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).divide(new BigDecimal("1.05"),2,BigDecimal.ROUND_HALF_UP).toPlainString()); break; case "4": - poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.97")).toPlainString()); + poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).divide(new BigDecimal("1.03"),2,BigDecimal.ROUND_HALF_UP).toPlainString()); break; case "5": - poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("1")).toPlainString()); + poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).divide(new BigDecimal("1"),2,BigDecimal.ROUND_HALF_UP).toPlainString()); break; default: - poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.87")).toPlainString()); + poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).divide(new BigDecimal("1.13"),2,BigDecimal.ROUND_HALF_UP).toPlainString()); break; } poundlistListVO.setRateAmount(String.valueOf(Double.parseDouble(poundlistListVO.getAmount()) - Double.parseDouble(poundlistListVO.getNotAmount()))); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java index 28815cbf..e868d4cc 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java @@ -6,6 +6,9 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.hutool.extra.expression.engine.jfireel.JfireELEngine; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import io.swagger.annotations.Api; @@ -531,6 +534,9 @@ public class SaleorderitemController { if (entity.getPrice() != null && entity.getNotPrice()!=null) { entity.setRate(entity.getPrice().subtract(entity.getNotPrice())); } + if (StringUtils.isNotEmpty(saleorderitemCrForm.getIsTransfer()) && saleorderitemCrForm.getIsTransfer().equals("1")){ + entity.setSourcePoId(saleorderitemCrForm.getPurchaseOrderId()); + } saleorderitemService.save(entity); // List Salesorder_item0List = JsonUtil.getJsonToList(saleorderitemCrForm.getSalesorder_item0List(),Salesorder_item0Entity.class); for(Salesorder_item0Entity entitys : Salesorder_item0List){ @@ -545,10 +551,10 @@ public class SaleorderitemController { salesorder_item0Service.save(entitys); } if (StringUtils.isNotEmpty(saleorderitemCrForm.getIsTransfer()) && saleorderitemCrForm.getIsTransfer().equals("1")){ - String[] purchaseIdList = saleorderitemCrForm.getPurchaseOrderId().split(","); - for (String purchaseId : purchaseIdList) { - if (StringUtils.isNotEmpty(purchaseId)) { - PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(purchaseId); + JSONArray array = JSON.parseArray(saleorderitemCrForm.getPurchaseOrderId()); + for (Object purchaseId : array) { + if (StringUtils.isNotEmpty(purchaseId.toString())) { + PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getInfo(purchaseId.toString()); if (ObjectUtils.isNotEmpty(purchaseorderitemEntity)) { purchaseorderitemEntity.setIsTransfer("1"); purchaseorderitemService.updateById(purchaseorderitemEntity); diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue index 248abec3..cf74c6d6 100644 --- a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue +++ b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue @@ -402,12 +402,8 @@ if(this.dataForm.arinvoices_item0List[i].taxRate){ this.taxRateOptions.find((item) => { if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { - debugger - this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item0List[i].involceAmount,item.fullName),100) - // this.dataForm.arinvoices_item0List[i].taxAmount = this.dataForm.arinvoices_item0List[i].involceAmount*item.fullName/100 - debugger - // this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) - this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatDiv(this.dataForm.arinvoices_item0List[i].involceAmount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))) + this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatDiv(this.dataForm.arinvoices_item0List[i].involceAmount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))).toFixed(2) + this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount,this.dataForm.arinvoices_item0List[i].amountNotTax).toFixed(2) } }) } @@ -420,9 +416,8 @@ for (let i = 0;i { if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { - this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item0List[i].involceAmount,item.fullName),100) - // this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) - this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatDiv(this.dataForm.arinvoices_item0List[i].involceAmount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))) + this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatDiv(this.dataForm.arinvoices_item0List[i].involceAmount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))).toFixed(2) + this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount,this.dataForm.arinvoices_item0List[i].amountNotTax).toFixed(2) } }) } diff --git a/SC-web/src/views/scm/basicInformation/invoices/Form.vue b/SC-web/src/views/scm/basicInformation/invoices/Form.vue index e42ca4d6..3b2854af 100644 --- a/SC-web/src/views/scm/basicInformation/invoices/Form.vue +++ b/SC-web/src/views/scm/basicInformation/invoices/Form.vue @@ -616,8 +616,8 @@ if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ this.taxRateOptions.forEach((model1, i) => { if(e.taxRate == model1.id){ - model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model1.fullName,100))); - model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model1.fullName),100) + model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model1.fullName,100))).toFixed(2); + model.taxAmount = this.jnpf.floatSub(model.invoiceAmount,model.amountNotTax).toFixed(2) } }) } @@ -635,12 +635,10 @@ if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ this.taxRateOptions.forEach((model1, i) => { if(e.taxRate == model1.id){ - model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model1.fullName,100))); - model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model1.fullName),100) + model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model1.fullName,100))).toFixed(2); + model.taxAmount = this.jnpf.floatSub(model.invoiceAmount,model.amountNotTax).toFixed(2) } }) - // model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model.fullName,100))); - // model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model.fullName),100) } }) }, diff --git a/SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue index 3a52bd49..699d4c09 100644 --- a/SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue +++ b/SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue @@ -49,7 +49,7 @@ - + @@ -70,14 +70,14 @@ - + - + @@ -847,8 +847,8 @@ }); this.dataForm.purchaseorder_item0List.forEach((item, index)=>{ if(row.vehicleId == item.vehicleId){ - item.amount = this.jnpf.floatMul(item.settlement, item.price);//重量 - item.notAmount = this.jnpf.floatDiv(this.jnpf.floatMul(item.amount, this.jnpf.floatSub(100, rate)), 100);//不含税金额 + item.amount = this.jnpf.floatMul(item.settlement, item.price).toFixed(2);//重量 + item.notAmount = this.jnpf.floatDiv(item.amount, this.jnpf.floatAdd(1, this.jnpf.floatDiv(rate,100))).toFixed(2);//不含税金额 } if(item.advance == '1'){//垫资 advanceAmount = this.jnpf.floatAdd(advanceAmount, item.amount);//垫资金额 @@ -861,7 +861,7 @@ this.dataForm.num = settlement; this.dataForm.amount = amount; this.dataForm.notAmount = notAmount; - this.dataForm.rate = this.jnpf.floatSub(amount, notAmount); + this.dataForm.rate = this.jnpf.floatSub(amount, notAmount).toFixed(2); }, changeContract(a, b) { this.dataForm.supplierId = b.code; diff --git a/SC-web/src/views/scm/basicInformation/poundlist/index.vue b/SC-web/src/views/scm/basicInformation/poundlist/index.vue index cf1b3d20..0f0809fb 100644 --- a/SC-web/src/views/scm/basicInformation/poundlist/index.vue +++ b/SC-web/src/views/scm/basicInformation/poundlist/index.vue @@ -859,7 +859,7 @@ this.formVisible4 = false; if (isrRefresh) this.reset(); }, - refresh4(isrRefresh) { + refresh6(isrRefresh) { this.formVisible6 = false; if (isrRefresh) this.reset(); }, diff --git a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue index 0c8dcf7b..5f42c7c4 100644 --- a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue +++ b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue @@ -859,8 +859,8 @@ }) this.dataForm.salesorder_item0List.forEach((item, index) => { if (row.vehicleId == item.vehicleId) { - item.price = this.jnpf.floatMul(item.settlement, item.unitPrice)//子表金额 - item.noPrice = this.jnpf.floatDiv(this.jnpf.floatMul(item.price, (this.jnpf.floatSub(100, rate))), 100)//子表不含税金额 + item.price = this.jnpf.floatMul(item.settlement, item.unitPrice).toFixed(2)//子表金额 + item.noPrice = this.jnpf.floatDiv(item.price, this.jnpf.floatAdd(1, this.jnpf.floatDiv(rate, 100))).toFixed(2)//子表不含税金额 } if (item.advance == '1') {//垫资 advanceAmount = this.jnpf.floatAdd(advanceAmount, item.price)//垫资金额 @@ -901,8 +901,8 @@ for (let i = 0; i < this.dataForm.salesorder_item0List.length; i++) { this.rateOptions.find((item) => { if (this.dataForm.salesorder_item0List[i].rate == item.id) { - this.dataForm.salesorder_item0List[i].noPrice = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.salesorder_item0List[i].price, (this.jnpf.floatSub(100, item.fullName))), 100) - notPrice = this.jnpf.floatAdd(notPrice, this.dataForm.salesorder_item0List[i].noPrice) + this.dataForm.salesorder_item0List[i].noPrice = this.jnpf.floatDiv(this.dataForm.salesorder_item0List[i].price,this.jnpf.floatAdd(1, this.jnpf.floatDiv(item.fullName,100 ))) + notPrice = this.jnpf.floatAdd(notPrice, this.dataForm.salesorder_item0List[i].noPrice).toFixed(2) } }) this.dataForm.notPrice = notPrice @@ -1010,15 +1010,15 @@ for (let i = 0; i < list.length; i++) { // this.dataForm.salesorder_item0List[i].unitPrice = list[i].salesPrice; this.dataForm.salesorder_item0List[i].poundlistId = list[i].id - this.dataForm.salesorder_item0List[i].price = this.jnpf.floatMul(list[i].salesPrice, list[i].settlement) + this.dataForm.salesorder_item0List[i].price = this.jnpf.floatMul(list[i].salesPrice, list[i].settlement).toFixed(2) this.rateOptions.find((item) => { if (this.dataForm.salesorder_item0List[i].rate == item.id) { - this.dataForm.salesorder_item0List[i].noPrice = this.jnpf.floatDiv(this.dataForm.salesorder_item0List[i].price, this.jnpf.floatAdd((1, this.jnpf.floatDiv(item.fullName,100)))) + this.dataForm.salesorder_item0List[i].noPrice = this.jnpf.floatDiv(this.dataForm.salesorder_item0List[i].price, this.jnpf.floatAdd(1, this.jnpf.floatDiv(item.fullName,100))).toFixed(2) notPrice = this.jnpf.floatAdd(notPrice, this.dataForm.salesorder_item0List[i].noPrice) } }) if (list[i].advance == 1) { - advance = this.jnpf.floatAdd(advance, this.jnpf.floatMul(list[i].salesPrice, list[i].settlement)) + advance = this.jnpf.floatAdd(advance, this.jnpf.floatMul(list[i].salesPrice, list[i].settlement)).toFixed(2) } num = this.jnpf.floatAdd(num, list[i].settlement) amount = this.jnpf.floatAdd(amount, list[i].price) diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue index d3c39141..1d9dd93d 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue @@ -581,8 +581,8 @@ if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ this.taxRateOptions.forEach((model1, i) => { if(e.taxRate == model1.id){ - model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model1.fullName,100))); - model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model1.fullName),100) + model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model1.fullName,100))).toFixed(2); + model.taxAmount = this.jnpf.floatSub(model.invoiceAmount,model.amountNotTax).toFixed(2) } }) // model.amountNotTax = model.invoiceAmount * taxRateName / 100; @@ -604,8 +604,8 @@ if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ this.taxRateOptions.forEach((model1, i) => { if(e.taxRate == model1.id){ - model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model1.fullName,100))); - model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model1.fullName),100) + model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model1.fullName,100))).toFixed(2); + model.taxAmount = this.jnpf.floatSub(model.invoiceAmount,model.amountNotTax).toFixed(2) } }) // model.amountNotTax = model.invoiceAmount * taxRateName / 100; @@ -641,6 +641,7 @@ } }, init(purchaseorder) { + debugger this.dataForm.id = ''; this.visible = true this.dataForm.businessDate = new Date( ); @@ -657,7 +658,7 @@ item.unitPrice = item.price; item.taxRate = item.rate; item.amountNotTax = item.notAmount; - item.taxAmount = this.jnpf.floatSub(item.amount, item.notAmount); + item.taxAmount = this.jnpf.floatSub(item.amount, item.notAmount).toFixed(2); }); this.dataForm.invoicesitem1List = purchaseorder.purchaseorder_item0List; let param = { diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue index b081b08c..680b8dcc 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue @@ -602,7 +602,7 @@ var flag = true; this.multipleSelectionItem.forEach((item,index) => { if(item.isTransfer == '1'){ - flag = flase; + flag = false; } }) if(!flag){ @@ -626,21 +626,24 @@ if(ids.length > 0){ ids = ids.substring(0, ids.length - 1); } + debugger request({ url: `/api/poundlist/Poundlist/createsale/${ids}`, method: 'post' }).then(res => { - var purchaseIds = ''; + var purchaseOrderIds = []; this.multipleSelectionItem.forEach((item,index) => { - purchaseIds = purchaseIds + item.id + ','; + purchaseOrderIds.push(item.id); }) var list = [] for (let i = 0; i < res.data.length; i++) { let _data = res.data[i] list.push(_data) - list.purchaseOrderId = purchaseIds + list.purchaseOrderId = purchaseOrderIds + list.purchaseOrderId = JSON.stringify(list.purchaseOrderId) list.isTransfer = '1' } + debugger if (list.length>0) { this.formVisible6 = true this.$nextTick(() => { diff --git a/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue index 758c482c..19f7fb75 100644 --- a/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue +++ b/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue @@ -188,7 +188,7 @@ @@ -489,12 +489,10 @@ if(this.dataForm.arinvoices_item0List[i].taxRate){ this.taxRateOptions.find((item) => { if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { - debugger - this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item0List[i].involceAmount,item.fullName),100) // this.dataForm.arinvoices_item0List[i].taxAmount = this.dataForm.arinvoices_item0List[i].involceAmount*item.fullName/100 - debugger // this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) - this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatDiv(this.dataForm.arinvoices_item0List[i].involceAmount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))) + this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatDiv(this.dataForm.arinvoices_item0List[i].involceAmount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))).toFixed(2) + this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount,this.dataForm.arinvoices_item0List[i].amountNotTax).toFixed(2) } }) } @@ -506,18 +504,8 @@ for (let i = 0;i { if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { - this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item0List[i].involceAmount,item.fullName),100) - // this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount, this.dataForm.arinvoices_item0List[i].taxAmount) - this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatDiv(this.dataForm.arinvoices_item0List[i].involceAmount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))) - } - }) - } - }, - computeAmount(){ - for (let i = 0;i { - if (this.dataForm.arinvoices_item1List[i].taxRate == item.id) { - this.dataForm.arinvoices_item1List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item1List[i].amount,item.fullName),100) + this.dataForm.arinvoices_item0List[i].amountNotTax = this.jnpf.floatDiv(this.dataForm.arinvoices_item0List[i].involceAmount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))).toFixed(2) + this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount,this.dataForm.arinvoices_item0List[i].amountNotTax).toFixed(2) } }) } @@ -571,7 +559,7 @@ // this.dataForm.arinvoices_item1List[i].taxAmount = list[0].list[i].price*list[0].list[i].rate this.taxRateOptions.find((item) => { if (this.dataForm.arinvoices_item1List[i].taxRate == item.id) { - this.dataForm.arinvoices_item1List[i].taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item1List[i].amount,item.fullName),100) + this.dataForm.arinvoices_item1List[i].taxAmount = this.jnpf.floatSub(this.dataForm.arinvoices_item1List[i].this.dataForm.arinvoices_item1List[i].amountNotTax,).toFixed(2) } }) } @@ -607,45 +595,46 @@ request() { this.submitDisabled = true; var _data =this.dataList() - if (!this.dataForm.id) { - request({ - url: '/api/arinvoices/Arinvoices', - method: 'post', - data: _data - }).then((res) => { - this.$message({ - message: res.msg, - type: 'success', - duration: 1000, - onClose: () => { - this.submitDisabled = false; - this.visible = false - this.$emit('refresh', true) - } - }) - }).catch(() => { - this.submitDisabled = false - }) - }else{ - request({ - url: '/api/arinvoices/Arinvoices/'+this.dataForm.id, - method: 'PUT', - data: _data - }).then((res) => { - this.$message({ - message: res.msg, - type: 'success', - duration: 1000, - onClose: () => { - this.submitDisabled = false; - this.visible = false - this.$emit('refresh', true) - } - }) - }).catch(() => { - this.submitDisabled = false - }) - } + debugger + // if (!this.dataForm.id) { + // request({ + // url: '/api/arinvoices/Arinvoices', + // method: 'post', + // data: _data + // }).then((res) => { + // this.$message({ + // message: res.msg, + // type: 'success', + // duration: 1000, + // onClose: () => { + // this.submitDisabled = false; + // this.visible = false + // this.$emit('refresh', true) + // } + // }) + // }).catch(() => { + // this.submitDisabled = false + // }) + // }else{ + // request({ + // url: '/api/arinvoices/Arinvoices/'+this.dataForm.id, + // method: 'PUT', + // data: _data + // }).then((res) => { + // this.$message({ + // message: res.msg, + // type: 'success', + // duration: 1000, + // onClose: () => { + // this.submitDisabled = false; + // this.visible = false + // this.$emit('refresh', true) + // } + // }) + // }).catch(() => { + // this.submitDisabled = false + // }) + // } }, addarinvoices_item1List(){ let item = {