权限修改

src/assets/utils/tripUtils.js

@@ -734,6 +734,19 @@ var tripUtils = {
       })
     }
     return flag;
+  },
+  //跳转到B2B一日游页面
+  GotoB2BOneDayPage(B2BDomain,ConfigId,tcid)
+  {
+    if (B2BDomain) {
+     var url = "http://"+B2BDomain;
+      window.open(
+        url+'/#/OneDayDetailTwo/' +
+        encodeURIComponent(ConfigId) + '/' + tcid +
+        '/preview',
+        '_blank'
+      )
     }
+  },
 }
 export default tripUtils;

src/components/Hotel/HotelContract.vue

@@ -71,8 +71,6 @@
   export default {
     data() {
       return {
-        //当前登录用户
-        CurrentUserInfo: {},
         defaultSelectValue: 0,
         list: [],
         roomList: [],
@@ -565,8 +563,7 @@
     },
     mounted() {
       this.getAllCurrency();
-      let userInfo = this.getLocalStorage()
-      this.CurrentUserInfo = userInfo;
+ 
       this.TCNUM = this.$route.query.TCNUM;
       this.NewTCIDs = this.$route.query.NewTCIDs;
       this.initSupplier();

src/components/Hotel/roomReservationsDetails.vue

@@ -604,8 +604,6 @@
     data() {
       return {
         EditBtn: false, //房餐景点修改权限
-        //当前登录用户
-        CurrentUserInfo: {},
         defaultSelectValue: 0,
         list: [],
         roomList: [],
@@ -1208,8 +1206,6 @@
     mounted() {
       this.GetAuth();
       this.getAllCurrency();
-      let userInfo = this.getLocalStorage()
-      this.CurrentUserInfo = userInfo;
       this.LeaderName = this.$route.query.LeaderName;
       this.GuideName = this.$route.query.GuideName;
       this.TCNUM = this.$route.query.TCNUM;

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -240,8 +240,6 @@
         GuestNum: 0,
         loading: false,
         IsOperation: '',
-        //当前登录人信息
-        CurrentUserInfo: {},
         //是否禁用按钮
         IsDisabled: false,
         allCurrencyList: [],
@@ -484,8 +482,6 @@
     mounted() {
       this.CheckAuth();
       this.GetAuth();
-      let userInfo = this.getLocalStorage();
-      this.CurrentUserInfo = userInfo;
       this.TCNUM = this.$route.query.TCNUM;
       this.GuestNum = this.$route.query.GuestNum;
       this.getList();

src/components/SalesModule/enrollTotalForAirUnion.vue

@@ -557,7 +557,6 @@
         this.CheckUserAuth(actionCode, res => {
           if (res.data.resultCode == 1 && res.data.data == 1) {
             this.EditBtn = true;
-            console.log("this.EditBtn",this.EditBtn)
           }
         });
       },

src/components/TravelManager/TravelList/OpTripList.vue

@@ -125,13 +125,12 @@
               </div>
               <div class="el-col">
                 <div class="d7">
-                  <el-button @click="goToOpenTravel('TravelManager2',item.ID)" type="primary" >
+                  <el-button @click="goToOpenTravel('TravelManager2',item.ID)" type="primary">
                     {{$t('Operation.Op_tripUpdate')}}</el-button>
                   <el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
                   <el-button @click="goUrlR('confirmationOrderDownLoad',item)" type="primary">
                     {{$t('Operation.Op_tripDownLoad')}}</el-button>
-                  <el-button style="display:none;" @click="goB2B(item.ID, 0)" type="primary">
-                    {{$t('Operation.Op_b2bView')}}</el-button>
+                  
                   <el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary">
                     {{$t('system.table_delete')}}</el-button>
 
@@ -197,8 +196,6 @@
           EndGroupDate: "",
           KeyWords: "", //关键字
         },
-        //当前登录人员信息
-        CurrentUserInfo: {},
         remarkMsg: {
           TCID: 0,
           OPRemark: "",
@@ -393,8 +390,8 @@
       //根据当前员工所在部门获取该部门及子部门员工信息
       SetTravelConfigShare(ID) {
         let msg = {
-          ID:ID,
-          ShareTeamType:1
+          ID: ID,
+          ShareTeamType: 1
         };
         this.apipost(
           "travel_post_SetTravelConfigShareService", msg,
@@ -407,17 +404,7 @@
           err => {}
         );
       },
-      goB2B(ConfigId, tcid) {
-        var B2BDomain = this.CurrentUserInfo.B2BDomain;
-        var url = "http://192.168.2.214:8084";
-        url = "http://www.oytour.com";
-        window.open(
-          url + '/#/detailTwo/' +
-          encodeURIComponent(ConfigId) + '/' + tcid +
-          '/preview',
-          '_blank'
-        )
-      },
+
       goUrlR(path, item) {
         var cityId = item.StartCityID
         if (item.IsUnion == 1 && item.UnionTypeStr == 2) {
@@ -444,8 +431,6 @@
       this.getLineList();
     },
     created() {
-      let userInfo = this.getLocalStorage()
-      this.CurrentUserInfo = userInfo;
       this.getControlList();
     },
   };

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -901,7 +901,6 @@
               this.queryMsg.TCID = "";
             }
             if (res.data.resultCode == 1) {
-              console.log("res.data.data.pageData",res.data.data.pageData);
               this.queryCommonData.dataList = res.data.data.pageData
               this.queryMsg.total = res.data.data.count
               this.queryMsg.noData = !this.queryMsg.total > 0
@@ -1150,13 +1149,8 @@
         })
       },
       goB2B (ConfigId, tcid) {
-        var B2BDomain = this.CurrentUserInfo.B2BDomain
-        window.open(
-          'http://www.oytour.com/#/OneDayDetailTwo/' +
-          encodeURIComponent(ConfigId) + '/' + tcid +
-          '/preview',
-          '_blank'
-        )
+        var B2BDomain = this.CurrentUserInfo.B2BDomain;
+        this.$tripUtils.GotoB2BOneDayPage(B2BDomain,ConfigId,tcid);
       },
       goTeamBalance (id, OutBranchId) {
         this.$router.push({

src/components/activity/LocaltourMan.vue

@@ -65,7 +65,7 @@
     text-align: center;
   }
 
-  .TC_Content ._pic_upload > div {
+  .TC_Content ._pic_upload>div {
     float: left;
     width: 138px;
     height: 92px;
@@ -81,16 +81,19 @@
   .TC_Content .avatar-uploader-icon {
     height: auto;
   }
-  .LocaltourMan .query-box li span>em{
+
+  .LocaltourMan .query-box li span>em {
     margin: 0 10px 0 0;
   }
+
 </style>
 <template>
   <div class="LocaltourMan TC_Content">
     <div class=" TC-MyList">
       <div class="query-box">
         <div class="TC_companyList">
-          <span :class="{'TC_checked':queryCommonData.checkCompanyAll}" @click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span>
+          <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>
@@ -130,7 +133,8 @@
           <li>
             <span>
               <em>推荐类型</em>
-              <el-select class="w150" v-model="queryMsg.LocalRecommendType" filterable :placeholder="$t('pub.pleaseSel')">
+              <el-select class="w150" v-model="queryMsg.LocalRecommendType" filterable
+                :placeholder="$t('pub.pleaseSel')">
                 <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
                 <el-option label="首页推荐" :value="1"></el-option>
                 <el-option label="首页热门" :value="2"></el-option>
@@ -142,27 +146,23 @@
             <span>
               <em>{{$t('visa.v_tuanhao')}}</em>
               <el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150"
-                        @keyup.native.enter="getControlList"
-                        :placeholder="$t('pub.pleaseImport')"></el-input>
+                @keyup.native.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input>
             </span>
           </li>
           <li style="display:none;">
             <span>
               <em>{{$t('hotel.hotel_SerialNumber')}}</em>
               <el-input maxlength="50" v-model="queryMsg.TCID" class="permiss-input w150"
-                        @keyup.native.enter="getControlList"
-                        :placeholder="$t('pub.pleaseImport')"></el-input>
+                @keyup.native.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input>
             </span>
           </li>
           <li>
             <span>
               <em>{{$t('scen.sc_ftTime')}}</em>
               <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
-                              :picker-options="pickerBeginDateBefore"
-                              value-format="yyyy-MM-dd" placeholder></el-date-picker>
+                :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
               <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
-                              :picker-options="pickerBeginDateAfter"
-                              value-format="yyyy-MM-dd" placeholder></el-date-picker>
+                :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
             </span>
           </li>
           <li class="advancedLi" style="height:34px;">
@@ -175,21 +175,19 @@
                       <span>{{$t('system.query_airCompanyName')}}</span>
                       <el-select v-model="queryMsg.AirTicketId" filterable :placeholder="$t('system.ph_buxian')"
                         class="w150">
-                        <el-option :label="$t('system.ph_buxian')"
-                                   :value="queryCommonData.SelectDefaultValue"></el-option>
+                        <el-option :label="$t('system.ph_buxian')" :value="queryCommonData.SelectDefaultValue">
+                        </el-option>
                         <el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId"
-                                   :label="item.AlName"
-                                   :value="item.AirLineId"></el-option>
+                          :label="item.AlName" :value="item.AirLineId"></el-option>
                       </el-select>
                     </div>
                     <div>
                       <span>{{$t('visa.v_czuser')}}</span>
                       <el-select class="w150" v-model="queryMsg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
-                        <el-option :label="$t('pub.unlimitedSel')"
-                                   :value="queryCommonData.SelectDefaultValue"></el-option>
+                        <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue">
+                        </el-option>
                         <el-option v-for="item in queryCommonData.EmployeeList" :label="item.EmName"
-                                   :value="item.EmployeeId"
-                                   :key="item.EmployeeId"></el-option>
+                          :value="item.EmployeeId" :key="item.EmployeeId"></el-option>
                       </el-select>
                     </div>
                     <div>
@@ -202,8 +200,8 @@
                       <span>{{$t('visa.v_lycity')}}</span>
                       <el-select class="w150" filterable v-model="queryMsg.UnionCityId"
                         :placeholder="$t('pub.pleaseSel')">
-                        <el-option :label="$t('pub.unlimitedSel')"
-                                   :value="queryCommonData.SelectDefaultValue"></el-option>
+                        <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue">
+                        </el-option>
                         <el-option v-for="item in queryCommonData.CityList" :label="item.Name" :value="item.ID"
                           :key="item.ID"></el-option>
                       </el-select>
@@ -213,27 +211,27 @@
                     <div>
                       <span>{{$t('visa.v_teamnum')}}</span>
                       <el-input maxlength="50" class="w80" v-model="queryMsg.TeamMinNum"
-                                @keyup.native="checkInteger(queryMsg,'TeamMinNum')"
-                                :placeholder="$t('pub.pleaseImport')"></el-input>
+                        @keyup.native="checkInteger(queryMsg,'TeamMinNum')" :placeholder="$t('pub.pleaseImport')">
+                      </el-input>
                       -
                       <el-input maxlength="50" class="w80" v-model="queryMsg.TeamMaxNum"
-                                @keyup.native="checkInteger(queryMsg,'TeamMaxNum')"
-                                @blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input>
+                        @keyup.native="checkInteger(queryMsg,'TeamMaxNum')" @blur="checkTeamNum(queryMsg)"
+                        :placeholder="$t('pub.pleaseImport')"></el-input>
                     </div>
                     <div>
                       <span>{{$t('leader.leader_registraNum')}}</span>
                       <el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMinNum"
-                                @keyup.native="checkInteger(queryMsg,'ApplyMinNum')"
-                                :placeholder="$t('pub.pleaseImport')"></el-input>
+                        @keyup.native="checkInteger(queryMsg,'ApplyMinNum')" :placeholder="$t('pub.pleaseImport')">
+                      </el-input>
                       -
                       <el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMaxNum"
-                                @keyup.native="checkInteger(queryMsg,'ApplyMaxNum')"
-                                @blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input>
+                        @keyup.native="checkInteger(queryMsg,'ApplyMaxNum')" @blur="checkTeamNum(queryMsg)"
+                        :placeholder="$t('pub.pleaseImport')"></el-input>
                     </div>
                     <div class="OnlyShowOverTeam">
                       <span>{{$t('visa.v_zkbaochaotuan')}}</span>
-                      <el-switch v-model="queryMsg.OnlyShowOverTeam" active-value="true"
-                                 inactive-value="false"></el-switch>
+                      <el-switch v-model="queryMsg.OnlyShowOverTeam" active-value="true" inactive-value="false">
+                      </el-switch>
                     </div>
                     <div>
                       <span>{{$t('visa.v_salecompany')}}</span>
@@ -248,7 +246,8 @@
                 <div class="comSearchDiv">
                   <span>{{$t('scen.sc_temStatu')}}</span>
                   <span>
-                    <el-checkbox v-model="queryCommonData.checkTCStateAll" @change="checkAllTeam">{{$t('system.table_chekAll')}}</el-checkbox>
+                    <el-checkbox v-model="queryCommonData.checkTCStateAll" @change="checkAllTeam">
+                      {{$t('system.table_chekAll')}}</el-checkbox>
                     <el-checkbox-group v-model="queryMsg.TCState" @change="checkedTeamList">
                       <el-checkbox v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Id"
                         :key="team.Name">{{team.Name}}</el-checkbox>
@@ -258,7 +257,8 @@
                 <div class="comSearchDiv">
                   <span>{{$t('Airticket.Air_salesPlatform')}}</span>
                   <span>
-                    <el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">{{$t('system.table_chekAll')}}</el-checkbox>
+                    <el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">
+                      {{$t('system.table_chekAll')}}</el-checkbox>
                     <el-checkbox-group v-model="queryMsg.SalePlat" @change="checkSales">
                       <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id"
                         :key="sales.Name">{{sales.Name}}</el-checkbox>
@@ -268,7 +268,8 @@
                 <div class="comSearchDiv">
                   <span>{{$t('visa.v_tqstatus')}}</span>
                   <span>
-                    <el-checkbox v-model="queryCommonData.checkGroupALL" @change="checkGroupAll">{{$t('system.table_chekAll')}}</el-checkbox>
+                    <el-checkbox v-model="queryCommonData.checkGroupALL" @change="checkGroupAll">
+                      {{$t('system.table_chekAll')}}</el-checkbox>
                     <el-checkbox-group v-model="queryMsg.GroupState" @change="checkGroup">
                       <el-checkbox v-for="state in $tripUtils.TeamStatesList.teamDateStates" :label="state.Id"
                         :key="state.Name">{{state.Name}}</el-checkbox>
@@ -281,8 +282,7 @@
                   <span>
                     <el-checkbox-group v-model="queryCommonData.flightCKed" style="margin-left:0;">
                       <el-checkbox v-for="state in flightStatus" :label="state.Id" :checked="state.Checked"
-                                   @change="checkedFlight(state)"
-                                   :key="state.Name">{{state.Name}}</el-checkbox>
+                        @change="checkedFlight(state)" :key="state.Name">{{state.Name}}</el-checkbox>
                     </el-checkbox-group>
                   </span>
                 </div>
@@ -311,7 +311,8 @@
                 <div class="clearfix">
                   <div class="TC_leftSearch">
                     <div>
-                      <span style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">{{$t('leader.leader_registraNum')}}</span>
+                      <span
+                        style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">{{$t('leader.leader_registraNum')}}</span>
                       <el-select v-model="queryMsg.WarningQuery" filterable :placeholder="$t('system.ph_buxian')"
                         class="w150">
                         <el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
@@ -323,7 +324,8 @@
                       </el-select>
                     </div>
                     <div>
-                      <span style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">{{$t('Operation.Op_daysChoice')}}</span>
+                      <span
+                        style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">{{$t('Operation.Op_daysChoice')}}</span>
                       <el-select v-model="queryMsg.RateOnDay" filterable :placeholder="$t('system.ph_buxian')"
                         class="w150">
                         <el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
@@ -334,7 +336,8 @@
                       </el-select>
                     </div>
                     <div>
-                      <span style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">{{$t('Operation.Op_Attendance')}}</span>
+                      <span
+                        style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">{{$t('Operation.Op_Attendance')}}</span>
                       <el-select v-model="queryMsg.RateOn" filterable :placeholder="$t('system.ph_buxian')"
                         class="w150">
                         <el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
@@ -365,8 +368,8 @@
       <div class="TravelTclList" v-loading="queryCommonData.loading">
         <ul>
           <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
-                         layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize"
-                         :total="queryMsg.total"></el-pagination>
+            layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total">
+          </el-pagination>
           <li v-for="(item,index) in queryCommonData.dataList" :key="index"
             :class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
             <div class="TC_remarkContent TC_teamName">
@@ -531,8 +534,7 @@
                   <a v-if="item.HotelDiningBus.HotelChangeState>0" @click="goHotelDiningBus(item,item.HotelDiningBus,1)"
                     style="color:blue;cursor:pointer">酒店变更</a>
                   <a v-if="item.HotelDiningBus.DiningChangeState>0"
-                     @click="goHotelDiningBus(item,item.HotelDiningBus,2)"
-                     style="color:blue;cursor:pointer">餐厅变更</a>
+                    @click="goHotelDiningBus(item,item.HotelDiningBus,2)" style="color:blue;cursor:pointer">餐厅变更</a>
                   <a v-if="item.HotelDiningBus.ResultBusTypeStr!=''">车型:{{item.HotelDiningBus.ResultBusTypeStr}}</a>
                 </div>
               </div>
@@ -541,8 +543,8 @@
         </ul>
         <div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>
         <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
-                       layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize"
-                       :total="queryMsg.total"></el-pagination>
+          layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total">
+        </el-pagination>
       </div>
     </div>
 
@@ -550,10 +552,11 @@
       <div class="combottomTitle">请选择上架平台</div>
       <span class="setPlatLeft">销售平台</span>
       <span>
-        <el-checkbox v-model="queryCommonData.checkDialogAll" @change="checkAllDialog"
-                     style="margin-right:20px;">全选</el-checkbox>
+        <el-checkbox v-model="queryCommonData.checkDialogAll" @change="checkAllDialog" style="margin-right:20px;">全选
+        </el-checkbox>
         <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 v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">
+            {{sales.Name}}</el-checkbox>
         </el-checkbox-group>
       </span>
       <span>
@@ -615,7 +618,7 @@
 </template>
 <script>
   export default {
-    data () {
+    data() {
       return {
         //查询数据列表
         queryCommonData: {
@@ -769,13 +772,16 @@
       }
     },
     methods: {
-        SetupState(item,num){
-            this.apipost('travel_post_SetLocalRecommendType', {"tcid":item.TCID,"localRecommendType":num}, res => {
+      SetupState(item, num) {
+        this.apipost('travel_post_SetLocalRecommendType', {
+          "tcid": item.TCID,
+          "localRecommendType": num
+        }, res => {
           if (res.data.resultCode == 1) {
             this.Success(res.data.message)
             this.getControlList()
 
-            }else{
+          } else {
             this.Error(res.data.message)
 
           }
@@ -787,18 +793,20 @@
         this.downloadFileRename(item.FullUrl.replace(reg, ''), item.Name)
       },
       //翻页
-      handleCurrentChange (val) {
+      handleCurrentChange(val) {
         this.queryMsg.pageIndex = val
         this.getControlList()
       },
       //重新查询
-      resetPageIndex () {
+      resetPageIndex() {
         this.queryMsg.pageIndex = 1
         this.queryMsg.currentPage = 1
       },
       //获取线路列表
-      getLineList () {
-        this.apipost('line_post_GetList', {"LineDirection":3}, res => {
+      getLineList() {
+        this.apipost('line_post_GetList', {
+          "LineDirection": 3
+        }, res => {
           if (res.data.resultCode == 1) {
             this.queryCommonData.LineList = res.data.data
             this.queryCommonData.PlaceList = []
@@ -807,7 +815,7 @@
         })
       },
       //获取目的地列表
-      getLinePlaceList () {
+      getLinePlaceList() {
         this.queryMsg.PlaceID = 0
         let msg = {
           lineID: this.queryMsg.LineId,
@@ -820,7 +828,7 @@
         })
       },
       //获取系列列表
-      getLineTeamList () {
+      getLineTeamList() {
         this.queryMsg.LineteamId = 0
         let msg = {
           lineID: this.queryMsg.LineId,
@@ -834,13 +842,13 @@
         })
       },
       //切换公司
-      getCompanyTab (Id) {
+      getCompanyTab(Id) {
         this.queryMsg.OutBranchId = Id
         this.queryMsg.currentPage = 1
         this.getControlList()
       },
       //获取航空公司
-      getAirlineList () {
+      getAirlineList() {
         this.apipost(
           'airline_post_GetList', {},
           res => {
@@ -848,12 +856,11 @@
               this.queryCommonData.AirlineList = res.data.data
             }
           },
-          err => {
-          }
+          err => {}
         )
       },
       //根据当前员工所在部门获取该部门及子部门员工信息
-      getEmployeeList () {
+      getEmployeeList() {
         let userInfo = this.getLocalStorage()
         let msg = {
           GroupId: userInfo.RB_Group_id,
@@ -869,13 +876,12 @@
               this.queryCommonData.EmployeeList = res.data.data
             }
           },
-          err => {
-          }
+          err => {}
         )
       },
 
       //新获取列表数据
-      getControlList () {
+      getControlList() {
         var msg = JSON.parse(JSON.stringify(this.queryMsg))
         if (msg.TeamMinNum == '') {
           msg.TeamMinNum = -1
@@ -913,13 +919,12 @@
               })
             }
           },
-          err => {
-          }
+          err => {}
         )
       },
 
       //验证大小
-      checkTeamNum (queryMsg) {
+      checkTeamNum(queryMsg) {
         var TeamMinNum = parseInt(queryMsg.TeamMinNum)
         var TeamMaxNum = parseInt(queryMsg.TeamMaxNum)
         var ApplyMinNum = parseInt(queryMsg.ApplyMinNum)
@@ -932,7 +937,7 @@
         }
       },
       //初始化公司
-      getCompanyList () {
+      getCompanyList() {
         let userInfo = this.getLocalStorage()
         var RB_Group_id = userInfo.RB_Group_id
         let msg = {
@@ -951,12 +956,11 @@
               })
             }
           },
-          err => {
-          }
+          err => {}
         )
       },
       //团期状态全选
-      checkGroupAll (val) {
+      checkGroupAll(val) {
         this.queryMsg.GroupState = []
         if (val) {
           this.$tripUtils.TeamStatesList.teamDateStates.forEach(x => {
@@ -964,13 +968,13 @@
           })
         }
       },
-      checkGroup (value) {
+      checkGroup(value) {
         let checkedCount = value.length
         this.queryCommonData.checkGroupALL =
           checkedCount === this.$tripUtils.TeamStatesList.teamDateStates.length
       },
       //销售平台全选
-      checkAllSales (val) {
+      checkAllSales(val) {
         this.queryMsg.SalePlat = []
         if (val) {
           this.$tripUtils.TeamStatesList.salsPlat.forEach(x => {
@@ -978,13 +982,13 @@
           })
         }
       },
-      checkSales (value) {
+      checkSales(value) {
         let checkedCount = value.length
         this.queryCommonData.checkPlatForm =
           checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length
       },
       //团队状态全选
-      checkAllTeam (val) {
+      checkAllTeam(val) {
         this.queryMsg.TCState = []
         if (val) {
           this.$tripUtils.TeamStatesList.TeamStates.forEach(x => {
@@ -1001,7 +1005,7 @@
           this.queryCommonData.showPlatForm = false
         }
       },
-      checkedTeamList (value) {
+      checkedTeamList(value) {
         if (value.indexOf(this.$tripUtils.TeamStatesList.TeamStates[2].Id) > -1) {
           this.queryCommonData.showPlatForm = true
         } else {
@@ -1012,7 +1016,7 @@
           checkedCount === this.$tripUtils.TeamStatesList.TeamStates.length
       },
       //全选弹出框
-      checkAllDialog (val) {
+      checkAllDialog(val) {
         this.queryCommonData.ckedplat = []
         if (val) {
           this.$tripUtils.TeamStatesList.salsPlat.forEach(x => {
@@ -1020,13 +1024,13 @@
           })
         }
       },
-      checkDialog (value) {
+      checkDialog(value) {
         let checkedCount = value.length
         this.queryCommonData.checkDialogAll =
           checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length
       },
       //点击上架
-      setUpPlat (item) {
+      setUpPlat(item) {
         this.queryCommonData.outerVisible = false
         this.queryCommonData.setPlatDialog = true
         this.queryCommonData.singleTCID = item.TCID
@@ -1046,7 +1050,7 @@
         }
       },
       //单团设置下架
-      Setshelves (TCID) {
+      Setshelves(TCID) {
         let msg = {
           TCID: TCID,
           TCState: 2,
@@ -1064,7 +1068,7 @@
         })
       },
       //单团设置上架
-      SetshelvesUp () {
+      SetshelvesUp() {
         let msg = {
           TCID: this.queryCommonData.singleTCID,
           TCState: 3,
@@ -1085,7 +1089,7 @@
         })
       },
 
-      goUrl (path, id, name) {
+      goUrl(path, id, name) {
         this.$store.commit('pageConditionUpdate', this.queryMsg)
         this.$router.push({
           name: path,
@@ -1096,7 +1100,7 @@
           }
         })
       },
-      goUrlR (path, item) {
+      goUrlR(path, item) {
         var cityId = item.StartCityID
         if (item.IsUnion == 1 && item.UnionTypeStr == 2) {
           cityId = item.UnionCityId
@@ -1116,15 +1120,15 @@
         window.open(routeData.href, '_blank')
       },
       //控制是否显示确认单按钮
-      showSureOrder (code,createBy) {
+      showSureOrder(code, createBy) {
         let UserInfo = this.getLocalStorage();
-        if(createBy == UserInfo.EmployeeId||UserInfo.ActionMenuCode.indexOf(code)!=-1){
+        if (createBy == UserInfo.EmployeeId || UserInfo.ActionMenuCode.indexOf(code) != -1) {
           return true;
-        }else{
+        } else {
           return false;
         }
       },
-      goSureOrder (path, TCID) {
+      goSureOrder(path, TCID) {
         this.$router.push({
           name: path,
           query: {
@@ -1134,7 +1138,7 @@
           }
         })
       },
-      goUrlMake (path, LineID, TCID, name) {
+      goUrlMake(path, LineID, TCID, name) {
         this.$router.push({
           name: path,
           query: {
@@ -1145,16 +1149,7 @@
           }
         })
       },
-      goB2B (ConfigId, tcid) {
-        var B2BDomain = this.CurrentUserInfo.B2BDomain
-        window.open(
-          'http://www.oytour.com/#/detailTwo/' +
-          encodeURIComponent(ConfigId) + '/' + tcid +
-          '/preview',
-          '_blank'
-        )
-      },
-      goTeamBalance (id, OutBranchId) {
+      goTeamBalance(id, OutBranchId) {
         this.$router.push({
           name: 'TeamBalancePayment',
           query: {
@@ -1166,7 +1161,7 @@
         })
       },
       //开团或修改
-      goToOpenTravel (path,configId, tcid) {
+      goToOpenTravel(path, configId, tcid) {
         if (configId > 0) {
           this.$store.commit('pageConditionUpdate', this.queryMsg)
           this.$router.push({
@@ -1186,7 +1181,7 @@
         }
       },
       //当团修改
-      goTonowTeam (path, configId, tcid, TCNUM) {
+      goTonowTeam(path, configId, tcid, TCNUM) {
         if (configId > 0) {
           this.$store.commit('pageConditionUpdate', this.queryMsg)
           this.$router.push({
@@ -1210,7 +1205,7 @@
       },
 
       //删除团期
-      removeTeamInfo (TCID) {
+      removeTeamInfo(TCID) {
         var that = this
         that.Confirm('是否删除?', function () {
           var msg = {
@@ -1232,14 +1227,14 @@
         })
       },
       //获取城市
-      getCountryCity () {
+      getCountryCity() {
         this.apipost('sellorder_get_GetAllStartCity', {}, res => {
           if (res.data.resultCode == 1) {
             this.queryCommonData.CityList = res.data.data
           }
         })
       },
-      getSellorCompany () {
+      getSellorCompany() {
         //出团公司
         this.apipost(
           'sellorder_post_GetBranchList', {},
@@ -1248,12 +1243,11 @@
               this.queryCommonData.companyList = res.data.data
             }
           },
-          err => {
-          }
+          err => {}
         )
       },
       //点击op备注
-      ckOPremark (item) {
+      ckOPremark(item) {
         this.remarkMsg.TCID = item.TCID
         this.remarkMsg.OPRemark = item.OPRemark
         this.remarkMsg.OPInnerRemark = item.OPInnerRemark
@@ -1261,7 +1255,7 @@
         this.queryCommonData.outerVisible = true
       },
       //设置OP备注
-      setOPremark () {
+      setOPremark() {
         this.apipost(
           'travel_post_SetTravelPrcieOpRemark',
           this.remarkMsg,
@@ -1274,19 +1268,18 @@
               this.Error(res.data.message)
             }
           },
-          err => {
-          }
+          err => {}
         )
       },
       //点击本团卖点
-      ckSellPoint (item) {
+      ckSellPoint(item) {
         this.queryCommonData.SellingPoints = true
         this.remarkMsg.ConfigId = item.ID
         this.remarkMsg.ProductRecommend = item.ProductRecommend
         this.remarkMsg.TCID = item.TCID
       },
       //本团卖点
-      SetSellingPoints () {
+      SetSellingPoints() {
         this.apipost(
           'travel_post_SetSellingPoints',
           this.remarkMsg,
@@ -1299,17 +1292,16 @@
               this.Error(res.data.message)
             }
           },
-          err => {
-          }
+          err => {}
         )
       },
-      checkedFlight (item) {
+      checkedFlight(item) {
         this.queryMsg.FlightState = item.Id
         this.queryCommonData.flightCKed = []
         this.queryCommonData.flightCKed.push(item.Id)
       },
       //点击选取出团公司
-      getCompanyCheck (item) {
+      getCompanyCheck(item) {
         item.isShow = !item.isShow
         this.queryCommonData.checkCompanyAll = false
         this.$forceUpdate()
@@ -1331,7 +1323,7 @@
         this.getControlList()
       },
       //查询全部
-      getCompanyCheckAll () {
+      getCompanyCheckAll() {
         this.queryCommonData.checkCompanyAll = true
         this.queryMsg.OutBranchIds = []
         this.queryCommonData.BranchList.forEach(x => {
@@ -1340,7 +1332,7 @@
         this.getControlList()
       },
 
-      SetPrice (value) {
+      SetPrice(value) {
         if (value == null) {
           return 0.0
         }
@@ -1357,7 +1349,7 @@
       },
 
       //隐藏显示
-      ShowUnionList (item) {
+      ShowUnionList(item) {
         // this.queryCommonData.showUnion = !this.queryCommonData.showUnion;
         item.isshowUnion = !item.isshowUnion
         if (item.isshowUnion) {
@@ -1368,7 +1360,7 @@
         this.$forceUpdate()
       },
       //酒店餐厅处理跳转
-      goHotelDiningBus (item, HotelDiningBus, type) {
+      goHotelDiningBus(item, HotelDiningBus, type) {
         if (type == 1) {
           this.$router.push({
             name: 'ChangeHotel',
@@ -1392,12 +1384,12 @@
         }
       },
       //显示弹窗层
-      ShowUploadWord (item) {
+      ShowUploadWord(item) {
         this.queryCommonData.UploadWORDTip = true
         this.queryCommonData.UploadItem = item
       },
       //保存WORD路劲
-      uploadFileBtn (file) {
+      uploadFileBtn(file) {
         var that = this
         let newArr = []
         newArr.push(file.file)
@@ -1422,8 +1414,7 @@
                   that.Error(res.data.message)
                 }
               },
-              err => {
-              }
+              err => {}
             )
           } else {
             that.Error('上传文件失败!')
@@ -1431,7 +1422,7 @@
         })
       },
       //结团/正常
-      OutGroup (TCID, Status) {
+      OutGroup(TCID, Status) {
         let msg = {
           TCID: TCID,
           Status: Status,
@@ -1449,11 +1440,11 @@
       },
     },
     filters: {
-      formatStartDate (value) {
+      formatStartDate(value) {
         let dataArr = value.split('-')
         return dataArr[1] + '-' + dataArr[2]
       },
-      priceFormat (value) {
+      priceFormat(value) {
         if (value == null) {
           return 0.0
         }
@@ -1469,7 +1460,7 @@
         return x1 + x2
       }
     },
-    mounted () {
+    mounted() {
       //销售公司
       this.getSellorCompany()
       this.getCompanyList()
@@ -1478,20 +1469,19 @@
       this.getEmployeeList()
       this.getCountryCity()
     },
-    created () {
+    created() {
       this.checkAllTeam();
       //默认显示联运
-      this.queryMsg.IsShowUnion = 1
-      let userInfo = this.getLocalStorage()
-      this.CurrentUserInfo = userInfo
+      this.queryMsg.IsShowUnion = 1;
+      this.CurrentUserInfo = this.getLocalStorage();
 
-      this.$route.query.tcmun = this.$route.query.tcmun
+      this.$route.query.tcmun = this.$route.query.tcmun;
       if (this.$route.query.tcmun) {
-        this.queryMsg.TCNUM = this.$route.query.tcmun
+        this.queryMsg.TCNUM = this.$route.query.tcmun;
       }
 
       if (this.CurrentUserInfo.IsParentCompany == undefined) {
-        this.queryCommonData.IsParentCompany = 2
+        this.queryCommonData.IsParentCompany = 2;
       } else {
         this.queryCommonData.IsParentCompany = this.CurrentUserInfo.IsParentCompany
       }

src/components/administrative/AirticketCommission.vue

@@ -61,12 +61,9 @@
         currentPage: 1,
         isDisable:false,
         IsAuth:0,//生成票务提成权限
-        CurrentUserInfo:{},//当前用户对象
       }
     },
     mounted() {
-      let userInfo = this.getLocalStorage();
-      this.CurrentUserInfo=userInfo;
       this.GetAuth();
       this.getList();
     },

src/components/administrative/AirticketCommissionDetail.vue

@@ -65,12 +65,10 @@
         loading: false,
         //数据源
         dataList: [],
-        CurrentUserInfo: {}, //当前登录对象
+ 
       }
     },
     mounted() {
-      let userInfo = this.getLocalStorage()
-      this.CurrentUserInfo = userInfo;
       this.msg.MainId = this.$route.query.ID;
       this.getList();
     },

src/components/administrative/DjCommissionsmangment.vue

@@ -82,7 +82,6 @@
           CostType: 112,
           SelectState:true,
         }
-        console.log(JSON.stringify(orderObj))
         let id=[29,31];
         this.$router.push({
             name: 'ChoiceAddFinancialDocuments',

src/components/administrative/ViittoCommission.vue

@@ -61,12 +61,11 @@
         currentPage: 1,
         isDisable:false,
         IsAuth:0,//生成票务提成权限
-        CurrentUserInfo:{},//当前用户对象
+ 
       }
     },
     mounted() {
       let userInfo = this.getLocalStorage();
-      this.CurrentUserInfo=userInfo;
       this.GetAuth();
       this.getList();
     },

src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue

@@ -383,7 +383,6 @@
         }
         basicData.TeamType = this.TeamType
         basicData.IsUpdateHotel = this.PostConfig.IsUpdateHotel
-        console.log("basicData",basicData);
         this.apipost(
           'travel_post_SetTravelConfigInfo',
           basicData,

src/components/scenicSpot/admissionStatistics.vue

@@ -143,8 +143,6 @@
         loading: false,
         currentPage: 1,
         total: 0,
-          //当前登录用户
-        CurrentUserInfo: {},
         msg: {
           pageIndex: 1,
           pageSize: 5,
@@ -266,8 +264,6 @@
       },
     },
     mounted() {
-            let userInfo = this.getLocalStorage()
-      this.CurrentUserInfo = userInfo;
       let myDate = new Date();
       let nowDate =
         myDate.getFullYear() +

src/components/scenicSpot/admissionStatisticsDetails.vue

@@ -170,8 +170,6 @@
         GuestNum: 0,
         loading: false,
         IsOperation: '',
-        //当前登录人信息
-        CurrentUserInfo: {},
         //是否禁用按钮
         IsDisabled: false,
       }
@@ -280,8 +278,6 @@
     },
     mounted() {
       this.CheckAuth();
-      let userInfo = this.getLocalStorage();
-      this.CurrentUserInfo = userInfo;
       this.TCNUM = this.$route.query.TCNUM;
       this.flightTotal = this.$route.query.flightTotal;
       this.GuestNum = this.$route.query.GuestNum;

src/components/systemManagement/lineManagement.vue

@@ -280,7 +280,6 @@
   }
 
   .lineManagement .LM_ul li {
-    /*height: 78px;*/
     margin: 20px 0 0px 0px;
     transition: linear all 0.5s;
     background-color: #fff;
@@ -444,8 +443,10 @@
               </div>
             </el-col>
             <el-col :span="2">
-              <div class="Linezhicai" :class="{'redType':item.isDirect=='0'}">{{item.isDirect=="0"?$t('op.feizhicai'):$t('op.zhicai')}}</div>
-              <div class="Linezhicai" :class="{'redType':item.isShow=='0'}">{{item.isShow=="0"?$t('MarketingActi.notShow'):$t('system.table_isShows')}}</div>
+              <div class="Linezhicai" :class="{'redType':item.isDirect=='0'}">
+                {{item.isDirect=="0"?$t('op.feizhicai'):$t('op.zhicai')}}</div>
+              <div class="Linezhicai" :class="{'redType':item.isShow=='0'}">
+                {{item.isShow=="0"?$t('MarketingActi.notShow'):$t('system.table_isShows')}}</div>
               <div class="Linezhicai" :class="{'redType':item.is_PacketGroup=='0'}">
                 {{item.is_PacketGroup =="0"?$t('op.notxiaobaotuan'):$t('Operation.Op_AllowSmallGroup')}}</div>
             </el-col>