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

src/components/SalesModule/groupInquiry.vue

@@ -134,7 +134,7 @@
   .RL-remarkTitle {
     display: inline-block;
     width: 36px;
- 
+
     white-space: nowrap;
     font-size: 14px;
   }
@@ -241,6 +241,15 @@
               </el-select>
             </span>
           </li>
+          <li>
+            <span>
+              <em>团队类型</em>
+              <el-select v-model="queryMsg.TeamType" clearable  class="w150" filterable  :placeholder="$t('pub.pleaseSel')">
+                <el-option label="常规团" value="0"></el-option>
+                <el-option label="小包团" value="1"></el-option>
+              </el-select>
+            </span>
+          </li>
           <li class="advancedLi">
             <el-popover popper-class="advanceQueryList" v-model="queryCommonData.showHigradeSearch" trigger="click">
               <div>
@@ -321,7 +330,7 @@
                 <div class="comSearchDiv">
                   <span class="comSearchDiv-span"><span>{{$t('Airticket.Air_salesPlatform')}}</span><el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">全选</el-checkbox></span>
                   <span>
-                    
+
                     <el-checkbox-group v-model="queryMsg.SalePlat" @change="checkSales">
                       <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">{{sales.Name}}</el-checkbox>
                     </el-checkbox-group>
@@ -330,7 +339,7 @@
                 <div class="comSearchDiv">
                   <span class="comSearchDiv-span"><span>{{$t('visa.v_tqstatus')}}</span><el-checkbox v-model="queryCommonData.checkGroupALL" @change="checkGroupAll">全选</el-checkbox></span>
                   <span>
-                    
+
                     <el-checkbox-group v-model="queryMsg.GroupState" @change="checkGroup">
                       <el-checkbox v-for="state in $tripUtils.TeamStatesList.teamDateStates" :label="state.Id" :key="state.Name">{{state.Name}}</el-checkbox>
                     </el-checkbox-group>
@@ -510,7 +519,7 @@
                                 <span v-if="childItem.VisaStatus===2" class="groupTourOrder_tickets_blue" >{{childItem.GuestName}}</span>
                               <span v-else-if="childItem.VisaStatus===3" class="groupTourOrder_tickets_black" >{{childItem.GuestName}}</span>
                               <span v-else-if="childItem.VisaStatus===1" class="groupTourOrder_tickets_red" >{{childItem.GuestName}}</span>
-                                
+
                                 </span>
                             </span>
                             <span class="RL-redType RL-remarkCon" v-else>
@@ -761,7 +770,7 @@ export default {
         //销售平台全选
         checkPlatForm: false,
         //团队状态全选
-        checkTCStateAll: true,
+        checkTCStateAll: false,
         //是否显示弹出框
         setPlatDialog: false,
         //弹出框全选
@@ -806,12 +815,12 @@ export default {
         TeamMinNum: "",
         TeamMaxNum: "",
         CreateBy: 0,
-        ApplyMinNum: "",
+        ApplyMinNum: "1",
         ApplyMaxNum: "",
         DayNum: "",
         OnlyShowOverTeam: false,
-        TCState: [1,2,3,4],
-        GroupState: [],
+        TCState: [1,3],
+        GroupState: [1,2,5],
         SalePlat: [],
         UnionCityId: 0,
         SaleBranchId: [],
@@ -824,6 +833,7 @@ export default {
         TCVisaStatus: '-1',
         IsShowUnion:-1,
         QueryType:1,//查询类型 1:签证
+        TeamType:'0',//0常规团 1小包团
       },
       remarkMsg: {
         TCID: 0,
@@ -1609,8 +1619,7 @@ export default {
     this.queryMsg.StartGroupDate = this.$route.query.startDate!==undefined?this.$route.query.startDate:nowDate;
 
     if (this.queryCommonData.IsParentCompany != 1) {
-      var RB_Branch_id = userInfo.RB_Branch_id;
-      this.queryMsg.OutBranchId = RB_Branch_id;
+      this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
     }
     this.getControlList();
   },