页面修改

src/assets/common/lang/jp.js

@@ -231,6 +231,8 @@ export const admin={  //行政
     admin_operate:'オペレーション',
     admin_leader:'担当者',
     admin_isshow:'表示かどうか',
+    B2BShow:'B2Bが表示されるか否か',
+    IsParentCompany:"会社の種類",
     admin_address:'アドレス',
     admin_addGuide:'添乗員/ガイドを添加する',
     admin_cpGuide:'会社専属ガイド',

src/assets/common/lang/zh-tw.js

@@ -220,6 +220,7 @@ export const admin={  //行政
   mane:'名稱',
   admin_group:'集團名稱',
   admin_company:'公司名稱',  
+  CompanyTitle:"確認件擡頭",
   admin_department:'部門名稱',  
   admin_departmentLevel:'部門層級',  
   admin_parentdepartment:'上級部門',  
@@ -230,7 +231,9 @@ export const admin={  //行政
   admin_linkman:'連絡人資訊',  
   admin_operate:'操作',  
   admin_leader:'負責人',  
-  admin_isshow:'是否顯示',  
+  admin_isshow:'是否顯示', 
+  B2BShow:'B2B是否顯示', 
+  IsParentCompany:"公司類型",
   admin_address:'地址',  
   admin_addGuide:'添加領隊/導遊',  
   admin_cpGuide:'公司導遊',  
@@ -1850,7 +1853,7 @@ export const salesModule={
   Yuefang:'近期約訪',
   TotalVisit:'累計拜訪',
   OntheBlackList:'已加入黑名單',
-  storeName:'門店名稱',
+  storeName:'同行名稱',
   HouseNumber:'請輸入,精准到門牌號碼',
   Belongbrand:'所屬品牌',
   premises:'經營場所',

src/assets/common/lang/zh.js

@@ -219,7 +219,8 @@ export const system = {
 export const admin={  //行政
   mane:'名称',
 	admin_group:'集团名称',
-	admin_company:'公司名称',
+    admin_company:'公司名称',
+    CompanyTitle:"",
 	admin_department:'部门名称',
 	admin_departmentLevel:'部门层级',
 	admin_parentdepartment:'上级部门',
@@ -230,7 +231,9 @@ export const admin={  //行政
 	admin_linkman:'联系人信息',
 	admin_operate:'操作',
 	admin_leader:'负责人',
-	admin_isshow:'是否显示',
+    admin_isshow:'是否显示',
+    B2BShow:'B2B是否显示',
+    IsParentCompany:"公司类型",
   admin_address:'地址',
   admin_addGuide:'添加领队/导游',
   admin_cpGuide:'公司导游',

src/assets/utils/commonUtils.js

@@ -37,8 +37,8 @@ var commonUtils = {
     return {
       Url: "",
       Name: "",
-      VideoPath:"",
-      FileType:"",//文件类型
+      VideoPath: "",
+      FileType: "", //文件类型
     }
   },
   //实现每三位一个逗号分隔并且保留两位小数
@@ -350,12 +350,12 @@ var commonUtils = {
     //返回年月日
     return myDate.getFullYear() + '-' + parseInt(myDate.getMonth() + 1) + "-" + myDate.getDate()
   },
-    //格式化日期
-    getFormatDate(dateStr) {
-        var myDate = new Date(dateStr);
-        //返回年月日
-        return myDate.getFullYear() + '-' + parseInt(myDate.getMonth() + 1) + "-" + myDate.getDate()
-      },
+  //格式化日期
+  getFormatDate(dateStr) {
+    var myDate = new Date(dateStr);
+    //返回年月日
+    return myDate.getFullYear() + '-' + parseInt(myDate.getMonth() + 1) + "-" + myDate.getDate()
+  },
   //判断字符串是否为数字
   isNumber: function (val) {
     var regPos = /^\d+(\.\d+)?$/; //非负浮点数
@@ -427,10 +427,10 @@ var commonUtils = {
     var month = myDate.getMonth() + 1;
     var strDate = myDate.getDate();
     if (month >= 1 && month <= 9) {
-        month = "0" + month;
+      month = "0" + month;
     }
     if (strDate >= 0 && strDate <= 9) {
-        strDate = "0" + strDate;
+      strDate = "0" + strDate;
     }
     var currentdate = year + seperator1 + month + seperator1 + strDate;
     return currentdate;

src/components/platformModule/companyManagement.vue

@@ -105,10 +105,10 @@
         <th>{{$t('restaurant.res_ContactNumber')}}</th>
         <th>{{$t('admin.admin_status')}}</th>
         <th>{{$t('admin.admin_isshow')}}</th>
-        <th>B2B是否显示</th>
-        <th>公司类型</th>
-        <th>是否服务费收费</th>
-        <th>服务费用</th>
+        <th>{{$t('admin.B2BShow')}}</th>
+        <th>{{$t('admin.IsParentCompany')}}</th>
+        <th v-if="userInfo.RB_Group_id==2">是否服务费收费</th>
+        <th v-if="userInfo.RB_Group_id==2">服务费用</th>
         <th width="200">{{$t('admin.admin_operate')}}</th>
       </tr>
       <tr v-for="(item,index) in DataList" v-loading='loading'>
@@ -119,8 +119,8 @@
         <td>{{item.is_show==0?'显示':'不显示'}}</td>
         <td>{{item.B2BShow==0?'显示':'不显示'}}</td>
         <td>{{item.IsParentCompany=='1'?'总公司':'分公司'}}</td>
-        <td>{{item.IsFreeFee==0?'付费':'免费'}}</td>
-        <td >{{item.ServiceFee}}</td>
+        <td v-if="userInfo.RB_Group_id==2">{{item.IsFreeFee==0?'付费':'免费'}}</td>
+        <td v-if="userInfo.RB_Group_id==2">{{item.ServiceFee}}</td>
         <td>
           <el-row>
             <el-tooltip class="item" effect="dark" content="修改" placement="top-start">
@@ -141,8 +141,8 @@
         <el-form-item class='w400' :label="$t('admin.admin_company')" prop="BName">
           <el-input type="text" v-model="addMsg.BName" :placeholder="$t('pub.pleaseImport')"></el-input>
         </el-form-item>
-        <el-form-item class='w400' label="确认件抬头" prop="CompanyTitle">
-          <el-input type="text" v-model="addMsg.CompanyTitle" placeholder="请输入确认件抬头"></el-input>
+        <el-form-item class='w400' :label="$t('admin.CompanyTitle')" prop="CompanyTitle">
+          <el-input type="text" v-model="addMsg.CompanyTitle" :placeholder="$t('admin.CompanyTitle')"></el-input>
         </el-form-item>
         <el-form-item :label="$t('system.table_pvrg')" prop="Province">
           <el-select class='w280' :placeholder="$t('pub.pleaseSel')" filterable v-model="addMsg.Province"
@@ -205,8 +205,7 @@
           </el-select>
         </el-form-item>
         <el-form-item class='w400' label='是否服务费收费'>
-          <el-select v-model='addMsg.IsFreeFee' :placeholder="$t('pub.pleaseSel')"
-            class='w280'>
+          <el-select v-model='addMsg.IsFreeFee' :placeholder="$t('pub.pleaseSel')" class='w280'>
             <el-option label="付费" :value='0'></el-option>
             <el-option label="免费" :value='1'></el-option>
           </el-select>
@@ -260,6 +259,7 @@
         }
       }
       return {
+        userInfo: {}, //当前用户信息
         options: [{
           value: '0',
           label: this.$t('pub.openSel')
@@ -378,23 +378,24 @@
           GatheringAddress: '',
           TravelLogo: '',
           CompanyTitle: '',
-          IsFreeFee:0,
-          ServiceFee:0
+          IsFreeFee: 0,
+          ServiceFee: 0
         },
         updateMsg: {
           GroupId: '1'
         },
-        userInfoList:{},
+        userInfoList: {},
       }
     },
     mounted() {
-      var userInfo = this.getLocalStorage(); //获取用户登录信息
+      this.userInfo = this.getLocalStorage();
+      //获取用户登录信息
       if (this.$route.query.id != undefined) { //如果用户从集团页面跳到 公司页面， 那查询公司使用的是 选中集团id. 如果直接进入公司页面， 默认使用该用户登录信息中的 集团id
         this.addMsg.RB_Group_Id = this.msg.RB_Group_Id = this.$route.query.id;
       } else {
-        this.addMsg.RB_Group_Id = this.msg.RB_Group_Id = userInfo.RB_Group_id
+        this.addMsg.RB_Group_Id = this.msg.RB_Group_Id = this.userInfo.RB_Group_id
       }
-      this.userInfoList=userInfo;
+      this.userInfoList = this.userInfo;
       this.getProvince();
       this.getList();
       this.getGroup();
@@ -564,4 +565,5 @@
       },
     },
   }
-</script>
\ No newline at end of file
+
+</script>