Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2069,6 +2069,8 @@ export default {
       loading: true,
       isChecked: true,
       comSelect: -1,
+      OpSetLossPeople: 0,
+      OpSetLossMoney: 0,
       remarksMsg: {
         OrderId: "0",
         OldRemarks: "",
@@ -2770,6 +2772,9 @@ export default {
             this.addMsg.BabyNum = x.BabyNum.toString();
             this.IsChildrenTour = x.IsChildrenTour;
             this.IsBirdDiscount = x.IsBirdDiscount;
+            this.OpSetLossPeople = x.OpSetLossPeople;
+            this.OpSetLossMoney = x.OpSetLossMoney;
+
             this.stratPrice = res.data.data.modelPrice.GoAddPrice;
 
             if (this.stratPrice == 0) {
@@ -3114,6 +3119,7 @@ export default {
         let dandijie =
           this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
         this.addMsg.PreferPrice =
+          this.OpSetLossMoney+
           dandijie +
           lianyun +
           chengren +
@@ -3165,6 +3171,7 @@ export default {
         let dandijie =
           this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
         this.addMsg.PreferPrice =
+        this.OpSetLossMoney+
           dandijie +
           lianyun +
           chengren +
@@ -3180,7 +3187,7 @@ export default {
               Number(this.addMsg.OldPeopleNum));
       }
       } else {
-        this.addMsg.PreferPrice = Number(this.addMsg.YSeatNum)*Number(this.addMsg.Unit_Price)
+        this.addMsg.PreferPrice = Number(this.addMsg.YSeatNum)*Number(this.addMsg.Unit_Price)+this.OpSetLossMoney;
       }
       
       this.getTicheng();

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2212,6 +2212,8 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
         },
         IsUnion: 2,
         IsChargeLossOrders:0,
+        OpSetLossPeople: 0,
+        OpSetLossMoney: 0,
          Unit_PriceList:[],//成交单价下拉数据
         LessMoney:0,
         addMsg: {
@@ -2875,6 +2877,8 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
               this.addMsg.BabyNum = x.BabyNum.toString();
               this.IsChildrenTour = x.IsChildrenTour;
               this.IsBirdDiscount = x.IsBirdDiscount;
+              this.OpSetLossPeople = x.OpSetLossPeople;
+              this.OpSetLossMoney = x.OpSetLossMoney;
 
               this.stratPrice = 0;
               if (res.data.data.modelPrice && res.data.data.modelPrice.GoAddPrice) {
@@ -3129,6 +3133,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
             let dandijie =
               this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
             this.addMsg.PreferPrice =
+            this.OpSetLossMoney+
               dandijie +
               lianyun +
               chengren +
@@ -3184,6 +3189,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
             let dandijie =
               this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
             this.addMsg.PreferPrice =
+            this.OpSetLossMoney+
               dandijie +
               lianyun +
               chengren +
@@ -3199,7 +3205,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
                 Number(this.addMsg.OldPeopleNum));
           }
         } else {
-          this.addMsg.PreferPrice = Number(this.addMsg.YSeatNum) * Number(this.addMsg.Unit_Price)
+          this.addMsg.PreferPrice = Number(this.addMsg.YSeatNum) * Number(this.addMsg.Unit_Price)+this.OpSetLossMoney;
         }
         this.getTicheng();
       },