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

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1302,7 +1302,7 @@ export default {
         {
           field: "CDIncome",
           // formatter: this.moneyFormat,
-          title: "冲抵收入",
+          title: "挂账支出",
           width: 90,
           titleAlign: "left",
           columnAlign: "right",

src/components/Hotel/roomReservationsDetails.vue

@@ -490,6 +490,7 @@
         LeaderName: "", //领队名称
         GuideName: "", //导游名称
         IsEditHotelPeople:0,//是否有修改人数权限[0-不能修改，1-可以修改]
+        IsCombine:false,//是否是合团，true-是合团，false-不是合团
       }
     },
     components: {
@@ -701,7 +702,8 @@
         this.loading = true;
         this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', {
           TCIDs: this.$route.query.id,
-          NewCombinationNum: this.$route.query.NewCombinationNum
+          NewCombinationNum: this.$route.query.NewCombinationNum,
+          IsCombine:this.IsCombine
         }, res => {
           if (res.data.resultCode == 1) {
             this.IsOperation = res.data.data.IsOperation;
@@ -928,6 +930,7 @@
       this.TCNUM = this.$route.query.TCNUM;
       this.flightTotal = this.$route.query.flightTotal;
       this.GuestNum = this.$route.query.GuestNum;
+      this.IsCombine=this.$route.query.IsCombine;
       let width = window.innerWidth - 50;
       let height = window.innerHeight - 65 - 55;
       this.boxHeight = height;

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1473,20 +1473,7 @@
               <el-input v-model='addMsg.FSeatNum' @input="getNumber()"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <!--<el-form-item label="单地接数量" prop="AirticketNum">
-						   <el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')"    @input='getTotalPrice();getHouseNo()'></el-input>
-						</el-form-item>-->
-          </el-col>
           <el-col :span="8">
-            <!-- <el-form-item label="可退景点">
-              <el-select filterable multiple class='multiple_input' v-model='addMsg.ScenicRefundArr'
-                :placeholder="$t('pub.pleaseSel')" @change='ScenicRefundMethods'>
-                <el-option v-for='item in ScenicRefundList' :label='item.ScenicName' :value='item.Id'
-                  :key='item.ScenicName'>
-                </el-option>
-              </el-select>
-            </el-form-item> -->
             <div class="clearfix">
                   <div class="leftSetInfo">
                     <span class="GO_Title">可退景点</span>
@@ -1514,7 +1501,7 @@
                                   {{item.RefundMoney}}
                               </td>
                               <td>
-                                  <el-input class="w80" @keyup.native="checkInteger(item,'Number')" @change="getGOScenictWO"
+                                  <el-input class="w80" @keyup.native="checkInteger(item,'Number'),CheckNum(item)" @change="getGOScenictWO"
                                   v-model="item.Number"></el-input>
                               </td>
                               <td>
@@ -3560,7 +3547,15 @@
           }
         })
       },
-
+      //验证输入人数
+      CheckNum(item){
+        let TotalNum = parseInt(this.addMsg.ManNum)+parseInt(this.addMsg.ChirdNoNeedBedNum)+
+          parseInt(this.addMsg.ChirdNeedBedNum)+parseInt(this.addMsg.BabyNum)+parseInt(this.addMsg.OldPeopleNum)+parseInt(this.addMsg.AirticketNum);
+        if(item.Number>TotalNum){
+            this.Error('不能超过总人数');
+            item.Number=0;
+        }
+      },
       platformOrderMethods() {
         if (this.addMsg.PlatformOrder == "") {
           this.addMsg.MinOrderPrice = 0;
@@ -4476,22 +4471,6 @@
           return;
         }
 
-        // if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) {
-        //   this.$message.warning("儿童占床不能大于儿童数！");
-        //   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;
-        // }
         this.addMsg.TCID = this.addObj.TCID;
         this.addMsg.GuestNum =
           Number(this.addMsg.ManNum) +

src/components/dmc/manager/dmcTotalTable.vue

@@ -843,6 +843,7 @@
             'NewCombinationNum': outItem.NewCombinationNum,
             'LeaderName': obj.LeaderName,
             'GuideName': obj.GuideName,
+            'IsCombine':outItem.PriceCommonList.length>1,//是否是合团
             blank: 'y',
             tab: title
           }

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -549,7 +549,7 @@
                 <div class="TPright">
                   <el-form-item prop="ChildNoNeedPrice">
                     <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ChildNoNeedPrice"
-                      @keyup.native="checkInteger(priceData,'ChildNoNeedPrice')">
+                      @keyup.native="checkInteger(priceData,'ChildNoNeedPrice',true)">
                       <template slot="prepend">儿童不占床</template>
                     </el-input>
                   </el-form-item>