yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修改

Browse Source
product
杨世强 2 years ago
parent 188bca2a77
commit 91f01ac661
10 changed files with 99 additions and 107 deletions
Show Stats Download Patch File Download Diff File

16
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java
Unescape View File

@ -192,27 +192,27 @@ public class PoundlistController {
poundlistListVO.setPrice(poundlistListVO.getPurchasePrice()); poundlistListVO.setPrice(poundlistListVO.getPurchasePrice());
poundlistListVO.setRate("0"); poundlistListVO.setRate("0");
poundlistListVO.setPountType(poundlistListVO.getPoundType()); poundlistListVO.setPountType(poundlistListVO.getPoundType());
poundlistListVO.setAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getPrice())).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()).multiply(new BigDecimal("0.87")).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()); poundlistListVO.setSaleAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getSalesPrice())).toPlainString());
switch (poundlistListVO.getSaleRate()) { switch (poundlistListVO.getSaleRate()) {
case "1": 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; break;
case "2": 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; break;
case "3": 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; break;
case "4": 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; break;
case "5": 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; break;
default: 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; break;
} }
poundlistListVO.setRateAmount(String.valueOf(Double.parseDouble(poundlistListVO.getAmount()) - Double.parseDouble(poundlistListVO.getNotAmount()))); poundlistListVO.setRateAmount(String.valueOf(Double.parseDouble(poundlistListVO.getAmount()) - Double.parseDouble(poundlistListVO.getNotAmount())));

14
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
Unescape View File

@ -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.params.ExcelExportEntity;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import cn.hutool.extra.expression.engine.jfireel.JfireELEngine; 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.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@ -531,6 +534,9 @@ public class SaleorderitemController {
if (entity.getPrice() != null && entity.getNotPrice()!=null) { if (entity.getPrice() != null && entity.getNotPrice()!=null) {
entity.setRate(entity.getPrice().subtract(entity.getNotPrice())); entity.setRate(entity.getPrice().subtract(entity.getNotPrice()));
} }
if (StringUtils.isNotEmpty(saleorderitemCrForm.getIsTransfer()) && saleorderitemCrForm.getIsTransfer().equals("1")){
entity.setSourcePoId(saleorderitemCrForm.getPurchaseOrderId());
}
saleorderitemService.save(entity); saleorderitemService.save(entity);
// List<Salesorder_item0Entity> Salesorder_item0List = JsonUtil.getJsonToList(saleorderitemCrForm.getSalesorder_item0List(),Salesorder_item0Entity.class); // List<Salesorder_item0Entity> Salesorder_item0List = JsonUtil.getJsonToList(saleorderitemCrForm.getSalesorder_item0List(),Salesorder_item0Entity.class);
for(Salesorder_item0Entity entitys : Salesorder_item0List){ for(Salesorder_item0Entity entitys : Salesorder_item0List){
@ -545,10 +551,10 @@ public class SaleorderitemController {
salesorder_item0Service.save(entitys); salesorder_item0Service.save(entitys);
} }
if (StringUtils.isNotEmpty(saleorderitemCrForm.getIsTransfer()) && saleorderitemCrForm.getIsTransfer().equals("1")){ if (StringUtils.isNotEmpty(saleorderitemCrForm.getIsTransfer()) && saleorderitemCrForm.getIsTransfer().equals("1")){
String[] purchaseIdList = saleorderitemCrForm.getPurchaseOrderId().split(","); JSONArray array = JSON.parseArray(saleorderitemCrForm.getPurchaseOrderId());
for (String purchaseId : purchaseIdList) { for (Object purchaseId : array) {
if (StringUtils.isNotEmpty(purchaseId)) { if (StringUtils.isNotEmpty(purchaseId.toString())) {
PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(purchaseId); PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getInfo(purchaseId.toString());
if (ObjectUtils.isNotEmpty(purchaseorderitemEntity)) { if (ObjectUtils.isNotEmpty(purchaseorderitemEntity)) {
purchaseorderitemEntity.setIsTransfer("1"); purchaseorderitemEntity.setIsTransfer("1");
purchaseorderitemService.updateById(purchaseorderitemEntity); purchaseorderitemService.updateById(purchaseorderitemEntity);

13
SC-web/src/views/scm/basicInformation/arinvoices/Form.vue
Unescape View File

@ -402,12 +402,8 @@
if(this.dataForm.arinvoices_item0List[i].taxRate){ if(this.dataForm.arinvoices_item0List[i].taxRate){
this.taxRateOptions.find((item) => { this.taxRateOptions.find((item) => {
if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) {
debugger 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.floatDiv(this.jnpf.floatMul(this.dataForm.arinvoices_item0List[i].involceAmount,item.fullName),100) this.dataForm.arinvoices_item0List[i].taxAmount = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount,this.dataForm.arinvoices_item0List[i].amountNotTax).toFixed(2)
// 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)))
} }
}) })
} }
@ -420,9 +416,8 @@
for (let i = 0;i<this.dataForm.arinvoices_item0List.length;i++) { for (let i = 0;i<this.dataForm.arinvoices_item0List.length;i++) {
this.taxRateOptions.find((item) => { this.taxRateOptions.find((item) => {
if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { 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.floatDiv(this.dataForm.arinvoices_item0List[i].involceAmount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))).toFixed(2)
// 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].taxAmount = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount,this.dataForm.arinvoices_item0List[i].amountNotTax).toFixed(2)
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)))
} }
}) })
} }

10
SC-web/src/views/scm/basicInformation/invoices/Form.vue
Unescape View File

@ -616,8 +616,8 @@
if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){
this.taxRateOptions.forEach((model1, i) => { this.taxRateOptions.forEach((model1, i) => {
if(e.taxRate == model1.id){ if(e.taxRate == model1.id){
model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(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.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model1.fullName),100) model.taxAmount = this.jnpf.floatSub(model.invoiceAmount,model.amountNotTax).toFixed(2)
} }
}) })
} }
@ -635,12 +635,10 @@
if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){
this.taxRateOptions.forEach((model1, i) => { this.taxRateOptions.forEach((model1, i) => {
if(e.taxRate == model1.id){ if(e.taxRate == model1.id){
model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(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.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model1.fullName),100) 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)
} }
}) })
}, },

12
SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue
Unescape View File

@ -49,7 +49,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="垫资金额" prop="advanceAmount"> <el-form-item label="垫资金额" prop="advanceAmount">
<el-input-number v-model="dataForm.advanceAmount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' :disabled="true"> <el-input-number v-model="dataForm.advanceAmount" placeholder="数字文本" :step="1" :precision="2" :style='{"width":"100%"}' :disabled="true">
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
@ -70,14 +70,14 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="不含税金额" prop="notAmount"> <el-form-item label="不含税金额" prop="notAmount">
<el-input-number v-model="dataForm.notAmount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' :disabled="true"> <el-input-number v-model="dataForm.notAmount" placeholder="数字文本" :step="1" :precision="2" :style='{"width":"100%"}' :disabled="true">
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="税额" prop="rate"> <el-form-item label="税额" prop="rate">
<el-input-number v-model="dataForm.rate" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' :disabled="true"> <el-input-number v-model="dataForm.rate" placeholder="数字文本" :step="1" :precision="2" :style='{"width":"100%"}' :disabled="true">
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
@ -847,8 +847,8 @@
}); });
this.dataForm.purchaseorder_item0List.forEach((item, index)=>{ this.dataForm.purchaseorder_item0List.forEach((item, index)=>{
if(row.vehicleId == item.vehicleId){ if(row.vehicleId == item.vehicleId){
item.amount = this.jnpf.floatMul(item.settlement, item.price);//重量 item.amount = this.jnpf.floatMul(item.settlement, item.price).toFixed(2);//重量
item.notAmount = this.jnpf.floatDiv(this.jnpf.floatMul(item.amount, this.jnpf.floatSub(100, rate)), 100);//不含税金额 item.notAmount = this.jnpf.floatDiv(item.amount, this.jnpf.floatAdd(1, this.jnpf.floatDiv(rate,100))).toFixed(2);//不含税金额
} }
if(item.advance == '1'){//垫资 if(item.advance == '1'){//垫资
advanceAmount = this.jnpf.floatAdd(advanceAmount, item.amount);//垫资金额 advanceAmount = this.jnpf.floatAdd(advanceAmount, item.amount);//垫资金额
@ -861,7 +861,7 @@
this.dataForm.num = settlement; this.dataForm.num = settlement;
this.dataForm.amount = amount; this.dataForm.amount = amount;
this.dataForm.notAmount = notAmount; 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) { changeContract(a, b) {
this.dataForm.supplierId = b.code; this.dataForm.supplierId = b.code;

2
SC-web/src/views/scm/basicInformation/poundlist/index.vue
Unescape View File

@ -859,7 +859,7 @@
this.formVisible4 = false; this.formVisible4 = false;
if (isrRefresh) this.reset(); if (isrRefresh) this.reset();
}, },
refresh4(isrRefresh) { refresh6(isrRefresh) {
this.formVisible6 = false; this.formVisible6 = false;
if (isrRefresh) this.reset(); if (isrRefresh) this.reset();
}, },

14
SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
Unescape View File

@ -859,8 +859,8 @@
}) })
this.dataForm.salesorder_item0List.forEach((item, index) => { this.dataForm.salesorder_item0List.forEach((item, index) => {
if (row.vehicleId == item.vehicleId) { if (row.vehicleId == item.vehicleId) {
item.price = this.jnpf.floatMul(item.settlement, item.unitPrice)//子表金额 item.price = this.jnpf.floatMul(item.settlement, item.unitPrice).toFixed(2)//子表金额
item.noPrice = this.jnpf.floatDiv(this.jnpf.floatMul(item.price, (this.jnpf.floatSub(100, rate))), 100)//子表不含税金额 item.noPrice = this.jnpf.floatDiv(item.price, this.jnpf.floatAdd(1, this.jnpf.floatDiv(rate, 100))).toFixed(2)//子表不含税金额
} }
if (item.advance == '1') {//垫资 if (item.advance == '1') {//垫资
advanceAmount = this.jnpf.floatAdd(advanceAmount, item.price)//垫资金额 advanceAmount = this.jnpf.floatAdd(advanceAmount, item.price)//垫资金额
@ -901,8 +901,8 @@
for (let i = 0; i < this.dataForm.salesorder_item0List.length; i++) { for (let i = 0; i < this.dataForm.salesorder_item0List.length; i++) {
this.rateOptions.find((item) => { this.rateOptions.find((item) => {
if (this.dataForm.salesorder_item0List[i].rate == item.id) { 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) 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) notPrice = this.jnpf.floatAdd(notPrice, this.dataForm.salesorder_item0List[i].noPrice).toFixed(2)
} }
}) })
this.dataForm.notPrice = notPrice this.dataForm.notPrice = notPrice
@ -1010,15 +1010,15 @@
for (let i = 0; i < list.length; i++) { for (let i = 0; i < list.length; i++) {
// this.dataForm.salesorder_item0List[i].unitPrice = list[i].salesPrice; // this.dataForm.salesorder_item0List[i].unitPrice = list[i].salesPrice;
this.dataForm.salesorder_item0List[i].poundlistId = list[i].id 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) => { this.rateOptions.find((item) => {
if (this.dataForm.salesorder_item0List[i].rate == item.id) { 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) notPrice = this.jnpf.floatAdd(notPrice, this.dataForm.salesorder_item0List[i].noPrice)
} }
}) })
if (list[i].advance == 1) { 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) num = this.jnpf.floatAdd(num, list[i].settlement)
amount = this.jnpf.floatAdd(amount, list[i].price) amount = this.jnpf.floatAdd(amount, list[i].price)

11
SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue
Unescape View File

@ -581,8 +581,8 @@
if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){
this.taxRateOptions.forEach((model1, i) => { this.taxRateOptions.forEach((model1, i) => {
if(e.taxRate == model1.id){ if(e.taxRate == model1.id){
model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(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.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model1.fullName),100) model.taxAmount = this.jnpf.floatSub(model.invoiceAmount,model.amountNotTax).toFixed(2)
} }
}) })
// model.amountNotTax = model.invoiceAmount * taxRateName / 100; // model.amountNotTax = model.invoiceAmount * taxRateName / 100;
@ -604,8 +604,8 @@
if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){ if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){
this.taxRateOptions.forEach((model1, i) => { this.taxRateOptions.forEach((model1, i) => {
if(e.taxRate == model1.id){ if(e.taxRate == model1.id){
model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(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.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model1.fullName),100) model.taxAmount = this.jnpf.floatSub(model.invoiceAmount,model.amountNotTax).toFixed(2)
} }
}) })
// model.amountNotTax = model.invoiceAmount * taxRateName / 100; // model.amountNotTax = model.invoiceAmount * taxRateName / 100;
@ -641,6 +641,7 @@
} }
}, },
init(purchaseorder) { init(purchaseorder) {
debugger
this.dataForm.id = ''; this.dataForm.id = '';
this.visible = true this.visible = true
this.dataForm.businessDate = new Date( ); this.dataForm.businessDate = new Date( );
@ -657,7 +658,7 @@
item.unitPrice = item.price; item.unitPrice = item.price;
item.taxRate = item.rate; item.taxRate = item.rate;
item.amountNotTax = item.notAmount; 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; this.dataForm.invoicesitem1List = purchaseorder.purchaseorder_item0List;
let param = { let param = {

11
SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
Unescape View File

@ -602,7 +602,7 @@
var flag = true; var flag = true;
this.multipleSelectionItem.forEach((item,index) => { this.multipleSelectionItem.forEach((item,index) => {
if(item.isTransfer == '1'){ if(item.isTransfer == '1'){
flag = flase; flag = false;
} }
}) })
if(!flag){ if(!flag){
@ -626,21 +626,24 @@
if(ids.length > 0){ if(ids.length > 0){
ids = ids.substring(0, ids.length - 1); ids = ids.substring(0, ids.length - 1);
} }
debugger
request({ request({
url: `/api/poundlist/Poundlist/createsale/${ids}`, url: `/api/poundlist/Poundlist/createsale/${ids}`,
method: 'post' method: 'post'
}).then(res => { }).then(res => {
var purchaseIds = ''; var purchaseOrderIds = [];
this.multipleSelectionItem.forEach((item,index) => { this.multipleSelectionItem.forEach((item,index) => {
purchaseIds = purchaseIds + item.id + ','; purchaseOrderIds.push(item.id);
}) })
var list = [] var list = []
for (let i = 0; i < res.data.length; i++) { for (let i = 0; i < res.data.length; i++) {
let _data = res.data[i] let _data = res.data[i]
list.push(_data) list.push(_data)
list.purchaseOrderId = purchaseIds list.purchaseOrderId = purchaseOrderIds
list.purchaseOrderId = JSON.stringify(list.purchaseOrderId)
list.isTransfer = '1' list.isTransfer = '1'
} }
debugger
if (list.length>0) { if (list.length>0) {
this.formVisible6 = true this.formVisible6 = true
this.$nextTick(() => { this.$nextTick(() => {

103
SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
Unescape View File

@ -188,7 +188,7 @@
<el-table-column prop="taxRate" label="税率 " align="center"> <el-table-column prop="taxRate" label="税率 " align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.taxRate" <el-select v-model="scope.row.taxRate"
placeholder="请选择" clearable :style='{"width":"100%"}' disabled @change="computeAmount"> placeholder="请选择" clearable :style='{"width":"100%"}' disabled >
<el-option v-for="(item, index) in taxRateOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option> <el-option v-for="(item, index) in taxRateOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select> </el-select>
</template> </template>
@ -489,12 +489,10 @@
if(this.dataForm.arinvoices_item0List[i].taxRate){ if(this.dataForm.arinvoices_item0List[i].taxRate){
this.taxRateOptions.find((item) => { this.taxRateOptions.find((item) => {
if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { 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 // 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.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<this.dataForm.arinvoices_item0List.length;i++) { for (let i = 0;i<this.dataForm.arinvoices_item0List.length;i++) {
this.taxRateOptions.find((item) => { this.taxRateOptions.find((item) => {
if (this.dataForm.arinvoices_item0List[i].taxRate == item.id) { 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.floatDiv(this.dataForm.arinvoices_item0List[i].involceAmount, this.jnpf.floatAdd(1,this.jnpf.floatDiv(item.fullName,100))).toFixed(2)
// 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].taxAmount = this.jnpf.floatSub(this.dataForm.arinvoices_item0List[i].involceAmount,this.dataForm.arinvoices_item0List[i].amountNotTax).toFixed(2)
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<this.dataForm.arinvoices_item1List.length;i++) {
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)
} }
}) })
} }
@ -571,7 +559,7 @@
// this.dataForm.arinvoices_item1List[i].taxAmount = list[0].list[i].price*list[0].list[i].rate // this.dataForm.arinvoices_item1List[i].taxAmount = list[0].list[i].price*list[0].list[i].rate
this.taxRateOptions.find((item) => { this.taxRateOptions.find((item) => {
if (this.dataForm.arinvoices_item1List[i].taxRate == item.id) { 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() { request() {
this.submitDisabled = true; this.submitDisabled = true;
var _data =this.dataList() var _data =this.dataList()
if (!this.dataForm.id) { debugger
request({ // if (!this.dataForm.id) {
url: '/api/arinvoices/Arinvoices', // request({
method: 'post', // url: '/api/arinvoices/Arinvoices',
data: _data // method: 'post',
}).then((res) => { // data: _data
this.$message({ // }).then((res) => {
message: res.msg, // this.$message({
type: 'success', // message: res.msg,
duration: 1000, // type: 'success',
onClose: () => { // duration: 1000,
this.submitDisabled = false; // onClose: () => {
this.visible = false // this.submitDisabled = false;
this.$emit('refresh', true) // this.visible = false
} // this.$emit('refresh', true)
}) // }
}).catch(() => { // })
this.submitDisabled = false // }).catch(() => {
}) // this.submitDisabled = false
}else{ // })
request({ // }else{
url: '/api/arinvoices/Arinvoices/'+this.dataForm.id, // request({
method: 'PUT', // url: '/api/arinvoices/Arinvoices/'+this.dataForm.id,
data: _data // method: 'PUT',
}).then((res) => { // data: _data
this.$message({ // }).then((res) => {
message: res.msg, // this.$message({
type: 'success', // message: res.msg,
duration: 1000, // type: 'success',
onClose: () => { // duration: 1000,
this.submitDisabled = false; // onClose: () => {
this.visible = false // this.submitDisabled = false;
this.$emit('refresh', true) // this.visible = false
} // this.$emit('refresh', true)
}) // }
}).catch(() => { // })
this.submitDisabled = false // }).catch(() => {
}) // this.submitDisabled = false
} // })
// }
}, },
addarinvoices_item1List(){ addarinvoices_item1List(){
let item = { let item = {

Write Preview
Loading…
Cancel
Save