开团调整

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1238,11 +1238,19 @@
       <span>
         <el-checkbox v-model="queryCommonData.checkDialogAll" @change="checkAllDialog" style="margin-right:20px;">
           {{$t('system.table_chekAll')}}</el-checkbox>
+        <template v-if="CurrentUserInfo.RB_Group_Id==2">
           <el-checkbox-group v-model="queryCommonData.ckedplat" @change="checkDialog">
             <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name"
               :disabled="((sales.Id=='2'||sales.Id=='5')&&SaleB2COrWeChatStatus)?true:false">
               {{sales.Name}}</el-checkbox>
           </el-checkbox-group>
+        </template>
+        <template v-else>
+          <el-checkbox-group v-model="queryCommonData.ckedplat" @change="checkDialog">
+            <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">
+              {{sales.Name}}</el-checkbox>
+          </el-checkbox-group>
+        </template>
       </span>
       <span>
         <button class="normalBtn" style="margin-left:50px;" @click="SetshelvesUp">{{$t('pub.sureBtn')}}</button>
@@ -2837,7 +2845,7 @@
         this.CurrentUserInfo.RB_Branch_id == 1216 ||
         this.CurrentUserInfo.RB_Branch_id == 49 ||
         this.CurrentUserInfo.RB_Branch_id == 1218 ||
-        this.CurrentUserInfo.RB_Branch_id == 1249||
+        this.CurrentUserInfo.RB_Branch_id == 1249 ||
         this.CurrentUserInfo.RB_Branch_id == 1252
       ) {
         this.IsModifyTravelControl = 1;
@@ -2903,13 +2911,15 @@
       if (!this.$route.query.tcmun) {
         this.queryMsg.StartGroupDate = nowDate;
       }
+      if (this.CurrentUserInfo.RB_Group_id == 2) {
         if (
           this.queryCommonData.IsParentCompany != 1 &&
-        this.CurrentUserInfo.RB_Branch_id != 49 && this.CurrentUserInfo.RB_Branch_id != 1249
-        && this.CurrentUserInfo.RB_Branch_id != 1252
+          this.CurrentUserInfo.RB_Branch_id != 49 && this.CurrentUserInfo.RB_Branch_id != 1249 &&
+          this.CurrentUserInfo.RB_Branch_id != 1252
         ) {
           this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id);
         }
+      }
       var routeName = this.$route.name
       if (routeName == 'TravelControlList') {
         this.queryMsg.TeamType = 0;

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

 <template>
-  <div>clickFeature
+  <div>
     <div class="TravelFeature" :class="{'foldHeight':isFold==1}">
       <span class="TMTitle">
         <i></i>{{$t('sm.chanpintese')}}
@@ -17,7 +17,8 @@
           <div class="TFslide"
             :class="{'TFcked':item.isShow,'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)}"
             @click="clickFeature(item)" :key="item.subCode"
-            v-if="((item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState<=3)">
+            >
+            <!--v-if="((item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState<=3)"-->
             <img v-bind:src="item.imgUrl">
             <div>{{item.ckTitle}}</div>
           </div>

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -654,7 +654,7 @@
                   </el-form-item>
                   <el-form-item prop="OutBranchId" style="margin-top:1px;">
                     <span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('scen.sc_cp')}}</span>
-                    <el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName" disabled>
+                    <el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName" :disabled="CurrentUserInfo.RB_Group_id==2">
                       <el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
                       <el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
                       </el-option>