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

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -3328,7 +3328,11 @@
         this.travelControlTripLayerShow = false;
       },
       yzVisaNum: function () {
-        let count = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
+        let ChirdNum = Number(this.addMsg.ChirdNum)
+        if (this.addMsg.GroupType == 4) {
+          ChirdNum = 0
+        }
+        let count = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + ChirdNum +
           Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
         if (count < this.addMsg.VisaNum) {
           this.addMsg.VisaNum = count
@@ -3336,7 +3340,11 @@
         }
       },
       yzSafeNum: function () {
-        let count = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
+        let ChirdNum = Number(this.addMsg.ChirdNum)
+        if (this.addMsg.GroupType == 4) {
+          ChirdNum = 0
+        }
+        let count = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + ChirdNum +
           Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
         if (count < this.addMsg.SafeNum) {
           this.addMsg.SafeNum = count
@@ -4068,6 +4076,8 @@
             if (this.addMsg.GroupType == 4) {
               dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
             ertong = 0
+            ertongbed = 0
+            zafeiqianzhen = 0
             } else {
               dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
 
@@ -4127,6 +4137,8 @@
             if (this.addMsg.GroupType == 4) {
               dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
             ertong = 0
+            ertongbed = 0
+            zafeiqianzhen = 0
             } else {
               dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
 

src/components/SalesModule/productQuery.vue

@@ -1241,7 +1241,11 @@
         this.downloadFileRename(item.FullUrl.replace(reg, ''), item.Name);
       },
       yzVisaNum: function () {
-        let count = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
+        let ChirdNum = Number(this.addMsg.ChirdNum)
+        if (this.addMsg.GroupType == 4) {
+          ChirdNum = 0
+        }
+        let count = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + ChirdNum +
           Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
         if (count < this.addMsg.VisaNum) {
           this.addMsg.VisaNum = count
@@ -1249,7 +1253,11 @@
         }
       },
       yzSafeNum: function () {
-        let count = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
+        let ChirdNum = Number(this.addMsg.ChirdNum)
+        if (this.addMsg.GroupType == 4) {
+          ChirdNum = 0
+        }
+        let count = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) +ChirdNum +
           Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
         if (count < this.addMsg.SafeNum) {
           this.addMsg.SafeNum = count
@@ -1763,9 +1771,12 @@
           let lianyun = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)) *
             (Number(this.stratPrice) + Number(this.returnPrice))
           let dandijie
+         
           if(this.addMsg.GroupType == 4){
             dandijie = this.SingleDMCPrice * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
             ertong = 0
+            ertongbed = 0
+            zafeiqianzhen = 0
           }else {
              dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum)
           }
@@ -1791,13 +1802,15 @@
           if(this.addMsg.GroupType == 4){
             dandijie = this.SingleDMCPrice * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
             ertong = 0
-            console.log(dandijie,this.addObj.ChildNeedPrice,this.addObj.ChildNoNeedPrice)
+            ertongbed = 0
+            zafeiqianzhen = 0
           }else {
               dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum)
           }
           this.addMsg.PreferPrice = dandijie + lianyun + chengren + ertong + yinger + laoren + zafeiqianzhen + danfang +
             ertongbed - this.ScenicRefundMoney * (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(
-              this.addMsg.OldPeopleNum));
+              this.addMsg.OldPeopleNum)); 
+          console.log(dandijie , lianyun , chengren , ertong , yinger , laoren , zafeiqianzhen , danfang ,ertongbed)
         }
         this.getTicheng();
         if (!t) {
@@ -1946,12 +1959,16 @@
           return
         }
 
-
-        if (Number(this.addMsg.ChirdNum) - Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.BabyNum) > Number(
-            this.addMsg.ManNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.ChirdNeedBedNum)) {
-          this.$message.warning('儿童占床数量不足！')
-          return
+        if (this.addMsg.GroupType == 4) {
+          
+        } else {
+          if (Number(this.addMsg.ChirdNum) - Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.BabyNum) > Number(
+              this.addMsg.ManNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.ChirdNeedBedNum)) {
+            this.$message.warning('儿童占床数量不足！')
+            return
+          }
         }
+        
 
         if (this.userId == this.createByInfo) {
           if (this.addMsg.CommissionSharePeople == '-1') {

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -4020,6 +4020,8 @@
             if (this.addMsg.GroupType == 4) {
               dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
             ertong = 0
+            ertongbed = 0
+            zafeiqianzhen = 0
             } else {
               dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
             }
@@ -4081,6 +4083,8 @@
             if (this.addMsg.GroupType == 4) {
               dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
             ertong = 0
+            ertongbed = 0
+            zafeiqianzhen = 0
             } else {
               dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
             }