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

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1564,7 +1564,7 @@
           </div>
           <div style="padding-left: 75px;">
             <button class="hollowFixedBtn"
-              v-if="(bossID===1 || bossID===5||bossID===1934 || bossID===2786) && (GetDetail.Status===2 || GetDetail.Status===5 || GetDetail.Status===1)"
+              v-if="(bossID===1 || bossID===5||bossID===1934 || bossID===2786 || bossID===2769) && (GetDetail.Status===2 || GetDetail.Status===5 || GetDetail.Status===1)"
               @click="bohui()">{{$t('fnc.bohui')}}</button>
             <button class="hollowFixedBtn" @click="AuditOrRefund()">{{$t('pub.returnBack')}}</button>
           </div>

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -2717,6 +2717,7 @@ export default {
     cW = allW - 90;
     cH = allH - 350 - 52;
     this.msg.pageSize = parseInt(cH / 30) - 2;
+    if(this.msg.pageSize>16){this.msg.pageSize=16;}
     let userInfo = this.getLocalStorage();
     this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
     this.userId = userInfo.EmployeeId;

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -595,7 +595,8 @@
                           <th width="80">{{ $t("system.query_arrivalTime") }}</th>
                           <th width="100">{{ $t("system.query_stopCity") }}</th>
                         </tr>
-                        <tr v-for="(fItem, fIndex) in nItem.flightList" :key="`hd_`+newIndex+`d_`+fIndex" style="text-align: center">
+                        <tr v-for="(fItem, fIndex) in nItem.flightList" :key="`hd_`+newIndex+`d_`+fIndex"
+                          style="text-align: center">
                           <td class="_d_name _color_666">
                             <span v-if="fIndex == 0">{{ $t("Airticket.Air_go") }}</span>
                             <span v-else-if="fIndex == item.flightList.length - 1">{{
@@ -634,8 +635,8 @@
                     <div class="FlightDiv-TCL" slot="reference">
                       <template v-if="item.UseFlightType == 0">
                         <template v-for="(nItem,newIndex) in item.newFlightList">
-                          <div v-for="(subItem) in nItem.flightList" slot="reference" :key="`f_`+newIndex+`_`+subItem.ID"
-                            class="TCL-flighInfoList">
+                          <div v-for="(subItem) in nItem.flightList" slot="reference"
+                            :key="`d_`+index+`f_`+newIndex+`_`+subItem.ID" class="TCL-flighInfoList">
                             <span class="travelnowrap">
                               <span class="TCL-FlightNumber">{{
                               subItem.Flight_number
@@ -2390,7 +2391,7 @@
         CurrentUserInfo: {},
         showHotelObj: {
           showPrice: true, //是否显示价格
-          showPay: false, //是否显示支付方式
+          showPay: true, //是否显示支付方式
           showZhan: true, //占房时间
           showBtnList: false, //是否下载、确认按钮
           ShowTaxType: false, //显示税入税别

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,
@@ -1791,7 +1791,7 @@
         CurrentUserInfo: {},
         showHotelObj: {
           showPrice: true, //是否显示价格
-          showPay: false, //是否显示支付方式
+          showPay: true, //是否显示支付方式
           showZhan: true, //占房时间
           showBtnList: false, //是否下载、确认按钮
           ShowTaxType: 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;

src/components/index.vue

@@ -2416,7 +2416,6 @@
             }
           );
         }
-
       },
       //测试方法
       testEmp() {

src/components/orderCommon/productOrderList.vue

@@ -468,7 +468,7 @@
         <div class="dline">
           <div class="d1">
             <div v-if="item.IsB2B === 0" class="product_nei"></div>
-            <div v-if="item.IsUnionTravel === 1" class="product_union"></div>
+            <div v-else-if="item.IsUnionTravel === 1" class="product_union"></div>
             <div v-if="item.IsWarning === 1" class="product_warning"></div>
             <div class="d12" style="float: none; margin: auto" :style="{'width': pagesTitle=='跟团游产品'?'300px':'auto'}">
               <p><i class="iconfont icon-biaoti1"></i> {{ item.LineName }}</p>
@@ -904,9 +904,9 @@
                   icon="iconfont icon-sousuo">
                 </el-button>
               </el-tooltip>
-              <!--关内团后不能在报名 hk 2022-07-13去掉 && item.IsB2B === 1 修改为可报名 -->
+              <!--关内团后(IsB2B=0)不能在报名 过了出发日期不能下单(IsPayOrder=1)  -->
               <el-tooltip class="item" effect="dark" :content="$t('salesModule.LJXD')" placement="top-start"
-                v-if="item.IsPayOrder !== 1 && item.IsB2B !== 0 ">
+                v-if="item.IsPayOrder == 2 && item.IsB2B == 1 ">
                 <el-button type="primary" style="background-color: #f16c3c !important; border-color: #f16c3c !important"
                   v-if="!TCIDList" icon="iconfont icon-fukuan1" @click="goBuy(item)"></el-button>
               </el-tooltip>