diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/purchasebackForm.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/purchasebackForm.vue index c53335d7..f05fbdec 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/purchasebackForm.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/purchasebackForm.vue @@ -369,7 +369,7 @@ sums[index] = values.reduce((prev, curr) => { const value = Number(curr); if (!isNaN(value)) { - return this.jnpf.floatAdd(prev,curr); + return Math.round(this.jnpf.floatAdd(prev,curr)*1000000)/1000000; } else { return prev; } @@ -432,8 +432,8 @@ var refundNum = 0; purchaseorder.purchaseorder_item0List.forEach((item, index)=>{ item.purchaseorderItem0Id = item.id; - refundAmount = refundAmount + parseFloat(item.amount); - refundNum = refundNum + parseFloat(item.settlement); + refundAmount = this.jnpf.floatAdd(refundAmount,item.amount); + refundNum = this.jnpf.floatAdd(refundNum,item.settlement); }); this.dataForm.refundAmount = refundAmount; this.dataForm.refundNum = refundNum; diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue index f02017c9..4751b15c 100644 --- a/SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue +++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue @@ -231,6 +231,7 @@ materialId: "", customerId: "", supplierId: "", + supplierName: "", salesId: "", vehicleId: "", vehiclePictures: [], @@ -475,6 +476,7 @@ }, customerSelect2(a, b) { this.dataForm.supplierId = b.code; + this.dataForm.supplierName = b.name; }, handleAvatarSuccess(res, file) { this.imageUrl = URL.createObjectURL(file.raw);