no message

src/assets/common/lang/zh_BACKUP_6332.js

@@ -41,8 +41,8 @@ export const pub={
   woman:'女',
   yes:'是',
   no:'否',
-  
-  
+
+
 }
 
 export const login = {
@@ -340,7 +340,7 @@ export const admin={  //行政
    table_UseAmount:'使用数量',
    table_CostPrice:'总成本',
    table_TotalPrice:'交易总金额',
-   
+
    table_servers:'服务人数',
    suplier_name:'供应商名称',
    suplier_contact:'联系人',
@@ -351,7 +351,7 @@ export const admin={  //行政
    hotel_remain:'余',
    hotel_remainList:'剩余',
    hotel_roomTypeOne:'红色表示未还',
-   hotel_roomTypeTwo:'绿色表示已还', 
+   hotel_roomTypeTwo:'绿色表示已还',
    hotel_roomUsed:'已用',
    hotel_room:'间',
    hotel_OccupancyTime:'用房时间',
@@ -658,12 +658,12 @@ export const visa = {
   v_yibaoru:'已报入',
   v_houbu:'候补',
   v_yxhoubu:'允许候补',
-  
-  
-  
-  
 
-  
+
+
+
+
+
 }
 export const advmanager = {
   v_all:'全部',
@@ -765,8 +765,8 @@ export const fnc = {
   fnc_zksr: '直客收入',
   fnc_thjksr: '同行交客收入',
   fnc_plattev: '平台收入',
-  
-  
+
+
   acc: '账户',
   accBming: '账户别名：',
   accType: '账户类型：',
@@ -1428,18 +1428,13 @@ export const rule = {
   qtxhkshijian: '请选择汇款时间！',
   qxzjylshuihao: '请选择交易流水号！',
   qxzskzhanghao: '请选择收款账号！',
-<<<<<<< HEAD
   qxzrzshijian: '请选择入职时间!',
   qsrzqdqq: '请输入正确的qq!',
-  
-  
-=======
   qtxckmingcheng: '请填写窗口名称',
   qxzywuyuan: '请选择业务员',
   qxzsyfangxiang: '请选择使用方向',
   qsrjine: '请输入金额',
   qsrzjine: '请输入总金额',
->>>>>>> 0b03e96e68e8d69d2784e82cb0cacd9368b44190
 }
 
 export const adm={
@@ -1477,7 +1472,7 @@ export const adm={
   adm_Rolename:"角色名称",
   adm_quanxian:"权限",
   adm_qsrmiaoshu:"请输入描述",
-  adm_qxshezhi:"权限设置", 
+  adm_qxshezhi:"权限设置",
   adm_Bindingattendance:"绑定考勤",
   adm_title:"标题",
   adm_Publisher:"发布人",
@@ -1492,7 +1487,7 @@ export const adm={
   adm_roof:"置顶",
   adm_exitroof:"取消置顶",
   adm_shifouroof:"是否置顶?",
-  
+
   adm_chehui:"撤回",
   adm_fujian:"附件",
   adm_download:"下载",
@@ -1513,8 +1508,8 @@ export const adm={
   adm_time:"时间",
   adm_Jobnumber:"工号",
   adm_Attendancedate:"考勤日期",
-   
-  
+
+
 }
 export const visaT = {
   cxjihua: '出行计划',
@@ -1632,4 +1627,4 @@ export const visaT = {
   qxzzzdqzlx:'请选择正确的签证类型！',
   qxzxybddry:"请选择需要绑定的人员",
   v_Othervisas:'其他'
-}
+}
\ No newline at end of file

src/components/Hotel/HotelProductManage2.vue

@@ -71,7 +71,7 @@
                     <tr>
                       <th width="40" style="text-align:center">{{$t('ground.pici')}}</th>
                       <th width="100" style="text-align:center">{{$t('Operation.Op_price')}}</th>
-                      <th width="40" style="text-align:center">散客价</th>
+                      <th width="40" style="text-align:center">{{$t('ground.sankejia')}}</th>
                       <th width="40" style="text-align:center">税金</th>
                       <th width="40" style="text-align:center">自然单间</th>
                       <th width="40" style="text-align:center">不占床</th>

src/components/Hotel/HotelSalesBoard.vue

@@ -222,11 +222,11 @@
           <span>
             <em>{{$t('system.quety_area')}}</em>
             <el-select v-model="msg.Province" filterable @change="getProvinceList(msg.Province,2)"
-              :placeholder="$t('hotel.hotel_province')">
+              :placeholder="$t('hotel.hotel_province')" clearable>
               <el-option :key="0" :value="0" :label="$t('pub.pleaseSel')"></el-option>
               <el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
-            <el-select v-model="msg.City" filterable :placeholder="$t('hotel.hotel_city')">
+            <el-select v-model="msg.City" filterable :placeholder="$t('hotel.hotel_city')" clearable>
               <el-option :key="0" :value="0" :label="$t('pub.pleaseSel')"></el-option>
               <el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
@@ -345,7 +345,7 @@
           Month: 0,
           HotelId: 0,
           //只查询日本
-          Country: "651",
+          Country: "0",
           Province: 0,
           City: 0,
           loading: false,
@@ -374,7 +374,8 @@
         cityList: [],
         district: [],
         //供应商列表
-        SupplierList: []
+        SupplierList: [],
+        currentUserInfo: {},
       };
     },
     methods: {
@@ -506,11 +507,15 @@
       },
       //获取酒店列表
       GetHotelList() {
+        var postMsg = {
+          QCountry: "",
+          IsMoreThanZero: 1
+        }
+        if (this.currentUserInfo && this.currentUserInfo.RB_Group_id == 2) {
+          postMsg.QCountry = "651"
+        }
         this.apipost(
-          "hotel_post_GetHasStockHotelList", {
-            QCountry: "651",
-            IsMoreThanZero: 1
-          },
+          "hotel_post_GetHasStockHotelList", postMsg,
           res => {
             if (res.data.resultCode == 1) {
               this.HotelList = res.data.data;
@@ -587,6 +592,9 @@
         }, err => {});
       },
     },
+    created() {
+      this.currentUserInfo = this.getLocalStorage();
+    },
     mounted() {
       //初始化日历
       var id = this.$route.query.id;
@@ -603,7 +611,12 @@
       this.GetHotelList();
       this.initCalendar();
       this.GetHoltelInventory();
-      this.getProvinceList("651", 1);
+      if (this.currentUserInfo && this.currentUserInfo.RB_Group_id == 2) {
+        this.msg.Country = "651";
+        this.getProvinceList("651", 1);
+      } else {
+        this.getProvinceList("0", 1);
+      }
     }
   };
 

src/components/Hotel/singleProduct/HotelOrderOP.vue

   <template>
     <div>
-        <HotelOrderList :pagesTitle="pagesTitle"></HotelOrderList>
+      <HotelOrderList :pagesTitle="pagesTitle"></HotelOrderList>
     </div>
   </template>
   <script>
     import HotelOrderList from '../reservation/HotelOrderList.vue';
     export default {
-      components: { HotelOrderList },
+      components: {
+        HotelOrderList
+      },
       data() {
         return {
-          pagesTitle:'OP',
+          pagesTitle: 'OP',
         };
       },
-
       methods: {
-        
-        
+
       },
       mounted() {
-        
+
       },
     };
 

src/components/Hotel/singleProduct/HotelQueryList.vue

@@ -46,10 +46,7 @@
           <span>
             <em>酒店</em>
             <el-input type="" v-model="msg.HotelName" placeholder="酒店名称"></el-input>
-            <!-- <el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')" class="multiple_input w300"
-                filterable multiple collapse-tags :multiple-limit="3">
-                <el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
-              </el-select> -->
+        
           </span>
         </li>
        
@@ -220,7 +217,7 @@
           OpType: 0,
         },
         //默认显示弹窗信息
-        showHQinfo: true,
+        showHQinfo: false,
         //酒店温馨提示列表
         HotelTipList: [],
         //供应商列表
@@ -414,7 +411,6 @@
         this.HOTEL_memorandum = true;
       }
       this.getProvinceList("651", 1);
-      // this.GetHotelList();//酒店名称下拉
       this.getList();
       this.com_onresize();
       window.onresize = () => {

src/components/busManagement/BookAcar/components/orderList.vue

@@ -807,7 +807,7 @@
             </el-tooltip>
           </div>
         </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
+        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px" v-if="userInfo&&userInfo.RB_Group_id==2">
           <div class="fz12">发票单据</div>
           <div class="row wrap orderNo fz12 py">
             <span
@@ -918,7 +918,7 @@
             <span class="c059FF6">编辑总金额</span>
           </div>
           <!-- 申请发票 -->
-          <ApplyFoInvoice v-if="userInfo.EmployeeId==scope.row.EnterID" :obj="scope.row" :type="5"></ApplyFoInvoice>
+          <ApplyFoInvoice v-if="userInfo&&userInfo.RB_Group_id==2&&userInfo.EmployeeId==scope.row.EnterID" :obj="scope.row" :type="5"></ApplyFoInvoice>
         </div>
       </div>
       <div class="mt mb20 bgf5 pa15 row-c" v-if="scope.row.CancelRemark">

src/components/busManagement/BookAcar/order.vue

@@ -4,7 +4,7 @@
   <template>
     <div>
       <el-tabs v-model="dataObj.tab" @tab-click="handleClick">
-        <el-tab-pane label="团队订单" name="0">
+        <el-tab-pane label="团队订单" name="0" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
           <TeamOrder :pagesTitle="pagesTitle" :OrderId="dataObj.OrderId"></TeamOrder>
         </el-tab-pane>
         <el-tab-pane label="接机订单" name="1">
@@ -30,7 +30,8 @@
           dataObj:{
             tab:'1',
             OrderId: '',
-          }
+          },
+          currentUserInfo: {},
         };
       },
       watch: {
@@ -52,7 +53,7 @@
         }
       },
       created() {
-        
+        this.currentUserInfo = this.getLocalStorage();
       },
       mounted() {
         if(this.$route.query.OrderType||this.$route.query.Type){
@@ -80,8 +81,12 @@
           }
         } else{
           this.dataObj.OrderId = ''
+          if (this.currentUserInfo && this.currentUserInfo.RB_Group_id == 100) {
+          this.dataObj.tab = "1";
+        } else {
           this.dataObj.tab = '0'
         }
+        }
       },
     };
 

src/components/busManagement/BookAcar/orderOP.vue

@@ -4,9 +4,11 @@
 <template>
   <div>
     <el-tabs v-model="dataObj.tab" @tab-click="handleClick">
-      <el-tab-pane label="团队订单" name="0">
-        <TeamOrder :pagesTitle="pagesTitle" :OrderId="dataObj.OrderId"></TeamOrder>
-      </el-tab-pane>
+      <template v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
+        <el-tab-pane label="团队订单" name="0">
+          <TeamOrder :pagesTitle="pagesTitle" :OrderId="dataObj.OrderId"></TeamOrder>
+        </el-tab-pane>
+      </template>
       <el-tab-pane label="接机订单" name="1">
         <BookAcarOrder :pagesTitle="pagesTitle" :dataObj="dataObj"></BookAcarOrder>
       </el-tab-pane>
@@ -23,68 +25,68 @@
   import BookAcarOrder from './components/BookAcarOrder.vue';
   import TeamOrder from '../../busManagement/tripBusOrder.vue';
   export default {
-    components: { TeamOrder,BookAcarOrder },
+    components: {
+      TeamOrder,
+      BookAcarOrder
+    },
     data() {
       return {
         pagesTitle: 'OP',
-        dataObj:{
-          tab:'1',
+        dataObj: {
+          tab: '1',
           OrderId: '',
-        }
+        },
+        currentUserInfo: {},
       };
     },
     watch: {
-      pagesTitle(val,oldval){
-        
+      pagesTitle(val, oldval) {
+
       },
-      // dataObj:{
-      //   handler(val, oldVal) {
-      //     this.dataObj.OrderType = val.tab
-      //     this.dataObj.OrderId = val.OrderId
-      //   },
-      //   deep: true,
-      //   immediate: true,
-      // }
     },
     methods: {
-      handleClick(tab, event){
+      handleClick(tab, event) {
         this.dataObj.tab = tab.name
       }
     },
     created() {
-      
+      this.currentUserInfo = this.getLocalStorage();
+
     },
     mounted() {
-      if(this.$route.query.OrderType){
-          this.dataObj.OrderId = this.$route.query.OrderId
-          if(this.$route.query.Type){
-            if(this.$route.query.Type<4){
-              this.dataObj.tab = this.$route.query.Type
-            }else{
-              this.dataObj.tab = '0'
-            }
-          }else{
-            if(this.$route.query.OrderType<4){
-              this.dataObj.tab = this.$route.query.OrderType
-            }else{
-              this.dataObj.tab = '0'
-            }
+      if (this.$route.query.OrderType) {
+        this.dataObj.OrderId = this.$route.query.OrderId
+        if (this.$route.query.Type) {
+          if (this.$route.query.Type < 4) {
+            this.dataObj.tab = this.$route.query.Type
+          } else {
+            this.dataObj.tab = '0'
           }
-        }else if(this.$route.query.OrderId){
-          this.dataObj.OrderId = this.$route.query.OrderId
-        }else if(this.$route.query.crmOrderObj){
-          let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
-          this.dataObj.OrderId = crmOrderObj.OrderId
-          if(crmOrderObj.Type<4){
-            this.dataObj.tab = String(crmOrderObj.Type)
-          }else{
+        } else {
+          if (this.$route.query.OrderType < 4) {
+            this.dataObj.tab = this.$route.query.OrderType
+          } else {
             this.dataObj.tab = '0'
           }
-          
-        } else{
-          this.dataObj.OrderId = ''
+        }
+      } else if (this.$route.query.OrderId) {
+        this.dataObj.OrderId = this.$route.query.OrderId
+      } else if (this.$route.query.crmOrderObj) {
+        let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
+        this.dataObj.OrderId = crmOrderObj.OrderId
+        if (crmOrderObj.Type < 4) {
+          this.dataObj.tab = String(crmOrderObj.Type)
+        } else {
           this.dataObj.tab = '0'
         }
+      } else {
+        this.dataObj.OrderId = ''
+        if (this.currentUserInfo && this.currentUserInfo.RB_Group_id == 100) {
+          this.dataObj.tab = "1";
+        } else {
+          this.dataObj.tab = '0'
+        }
+      }
     },
   };
 

src/components/index.vue

@@ -179,19 +179,22 @@
                     <el-badge class="mark" :value="NotDealCount?NotDealCount:'0'" />
                     <i class="iconfont icon-right1"></i>
                   </el-dropdown-item>
-                  <el-dropdown-item class="clearfix _dropdown_other" v-if='firstMenuList.indexOf("考勤")!==-1'
-                    @click.native="goUrlT('myApproval',-1,'考勤')">
-                    <i class="iconfont icon-menu-kaoqin" style="color:#27ae60"></i>
-                    考勤
-                    <el-badge class="mark" :value="MyAuditCount?MyAuditCount:'0'" />
-                    <i class="iconfont icon-right1"></i>
-                  </el-dropdown-item>
-                  <el-dropdown-item class="clearfix _dropdown_other" v-if='firstMenuList.indexOf("企业云盘")!==-1'
-                    @click.native="goUrlT('myDocuments',-1,'企业云盘')">
-                    <i class="iconfont icon-menu-yunpan" style="color:#2980b9"></i>
-                    企业云盘
-                    <i class="iconfont icon-right1"></i>
-                  </el-dropdown-item>
+                  <template v-if="userInfo&&userInfo.RB_Group_id==2">
+
+                    <el-dropdown-item class="clearfix _dropdown_other" v-if='firstMenuList.indexOf("考勤")!==-1'
+                      @click.native="goUrlT('myApproval',-1,'考勤')">
+                      <i class="iconfont icon-menu-kaoqin" style="color:#27ae60"></i>
+                      考勤
+                      <el-badge class="mark" :value="MyAuditCount?MyAuditCount:'0'" />
+                      <i class="iconfont icon-right1"></i>
+                    </el-dropdown-item>
+                    <el-dropdown-item class="clearfix _dropdown_other" v-if='firstMenuList.indexOf("企业云盘")!==-1'
+                      @click.native="goUrlT('myDocuments',-1,'企业云盘')">
+                      <i class="iconfont icon-menu-yunpan" style="color:#2980b9"></i>
+                      企业云盘
+                      <i class="iconfont icon-right1"></i>
+                    </el-dropdown-item>
+                  </template>
                   <el-dropdown-item class="clearfix _dropdown_other"
                     v-if='firstMenuList.indexOf("常用付款对象") &&  (qjGroupId==userInfo.RB_Group_id || F_Finance_Create)'
                     @click.native="goUrlPayment()">
@@ -224,19 +227,19 @@
                     机票未绑团查看
                     <i class="iconfont icon-right1"></i>
                   </el-dropdown-item>
-                  <el-dropdown-item v-if="ChangeThePriceList.length>0" class="clearfix _dropdown_other"
+                  <el-dropdown-item v-if="userInfo.RB_Group_id==2 && ChangeThePriceList.length>0" class="clearfix _dropdown_other"
                     @click.native="GetChangeThePrice(1),GetExaminePriceOrderPageList(1)">
                     <i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
                     订单改价查看
                     <i class="iconfont icon-right1"></i>
                   </el-dropdown-item>
-                  <el-dropdown-item v-if="userInfo.IsEditTripTemplate==1" class="clearfix _dropdown_other"
+                  <el-dropdown-item v-if="userInfo.RB_Group_id==2 && userInfo.IsEditTripTemplate==1" class="clearfix _dropdown_other"
                     @click.native="journeyTemplate()">
                     <i class="iconfont icon-pdf" style="color:#f39c12"></i>
                     添加/编辑模版
                     <i class="iconfont icon-right1"></i>
                   </el-dropdown-item>
-                  <el-dropdown-item class="clearfix _dropdown_other" @click.native="journeyTemplate(1)">
+                  <el-dropdown-item v-if="userInfo.RB_Group_id==2" class="clearfix _dropdown_other" @click.native="journeyTemplate(1)">
                     <i class="iconfont icon-pdf" style="color:#f39c12"></i>
                     在线行程
                     <i class="iconfont icon-right1"></i>
@@ -254,6 +257,7 @@
                 </el-dropdown-menu>
               </el-dropdown>
             </li>
+            <template v-if="userInfo.RB_Group_id==2">
             <li style="position: relative;">
               <i class="iconfont icon-imessage_top"
                 :class="[hasNewMsg>0&&!IM_bodyIsShow?'animation red':'',IM_bodyIsShow?'red':'']"
@@ -263,6 +267,7 @@
             <li v-if="!useRed"><i class="iconfont icon-gonggao"
                 @click="IM_bodyIsShow=!IM_bodyIsShow, IM_navType=52"></i>
             </li>
+            </template>
             <li>
               <el-dropdown trigger="click">
                 <span class="el-dropdown-link">
@@ -279,15 +284,15 @@
                   <el-dropdown-item @click.native="ChangeLan('zh-TW')">繁体中文 <i v-if="language=='zh-TW'"
                       class="iconfont icon-duigou"></i></el-dropdown-item>
                   <el-dropdown-item @click.native="ChangeLan('en-US')">English <i v-if="language=='en-US'"
-                    class="iconfont icon-duigou"></i></el-dropdown-item>
+                      class="iconfont icon-duigou"></i></el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </li>
-            <li v-if="!useRed">
+            <li v-if="!useRed && userInfo.RB_Group_id==2">
               <i @click="downmz=!downmz" class="el-icon-download"></i>
             </li>
           </template>
-          <li>
+          <li v-if="userInfo.RB_Group_id==2">
             <a :href="`http://${b2bDomain}`" target="_blank" v-if="b2bDomain && b2bDomain!=''"
               style="color:#FFF">前往前台</a>
             <a href="javascript:alert('未開通B2B前端系統，請您聯繫業務員')" v-else style="color:#FFF">前往前台</a>
@@ -1533,7 +1538,8 @@
         qjGroupId: -1,
         F_ContractManagement: false, //合同权限
         F_Finance_Create: false,
-        HOTEL_memorandum: false
+        HOTEL_memorandum: false,
+
       };
     },
     filters: {
@@ -1839,12 +1845,12 @@
         this.userInfo.UserPhoto = "";
       }
 
-      let UserInfo = this.getLocalStorage();
-      this.userId = UserInfo.EmployeeId;
+
+      this.userId = this.userInfo.EmployeeId;
       this.allPartMsg.RB_Group_Id = this.deleteMsg.groupId = this.likeMsg.groupId = this.addDynamicMsg.rB_GroupId = this
         .dynamicMsg.groupId =
-        UserInfo.RB_Group_id;
-      this.addDynamicMsg.rB_BranchId = UserInfo.RB_Branch_id;
+        this.userInfo.RB_Group_id;
+      this.addDynamicMsg.rB_BranchId = this.userInfo.RB_Branch_id;
       //获取版本
       this.getVersion();
       this.getMenu();

src/components/personalCenter.vue

@@ -24,7 +24,7 @@
           <span class="v">{{CurrentUserInfo.DepartName}}</span>
         </div>
       </div>
-      <div class="n-info" >
+      <div class="n-info">
         <div class="item" @click="changeBoard(0)">
           <i class="iconfont icon-yichuheimingdan"></i>
           <span class="n-name">个人首页</span>
@@ -32,64 +32,66 @@
             <i class="iconfont icon-right1"></i>
           </span>
         </div>
-        <div class="item" @click="changeBoard(1)">
-          <i class="iconfont icon-pingjiabaogao"></i>
-          <span class="n-name">我的业绩</span>
-          <span class="fang">
-            <i class="iconfont icon-right1"></i>
-          </span>
-        </div>
-        <div class="item" @click="changeBoard(2)">
-          <i class="iconfont icon-guanjun"></i>
-          <span class="n-name">冠军之路</span>
-          <span class="fang">
-            <i class="iconfont icon-right1"></i>
-          </span>
-        </div>
-        <div class="item">
-          <i class="iconfont icon-dingdanguanli-"></i>
-          <span class="n-name" @click="goUrlNav('groupTourOrder',0,'跟团游订单')">我的订单</span>
-          <span class="fang">
-            <i class="iconfont icon-right1"></i>
-          </span>
-        </div>
-        <div class="item">
-          <i class="iconfont icon-kaohedefen"></i>
-          <span class="n-name" @click="goUrlNav('ExaminationStatistics',0,'行政考核')">行政考核</span>
-          <span class="fang">
-            <i class="iconfont icon-right1"></i>
-          </span>
-        </div>
-        <div class="item" @click="goUrlNav('FinancialDocuments',3,'财务单据')">
-          <i class="iconfont icon-danju1"></i>
-          <span class="n-name">财务审批</span>
-          <span class="fang">
-            <span class="tips" v-if="NotDealCount>0">{{NotDealCount}}</span>
-            <i class="iconfont icon-right1"></i>
-          </span>
-        </div>
-        <div class="item" @click="goUrlNav('myApproval',-1,'考勤')">
-          <i class="iconfont icon-kaoqinshenpi"></i>
-          <span class="n-name">考勤审批</span>
-          <span class="fang">
-            <span class="tips" v-if="MyAuditCount>0">{{MyAuditCount}}</span>
-            <i class="iconfont icon-right1"></i>
-          </span>
-        </div>
-        <div class="item" @click="goUrlNav('myDocuments',-1,'企业云盘')">
-          <i class="iconfont icon-cloud-disk-services"></i>
-          <span class="n-name">我的云盘</span>
-          <span class="fang">
-            <i class="iconfont icon-right1"></i>
-          </span>
-        </div>
-        <div class="item">
-          <i class="iconfont icon-fukuan2"></i>
-          <span class="n-name">常用付款对象</span>
-          <span class="fang">
-            <i class="iconfont icon-right1"></i>
-          </span>
-        </div>
+        <template v-if="CurrentUserInfo&&CurrentUserInfo.RB_Group_id==2">
+          <div class="item" @click="changeBoard(1)">
+            <i class="iconfont icon-pingjiabaogao"></i>
+            <span class="n-name">我的业绩</span>
+            <span class="fang">
+              <i class="iconfont icon-right1"></i>
+            </span>
+          </div>
+          <div class="item" @click="changeBoard(2)">
+            <i class="iconfont icon-guanjun"></i>
+            <span class="n-name">冠军之路</span>
+            <span class="fang">
+              <i class="iconfont icon-right1"></i>
+            </span>
+          </div>
+          <div class="item">
+            <i class="iconfont icon-dingdanguanli-"></i>
+            <span class="n-name" @click="goUrlNav('groupTourOrder',0,'跟团游订单')">我的订单</span>
+            <span class="fang">
+              <i class="iconfont icon-right1"></i>
+            </span>
+          </div>
+          <div class="item">
+            <i class="iconfont icon-kaohedefen"></i>
+            <span class="n-name" @click="goUrlNav('ExaminationStatistics',0,'行政考核')">行政考核</span>
+            <span class="fang">
+              <i class="iconfont icon-right1"></i>
+            </span>
+          </div>
+          <div class="item" @click="goUrlNav('FinancialDocuments',3,'财务单据')">
+            <i class="iconfont icon-danju1"></i>
+            <span class="n-name">财务审批</span>
+            <span class="fang">
+              <span class="tips" v-if="NotDealCount>0">{{NotDealCount}}</span>
+              <i class="iconfont icon-right1"></i>
+            </span>
+          </div>
+          <div class="item" @click="goUrlNav('myApproval',-1,'考勤')">
+            <i class="iconfont icon-kaoqinshenpi"></i>
+            <span class="n-name">考勤审批</span>
+            <span class="fang">
+              <span class="tips" v-if="MyAuditCount>0">{{MyAuditCount}}</span>
+              <i class="iconfont icon-right1"></i>
+            </span>
+          </div>
+          <div class="item" @click="goUrlNav('myDocuments',-1,'企业云盘')">
+            <i class="iconfont icon-cloud-disk-services"></i>
+            <span class="n-name">我的云盘</span>
+            <span class="fang">
+              <i class="iconfont icon-right1"></i>
+            </span>
+          </div>
+          <div class="item">
+            <i class="iconfont icon-fukuan2"></i>
+            <span class="n-name">常用付款对象</span>
+            <span class="fang">
+              <i class="iconfont icon-right1"></i>
+            </span>
+          </div>
+        </template>
       </div>
     </div>
     <personalIndex v-if="boardIndex==0"></personalIndex>
@@ -173,7 +175,7 @@
         //   path: "/"+url,
         //   query
         // });
-        window.location.href=`http://${window.location.host}/#/${url}?tab=${name}&Conditon=${index}`
+        window.location.href = `http://${window.location.host}/#/${url}?tab=${name}&Conditon=${index}`
       }
     }
   };
@@ -199,7 +201,7 @@
     border: 1px solid #2c2739;
   }
 
-  .red-theme .personal .u-box{
+  .red-theme .personal .u-box {
     background: #FBFBFB;
     border: none;
   }
@@ -224,18 +226,22 @@
     margin: 15px;
     display: flex;
   }
-  .red-theme .personal .u-box .h-info-box{
+
+  .red-theme .personal .u-box .h-info-box {
     background: #F4F4F4;
     margin: 0;
     padding: 20px 15px;
   }
-  .red-theme .personal .u-box .u-info{
+
+  .red-theme .personal .u-box .u-info {
     background: none;
   }
-  .red-theme .personal .u-box .u-info .item .k{
+
+  .red-theme .personal .u-box .u-info .item .k {
     color: #787A7D;
     font-family: unset;
   }
+
   .personal .u-box .h-info-box .h-info {
     flex: 1;
   }
@@ -250,15 +256,19 @@
     display: block;
     margin-top: 10px;
   }
-  .red-theme .personal .u-box .h-info-box .h-img{
-    border:1px dotted #EB3349;
+
+  .red-theme .personal .u-box .h-info-box .h-img {
+    border: 1px dotted #EB3349;
   }
+
   .red-theme .personal .u-box .h-info-box .h-info .k {
     font-family: unset;
   }
+
   .red-theme .personal .u-box .h-info-box .h-info .v {
     color: #121315;
   }
+
   .personal .u-box .h-info-box .h-info .v {
     color: #ddd;
     height: 20;
@@ -327,20 +337,25 @@
     margin: 20px 0;
     background: rgba(25, 19, 62, 0.56);
   }
-  .red-theme .personal .u-box .n-info{
+
+  .red-theme .personal .u-box .n-info {
     background: #F4F4F4;
   }
-  .red-theme .personal .u-box .n-info .item:hover{
+
+  .red-theme .personal .u-box .n-info .item:hover {
     background: #eaeaea;
-    
+
   }
-  .red-theme .personal .u-box .n-info .item:hover *:not(.tips){
+
+  .red-theme .personal .u-box .n-info .item:hover *:not(.tips) {
     color: #33B3FF;
   }
-  .red-theme .personal .u-box .n-info .item .n-name{
+
+  .red-theme .personal .u-box .n-info .item .n-name {
     color: #333;
     font-family: unset;
   }
+
   .personal .u-box .n-info .item {
     align-items: center;
     display: flex;
@@ -422,12 +437,14 @@
     border-left: 3px solid #8a8894;
     border-bottom: 3px solid #8a8894;
   }
+
   .red-theme .personal .left-point-samll::before,
   .red-theme .personal .left-point-samll::after,
   .red-theme .personal .right-point-samll::before,
-  .red-theme .personal .right-point-samll::after{
+  .red-theme .personal .right-point-samll::after {
     border-color: #EB3349;
   }
+
   .personal .right-point::after {
     position: absolute;
     width: 9px;

src/components/platformModule/cityManagement.vue

@@ -206,12 +206,21 @@
       <div class="btmTitle">{{titleInfo}}</div>
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
         <ul class="changeMsg clearfix">
-          <li>
-            <el-form-item label="中文名称" prop="Name">
-              <el-input v-model="addMsg.Name" class="w150" maxlength="20"></el-input>
-            </el-form-item>
-          </li>
-          <li>
+          <template v-if="currentUserInfo&&currentUserInfo.RB_Group_id==100">
+            <li>
+              <el-form-item label="名称" prop="Name">
+                <el-input v-model="addMsg.Name" class="w150" maxlength="20"></el-input>
+              </el-form-item>
+            </li>
+          </template>
+          <template v-else>
+            <li>
+              <el-form-item label="中文名称" prop="Name">
+                <el-input v-model="addMsg.Name" class="w150" maxlength="20"></el-input>
+              </el-form-item>
+            </li>
+          </template>
+          <li v-if="currentUserInfo&&currentUserInfo.RB_Group_id!=100">
             <el-form-item label="英文名称">
               <el-input v-model="addMsg.EnName" class="w150" maxlength="20"></el-input>
             </el-form-item>
@@ -401,7 +410,8 @@
             message: "请输入三码",
             trigger: "change"
           }]
-        }
+        },
+        currentUserInfo: {},
       };
     },
     methods: {
@@ -558,7 +568,7 @@
                 this.disCountry = true;
                 this.addMsg.ParentID = res.data.data.CountryID;
               } else if (res.data.data.CodeLevel == 3) {
-                this.getProvinceList(res.data.data.CountryID,1)
+                this.getProvinceList(res.data.data.CountryID, 1)
                 this.addMsg.ParentID = res.data.data.ProvinceID;
                 this.disCountry = true;
                 this.disProvince = true;
@@ -573,8 +583,8 @@
               this.addMsg.ProvinceID = res.data.data.ProvinceID;
               this.addMsg.CityID = res.data.data.CityID;
               this.addMsg.Images = res.data.data.Images;
-              this.addMsg.Lng=res.data.data.Lng;
-              this.addMsg.Lat=res.data.data.Lat;
+              this.addMsg.Lng = res.data.data.Lng;
+              this.addMsg.Lat = res.data.data.Lat;
               if (this.addMsg.Area == 0) {
                 this.addMsg.Area = this.addMsg.Area.toString();
               } else {
@@ -720,6 +730,9 @@
         }
       }
     },
+    created() {
+      this.currentUserInfo = this.getLocalStorage();
+    },
     mounted() {
       this.initData();
       this.getContinentList();

src/components/platformModule/menuManagement.vue

@@ -6,7 +6,8 @@
       <ul>
         <li>
           <span><em>名称</em>
-            <el-input v-model='msg.MenuName' class="permiss-input" placeholder="请输入内容"></el-input>
+            <el-input v-model='msg.MenuName' class="permiss-input" placeholder="请输入内容"
+              @keyup.native="resetPageIndex(),getList()"></el-input>
           </span>
         </li>
         <li>
@@ -150,9 +151,9 @@
             <td>
               <el-form-item label="系统菜单" prop="menutype">
                 <el-select filterable class='w200' v-model='addMsg.menutype' :placeholder="$t('pub.pleaseSel')">
-                  <el-option  label="ERP菜单" :value="1"></el-option>
-                  <el-option  label="资产菜单" :value="2"></el-option>
-                  <el-option  label="CRM菜单" :value="3"></el-option>
+                  <el-option label="ERP菜单" :value="1"></el-option>
+                  <el-option label="资产菜单" :value="2"></el-option>
+                  <el-option label="CRM菜单" :value="3"></el-option>
                 </el-select>
               </el-form-item>
             </td>
@@ -190,7 +191,6 @@
           callback();
         }
       }
-
       return {
         dialogTitle: '',
         DataList: '',
@@ -222,7 +222,7 @@
           'ParentId': '',
           'MenuStatus': '0',
           'Tier': '',
-          
+
         },
         addMsg: {
           'MenuId': '0',
@@ -235,8 +235,8 @@
           MenuStyleIcon: '',
           MenuStyleColor: '',
           Sort: 0,
-          menutype:1,
-          GroupingCode:''
+          menutype: 1,
+          GroupingCode: ''
         },
         rules: {
           Sort: [{
@@ -258,7 +258,7 @@
             validator: validateParent,
             trigger: 'change'
           }],
-          menutype:[{
+          menutype: [{
             required: true,
             message: '请选择系统菜单',
             trigger: 'change'
@@ -303,7 +303,6 @@
           }
         }, err => {})
       },
-
       getList() { //列表查询
         this.apipost('admin_get_SysMenuGetPageList', this.msg, res => {
           if (res.data.resultCode == 1) {
@@ -346,7 +345,6 @@
             this.$message.error(res.data.message);
           }
         }, err => {})
-
       },
       updateData(index, id) { //修改
         this.apipost('admin_get_SysMenuGet', {
@@ -360,11 +358,11 @@
           this.addMsg.Sort = updateList.Sort
           this.addMsg.GroupingCode = updateList.GroupingCode
           this.addMsg.MenuUrl = updateList.MenuUrl
-          this.addMsg.menutype = updateList.MenuType?updateList.MenuType:1
+          this.addMsg.menutype = updateList.MenuType ? updateList.MenuType : 1
           this.addMsg.MenuStatus = updateList.MenuStatus.toString()
           let style = JSON.parse(updateList.MenuStyle)
           this.addMsg.MenuStyleIcon = style.icon
-          this.addMsg.MenuStyleColor = style.color 
+          this.addMsg.MenuStyleColor = style.color
           this.currentUpdateIndex = index
         }, err => {})
         this.getChildMenu();
@@ -414,4 +412,5 @@
       }
     }
   }
-</script>
+
\ No newline at end of file
+</script>

src/components/scenicSpot/scenicSpotSalesBoard.vue

@@ -204,8 +204,8 @@
         <li>
           <span>
             <em>{{$t('commonPickUp.Pick_attractions')}}</em>
-            <el-select v-model="msg.CouponsIdList" :placeholder="$t('pub.pleaseSel')"
-            multiple collapse-tags filterable @change="getMultipleChoice">
+            <el-select v-model="msg.CouponsIdList" :placeholder="$t('pub.pleaseSel')" multiple collapse-tags filterable
+              @change="getMultipleChoice">
               <el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
               <el-option v-for="item in ScenicList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
@@ -279,11 +279,11 @@
           Year: 0,
           Month: 0,
           CouponsId: 0,
-          CouponsIdList:[],
+          CouponsIdList: [],
           CouponsIds: '',
           QStatus: 0,
           loading: false,
-          uid:0,
+          uid: 0,
         },
         //餐厅列表
         ScenicList: [],
@@ -299,21 +299,21 @@
     },
     methods: {
       // 多选
-      getMultipleChoice(){
-        if(this.msg.CouponsIdList.length>1){
-            if(this.msg.CouponsIdList.at(-1)==0){
-              this.msg.CouponsIdList = [0]
-            }else if(this.msg.CouponsIdList.at(-1)!=0){
-              this.msg.CouponsIdList.forEach((x,index)=>{
-                if(x==0){
-                  this.msg.CouponsIdList.splice(index,1)
-                }
-              })
-            }
-            this.msg.CouponsId = 0
-            this.msg.CouponsIds = this.msg.CouponsIdList.join(',')
+      getMultipleChoice() {
+        if (this.msg.CouponsIdList.length > 1) {
+          if (this.msg.CouponsIdList.at(-1) == 0) {
+            this.msg.CouponsIdList = [0]
+          } else if (this.msg.CouponsIdList.at(-1) != 0) {
+            this.msg.CouponsIdList.forEach((x, index) => {
+              if (x == 0) {
+                this.msg.CouponsIdList.splice(index, 1)
+              }
+            })
+          }
+          this.msg.CouponsId = 0
+          this.msg.CouponsIds = this.msg.CouponsIdList.join(',')
         }
-        if(this.msg.CouponsIdList.length==1){
+        if (this.msg.CouponsIdList.length == 1) {
           this.msg.CouponsId = this.msg.CouponsIdList[0]
           this.msg.CouponsIds = ''
         }
@@ -407,10 +407,14 @@
       },
       //获取酒店列表
       GetScenicList() {
+        var postMsg = {
+          QCountrys: ""
+        };
+        if (this.userInfo.RB_Group_id == 2) {
+          postMsg.QCountrys = "651";
+        }
         this.apipost(
-          "ticketcoupons_post_GetList", {
-            QCountrys: "651"
-          },
+          "ticketcoupons_post_GetList", postMsg,
           res => {
             if (res.data.resultCode == 1) {
               this.ScenicList = res.data.data;
@@ -421,18 +425,18 @@
       },
       //下载餐厅统计
       DownLoadDinnerSalesBoard() {
-        if (this.msg.CouponsId<=0&&!this.msg.CouponsIds) {
+        if (this.msg.CouponsId <= 0 && !this.msg.CouponsIds) {
           this.Info("请选择景点!");
           return;
         }
         let url
-        if(this.msg.CouponsId>0){
+        if (this.msg.CouponsId > 0) {
           url = 'ticketcouponsorder_post_DownLoadScenicMonthStatistics'
-        }else{
-          url ='ticketcouponsorder_post_DownLoadScenicMonthStatisticsNew'
+        } else {
+          url = 'ticketcouponsorder_post_DownLoadScenicMonthStatisticsNew'
         }
         this.msg.loading = true;
-        this.msg.uid=this.userInfo.EmployeeId;
+        this.msg.uid = this.userInfo.EmployeeId;
         let fileName = "门票下载" + this.$commonUtils.getCurrentDate() + ".xls";
         this.GetLocalFile(url, this.msg, fileName,
           res => {

src/components/scenicSpot/ticketManagement.vue

@@ -408,6 +408,7 @@
       resetForm(formName) {
         this.clearMsg();
         this.$refs[formName].resetFields();
+        this.addMsg.CouponsId = parseInt(this.$route.query.id);
       },
       //获取所有币种
       getAllCurrency() {