1 应收 显示 剔除 优惠券金额

src/components/SalesModule/groupTourOrder.vue

@@ -2906,7 +2906,8 @@
         userInfo: {},
         LessRule: [],
         LessNPrice: 0,
-        LessNAvgPrice: 0
+        LessNAvgPrice: 0,
+        DealDiscountMoney: 0
       };
     },
     components: {
@@ -3760,6 +3761,7 @@
         this.apipost(
           "sellorder_post_GetOrderEntity", {
             ID: obj.orderId,
+            IsDealDiscount:1
           },
           (res) => {
             if (res.data.resultCode == 1) {
@@ -3772,6 +3774,7 @@
               this.addObj.OpSetLossMoney = x.OpSetLossMoney;
 
               this.addMsg = x;
+              this.DealDiscountMoney = this.addMsg.DiscountMoney+this.addMsg.RedEnvelopeMoney;
               this.LessNPrice = this.addMsg.LessMaxPrice; //先初始化 最高少价
               this.LessNAvgPrice = this.addMsg.LessMaxAvgPrice;
               if (this.addMsg.IsLessPrice == 1) {
@@ -4285,7 +4288,7 @@
               this.addMsg.LessPrice = this.addMsg.LessAvgPrice * LessNum;
             }
           }
-          this.addMsg.PreferPrice = this.addMsg.PreferPrice - this.addMsg.LessPrice;
+          this.addMsg.PreferPrice = this.addMsg.PreferPrice - this.addMsg.LessPrice - this.DealDiscountMoney;
         } else {
           let chengren =
             Number(this.addMsg.ManNum) * Number(this.addMsg.Unit_Price);
@@ -4382,7 +4385,7 @@
               this.addMsg.LessPrice = this.addMsg.LessAvgPrice * LessNum;
             }
           }
-          this.addMsg.PreferPrice = this.addMsg.PreferPrice - this.addMsg.LessPrice;
+          this.addMsg.PreferPrice = this.addMsg.PreferPrice - this.addMsg.LessPrice - this.DealDiscountMoney;
         }
 
         this.getTicheng();
@@ -4631,6 +4634,7 @@
           Number(this.addMsg.AirticketNum);
         this.addMsg.IsChildrenTour = this.IsChildrenTour;
         this.addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount;
+        this.addMsg.IsDealDiscount = 1;
         this.apipost(
           "sellorder_post_SetOrderInfo_02",
           this.addMsg,

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -3699,7 +3699,8 @@
         SQOrderId: "",
         LessRule:[],
         LessNPrice:0,
-        LessNAvgPrice:0
+        LessNAvgPrice:0,
+        DealDiscountMoney:0
       };
     },
     components: {
@@ -4568,6 +4569,7 @@
         this.apipost(
           "sellorder_post_GetOrderEntity", {
             ID: obj.orderId,
+            IsDealDiscount:1
           },
           (res) => {
             if (res.data.resultCode == 1) {
@@ -4576,6 +4578,7 @@
 
               let modelPrice = res.data.data.modelPrice;
               this.addMsg = x;
+              this.DealDiscountMoney = this.addMsg.DiscountMoney+this.addMsg.RedEnvelopeMoney;
               this.LessNPrice = this.addMsg.LessMaxPrice;//先初始化 最高少价
               this.LessNAvgPrice = this.addMsg.LessMaxAvgPrice;
               if(this.addMsg.IsLessPrice==1){
@@ -5116,7 +5119,7 @@
                 if(this.LessNPrice==0){this.addMsg.LessPrice=0; this.addMsg.LessAvgPrice=0;}
                 if(this.addMsg.LessAvgPrice>this.LessNAvgPrice){this.addMsg.LessAvgPrice=this.LessNAvgPrice; this.addMsg.LessPrice = this.addMsg.LessAvgPrice * LessNum;}
             }
-            this.addMsg.PreferPrice = this.addMsg.PreferPrice - this.addMsg.LessPrice;
+            this.addMsg.PreferPrice = this.addMsg.PreferPrice - this.addMsg.LessPrice - this.DealDiscountMoney;
 
           } else {
             let chengren =
@@ -5207,7 +5210,7 @@
                 if(this.LessNPrice==0){this.addMsg.LessPrice=0; this.addMsg.LessAvgPrice=0;}
                 if(this.addMsg.LessAvgPrice>this.LessNAvgPrice){this.addMsg.LessAvgPrice=this.LessNAvgPrice; this.addMsg.LessPrice = this.addMsg.LessAvgPrice * LessNum;}
             }
-            this.addMsg.PreferPrice = this.addMsg.PreferPrice - this.addMsg.LessPrice;
+            this.addMsg.PreferPrice = this.addMsg.PreferPrice - this.addMsg.LessPrice - this.DealDiscountMoney;
           }
         } else {
           this.addMsg.PreferPrice =
@@ -5468,7 +5471,7 @@
           Number(this.addMsg.AirticketNum);
         this.addMsg.IsChildrenTour = this.IsChildrenTour;
         this.addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount;
-
+        this.addMsg.IsDealDiscount = 1;
         this.apipost(
           "sellorder_post_SetOrderInfo_02",
           this.addMsg,

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -4434,7 +4434,8 @@
         },
         LessRule: [],
         LessNPrice: 0,
-        LessNAvgPrice: 0
+        LessNAvgPrice: 0,
+        DealDiscountMoney: 0
       };
     },
     components: {
@@ -4778,6 +4779,7 @@
         this.apipost(
           "sellorder_post_GetOrderEntity", {
             ID: obj.OrderId,
+            IsDealDiscount:1
           },
           (res) => {
             if (res.data.resultCode == 1) {
@@ -4786,6 +4788,7 @@
               this.addObj = res.data.data.modelPrice;
               let x = res.data.data.model;
               this.addMsg = x;
+              this.DealDiscountMoney = this.addMsg.DiscountMoney+this.addMsg.RedEnvelopeMoney;
               this.LessNPrice = this.addMsg.LessMaxPrice; //先初始化 最高少价
               this.LessNAvgPrice = this.addMsg.LessMaxAvgPrice;
               if (this.addMsg.IsLessPrice == 1) {
@@ -5630,7 +5633,7 @@
                 this.addMsg.LessPrice = this.addMsg.LessAvgPrice * LessNum;
               }
             }
-            this.addMsg.PreferPrice = this.addMsg.PreferPrice - this.addMsg.LessPrice;
+            this.addMsg.PreferPrice = this.addMsg.PreferPrice - this.addMsg.LessPrice - this.DealDiscountMoney;
           } else {
             let chengren =
               Number(this.addMsg.ManNum) * Number(this.addMsg.Unit_Price);
@@ -5728,7 +5731,7 @@
                 this.addMsg.LessPrice = this.addMsg.LessAvgPrice * LessNum;
               }
             }
-            this.addMsg.PreferPrice = this.addMsg.PreferPrice - this.addMsg.LessPrice;
+            this.addMsg.PreferPrice = this.addMsg.PreferPrice - this.addMsg.LessPrice - this.DealDiscountMoney;
           }
         } else {
           this.addMsg.PreferPrice =
@@ -5992,6 +5995,7 @@
           Number(this.addMsg.AirticketNum);
         this.addMsg.IsChildrenTour = this.IsChildrenTour;
         this.addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount;
+        this.addMsg.IsDealDiscount = 1;
         this.apipost(
           "sellorder_post_SetOrderInfo_02",
           this.addMsg,