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

src/App.vue

@@ -173,7 +173,7 @@ export default {
 }
 </script>
 <style>
-  @import "//at.alicdn.com/t/font_635492_3v2juwulgcc.css";
+  @import "//at.alicdn.com/t/font_635492_jhwh1knmwnd.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
   @import "./assets/css/fileIcon.css";

src/assets/common/lang/jp-demo.js

+export const obj = {
+    BrandName:'品牌名称',
+  }
+export default obj;
\ No newline at end of file

src/assets/common/lang/jp.js

 /**
  * Created by Administrator on 2018/4/17.
  */
+import zhDemo from './jp-demo'
+export const demo = zhDemo
+
 export const pub={
     addBtn:'追加',
     saveBtn:'保存',
@@ -35,8 +38,16 @@ export const pub={
     closeWindow:'窓口を閉める',
     noMsg:'無',
     returnBack:'戻る',
-    allday:'一日中'
-}
+    allday:'一日中',
+    clickToView:'クリックして見る',
+    man:'男',
+    woman:'女',
+    yes:'は',
+    no:'いいえ',
+    area:'地域',
+    edit:'編集',
+    Brand:'ブランド',  
+  }
 
 export const login = {
     login_account: "アカウントをご記入ください",
@@ -626,4 +637,34 @@ export const advmanager = {
 }
 export const insManage = {
   im_acc:'従属アカウント',
-}
\ No newline at end of file
+}
+//销售模块
+export const salesModule={
+  keyWords:'キーワード',
+  InformalClient:'正式顧客',
+  enterPhone:'は携帯電話または旅行会社名を入力します',
+  notInformalClient:'非公式顧客',
+  UnapprovedClient:'はお客さんを通していません',
+  BlackListCustomers:'ブラックリストのお客様',
+  addCustomer:'新規顧客',
+  belongUnion:'所属連盟',
+  InquiryAndDemand:'引合と需要',
+  CumulativeTurnover:'累計取引額',
+  HappinessPassbook:'幸せの通帳',
+  noVisit:'最近の訪問：まだありません。',
+  Visit:'最近お邪魔します',
+  noYuefang:'最近の訪問：まだありません。',
+  Yuefang:'近いうちに訪問することにします',
+  TotalVisit:'累計訪問',
+  OntheBlackList:'ブラックリストに追加しました',
+  storeName:'店舗名',
+  HouseNumber:'ドアナンバーを正確に入力してください。',
+  Belongbrand:'所属ブランド',
+  premises:'経営の場所',
+  CustomerSource:'顧客ソース',
+  CustomerInfo:'取引先情報',
+  BusinessPhoto:'名刺の写真',
+  doorPhoto:'表札の写真',
+  businessPhoto:'営業写真',
+  BrandName:'ブランド名',
+}

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

 export const obj = {
-  ceshi: '测试啊？？？？123'
+  BrandName:'品牌名称',
 }
 export default obj;
\ No newline at end of file

src/assets/common/lang/zh.js

@@ -44,8 +44,9 @@ export const pub={
   woman:'女',
   yes:'是',
   no:'否',
-  
-  
+  area:'地区',
+  edit:'编辑',
+  Brand:'品牌',
 }
 
 export const login = {
@@ -1746,5 +1747,35 @@ export const visaT = {
   dxzhanghu: '对象账户',
   guazdanju: '挂账单'
 }
+//销售模块
+export const salesModule={
+  keyWords:'关键字',
+  InformalClient:'正式客户',
+  enterPhone:'输入手机或者旅行社名',
+  notInformalClient:'非正式客户',
+  UnapprovedClient:'未通过客户',
+  BlackListCustomers:'黑名单客户',
+  addCustomer:'新增客户',
+  belongUnion:'所属联盟',
+  InquiryAndDemand:'询价与需求',
+  CumulativeTurnover:'累计交易额度',
+  HappinessPassbook:'幸福存折',
+  noVisit:'最近拜访：暂无',
+  Visit:'最近拜访',
+  noYuefang:'近期约访：暂无',
+  Yuefang:'近期约访',
+  TotalVisit:'累计拜访',
+  OntheBlackList:'已加入黑名单',
+  storeName:'门店名称',
+  HouseNumber:'请输入，精准到门牌号码',
+  Belongbrand:'所属品牌',
+  premises:'经营场所',
+  CustomerSource:'客户来源',
+  CustomerInfo:'客户来源信息',
+  BusinessPhoto:'名片照片',
+  doorPhoto:'门牌照片',
+  businessPhoto:'营业照片',
+  BrandName:'品牌名称',
+}
 import invoicesManager from './H/h-invoicesManager'
 export const ios = invoicesManager
\ No newline at end of file

src/assets/common/lang/zhtw-demo.js

+export const obj = {
+    BrandName:'品牌名称',
+  }
+export default obj;
\ No newline at end of file

src/components/FinancialModule/RecPayQuery.vue

@@ -104,7 +104,7 @@
                 <el-row style="padding:15px 20px 0 0;">
                     <el-col :span="4">
                         <el-form-item label="单号：">
-                            <el-input placeholder="" class="" v-model="msg.FrID" @keyup.native="checkInteger(msg,'FrID')"></el-input>
+                            <el-input placeholder="" class="" v-model="msg.FrID" @keyup.native="checkInteger(msg,'FrID')" maxlength="8"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="4">

src/components/SalesModule/branding.vue

@@ -2,38 +2,38 @@
     <div class="branding">
         <div class="branding_header">
             <div class="branding_item_btn">
-                <div @click="checkBtn">查询</div>
-                <div @click="addBtn">添加</div>
+                <div @click="checkBtn">{{$t('pub.searchBtn')}}</div>
+                <div @click="addBtn">{{$t('fnc.tianjia')}}</div>
             </div>
         </div>
         <div class="branding_name">
-            <div>品牌名称</div>
+            <div>{{$t('salesModule.BrandName')}}</div>
             <div>
-                <el-input v-model="checkData.Name" size="mini" placeholder="请输入"></el-input>
+                <el-input v-model="checkData.Name" size="mini" :placeholder="$t('pub.pleaseImport')"></el-input>
             </div>
         </div>
         <div class="branding_list">
             <div class="branding_item" v-for="(option, index) in list" :key="index">
                 <div>{{option.name}}</div>
                 <div class="branding_item_btn">
-                    <div @click="editBtn(index)">编辑</div>
-                    <div @click="delBtn(option.id)">删除</div>
+                    <div @click="editBtn(index)">{{$t('pub.edit')}}</div>
+                    <div @click="delBtn(option.id)">{{$t('system.ph_shanchu')}}</div>
                 </div>
             </div>
         </div>
         <el-pagination background @current-change="handleCurrentChange" :current-page.sync="checkData.pageIndex" layout="total,prev, pager, next, jumper" :page-size='20' :total='checkData.pageCount'></el-pagination>
         <div v-show="editShow" class="branding_buttom">
             <div class="branding_buttom_header">
-                <div>{{editType==='add'?'新增':'修改'}}品牌</div>
+                <div>{{editType==='add'?'新增':'修改'}}{{$t('pub.Brand')}}</div>
                 <div class="branding_item_btn">
-                    <div @click="editOk">保存</div>
-                    <div @click="editToHide">取消</div>
+                    <div @click="editOk">{{$t('pub.saveBtn')}}</div>
+                    <div @click="editToHide">{{$t('pub.cancelBtn')}}</div>
                 </div>
             </div>
             <div class="branding_name">
-                <div>品牌名称</div>
+                <div>{{$t('demo.BrandName')}}</div>
                 <div>
-                    <el-input v-model="editData.Name" size="mini" placeholder="请输入"></el-input>
+                    <el-input v-model="editData.Name" size="mini" :placeholder="$t('pub.pleaseImport')"></el-input>
                 </div>
             </div>
         </div>

src/components/index.vue

@@ -224,10 +224,13 @@
                   <span class="el-dropdown-link">
                     <i v-if="language=='zh-CN'" class="iconfont icon-language_top"></i>
                     <i v-if="language=='Japanese'" class="iconfont icon-icon-riyu"></i>
+                    <i v-if="language=='zh-TW'" class="iconfont icon-fanti"></i>
+
                   </span>
                   <el-dropdown-menu  class="changelanguage" slot="dropdown">
                     <el-dropdown-item @click.native="ChangeLan('Japanese')">日语 <i v-if="language=='Japanese'" class="iconfont icon-duigou"></i></el-dropdown-item>
                     <el-dropdown-item @click.native="ChangeLan('zh-CN')">简体中文 <i v-if="language=='zh-CN'" class="iconfont icon-duigou"></i></el-dropdown-item>
+                    <el-dropdown-item @click.native="ChangeLan('zh-TW')">繁体中文 <i v-if="language=='zh-TW'" class="iconfont"></i></el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </li>