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

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -119,7 +119,7 @@
     <div class=" TC-MyList">
       <div class="query-box">
         <!--v-if="queryCommonData.IsParentCompany==1"-->
-        <div class="TC_companyList">
+        <div class="TC_companyList" v-show="IsShowAllBranch()">
           <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}"
@@ -1090,8 +1090,7 @@
                       <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 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')}}
@@ -1549,6 +1548,13 @@
       },
     },
     methods: {
+      IsShowAllBranch() {
+        var flag = true;
+        if (this.CurrentUserInfo && this.CurrentUserInfo.RB_Branch_id && this.CurrentUserInfo.RB_Branch_id == 1220) {
+          flag = false;
+        }
+        return flag;
+      },
       //复制、新增报价单
       NewCopyPriceSheet(item, type) {
         if (type) {
@@ -2391,7 +2397,6 @@
         this.queryCommonData.checkCompanyAll = false;
         this.$forceUpdate();
         this.queryMsg.OutBranchIds = [];
-
         this.queryCommonData.BranchList.forEach(x => {
           if (x.isShow) {
             this.queryMsg.OutBranchIds.push(x.Id);

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -87,7 +87,7 @@
   <div class="TC_Content">
     <div class=" TC-MyList">
       <div class="query-box">
-        <div class="TC_companyList">
+        <div class="TC_companyList" v-show="IsShowAllBranch()">
           <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}"
@@ -1037,6 +1037,13 @@
       }
     },
     methods: {
+      IsShowAllBranch() {
+        var flag = true;
+        if (this.CurrentUserInfo && this.CurrentUserInfo.RB_Branch_id && this.CurrentUserInfo.RB_Branch_id == 1220) {
+          flag = false;
+        }
+        return flag;
+      },
       //复制、新增报价单
       NewCopyPriceSheet(item, type) {
         if (type) {