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

src/components/SalesModule/groupInquiry.vue

@@ -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>
@@ -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();
   },