|
@@ -1009,14 +1009,22 @@ export default {
|
|
},
|
|
},
|
|
//计算退款总额 商品退款金额 + 退运费金额 +退税金额
|
|
//计算退款总额 商品退款金额 + 退运费金额 +退税金额
|
|
calculateRefundAmount() {
|
|
calculateRefundAmount() {
|
|
- //如果没选择退税
|
|
|
|
- if (this.addRefundForm.refundTaxAble != "1") {
|
|
|
|
|
|
+ //如果没选择退税 或者税费为空
|
|
|
|
+ if (
|
|
|
|
+ this.addRefundForm.refundTaxAble != "1" ||
|
|
|
|
+ this.addRefundForm.refundTaxAmount === "NaN" ||
|
|
|
|
+ !this.addRefundForm.refundTaxAmount
|
|
|
|
+ ) {
|
|
this.addRefundForm.refundTaxAmount = BigNumber(0)
|
|
this.addRefundForm.refundTaxAmount = BigNumber(0)
|
|
.toNumber()
|
|
.toNumber()
|
|
.toFixed(2);
|
|
.toFixed(2);
|
|
}
|
|
}
|
|
- //如果没选择退运费
|
|
|
|
- if (this.addRefundForm.refundPostage != "1") {
|
|
|
|
|
|
+ //如果没选择退运费 或者运费为空
|
|
|
|
+ if (
|
|
|
|
+ this.addRefundForm.refundPostage != "1" ||
|
|
|
|
+ !this.addRefundForm.refundPostageAmount ||
|
|
|
|
+ this.addRefundForm.refundPostageAmount === "NaN"
|
|
|
|
+ ) {
|
|
this.addRefundForm.refundPostageAmount = BigNumber(0)
|
|
this.addRefundForm.refundPostageAmount = BigNumber(0)
|
|
.toNumber()
|
|
.toNumber()
|
|
.toFixed(2);
|
|
.toFixed(2);
|
|
@@ -1358,7 +1366,6 @@ export default {
|
|
}
|
|
}
|
|
|
|
|
|
var items = [];
|
|
var items = [];
|
|
- // this.btnLoading = true;
|
|
|
|
this.$confirm(
|
|
this.$confirm(
|
|
"退款总计:" + this.addRefundForm.refundTotalAmount + ",是否确认?",
|
|
"退款总计:" + this.addRefundForm.refundTotalAmount + ",是否确认?",
|
|
"提示",
|
|
"提示",
|
|
@@ -1373,7 +1380,6 @@ export default {
|
|
var obj = this.multipleSelection[ind];
|
|
var obj = this.multipleSelection[ind];
|
|
if (!obj.refundReason) {
|
|
if (!obj.refundReason) {
|
|
this.$alert(obj.ordersId + ":请选择退款原因");
|
|
this.$alert(obj.ordersId + ":请选择退款原因");
|
|
- this.btnLoading = false;
|
|
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
var newobj = {
|
|
var newobj = {
|
|
@@ -1404,13 +1410,14 @@ export default {
|
|
this.addRefundForm.refundAmount = val;
|
|
this.addRefundForm.refundAmount = val;
|
|
this.addRefundForm.differenceAmount = 0;
|
|
this.addRefundForm.differenceAmount = 0;
|
|
}
|
|
}
|
|
|
|
+ this.btnLoading = true;
|
|
const saveRefund = () => {
|
|
const saveRefund = () => {
|
|
let query = {
|
|
let query = {
|
|
orderPreviewVO: this.originReturnPreviewDatas,
|
|
orderPreviewVO: this.originReturnPreviewDatas,
|
|
ordersRefund: this.addRefundForm
|
|
ordersRefund: this.addRefundForm
|
|
};
|
|
};
|
|
- backstageSubmitRefund(query).then(
|
|
|
|
- res => {
|
|
|
|
|
|
+ backstageSubmitRefund(query)
|
|
|
|
+ .then(res => {
|
|
if (200 == res.code) {
|
|
if (200 == res.code) {
|
|
this.$message({
|
|
this.$message({
|
|
message: this.$t("optSuccess"),
|
|
message: this.$t("optSuccess"),
|
|
@@ -1419,11 +1426,10 @@ export default {
|
|
items = [];
|
|
items = [];
|
|
this.btnStyle = "display:none";
|
|
this.btnStyle = "display:none";
|
|
}
|
|
}
|
|
- },
|
|
|
|
- error => {
|
|
|
|
|
|
+ })
|
|
|
|
+ .finally(() => {
|
|
this.btnLoading = false;
|
|
this.btnLoading = false;
|
|
- }
|
|
|
|
- );
|
|
|
|
|
|
+ });
|
|
};
|
|
};
|
|
const validPromotion = async () => {
|
|
const validPromotion = async () => {
|
|
// 校验是否包含促销赠品,不包含直接返回true
|
|
// 校验是否包含促销赠品,不包含直接返回true
|