Merge branch 'lang'

src/assets/common/lang/jp.js

@@ -2618,5 +2618,7 @@ export const op={
 
 import invoicesManager from './Japan/invoicesManager'
 import Ground from './Japan/Ground'
+import ObjFill from './Japan/fill'
 export const ios = invoicesManager
 export const ground = Ground
+export const objFill = ObjFill

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

@@ -2648,5 +2648,7 @@ export const op={
 
 import invoicesManager from './zhTW/invoicesManager'
 import Ground from './zhTW/Ground'
+import ObjFill from './zhTW/fill'
 export const ios = invoicesManager
 export const ground = Ground
+export const objFill = ObjFill

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

@@ -26,6 +26,9 @@ export const obj = {
     noinvoicedocument: '暂无发票单据',
     balanceout: '冲抵',
     groundsforcancellation: '取消理由',
+    precharge: '预付款冲抵',
+    amountoffset: '冲抵金额',
+    onlyoneitem: '只能选择一项！',
     caravanshopcol: {
       t1: '车/使用时间/天数',
       t2: '用车详情',

src/components/public/offset.vue

 <template>
-    <el-dialog title="预付款冲抵" width="860px" :visible.sync="cdState" center @close="close">
+    <el-dialog :title="$t('objFill.precharge')" width="860px" :visible.sync="cdState" center @close="close">
         <el-form class="cdForm" label-width="90px">
-            <el-form-item label="单号" prop="FrID">
+            <el-form-item :label="$t('fnc.danhao')" prop="FrID">
               <el-input class="w220" @keyup.native="checkInteger(czMsg,'FrID')" v-model="czMsg.FrID"></el-input>
             </el-form-item>
-            <el-form-item label="费用类型">
+            <el-form-item :label="$t('fnc.feiyongleixing')">
               <el-select filterable v-model='czMsg.CostTypeID' class="">
-                <el-option label="不限" value=''></el-option>
+                <el-option :label="$t('pub.unlimitedSel')" value=''></el-option>
                 <el-option v-for="(item,index) in costList" :key="index" :label="item.Name" :value='item.ID'></el-option>
               </el-select>
             </el-form-item>
             <el-form-item>
-                <input type="button" value="查询" class="leader2Btn" @click="czgetList">
+                <input type="button" :value="$t('pub.searchBtn')" class="leader2Btn" @click="czgetList">
             </el-form-item>
-            <el-form-item label="交易日期">
+            <el-form-item :label="$t('fnc.jiaoyiriqi')">
               <el-date-picker
                 v-model="czdateList"
                 type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期">
+                :range-separator="$t('OrderList.zhi')"
+                :start-placeholder="$t('OrderList.star')"
+                :end-placeholder="$t('OrderList.end')">
               </el-date-picker>
             </el-form-item>
 
@@ -27,15 +27,15 @@
           <table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" v-loading="loading">
             <tr>
               <th></th>
-              <th>单号</th>
-              <th>公司</th>
-              <th>费用类型</th>
-              <th>币种</th>
-              <th>汇率</th>
-              <th>金额</th>
-              <th>冲抵金额</th>
-              <th>状态</th>
-              <th>付款对象</th>
+              <th>{{$t('fnc.danhao')}}</th>
+              <th>{{$t('sm.company')}}</th>
+              <th>{{$t('fnc.feiyongleixing')}}</th>
+              <th>{{$t('hotel.hotel_Currency')}}</th>
+              <th>{{$t('hotel.hotel_CurrentRate')}}</th>
+              <th>{{$t('fnc.jine')}}</th>
+              <th>{{$t('objFill.amountoffset')}}</th>
+              <th>{{$t('admin.admin_status')}}</th>
+              <th>{{$t('fnc.fkduixiang')}}</th>
             </tr>
             <tr v-for="(item,index) in czList" :key="index">
               <td><input type="checkbox" :value="item" v-model="checkList" @change="ckeckOne"></td>
@@ -54,7 +54,7 @@
                 </td>
             </tr>
             <tr v-if="czList.length==0">
-              <td colspan="12">暂无数据</td>
+              <td colspan="12">{{$t('system.content_noData')}}</td>
             </tr>
           </table>
           <el-pagination background @current-change="handleCurrentChange2"
@@ -140,11 +140,11 @@
             let checkList=JSON.parse(JSON.stringify(this.checkList))
 
             if(this.checkList.length>1){
-            this.Error("只能选择一项！");
+            this.Error(this.$t('objFill.onlyoneitem'));
             return;
             }
             if(this.checkList.length==0){
-            this.Error("至少选择一项");
+            this.Error(this.$t('objFill.atleastone'));
             return;
             }
             this.tradeObj.MatchFrId = this.checkList[0].FrID
@@ -166,7 +166,7 @@
               this.queryObj.czmsg.TCNUM = this.$route.query.id
               this.queryObj.czmsg = JSON.stringify(this.queryObj.czmsg)
             }
-            this.queryObj.searchTitle='分摊';
+            this.queryObj.searchTitle=this.queryObj.searchTitle?this.queryObj.searchTitle:'分摊';
             let query = this.queryObj
             this.$emit('success')
             this.close()
@@ -212,7 +212,7 @@
             this.checkList.splice(0,1);
             }
             if(this.checkList.length>1){
-            this.Error("只能选择一项！");
+            this.Error(this.$t('objFill.onlyoneitem'));
             }
         },
         handleCurrentChange2(val) {