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

src/components/Login.vue

@@ -304,25 +304,9 @@ export default {
             this.$cookie.set("RB_Group_id", userData.RB_Group_id);
             localStorage.menu=JSON.stringify(firstTire)
             this.loginState = 0;
-            // let previousPathInfo = localStorage.previousPathInfo ? JSON.parse(localStorage.previousPathInfo) : ''
-            // if (previousPathInfo) {
-            //   let path = previousPathInfo.path.indexOf('login') === -1 ? previousPathInfo.path : 'index'
-            //   let query = previousPathInfo.query ? previousPathInfo.query : {} 
-            //   this.$router.push({ path: "/"+ path, query: query });
-            // }else {
-            //   this.$router.push({ path: "/index" });
-            // }
 
             this.$router.push({ path: "/personalCenter" });
 
-            //登录成功后跳转页面
-            // this.$notify.success({
-            //   title:'提示',
-            //   customClass:'msgTips',
-            //   message: '登陆成功',
-            //   showClose: false,
-            //   duration:1000
-            // });
           } else {
             this.$notify.error({
               title: "提示",

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -967,13 +967,14 @@
                       <el-dropdown-item v-if="item.Status==2&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
                         @click.native="goSureOrder('priceIncomeConfirmInfo',item.TCID)">{{$t('Operation.Op_shouruDan')}}
                       </el-dropdown-item>
+                      <!--CurrentUserInfo.IsOpenB2C==1&&-->
                       <el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''"
                         @click.native="goB2B(item.ConfigId, item.TCID , 1)">
                         {{$t('Operation.Op_b2bView')}}
                       </el-dropdown-item>
-
+                      <!--CurrentUserInfo.IsOpenB2C==1&&-->
                       <el-dropdown-item @click.native="goB2B(item.ConfigId, item.TCID , 2)"
-                        v-if="CurrentUserInfo.B2BDomain!=''&&item.LineID!=2&&item.LineID!=8">
+                        v-if=" CurrentUserInfo.B2BDomain!=''&&item.LineID!=2&&item.LineID!=8">
                         直客版预览
                       </el-dropdown-item>
 
@@ -2393,6 +2394,7 @@
       var routeName = this.$route.name
       if (routeName == 'TravelControlList') {
         this.queryMsg.TeamType = 0;
+
       }
       if (routeName == 'TravelControlList2') {
         this.queryMsg.TeamType = 3;

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -16,7 +16,8 @@
           {{$t('sm.xianluxingcheng')}}
         </div>
         <div class="TravelLine" v-if="TeamType!=3"></div>
-        <div class="TravelNavList" v-if="TeamType!=3" :class="{'TravelCked':ckedNav==3}"
+        <!--&&CurrentUserInfo.IsOpenTripFeature==1-->
+        <div class="TravelNavList" v-if="(TeamType!=3)" :class="{'TravelCked':ckedNav==3}"
           @click.prevent="custormAnchor('thirdAnchor',3)">
           {{$t('sm.chanpintese')}}
         </div>
@@ -38,7 +39,8 @@
           :subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList"
           v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend"
           @change="handlerChangeData" :TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect>
-        <TravelFeature :class="{'showOther':TeamType==3}" ref="TravelFeature" id="thirdAnchor"
+         <!--v-if="CurrentUserInfo.IsOpenTripFeature==1"-->
+        <TravelFeature  :class="{'showOther':(TeamType==3)}" ref="TravelFeature" id="thirdAnchor"
           @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType" :isNewConfig="isNewConfig"
           @unlockFormCommit="unlockFormCommit"></TravelFeature>
         <TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
@@ -96,6 +98,8 @@
     },
     data() {
       return {
+        //当前登录用户信息
+        CurrentUserInfo: {},
         IsShowBtn: false, //是否显示按钮
         ConfigId: 0, //地址栏查询参数
         IsHaveOffer: 0, //是否有报价单
@@ -858,6 +862,8 @@
       },
     },
     mounted() {
+      this.CurrentUserInfo = this.getLocalStorage();;
+      console.log("this.CurrentUserInfo",this.CurrentUserInfo);
       this.ScrollMethod();
     },
     created() {

src/components/personalCenter/gonggao.vue

 <template>
   <div class="ad" v-loading="loading">
-    <div class="content">
-      <div class="notice-title">{{notices.title}}</div>
+    <div class="content" v-if="notices">
+      <div class="notice-title"> {{notices.title}}</div>
       <div v-html="notices.content"></div>
       <div class="user">{{notices.updateName}}</div>
       <div class="time">{{notices.updateTime?notices.updateTime.replace("T"," "):""}}</div>
     </div>
-    <div class="foot">
+    <div class="foot" v-if="notices">
       <div class="lt">
-        <!-- <div>附件：</div>
-        <div class="v">
-          <a href="javascript:void(0);">关于库存现金管理的通知.jpg</a>
-        </div> -->
       </div>
       <div class="rt">
         <span :class="{'disable':notices.maxID==0}" @click="queryNotice(notices.maxID)">

src/components/systemManagement/AccountType.vue

@@ -180,7 +180,7 @@
                       <el-form-item :label="$t('fnc.sybumen')">
                         <!--<el-select filterable   v-model='addMsg.DepartmentID' @change="getPostList()">-->
                         <el-select filterable multiple v-model='RangeIdsList' @change="changeRange">
-                          <el-option :label='$t('active.cl_tongyong')' :value='-1'></el-option>
+                          <el-option :label="$t('active.cl_tongyong')" :value='-1'></el-option>
                           <el-option v-for='item in departmentList'
                                      :label='item.DepartmentName'
                                      :value='item.DepartmentID'
@@ -256,7 +256,7 @@
 				},
                 rules: {//表单必填验证
                     Name: [
-                        { required: true, message: this.$t('fnc.qtxzhmingcheng'), trigger: 'blur' }
+                        { required: true, message: this.$t('rule.qtxzhmingcheng'), trigger: 'blur' }
                     ],
                     DepartIDsArr: [
                         { required: true, message: this.$t('fnc.qxzsybumen'), trigger: 'change' }