11

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -279,11 +279,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('advmanager.v_all')" :value="-1"></el-option>
-                      <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>
                 <div class="comSearchDiv" style="display: flex;align-items: center;">
@@ -1733,6 +1732,7 @@
           singleTCID: 0,
           outerVisible: false,
           flightCKed: [],
+          IsUnionCked: [],
           loading: false,
           checkCompanyAll: true,
           showUnion: false,
@@ -1826,6 +1826,23 @@
             Checked: false
           }
         ],
+        //联运状态
+        unionStatus: [{
+            Id: -1,
+            Name: this.$t("advmanager.v_all"),
+            Checked: true,
+          },
+          {
+            Id: 0,
+            Name: this.$t("op.MainGroup"),
+            Checked: false,
+          },
+          {
+            Id: 1,
+            Name: this.$t("op.DistributionGroup"),
+            Checked: false,
+          },
+        ],
         CopyTripAndFeatureMsg: {
           updateType: 1, //1-复制行程，2-修改出团日期，3-修改行程版面
           isShowTripFeature: false,
@@ -2979,6 +2996,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;