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

磅单列表修复

Browse Source
product
17602169347 2 years ago
parent e432c65c9c
commit 0aee283360
10 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File

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

@ -45,6 +45,8 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import jnpf.util.GeneraterSwapUtil; import jnpf.util.GeneraterSwapUtil;
import java.math.BigDecimal;
import java.util.*; import java.util.*;
import jnpf.util.file.UploadUtil; import jnpf.util.file.UploadUtil;
@ -166,30 +168,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(String.valueOf(Double.parseDouble(poundlistListVO.getSettlement()) * Double.parseDouble(poundlistListVO.getPrice()))); poundlistListVO.setAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getPrice())).toString());
poundlistListVO.setNotAmount(String.valueOf(Double.parseDouble(poundlistListVO.getAmount()) * 0.87)); poundlistListVO.setNotAmount(new BigDecimal(poundlistListVO.getAmount()).multiply(new BigDecimal("0.87")).toString());
poundlistListVO.setSaleAmount(String.valueOf(Double.parseDouble(poundlistListVO.getSettlement()) * Double.parseDouble(poundlistListVO.getSalesPrice()))); poundlistListVO.setSaleAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getSalesPrice())).toString());
switch (poundlistListVO.getSaleRate()) { switch (poundlistListVO.getSaleRate()) {
case "0":
poundlistListVO.setSaleNotAmount(String.valueOf(Double.parseDouble(poundlistListVO.getSaleAmount()) * 0.87));
break;
case "1": case "1":
poundlistListVO.setSaleNotAmount(String.valueOf(Double.parseDouble(poundlistListVO.getSaleAmount()) * 0.91)); poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.91")).toString());
break; break;
case "2": case "2":
poundlistListVO.setSaleNotAmount(String.valueOf(Double.parseDouble(poundlistListVO.getSaleAmount()) * 0.94)); poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.94")).toString());
break; break;
case "3": case "3":
poundlistListVO.setSaleNotAmount(String.valueOf(Double.parseDouble(poundlistListVO.getSaleAmount()) * 0.95)); poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.95")).toString());
break; break;
case "4": case "4":
poundlistListVO.setSaleNotAmount(String.valueOf(Double.parseDouble(poundlistListVO.getSaleAmount()) * 0.97)); poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.97")).toString());
break; break;
case "5": case "5":
poundlistListVO.setSaleNotAmount(String.valueOf(Double.parseDouble(poundlistListVO.getSaleAmount()) * 1)); poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("1")).toString());
break; break;
default: default:
poundlistListVO.setSaleNotAmount(String.valueOf(Double.parseDouble(poundlistListVO.getSaleAmount()) * 0.87)); poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.87")).toString());
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())));

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

@ -524,6 +524,14 @@
} }
this.dataForm.invoicesitem0List.push(column); this.dataForm.invoicesitem0List.push(column);
}); });
var invoiceQuantity = 0;
var invoiceAmount = 0;
this.dataForm.invoicesitem0List.forEach((item, index) => {
invoiceQuantity = invoiceQuantity + parseFloat(item.invoiceQuantity);
invoiceAmount = invoiceAmount + parseFloat(item.invoiceAmount);
});
this.dataForm.invoiceQuantity = invoiceQuantity;
this.dataForm.invoiceAmount = invoiceAmount;
}, },
uploadForm() { uploadForm() {
this.importFormVisible = true this.importFormVisible = true
@ -708,8 +716,6 @@
this.$emit('refresh', true) this.$emit('refresh', true)
} }
}) })
}).catch(() => {
this.submitDisabled = false
}) })
} else { } else {
request({ request({
@ -727,8 +733,6 @@
this.$emit('refresh', true) this.$emit('refresh', true)
} }
}) })
}).catch(() => {
this.submitDisabled = false
}) })
} }
}, },

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

@ -64,7 +64,7 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false" <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
@selection-change="handleSelectionChange" border> @selection-change="handleSelectionChange" custom-column border>
<el-table-column type="index" width="50" label="序号" align="center" /> <el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentNo" label="单据编号" width="200" align="center" sortable="custom" /> <el-table-column prop="documentNo" label="单据编号" width="200" align="center" sortable="custom" />
<el-table-column prop="businessDate" label="业务日期" width="150" align="center" sortable="custom" /> <el-table-column prop="businessDate" label="业务日期" width="150" align="center" sortable="custom" />

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

@ -53,7 +53,7 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false" <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
@selection-change="handleSelectionChange" border> @selection-change="handleSelectionChange" custom-column border>
<el-table-column type="index" width="50" label="序号" align="center" /> <el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentno" label="单据编号" sortable width="200" align="center" /> <el-table-column prop="documentno" label="单据编号" sortable width="200" align="center" />
<el-table-column prop="paymentno" label="来源单号" sortable width="200" align="center" /> <el-table-column prop="paymentno" label="来源单号" sortable width="200" align="center" />

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

@ -36,7 +36,7 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
@selection-change="handleSelectionChange" has-c :hasNO="false" border> @selection-change="handleSelectionChange" has-c :hasNO="false" custom-column border>
<el-table-column type="index" width="50" label="序号" align="center" /> <el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentNo" label="单据编号" width="200" align="center" <el-table-column prop="documentNo" label="单据编号" width="200" align="center"
sortable="custom" /> sortable="custom" />

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

@ -112,7 +112,7 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false" <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
@selection-change="handleSelectionChange" border show-summary :summary-method="getSummaries"> @selection-change="handleSelectionChange" custom-column border show-summary :summary-method="getSummaries">
<el-table-column type="index" width="50" label="序号" align="center" /> <el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="vehicleName" label="车号" sortable width="120" align="center" /> <el-table-column prop="vehicleName" label="车号" sortable width="120" align="center" />
<!-- <el-table-column prop="purchaseStatus" label="采购状态" sortable width="100" align="center" >--> <!-- <el-table-column prop="purchaseStatus" label="采购状态" sortable width="100" align="center" >-->

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

@ -495,6 +495,14 @@
} }
this.dataForm.invoicesitem0List.push(column); this.dataForm.invoicesitem0List.push(column);
}); });
var invoiceQuantity = 0;
var invoiceAmount = 0;
this.dataForm.invoicesitem0List.forEach((item, index) => {
invoiceQuantity = invoiceQuantity + parseFloat(item.invoiceQuantity);
invoiceAmount = invoiceAmount + parseFloat(item.invoiceAmount);
});
this.dataForm.invoiceQuantity = invoiceQuantity;
this.dataForm.invoiceAmount = invoiceAmount;
}, },
uploadForm() { uploadForm() {
this.importFormVisible = true this.importFormVisible = true

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

@ -78,7 +78,7 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false" <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
@selection-change="handleSelectionChange" border> @selection-change="handleSelectionChange" custom-column border>
<el-table-column type="index" width="50" label="序号" align="center" /> <el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentNo" label="单据编号" sortable width="200" align="center" /> <el-table-column prop="documentNo" label="单据编号" sortable width="200" align="center" />
<!-- <el-table-column label="单据状态 " sortable width="150" prop="status" align="center" >--> <!-- <el-table-column label="单据状态 " sortable width="150" prop="status" align="center" >-->

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

@ -67,7 +67,7 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false" <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
@selection-change="handleSelectionChange" border> @selection-change="handleSelectionChange" custom-column border>
<el-table-column type="index" width="50" label="序号" align="center" /> <el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentno" label="单据编号" sortable width="200" align="center" /> <el-table-column prop="documentno" label="单据编号" sortable width="200" align="center" />
<el-table-column prop="supplier" label="供应商" sortable width="220" align="center" /> <el-table-column prop="supplier" label="供应商" sortable width="220" align="center" />

3
SC-web/src/views/scm/basicInformation/vehicle/Form.vue
Unescape View File

@ -98,8 +98,7 @@
required: true, required: true,
message: '请输入车牌号', message: '请输入车牌号',
trigger: 'blur' trigger: 'blur'
}, }, ],
{ pattern: /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/, message: '请输入有效的车牌号(如：豫H81888)', trigger: 'blur' }],
drivername: [{ drivername: [{
required: true, required: true,
message: '请输入司机名称', message: '请输入司机名称',

Write Preview
Loading…
Cancel
Save