|
@@ -218,7 +218,7 @@
|
|
|
</a-col>
|
|
|
<a-col :span="12">
|
|
|
<a-form-item
|
|
|
- label="折后金额(discountAmount)"
|
|
|
+ label="折后金额(discounted amount)"
|
|
|
v-bind="validateInfos.discountAmount"
|
|
|
id="SaleOrderForm-discountAmount"
|
|
|
name="discountAmount"
|
|
@@ -432,7 +432,7 @@
|
|
|
currency: '',
|
|
|
notes: '',
|
|
|
agreementTerms: '',
|
|
|
- discountHead: '',
|
|
|
+ discountHead: 0,
|
|
|
discountAmount: '',
|
|
|
totalAmount: '',
|
|
|
});
|
|
@@ -475,7 +475,7 @@
|
|
|
formData.purchasemanName = userStore.getUserInfo.realname;
|
|
|
formData.purchaseDepartment = userStore.getUserInfo.orgCode;
|
|
|
formData.purchaseDepartmentName = userStore.getUserInfo.orgName;
|
|
|
- formData.discountHead = '';
|
|
|
+ formData.discountHead = 0;
|
|
|
}
|
|
|
async function copy(data, id) {
|
|
|
//主表数据
|
|
@@ -790,9 +790,8 @@
|
|
|
|
|
|
// 折扣改变
|
|
|
const discountHeadChange = (event) => {
|
|
|
- console.log(purOrderFormShipFormProductTable.dataSource);
|
|
|
if (formData.totalAmount) {
|
|
|
- formData.discountAmount = formData.totalAmount * (1 - formData.discountHead / 100);
|
|
|
+ formData.discountAmount = Number((formData.totalAmount * (1 - formData.discountHead / 100)).toFixed(2));
|
|
|
}
|
|
|
};
|
|
|
|
|
@@ -806,12 +805,9 @@
|
|
|
total += item.taxAmount;
|
|
|
});
|
|
|
formData.totalAmount = total;
|
|
|
- console.log(111, formData.totalAmount);
|
|
|
- if (formData.discountHead) {
|
|
|
- formData.discountAmount = formData.totalAmount * (1 - formData.discountHead / 100);
|
|
|
- }
|
|
|
+ formData.discountAmount = Number((formData.totalAmount * (1 - formData.discountHead / 100)).toFixed(2));
|
|
|
if (data.length < 1) {
|
|
|
- formData.discountHead = '';
|
|
|
+ formData.discountHead = 0;
|
|
|
formData.discountAmount = '';
|
|
|
}
|
|
|
},
|