Skip to content

S
SuperMan
Commit e785642f authored by youjie's avatar youjie
Browse files
Options

Merge branch 'lang'

parents 4b887c3d e00e51b3
Show whitespace changes
Inline Side-by-side
Showing with 561 additions and 554 deletions
src/assets/common/lang/jp.js
View file @ e785642f
......@@ -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
View file @ e785642f
......@@ -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
View file @ e785642f
......@@ -26,6 +26,9 @@ export const obj = {
noinvoicedocument: '暂无发票单据',
balanceout: '冲抵',
groundsforcancellation: '取消理由',
precharge: '预付款冲抵',
amountoffset: '冲抵金额',
onlyoneitem: '只能选择一项！',
caravanshopcol: {
t1: '车/使用时间/天数',
t2: '用车详情',
......
src/components/FinancialModule/MonthlyCostStatement/index.vue
View file @ e785642f
......@@ -11,17 +11,17 @@
<el-form class="_info_box clearfix" label-width="110px">
<el-row style="padding:15px 20px 0 0;">
<el-col :span="4">
<el-form-item label="单号：">
<el-form-item :label="$t('fnc.danhao')">
<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">
<el-form-item label="团队编号：">
<el-form-item :label="$t('scen.sc_temID')">
<el-input v-model="msg.TCNUM" class=""></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="结算状态：">
<el-form-item :label="$t('objFill.settlementstatus')">
<el-select v-model='msg.IsSelectAduiting'>
<el-option v-for='item in SelectAduitingList'
:label='item.Name'
......@@ -32,9 +32,9 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="所属公司：">
<el-form-item :label="$t('system.query_company')">
<el-select filterable v-model='msg.RB_Branch_Id' @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',msg.UpdateBy='',getDepartment()" class="">
<el-option :value="-1" label="不限"></el-option>
<el-option :value="-1" :label="$t('system.ph_buxian')"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
......@@ -44,9 +44,9 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="制单人员：">
<el-form-item :label="$t('fnc.zdrenyuan')">
<el-select filterable v-model='msg.UpdateBy' class="">
<el-option :value="0" label="不限"></el-option>
<el-option :value="0" :label="$t('system.ph_buxian')"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
......@@ -56,25 +56,25 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="单据类型：">
<el-form-item :label="$t('fnc.djleixing')">
<el-select filterable v-model='msg.Type' class="">
<el-option key="-1" value="-1" label="不限"></el-option>
<el-option key="1" value="1" label="收入"></el-option>
<el-option key="2" value="2" label="支出"></el-option>
<el-option key="-1" value="-1" :label="$t('system.ph_buxian')"></el-option>
<el-option key="1" value="1" :label="$t('restaurant.res_income')"></el-option>
<el-option key="2" value="2" :label="$t('restaurant.res_outcome')"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="费用类型：">
<el-form-item :label="$t('fnc.feiyongleixing')">
<el-select filterable v-model='msg.CostTypeID' >
<el-option :value="0" label="不限"></el-option>
<el-option :value="0" :label="$t('system.ph_buxian')"></el-option>
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="汇款人：">
<el-form-item :label="$t('fnc.huikuanren')">
<el-input placeholder="" class="" v-model="msg.RemitterName" ></el-input>
</el-form-item>
</el-col>
......@@ -96,7 +96,7 @@
filterable
remote
reserve-keyword
placeholder="请输入关键词"
:placeholder="$t('pub.PleaseKeyWords')"
:remote-method="GetClientAccountListByKeyWord"
>
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
......@@ -107,7 +107,7 @@
<div>
<span>{{`${item.AccountAlias}(${item.AccountHolder}/${item.CardNum})`}}</span>
<span style="margin-left: 15px;">
<el-tag size="mini" v-if="item.Status==1">冻结</el-tag>
<el-tag size="mini" v-if="item.Status==1">{{$t('pub.fressSel')}}</el-tag>
</span>
</div>
</el-option>
......@@ -115,7 +115,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="金额：">
<el-form-item :label="$t('fnc.jine')">
<div style="display: flex;flex-direction: row;flex-wrap: nowrap;">
<div>
<el-input v-model="msg.sMoney"
......@@ -129,7 +129,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单日期：">
<el-form-item :label="$t('fnc.zdriqi')">
<el-date-picker class="h34"
@change="timeAdd(1)"
v-model="productionDate"
......@@ -140,7 +140,7 @@
</el-col>
<template v-if="heightQueryBox">
<el-col :span="6">
<el-form-item label="发团日期：">
<el-form-item :label="$t('scen.sc_ftTime')">
<el-date-picker class="h34"
v-model="missionDate"
@change="timeAdd(4)"
......@@ -151,9 +151,9 @@
</el-col>
<el-col :span="4">
<el-form-item label="模板类型：">
<el-form-item :label="$t('fnc.mbleixing')">
<el-select v-model="msg.TemplateIds" filterable >
<el-option value="" label="不限"></el-option>
<el-option value="" :label="$t('system.ph_buxian')"></el-option>
<el-option v-for='item in TemplateGetList'
:label='item.Name'
:value='item.Id'
......@@ -163,24 +163,24 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="审核状态：">
<el-form-item :label="$t('fnc.shzhuangtai')">
<el-select filterable v-model='msg.Status' class="">
<el-option key="-1" value="-1" label="不限"></el-option>
<el-option key="0" value="0" label="暂存"></el-option>
<el-option key="1" value="1" label="审核中"></el-option>
<el-option key="2" value="2" label="通过"></el-option>
<el-option key="3" value="3" label="驳回"></el-option>
<el-option key="4" value="4" label="作废"></el-option>
<el-option key="5" value="5" label="出纳暂存"></el-option>
<el-option key="-1" value="-1" :label="$t('system.ph_buxian')"></el-option>
<el-option key="0" value="0" :label="$t('fnc.zancun')"></el-option>
<el-option key="1" value="1" :label="$t('fnc.a_shezhong')"></el-option>
<el-option key="2" value="2" :label="$t('visa.v_tongguo')"></el-option>
<el-option key="3" value="3" :label="$t('fnc.bohui')"></el-option>
<el-option key="4" value="4" :label="$t('active.cl_zuofei')"></el-option>
<el-option key="5" value="5" :label="$t('fnc.a_cnzancun')"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="订单类型">
<el-form-item :label="$t('OrderList.search.orderType')">
<el-select filterable v-model='msg.OtherType' class=""
:disabled="typeSystem">
<el-option key="0" value="0" label="不限"></el-option>
<el-option key="63" value="63" label="团队"></el-option>
<el-option key="0" value="0" :label="$t('system.ph_buxian')"></el-option>
<el-option key="63" value="63" :label="$t('active.cl_team')"></el-option>
<el-option key="61" value="61" label="酒店"></el-option>
<el-option key="66" value="66" label="门票"></el-option>
<el-option key="67" value="67" label="车辆"></el-option>
......@@ -197,7 +197,7 @@
<el-col :span="4">
<el-form-item label="费用部门：">
<el-select filterable v-model='msg.RB_Depart_Id' @change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(),msg.UpdateBy=''" class="">
<el-option :value="0" label="不限"></el-option>
<el-option :value="0" :label="$t('system.ph_buxian')"></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
......@@ -209,7 +209,7 @@
<el-col :span="4">
<el-form-item label="排序：">
<el-select filterable v-model='msg.Sort' >
<el-option key="-1" value="-1" label="不限"></el-option>
<el-option key="-1" value="-1" :label="$t('system.ph_buxian')"></el-option>
<el-option key="0" value="0" label="团期"></el-option>
<el-option key="1" value="1" label="汇款日期"></el-option>
<el-option key="2" value="2" label="单号"></el-option>
......@@ -225,7 +225,7 @@
<el-col :span="4">
<el-form-item label="车行客户：">
<el-select filterable v-model='msg.JapanCarCustomerId' >
<el-option :value="0" label="不限"></el-option>
<el-option :value="0" :label="$t('system.ph_buxian')"></el-option>
<el-option v-for="item in JapanCarCustomerList" :key="item.Id" :value="item.Id" :label="item.CustomerName"></el-option>
</el-select>
</el-form-item>
......
src/components/public/offset.vue
View file @ e785642f
<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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment