Bläddra i källkod

fix:生成退款单字段修复

chenjiaxin 3 månader sedan
förälder
incheckning
d3e4b7f3e6
1 ändrade filer med 18 tillägg och 12 borttagningar
  1. 18 12
      src/views/oms/refund/components/createRefundDialog.vue

+ 18 - 12
src/views/oms/refund/components/createRefundDialog.vue

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