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

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1090,6 +1090,9 @@
                       <el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1"
                         @click.native="setUpPlat(item)">{{$t('Operation.Op_shangjia')}}
                       </el-dropdown-item>
+                      <el-dropdown-item v-if="item.TCState==3"
+                        @click.native="setUpPlat(item)">修改上架平台
+                      </el-dropdown-item>
                       <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">
                         {{$t('Operation.Op_xiajia')}}
                       </el-dropdown-item>
@@ -2074,12 +2077,15 @@
         }
       },
       checkDialog(value) {
+        console.log("value",value);
+        console.log("this.$tripUtils.TeamStatesList.salsPlat",this.$tripUtils.TeamStatesList.salsPlat);
         let checkedCount = value.length;
         this.queryCommonData.checkDialogAll =
           checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length;
       },
       //点击上架
       setUpPlat(item) {
+        console.log("item",item);
         this.queryCommonData.outerVisible = false;
         this.queryCommonData.setPlatDialog = true;
         this.queryCommonData.singleTCID = item.TCID;

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -668,7 +668,7 @@
                   <div class="TC_SeatList">{{$t('Airticket.Air_firstClass')}}：{{item.FSeat}}</div>
                   <div class="TC_SeatList">{{$t('Airticket.Air_businessClass')}}：{{item.CSeat}}</div>
                   <div class="TC_SeatList">{{$t('Airticket.Air_EconomyClass')}}：{{item.YSeat}}</div>
-                         <div class="TC_SeatList" v-if="item.BindNum>0" style="color:red;">{{$t('Operation.Op_bindNum')}}:
+                  <div class="TC_SeatList" v-if="item.BindNum>0" style="color:red;">{{$t('Operation.Op_bindNum')}}:
                     {{item.BindNum}}</div>
                   <div class="TC_SeatList" v-if="item.TicketNum>0 && item.TicketList">
                     <el-popover width="550" trigger="click">
@@ -813,8 +813,7 @@
                     <el-dropdown-menu slot="dropdown" class="TC-dropdown">
                       <el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
                         {{$t('Operation.Op_shouzhiDetail')}}</el-dropdown-item>
-                      <el-dropdown-item
-                        @click.native="goUrlR(item)">
+                      <el-dropdown-item @click.native="goUrlR(item)">
                         {{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item>
                       <el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}}
                       </el-dropdown-item>
@@ -823,9 +822,10 @@
                         @click.native="setUpPlat(item)">{{$t('Operation.Op_shangjia')}}</el-dropdown-item>
                       <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">
                         {{$t('Operation.Op_xiajia')}}</el-dropdown-item>
-                        <!--&&Number(item.OrderGuestNum)>0 HK 2023-09-14去掉人数判断-->
-                      <el-dropdown-item v-if="item.Status==1"
-                        @click.native="OutGroup(item.TCID,2)">
+                      <el-dropdown-item v-if="item.TCState==3" @click.native="setUpPlat(item)">修改上架平台
+                      </el-dropdown-item>
+                      <!--&&Number(item.OrderGuestNum)>0 HK 2023-09-14去掉人数判断-->
+                      <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
                         {{$t('Operation.Op_jietuan')}}
                       </el-dropdown-item>
                       <el-dropdown-item @click.native="goB2B(item.ConfigId)">{{$t('Operation.Op_b2bView')}}
@@ -1591,11 +1591,11 @@
         });
       },
       goUrlR(item) {
-         var cityId = item.StartCityID;
+        var cityId = item.StartCityID;
         if (item.IsUnion == 1 && item.UnionTypeStr == 2) {
           cityId = item.UnionCityId;
         }
-         let routeData = this.$router.resolve({
+        let routeData = this.$router.resolve({
           name: 'confirmationOrderDownLoadNew',
           query: {
             configId: item.ID,

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -655,10 +655,10 @@
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
                     <el-dropdown-menu slot="dropdown" class="TC-dropdown">
-                      <el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,0,item)">
+                      <el-dropdown-item @click.native="goToOpenTravel('TravelManager5',item.ID,0,item)">
                         {{$t('Operation.Op_xilieModyfi')}}
                       </el-dropdown-item>
-                      <el-dropdown-item @click.native="goTonowTeam('TravelManager',item.ID,item.TCID,item.TCNUM,item)">
+                      <el-dropdown-item @click.native="goTonowTeam('TravelManager5',item.ID,item.TCID,item.TCNUM,item)">
                         {{$t('Operation.Op_dangtuanModify')}}
                       </el-dropdown-item>
                     </el-dropdown-menu>
@@ -687,12 +687,13 @@
                       <el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1"
                         @click.native="setUpPlat(item)">{{$t('Operation.Op_shangjia')}}
                       </el-dropdown-item>
+                      <el-dropdown-item v-if="item.TCState==3" @click.native="setUpPlat(item)">修改上架平台
+                      </el-dropdown-item>
                       <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">
                         {{$t('Operation.Op_xiajia')}}
                       </el-dropdown-item>
                       <!--&&Number(item.OrderGuestNum)>0 HK 2023-09-14 取消人数判断-->
-                      <el-dropdown-item v-if="item.Status==1"
-                        @click.native="OutGroup(item.TCID,2)">
+                      <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
                         {{$t('Operation.Op_jietuan')}}
                       </el-dropdown-item>
                       <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">{{$t('visaT.sale')}}