增加团控列表联运状态筛选条件

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -275,10 +275,10 @@
                 <div class="comSearchDiv">
                   <span>{{$t('Operation.Op_TransportState')}}</span>
                   <span>
-                    <el-select class="w180 multiple_input" v-model="queryMsg.IsShowUnion">
-                      <el-option :key="1" :label="$t('system.table_isShows')" :value="1"></el-option>
-                      <el-option :key="0" :label="$t('Operation.Op_hide')" :value="0"></el-option>
-                    </el-select>
+                    <el-checkbox-group v-model="queryCommonData.IsUnionCked" style="margin-left:0;">
+                      <el-checkbox v-for="state in unionStatus" :label="state.Id" :checked="state.Checked"
+                        @change="checkedUnion(state)" :key="state.Name">{{state.Name}}</el-checkbox>
+                    </el-checkbox-group>
                   </span>
                 </div>
                 <button class="normalBtn TC_SearchBtn"
@@ -874,6 +874,7 @@
           singleTCID: 0,
           outerVisible: false,
           flightCKed: [],
+          IsUnionCked:[],
           loading: false,
           checkCompanyAll: true,
           //本团卖点
@@ -956,12 +957,26 @@
             Checked: false
           }
         ],
+        //联运状态
+        unionStatus:[{
+          Id:1,
+          Name:'主团',
+          Checked: true
+        },{
+          Id:0,
+          Name:'分销团',
+          Checked: false
+        }],
         //当前登录用户信息
         CurrentUserInfo: {},
         pickerBeginDateBefore: {
           disabledDate: time => {
-            let endTime = new Date(this.queryMsg.EndGroupDate)
-            return endTime.getTime() < time.getTime()
+            if(this.queryMsg.EndGroupDate==null){
+              return false;
+            }else{
+              let endTime = new Date(this.queryMsg.EndGroupDate)
+              return endTime.getTime() < time.getTime()
+            }
           }
         },
         pickerBeginDateAfter: {
@@ -1495,6 +1510,11 @@
         this.queryCommonData.flightCKed = []
         this.queryCommonData.flightCKed.push(item.Id)
       },
+      checkedUnion(item){
+        this.queryMsg.IsShowUnion = item.Id
+        this.queryCommonData.IsUnionCked = []
+        this.queryCommonData.IsUnionCked.push(item.Id)
+      },
       //点击选取出团公司
       getCompanyCheck(item) {
         item.isShow = !item.isShow