11

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -119,14 +119,14 @@
     <div class="TC-MyList">
       <div class="query-box">
         <!--v-if="queryCommonData.IsParentCompany==1"-->
-        <div class="TC_companyList" v-show="IsShowAllBranch() &&CurrentUserInfo.EmployeeId!=3384">
+        <div class="TC_companyList" v-show="IsShowAllBranch() &&CurrentUserInfo.RB_Branch_id!=1257">
           <span :class="{ TC_checked: queryCommonData.checkCompanyAll }"
             @click="getCompanyCheckAll()">{{ $t("advmanager.v_all") }}</span>
           <span v-for="(item, bindex) in queryCommonData.BranchList" :class="{ TC_checked: item.isShow }"
             @click="getCompanyCheck(item)" :key="bindex">{{ item.BName }}</span>
         </div>
         <ul>
-          <li v-if="CurrentUserInfo.EmployeeId != 3384">
+          <li v-if="CurrentUserInfo.RB_Branch_id!=1257">
             <span>
               <em>{{ $t("system.table_ssLine") }}</em>
               <el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
@@ -137,7 +137,7 @@
               </el-select>
             </span>
           </li>
-          <li v-if="CurrentUserInfo.EmployeeId != 3384">
+          <li v-if="CurrentUserInfo.RB_Branch_id!=1257">
             <span>
               <em>{{ $t("Operation.Op_Country") }}/{{ $t("system.query_dest") }}</em>
               <el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')"
@@ -148,7 +148,7 @@
               </el-select>
             </span>
           </li>
-          <li v-if="CurrentUserInfo.EmployeeId != 3384">
+          <li v-if="CurrentUserInfo.RB_Branch_id!=1257">
             <span>
               <em>{{ $t("active.ad_xlmc") }}</em>
               <el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
@@ -3950,7 +3950,10 @@
         this.queryMsg.StartGroupDate = nowDate;
       }
       if (this.CurrentUserInfo.RB_Group_id == 2) {
-        if (
+        if (this.CurrentUserInfo.RB_Branch_id == 1257) {
+          this.queryMsg.LineId = 1;
+          this.queryMsg.PlaceID = 12;
+        } else if (
           this.queryCommonData.IsParentCompany != 1 &&
           this.CurrentUserInfo.RB_Branch_id != 49 &&
           this.CurrentUserInfo.RB_Branch_id != 1249 &&
@@ -3960,10 +3963,6 @@
           this.CurrentUserInfo.RB_Branch_id != 1257
         ) {
           this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id);
-        } else if (this.CurrentUserInfo.EmployeeId == 3384) {
-          //this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id);
-          this.queryMsg.LineId = 1;
-          this.queryMsg.PlaceID = 12;
         }
       }
       var routeName = this.$route.name;

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -78,14 +78,14 @@
     <div class="TC_Content TC-MyList">
       <div class="query-box">
         <!--v-if="queryCommonData.IsParentCompany==1"-->
-        <div class="TC_companyList" v-if="CurrentUserInfo.EmployeeId!=3384">
+        <div class="TC_companyList" v-if="CurrentUserInfo.RB_Branch_id!=1257">
           <span :class="{'TC_checked':queryCommonData.checkCompanyAll}"
             @click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span>
           <span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}"
             @click="getCompanyCheck(item)" :key="bindex">{{item.BName}}</span>
         </div>
         <ul>
-          <li v-if="CurrentUserInfo.EmployeeId!=3384">
+          <li v-if="CurrentUserInfo.RB_Branch_id!=1257">
             <span>
               <em>{{$t('system.table_ssLine')}}</em>
               <el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
@@ -96,7 +96,7 @@
               </el-select>
             </span>
           </li>
-          <li v-if="CurrentUserInfo.EmployeeId!=3384">
+          <li v-if="CurrentUserInfo.RB_Branch_id!=1257">
             <span>
               <em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
               <el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')"
@@ -107,7 +107,7 @@
               </el-select>
             </span>
           </li>
-          <li v-if="CurrentUserInfo.EmployeeId!=3384">
+          <li v-if="CurrentUserInfo.RB_Branch_id!=1257">
             <span>
               <em>{{$t('active.ad_xlmc')}}</em>
               <el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
@@ -2788,14 +2788,14 @@
           myDate.getDate();
         this.queryMsg.StartGroupDate = nowDate;
       }
-      if (this.queryCommonData.IsParentCompany != 1 && userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id != 1224 &&
-        userInfo.RB_Branch_id != 1249 && userInfo.RB_Branch_id != 1252 && userInfo.RB_Branch_id != 1253 && userInfo
-        .RB_Branch_id != 1216&& userInfo.RB_Branch_id != 1257) {
-        this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
-      } else if (this.CurrentUserInfo.EmployeeId == 3384) {
-        //this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id);
+      if (userInfo.RB_Branch_id == 1257) {
         this.queryMsg.LineId = 1;
         this.queryMsg.PlaceID = 12;
+      } else if (this.queryCommonData.IsParentCompany != 1 && userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id !=
+        1224 &&
+        userInfo.RB_Branch_id != 1249 && userInfo.RB_Branch_id != 1252 && userInfo.RB_Branch_id != 1253 && userInfo
+        .RB_Branch_id != 1216 && userInfo.RB_Branch_id != 1257) {
+        this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
       }
       //默认查询全部团队状态
       this.$tripUtils.TeamStatesList.TeamStates.forEach(states => {

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -87,14 +87,14 @@
   <div class="TC_Content">
     <div class=" TC-MyList">
       <div class="query-box">
-        <div class="TC_companyList" v-show="IsShowAllBranch()&&CurrentUserInfo.EmployeeId!=3384">
+        <div class="TC_companyList" v-show="IsShowAllBranch()&&CurrentUserInfo.RB_Branch_id!=1257">
           <span :class="{'TC_checked':queryCommonData.checkCompanyAll}"
             @click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span>
           <span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}"
             @click="getCompanyCheck(item)">{{item.BName}}</span>
         </div>
         <ul>
-          <li v-if="CurrentUserInfo.EmployeeId!=3384">
+          <li v-if="CurrentUserInfo.RB_Branch_id!=1257">
             <span>
               <em>{{$t('system.table_ssLine')}}</em>
               <el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
@@ -105,7 +105,7 @@
               </el-select>
             </span>
           </li>
-          <li v-if="CurrentUserInfo.EmployeeId!=3384">
+          <li v-if="CurrentUserInfo.RB_Branch_id!=1257">
             <span>
               <em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
               <el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')"
@@ -116,7 +116,7 @@
               </el-select>
             </span>
           </li>
-          <li>
+          <li v-if="CurrentUserInfo.RB_Branch_id!=1257">
             <span>
               <em>{{$t('active.ad_xlmc')}}</em>
               <el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
@@ -2475,14 +2475,14 @@
         this.queryMsg.StartGroupDate = nowDate
       }
       if (this.queryCommonData.IsParentCompany != 1) {
-        if (this.CurrentUserInfo.RB_Branch_id != 49 && this.CurrentUserInfo.RB_Branch_id != 1245 && this.CurrentUserInfo
+        if (this.CurrentUserInfo.RB_Branch_id == 1257) {
+          this.queryMsg.LineId = 177;
+          this.queryMsg.PlaceID = 525;
+        } else if (this.CurrentUserInfo.RB_Branch_id != 49 && this.CurrentUserInfo.RB_Branch_id != 1245 && this
+          .CurrentUserInfo
           .RB_Branch_id != 1249 && this.CurrentUserInfo.RB_Branch_id != 1252 && this.CurrentUserInfo.RB_Branch_id !=
           1253 && this.CurrentUserInfo.RB_Branch_id != 1257) {
           this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id)
-        } else if (this.CurrentUserInfo.EmployeeId == 3384) {
-          //this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id);
-          this.queryMsg.LineId = 177;
-          this.queryMsg.PlaceID = 525;
         }
       }
       this.getControlList()