翻译修改

src/assets/common/lang/EN/Ground.js

@@ -63,7 +63,7 @@ export const obj = {
   jiudianleixing: "Hotel Type ",
   zhenshimingcheng: "Real Name ",
   baojiayukucun: "Offer and Inventory ",
-  jiudianmingzi: "Real name of the hotel ",
+  jiudianmingzi: "Real Name",
   shifouyuyue: "Whether to make an appointment ",
   zhifufangshi: "Payment Method ",
   jiudianyouhui: "Hotel Deals ",
@@ -94,11 +94,7 @@ export const obj = {
   qishiyue: "Beginning month ",
   shengyuzongkucun: "Total Remaining Inventory ",
   kucunyouxiaoqi: "Inventory expiration date ",
-  hongri: "Red Sun ",
-  wangji: "Peak season ",
-  pingji: "Shoulder season ",
-  danji: "Off season ",
-  tebiejia: "Special price ",
+
   dianjichakanxq: "Click for details ",
   baojiaxinxi: "Offer information ",
   pici: "Batch ",

src/assets/common/lang/EN/fill.js

@@ -382,6 +382,28 @@ export const obj = {
     zhanghuxinxi: 'Account Information ',
     qingshurutdbz: 'Please enter team remarks content ',
     qingxuanzhettname: 'Please select a header name',
+    xiugaikehuxx: 'Edit Customer Info',
+    kezhijiebc: 'Save',
+    ruguosgrzwxsh: 'If it is an individual, there is no need to fill in the tax number. If it is a supplier, the tax number must be filled in;',
+    gouwuche: 'Shopping Car',
+    hongri: "Red Sun",
+    wanji: "Peak season",
+    pingji: "Shoulder season",
+    danji: "Off season ",
+    tiebiejia: "Special price",
+    xingqianri: 'Day before departure',
+    tuichu: 'Log Out',
+    gerenzhongxin: 'Personal Center',
+    zhinengscexwj: 'Only Excel files can be uploaded',
+    qingshurtybm: 'Please enter a unified code',
+    qingshureml: 'Please enter the email address',
+    qingshurlineid: 'Please enter LINE ID',
+    mobandaoru: 'Template import',
+    yichangmicheng: 'Exception Name',
+    yi: 'Exception',
+    shuihao: 'Tax ID',
+    shangchuanshijian: 'Upload time',
+    diliweizhi: 'Geographic Location',
     caravanshopcol: {
       t1: 'Car/usage time/days ',
       t2: 'Car Details ',

src/assets/common/lang/EN/invoicesManager.js

@@ -29,7 +29,7 @@ export const obj = {
   cwdanju: 'Financial documents ',
   zanwu: 'Not yet ',
   kjneirong: 'Open content ',
-  shuihao: 'Tax ID ',
+  shuihao: 'Tax ID',
   khuhang: 'Account bank ',
   shuihao2: 'Tax ID: ',
   qsrshuihao: 'Please enter your tax ID ',

src/assets/common/lang/en.js

@@ -145,19 +145,19 @@
       table_Appraise:' Appraiser ',
       table_Auditing:' Auditors ',
       table_staffs: "staff",
-      table_destName:' destination name ',
-      table_country:' country ',
-      table_city:' City ',
-      table_destCoun:' Destination country ',
-      table_edit:' Modify ',
-      table_delete:' Delete ',
+      table_destName:'destination name',
+      table_country:'Country',
+      table_city:'City',
+      table_destCoun:'Destination Country',
+      table_edit:'Modify',
+      table_delete:'Delete',
       table_kfPhone:' Customer service phone ',
       table_logoImg:'logo picture ',
       table_ticketCont:' What you need to issue a ticket ',
       table_chekAll: 'Select all',
       table_ticketAotu:' Whether tickets are automatically issued ',
       table_groupName:' Group name ',
-      table_code:' code ',
+      table_code:'Code',
       table_codeTips:' (three codes) ',
       table_LtName:' Group name name ',
       table_NetLtName:' Page group name ',
@@ -338,38 +338,38 @@
   }
   //zk
   export const hotel = {
-    hoetel_red:' Red: inside ',
-    hoetel_green:' Green: B2C',
-    hoetel_blu:' Blue: B2B',
-    hotel_name:' Hotel name ',
-    hotel_status:' Status ',
-    hotel_country:' country ',
-    hotel_province:' Province ',
-    hotel_city:' city ',
-    hotel_area:' area ',
-    hotel_baseinfo:' basic data ',
-    hotel_services:' Facility services ',
-    hotel_policy:' Hotel policy ',
-    hotel_imgintroduce:' Picture introduction ',
-    hotel_describle:' Text description ',
-    hotel_roomnumber:' Number of rooms ',
-    hotel_openplatform:' Open platform ',
-    hotel_brand:' Hotel brand ',
-    hotel:' Hotel ',
-    hotel_starlevel:' Star ',
-    hotel_website:' Official website ',
-    hotel_landline:' landline ',
-    hotel_detailinfo:' Detailed address ',
-    hotel_fax:' fax ',
-    hotel_deadday:' Days in advance ',
-    hotel_remark:' Remark ',
-    hotel_resource:' Hotel resource ',
-    hotel_produceDes:' Product Description ',
-    hotel_remind:' Not filled in ',
-    hotel_day:' day ',
-    hotel_item:' bar ',
-    hotel_mapLocation:' map location ',
-    hotel_detailInfo:' Please enter the detailed address ',
+    hoetel_red:'Red: inside',
+    hoetel_green:'Green: B2C',
+    hoetel_blu:'Blue: B2B',
+    hotel_name:'Name',
+    hotel_status:'Status',
+    hotel_country:'country',
+    hotel_province:'Province',
+    hotel_city:'City',
+    hotel_area:'area',
+    hotel_baseinfo:'Basic Data',
+    hotel_services:'Facility Services',
+    hotel_policy:'Hotel policy',
+    hotel_imgintroduce:'Picture introduction',
+    hotel_describle:'Text Info',
+    hotel_roomnumber:'Number of rooms',
+    hotel_openplatform:'Platform ',
+    hotel_brand:'Brand',
+    hotel:'Hotel',
+    hotel_starlevel:'Star',
+    hotel_website:'Website',
+    hotel_landline:'Landline',
+    hotel_detailinfo:'Address',
+    hotel_fax:'Fax',
+    hotel_deadday:'Advance',
+    hotel_remark:'Remark',
+    hotel_resource:'Hotel Resource',
+    hotel_produceDes:'Product Description',
+    hotel_remind:'Not filled in',
+    hotel_day:'day',
+    hotel_item:'bar',
+    hotel_mapLocation:'Map Location',
+    hotel_detailInfo:'Please enter the detailed address',
     hotel_productManage:' Product quote Management ',
     hotel_inputholder:' unlimited ',
     hotel_cost:' cost ',
@@ -377,9 +377,9 @@
     hotel_InventoryAdd:' add inventory ',
     hotel_B2BPrice:'B2B price ',
     hotel_B2CPrice:'B2C Price ',
-    hotel_SalesPrice:' internal price ',
-    hotel_DMCPrice:' ground price ',
-    hotel_yuan:' yuan ',
+    hotel_SalesPrice:'internal price ',
+    hotel_DMCPrice:'ground price ',
+    hotel_yuan:'yuan',
     hotel_Supplier:' supplier ',
     hotel_attention:' Attention ',
     hotel_attentionOne:' Only one months data can be processed at a time. ',
@@ -470,7 +470,9 @@
     hotel_dataReport:' Data report ',
     hotel_ReturnRoomNumber:' Return number ',
     hotel_zanwu:' No modification log ',
-    hotel_type: 'Hotel type ',
+    hotel_type: 'Hotel type',
+    hotel_jingdu:'Lng',
+    hotel_weidu:'Lat',
   }
 
   export const leader = {
@@ -520,7 +522,7 @@
     res_salePlatform:' Platform for sale ',
     res_bookCapacity:' Number of people available to book ',
     res_advanceDays:' Advance booking days ',
-    res_commissionColumn:' Commission ratio ',
+    res_commissionColumn:'Commission Ratio',
     res_peopleNumber:' Enter the number of people ',
     res_percentage:' Input percentage ',
     res_foodLabels:' Food labels ',
@@ -540,8 +542,8 @@
     res_fy:' Expected rebate ',
     res_cwsj:' Financial documents ',
     res_history:' View historical operations ',
-    res_ContactNumber:' Contact number ',
-    res_AnnualAccounts:' annual accounting statement ',
+    res_ContactNumber:'Contact number',
+    res_AnnualAccounts:'annual accounting statement ',
     res_OutStandingBills:' outstanding bills ',
     res_To:' to ',
     res_ContainsAll:' Contains all unconsolidated bills ',
@@ -1903,7 +1905,7 @@
     enterPhone:' Enter the name of your phone or travel agency ',
     notInformalClient:' Informal client ',
     UnapprovedClient:' failed client ',
-    BlackListCustomers: 'Blacklistcustomers',
+    BlackListCustomers: 'Blacklist',
     addCustomer:' New customer ',
     belongUnion:' A union to which you belong ',
     InquiryAndDemand:' Inquiry and demand ',
@@ -1916,6 +1918,7 @@
     TotalVisit:' Total visit ',
     OntheBlackList:' Added to the blacklist ',
     storeName:' Store name ',
+    c_email:"EMail",
     HouseNumber:' Please enter, accurate to the house number ',
     Belongbrand:' Brand to which you belong ',
     premises:' Premises ',

src/assets/common/lang/jp.js

@@ -423,7 +423,9 @@ export const admin={  //行政
     hotel_dataReport:'データレポート',　　　　　　　　　　
     hotel_ReturnRoomNumber:'チエックアウト数',　　　　
     hotel_zanwu:'暫く改訂レポート無',
-    hotel_type: '酒店类型',　　　　　　　　　
+    hotel_type: '酒店类型',　　　
+    hotel_jingdu:'経度',
+    hotel_weidu:'緯度',　　　　　　
   }
 
   export const leader = {
@@ -1827,6 +1829,7 @@ export const salesModule={
   TotalVisit:'累計訪問',
   OntheBlackList:'ブラックリストに追加しました',
   storeName:'店舗名',
+  c_email:"メールボックス",
   HouseNumber:'ドアナンバーを正確に入力してください。',
   Belongbrand:'所属ブランド',
   premises:'経営の場所',

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

@@ -469,6 +469,8 @@ export const admin={  //行政
   hotel_ReturnRoomNumber:'還房數量',
   hotel_zanwu:'暫無修改日誌',
   hotel_type: '酒店类型',
+  hotel_jingdu:'經度',
+  hotel_weidu:'緯度',
  }
 
  export const leader = {
@@ -1903,6 +1905,7 @@ export const salesModule={
   TotalVisit:'累計拜訪',
   OntheBlackList:'已加入黑名單',
   storeName:'同行名稱',
+  c_email:"郵箱",
   HouseNumber:'請輸入,精准到門牌號碼',
   Belongbrand:'所屬品牌',
   premises:'經營場所',

src/assets/common/lang/zh.js

@@ -471,6 +471,8 @@ export const admin={  //行政
    hotel_ReturnRoomNumber:'还房数量',
    hotel_zanwu:'暂无修改日志',
    hotel_type: '酒店类型',
+   hotel_jingdu:'经度',
+   hotel_weidu:'纬度',
  }
 
  export const leader = {
@@ -1916,6 +1918,7 @@ export const salesModule={
   TotalVisit:'累计拜访',
   OntheBlackList:'已加入黑名单',
   storeName:'门店名称',
+  c_email:"邮箱",
   HouseNumber:'请输入，精准到门牌号码',
   Belongbrand:'所属品牌',
   premises:'经营场所',

src/components/Hotel/HotelInfo.vue

@@ -107,15 +107,9 @@
           </div>
           <span class="resource-lititle sheshi">{{$t('hotel.hotel_type')}}</span>
           <div class="res-span">
-            <el-tree
-  :data="categoryTree" default-expand-all
-  :props="{label: 'CategoryName', children: 'SubList'}"
-  show-checkbox
-  node-key="Id"
-  ref="treeForm"
-  @check-change="handleNodeClick"
-  >
-</el-tree>
+            <el-tree :data="categoryTree" default-expand-all :props="{label: 'CategoryName', children: 'SubList'}"
+              show-checkbox node-key="Id" ref="treeForm" @check-change="handleNodeClick">
+            </el-tree>
           </div>
         </div>
         <div class="resource-imginfo">
@@ -176,11 +170,11 @@
               <span class="fanbili">{{$t('objFill.diliweizhi')}}</span>
               <div class="RabateDiv clearfix">
                 <div class="RebateCount reOne">
-                  <div class="leftPnum">{{$t('objFill.jingdu')}}</div>
+                  <div class="leftPnum">{{$t('hotel.hotel_jingdu')}}</div>
                   <input type="text" class="toolInput inpuOne" v-model="addMsg.Lng" maxlength="20">
                 </div>
                 <div class="RebateCount reTwo">
-                  <div class="fanNum">{{$t('objFill.weidu')}}</div>
+                  <div class="fanNum">{{$t('hotel.hotel_weidu')}}</div>
                   <input type="text" class="toolInput inpuTwo" v-model="addMsg.Lat" maxlength="20">
                 </div>
               </div>
@@ -651,27 +645,27 @@
       addParentId(tree, idArr) {
         tree.forEach(item => {
           item.ids = [...idArr, item.Id]
-                if(item.SubList && item.SubList.length) {
+          if (item.SubList && item.SubList.length) {
             this.addParentId(item.SubList, item.ids)
           }
         })
       },
       setSelectedKeys() {
         this.arr = []
-        if(this.checkedId.length && this.categoryTree.length) {
+        if (this.checkedId.length && this.categoryTree.length) {
           this.findSelcetedKey(this.categoryTree)
 
-        if(this.$refs.treeForm) {
+          if (this.$refs.treeForm) {
             this.$refs.treeForm.setCheckedKeys(this.arr)
           }
         }
       },
-      findSelcetedKey(tree,) {
+      findSelcetedKey(tree, ) {
         tree.forEach(item => {
-                if(item.SubList && item.SubList.length) {
+          if (item.SubList && item.SubList.length) {
             this.findSelcetedKey(item.SubList)
           } else {
-                  if(this.checkedId.includes(item.Id)) {
+            if (this.checkedId.includes(item.Id)) {
               this.arr.push(item.Id)
             }
           }
@@ -681,20 +675,19 @@
         this.idsList = []
         this.selectedKeys = this.$refs.treeForm.getCheckedKeys()
         this.getSelcetedKeyIds(this.categoryTree)
-        return [... new Set(this.idsList)].join(',')
+        return [...new Set(this.idsList)].join(',')
       },
       getSelcetedKeyIds(tree) {
         tree.forEach(item => {
-                if(item.SubList && item.SubList.length) {
+          if (item.SubList && item.SubList.length) {
             this.getSelcetedKeyIds(item.SubList)
           }
-                if(this.selectedKeys.includes(item.Id)) {
+          if (this.selectedKeys.includes(item.Id)) {
             this.idsList = this.idsList.concat(item.ids)
           }
         })
       },
-handleNodeClick(data, checked, node) {
-    },
+      handleNodeClick(data, checked, node) {},
       initHotelData() {
         var msg = {
           hotelID: this.hotelID
@@ -706,7 +699,8 @@ handleNodeClick(data, checked, node) {
           msg,
           res => {
             if (res.data.resultCode == 1) {
-              this.checkedId = res.data.data.WebSiteCategoryIds ? res.data.data.WebSiteCategoryIds.split(',').map(item => Number(item)) : []
+              this.checkedId = res.data.data.WebSiteCategoryIds ? res.data.data.WebSiteCategoryIds.split(',').map(
+                item => Number(item)) : []
               this.setSelectedKeys()
               _self.addMsg = res.data.data;
               if (_self.addMsg.Country > 0) {
@@ -959,7 +953,8 @@ handleNodeClick(data, checked, node) {
 
 
     },
-    mounted() {this.checkedId = []
+    mounted() {
+      this.checkedId = []
       let userInfo = this.getLocalStorage()
       //有权限操作的部门
       if (userInfo.RB_Department_Id == 240 || userInfo.RB_Department_Id == 1 || userInfo.RB_Department_Id == 3 ||

src/components/SalesModule/MyCustomer.vue

@@ -574,7 +574,6 @@
               <p v-else>
                 <span style="cursor: pointer;text-decoration: underline;">{{$t('pub.noMsg')}}</span></p>
             </div>
-
           </td>
           <td v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2"><span @click="goUrl(type,item.customerId,2)"
               style="cursor: pointer;text-decoration: underline;">{{item.visiteCount}}</span></td>
@@ -651,7 +650,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6" v-if="currentUserInfo&&currentUserInfo.RB_Group_id!=2">
-            <el-form-item label="邮箱" prop="Email">
+            <el-form-item :label="$t('sm.email')" prop="Email">
               <el-input v-model="addMsg.Email" :placeholder="$t('pub.pleaseImport')" maxlength="50"></el-input>
             </el-form-item>
           </el-col>
@@ -828,8 +827,8 @@
         :on-success="handleAvatarSuccess">
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">
-          {{$t('Operation.tuodongwenjian')}}
-          <em>{{$t('Operation.dianjishanhcuan')}}</em>
+          {{$t('tips.tuodongwenjian')}}
+          <em>{{$t('tips.dianjishanhcuan')}}</em>
         </div>
         <div slot="tip" class="el-upload__tip">{{$t('objFill.zhinengscexwj')}}</div>
       </el-upload>
@@ -864,7 +863,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6" v-if="currentUserInfo&&currentUserInfo.RB_Group_id!=2">
-            <el-form-item label="邮箱" prop="Email">
+            <el-form-item :label="$t('salesModule.c_email')" prop="Email">
               <el-input v-model="updateMsg.email" :placeholder="$t('pub.pleaseImport')" maxlength="50"></el-input>
             </el-form-item>
           </el-col>
@@ -927,7 +926,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="$t('hotel_.hotel_detailinfo')">
+            <el-form-item :label="$t('hotel.hotel_detailinfo')">
               <el-input v-model='updateMsg.Address' maxlength="50"></el-input>
             </el-form-item>
           </el-col>
@@ -1133,17 +1132,17 @@
           }],
           UniqueCode: [{
             required: true,
-            message: this.$t('onjFill.qingshurtybm'),
+            message: this.$t('objFill.qingshurtybm'),
             trigger: "blur"
           }],
           LINEID: [{
             required: true,
-            message: this.$t('onjFill.qingshurlineid'),
+            message: this.$t('objFill.qingshurlineid'),
             trigger: "blur"
           }],
           Email: [{
             required: true,
-            message: this.$t('onjFill.qingshureml'),
+            message: this.$t('objFill.qingshureml'),
             trigger: "blur"
           }],
         },