Skip to content

S
SuperMan
Commit 78c4b9f9 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

多语言bug修改

parent 5a73480d
Show whitespace changes
Inline Side-by-side
Showing with 351 additions and 249 deletions
src/assets/common/lang/zh.js
View file @ 78c4b9f9
......@@ -733,6 +733,9 @@ export const active = {
cl_dkjezk: '抵扣金额/折扣',
cl_mdskeyong: '满多少可用',
cl_yxjzhiri: '有效截止日',
cl_sytiaojian: '使用条件',
cl_huoqufangshi: '获取方式',
cl_hqriqi: '获取日期',
cl_zuofei: '作废',
cl_syfanwei: '适用范围',
cl_tongyong: '通用',
......@@ -753,6 +756,8 @@ export const active = {
cl_zanwu: '暂无',
cl_qita: '其他',
cjjiangxiang: '抽奖奖项',
cl_man: '满',
cl_keyong: '可用',
}
export const fnc = {
......@@ -1007,6 +1012,7 @@ export const fnc = {
day: '日',
fyshuoming: '费用说明',
danjia: '单价',
cjdanjia: '成交单价',
jine: '金额',
yuanbi: '原币',
sfjine: '实付金额',
......@@ -1058,6 +1064,9 @@ export const fnc = {
yingfu: '应付',
shishou: '实收',
shifu: '实付',
youhui: '优惠',
xiaofei: '小费',
tuikuan: '退款',
zjdiaobo: '资金调拨',
tuanqi: '团期',
hkriqi: '汇款日期',
......@@ -1077,6 +1086,7 @@ export const fnc = {
shoukuan: '收款',
fukuan: '付款',
duixiang: '对象',
zhikuan: '支款',
dqzhuangtai: '当前状态',
gnjpqishu: '国内票务期数',
qzbianhao: '签证编号',
......@@ -1121,6 +1131,93 @@ export const fnc = {
xsfujian: '显示附件',
ycfujian: '隐藏附件',
ysjine: '应收金额',
guazhang: '挂账',
bmxuanze: '部门选择',
ryxuanze: '人员选择',
ctleixing: '参团类型',
bmriqi: '报名日期',
bmzrenshu: '总报名人数',
zcbmrenshu: '正常报名人数',
qxrenshu: '取消人数',
qtxtongji: '其他统计项',
nbbaoming: '内部报名',
B2BWAP: 'B2B/WAP网络报名',
cwdjshuoming: '财务单据说明',
yidadan: '已打单',
ptcnyshenhe: '平台出纳已审核',
yhcnyshenhe: '银行出纳已审核',
ytongguo: '已通过',
ysjine: '应收金额',
yishoujine: '已收金额',
tkjine: '退款金额',
ptshuijin: '平台税金',
ztjine: '在途金额',
wsjine: '未收金额',
khxinxi: '客户信息',
yszonge: '应收总额',
zaitu: '在途',
weishou: '未收',
sun: '损',
shousun: '收损',
dingdan: '订单',
lsbeizhu: '历史备注',
skdanju: '收款单据',
fkdanju: '付款单据',
w_ckmingcheng: '窗口名称',
w_ywrenyuan: '业务人员',
w_fzfangxiang: '负责方向',
w_djxinxi: '单据信息',
w_gong: '共',
w_chuangkou: '窗口',
w_shou: '收',
w_zhi: '支',
w_sqzhanghu: '授权账户',
w_ycldanju: '已处理单据',
w_dcldanju: '待处理单据',
w_zhbieming: '账户别名',
w_gsdgong: '公',
w_gsdsi: '私',
w_kscaozuo: '快速操作',
w_sygongzhang: '所有公账',
w_sysizhang: '所有私账',
w_sypingtai: '所有平台',
w_syzjinchi: '所有资金池',
w_syyhzhu: '所有银行账户',
w_syxjzhanghu: '所有现金账户',
a_xjzhanghu: '现金账户',
a_cnyshenhe: '出纳审核',
a_yshenhe: '已审核',
a_wshenhe: '未审核',
a_hkfkriqi: '汇款/付款日期',
a_hbdanju: '合并单据',
a_zhaiyao: '摘要',
a_hkrfkduixiang: '汇款人/付款对象',
a_hkfkshijian: '汇款时间/付款时间',
a_dhuanlv: '兑换率',
a_rminbi: '人民币',
a_qcyue: '期初余额',
a_fkshijian: '付款时间',
a_heji: '合计',
a_hbtips: '条合并为1条，外币总金额',
a_hbtips2: '，本位币总金额',
a_zongjine: '总金额',
a_qxzdanju: '请选择单据',
a_qxzjyriqi: '请选择交易日期！',
a_qxzjyfangshi: '请选择交易方式！',
a_yhzhanghu: '银行账户',
a_djztai: '单据状态',
a_shezhong: '审核中',
a_cnzancun: '出纳暂存',
a_ptzhanghu: '平台账户',
a_qsrjylshuihao: '请输入交易流水号',
a_zjczhanghu: '资金池账户',
a_xjrbaobiao: '现金日报表',
a_sqyue: '上期余额',
a_bqjffshenge: '本期借方发生额',
a_bqdffshenge: '本期贷方发生额',
a_bqyue: '本期余额',
a_jfbishu: '借方笔数',
a_dfbishu: '贷方笔数',
}
export const tips = {
tips: '提示',
......@@ -1179,7 +1276,11 @@ export const tips = {
qishu: '期数',
jiaoyifangshi: '交易方式',
zwtqxinxi: '暂无团期信息',
zuofeicaiwudan: '是否对申请单进行作废操作？作废后不可恢复！'
zuofeicaiwudan: '是否对申请单进行作废操作？作废后不可恢复！',
jsrqbndyksriqi: '结束日期不能大于开始日期',
hqsjshibai: '数据获取失败！',
accWorkTips: '注：指定银行卡收支方向的单据会自动分发到各个窗口，管理员在设定时应注意以下窗口是否涵盖了所有的业务，如果没有请及时设定，以免造成单据混乱',
qrscchuangkou: '确定删除窗口？',
}
export const Operation = {
Op_ShortName:'线路简称',
......@@ -1308,6 +1409,11 @@ export const rule = {
qtxhkshijian: '请选择汇款时间！',
qxzjylshuihao: '请选择交易流水号！',
qxzskzhanghao: '请选择收款账号！',
qtxckmingcheng: '请填写窗口名称',
qxzywuyuan: '请选择业务员',
qxzsyfangxiang: '请选择使用方向',
qsrjine: '请输入金额',
qsrzjine: '请输入总金额',
}
export const adm={
......
src/components/FinancialModule/FProcessManagement.vue
View file @ 78c4b9f9
......@@ -22,7 +22,7 @@
._cu{cursor: pointer;}
._none{opacity:0 ;}
._block{opacity: 1}
.InfoChangeLog{height: auto;max-height: 220px;background-color: #FFFFFF;}
.InfoChangeLog{height: auto;background-color: #FFFFFF;}
.changLogList{padding-left: 20px;max-height: 180px;overflow: auto;}
.changLogList_l{border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;}
._radius_green{background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;}
......
src/components/FinancialModule/ReceivingOfficer.vue
View file @ 78c4b9f9
......@@ -7,17 +7,17 @@
<div class="query-box">
<ul>
<li>
<button class="normalBtn" @click="addShow=true,text='新增'">{{$t('pub.addBtn')}}</button>
<button class="normalBtn" @click="addShow=true,text=$t('pub.addBtn')">{{$t('pub.addBtn')}}</button>
</li>
</ul>
</div>
<div v-loading="loading" class="cm_content _scrollbar" :class="addShow==true?'_edHeight':''">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" >
<tr>
<th>窗口名称</th>
<th>所属公司</th>
<th>业务人员</th>
<th>负责方向</th>
<th>{{$t('fnc.w_ckmingcheng')}}</th>
<th>{{$t('system.query_company')}}</th>
<th>{{$t('fnc.w_ywrenyuan')}}</th>
<th>{{$t('fnc.w_fzfangxiang')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in dataList" :key="index">
......@@ -27,19 +27,19 @@
<span v-for="(i,ix) in item.emList">{{i.emName}} <span v-if="ix!=item.emList.length-1">,</span> </span>
</td>
<td>
<span v-if="item.Direct==1">收款</span>
<span v-else-if="item.Direct==2">支款</span>
<span v-else>收支</span>
<span v-if="item.Direct==1">{{$t('fnc.shoukuan')}}</span>
<span v-else-if="item.Direct==2">{{$t('fnc.zhikuan')}}</span>
<span v-else>{{$t('fnc.shouzhi')}}</span>
</td>
<td>
<el-row>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-button type="primary" class="iconfont icon-bianji-smal" circle @click="editCurency(item.ID),text='修改'"></el-button>
<el-tooltip class="item" effect="dark" :content="$t('pub,updateMsg')" placement="top-start">
<el-button type="primary" class="iconfont icon-bianji-smal" circle @click="editCurency(item.ID),text=$t('pub,updateMsg')"></el-button>
</el-tooltip>
<!--<el-tooltip class="item" effect="dark" content="单据信息" placement="top-start">-->
<!--<el-button type="danger" class="iconfont icon-img-rili" circle @click="goUrlDetail('CashierWorkDetail',2,item.Name,item.ID,item.BranchId)"></el-button>-->
<!--</el-tooltip>-->
<el-tooltip class="item" effect="dark" content="删除" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button type="danger" class="iconfont icon-img_delete_small" circle @click="financeinfoRemove(item.ID,item.ID)"></el-button>
</el-tooltip>
</el-row>
......@@ -63,7 +63,7 @@
<div class="_vMG_edit" :class="addShow==true?'edHeight':''">
<el-row class="_margin_bottom_20">
<el-col :span="20">
<p class="_tit">{{text}}窗口</p>
<p class="_tit">{{text}}{{$t('fnc.w_chuangkou')}}</p>
</el-col>
<el-col :span="4" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button>
......@@ -91,7 +91,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="业务人员" prop="listArr">
<el-form-item :label="$t('fnc.w_ywrenyuan')" prop="listArr">
<el-select
v-model="addMsg.listArr"
filterable
......@@ -115,10 +115,10 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="负责方向" prop="Direct">
<el-radio v-model="addMsg.Direct" :label="1">收</el-radio>
<el-radio v-model="addMsg.Direct" :label="2">支</el-radio>
<el-radio v-model="addMsg.Direct" :label="3">收支</el-radio>
<el-form-item :label="$t('fnc.w_fzfangxiang')" prop="Direct">
<el-radio v-model="addMsg.Direct" :label="1">{{$t('fnc.w_shou')}}</el-radio>
<el-radio v-model="addMsg.Direct" :label="2">{{$t('fnc.w_zhi')}}</el-radio>
<el-radio v-model="addMsg.Direct" :label="3">{{$t('fnc.shouzhi')}}</el-radio>
</el-form-item>
</el-col>
</el-row>
......@@ -157,14 +157,14 @@
text: '',
rules: {
Name: [
{ required: true, message: '请填写窗口名称', trigger: 'blur' }
{ required: true, message: this.$t('rule.qtxckmingcheng'), trigger: 'blur' }
],
listArr: [
{type: 'array', required: true, editCurencymessage: '请选择业务员', trigger: 'blur' }
{type: 'array', required: true, editCurencymessage: this.$t('rule.qxzywuyuan'), trigger: 'blur' }
],BranchId:[
{ required: true, message: '请选择公司', trigger: 'change' }
{ required: true, message: this.$t('rule.company'), trigger: 'change' }
],Direct:[
{ required: true, message: '请选择使用方向', trigger: 'change' }
{ required: true, message: this.$t('rule.qxzsyfangxiang'), trigger: 'change' }
]
},
}
......@@ -173,9 +173,9 @@
}, methods: {
financeinfoRemove: function(id){ // 删除
this.$confirm('确定删除窗口？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
this.$confirm(this.$t('tips.qrscchuangkou'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.apipost('Window_post_RemoveTwo',{ID:id}, res => {
......@@ -189,7 +189,7 @@
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
message: this.$t('hotel.hotel_HasBeenCancelled'),
});
});
},
......
src/components/FinancialModule/TransferReport.vue
View file @ 78c4b9f9
......@@ -37,7 +37,7 @@
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="交易日期：">
<el-form-item :label="$t('fnc.jiaoyiriqi')+'：'">
<el-date-picker class="h34" v-model="transactionDate" @change="timeAdd(3)" type="daterange" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
......@@ -49,24 +49,24 @@
<span>
</span>
<button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="method5()">导出</button>
<button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
</li>
</ul>
</div>
<div class="_fnDm_content" v-loading='loading'>
<table class="singeRowTable" cellspacing="0" cellpadding="0" style="border: 1px solid rgb(230, 230, 230);">
<tr>
<th colspan="8">四川和平国际旅行社有限公司现金日报表</th>
<th colspan="8">{{branchName}}{{$t('fnc.a_xjrbaobiao')}}</th>
</tr>
<tr>
<th>公司</th>
<th>银行</th>
<th>上期余额</th>
<th>本期借方发生额</th>
<th>本期贷方发生额</th>
<th>本期余额</th>
<th>借方笔数</th>
<th>贷方笔数</th>
<th>{{$t('system.table_company')}}</th>
<th>{{$t('fnc.yinhang')}}</th>
<th>{{$t('fnc.a_sqyue')}}</th>
<th>{{$t('fnc.a_bqjffshenge')}}</th>
<th>{{$t('fnc.a_bqdffshenge')}}</th>
<th>{{$t('fnc.a_bqyue')}}</th>
<th>{{$t('fnc.a_jfbishu')}}</th>
<th>{{$t('fnc.a_dfbishu')}}</th>
</tr>
<template v-for="item in dataObj.resultList">
<tr>
......@@ -153,6 +153,7 @@
comPanyALLList: [],
ALLMoney: [],
dataObj: {},
branchName: ''
}
},
created() {
......@@ -161,6 +162,7 @@
components: {},
mounted() {
let userInfo = this.getLocalStorage();
this.branchName = userInfo.GroupName
this.getList();
this.msg.EmployeeId= userInfo.EmployeeId;
},
......
src/components/FinancialModule/accDetail/CashAccDetail.vue
View file @ 78c4b9f9
......@@ -47,7 +47,7 @@
<el-form class="_info_box clearfix" label-width="110px">
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item label="账户类型">
<el-form-item :label="$t('fnc.zhanghuleixing')">
<el-select filterable v-model='accType' @change="bankaccount_post_GetList">
<el-option v-for='item in AccList'
:label='item.Name'
......@@ -58,7 +58,7 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="现金账户">
<el-form-item :label="$t('fnc.a_xjzhanghu')">
<el-select filterable v-model='AccountId' @change="accountListChange">
<el-option v-for='item in accountList'
:label='item.Alias'
......@@ -69,16 +69,16 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="出纳审核">
<el-form-item :label="$t('fnc.a_cnyshenhe')">
<el-select filterable v-model='msg.Is_Cashier' >
<el-option label='全部' :value='-1'></el-option>
<el-option label='已审核' :value='1'></el-option>
<el-option label='未审核' :value='0'></el-option>
<el-option :label='$t("advmanager.v_all")' :value='-1'></el-option>
<el-option :label='$t("fnc.a_yshenhe")' :value='1'></el-option>
<el-option :label='$t("fnc.a_wshenhe")' :value='0'></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="付款对象">
<el-form-item :label="$t('fnc.fkduixiang')">
<el-select filterable v-model='msg.ClientID' >
<el-option v-for='item in ClientAccountList'
:label='item.AccountAlias'
......@@ -89,13 +89,13 @@
</el-form-item>
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="汇款/付款日期">
<el-form-item :label="$t('fnc.a_hkfkriqi')">
<el-date-picker class="h34"
@change="timeAdd"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至">
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -103,8 +103,8 @@
</el-form>
<ul>
<li>
<input type="button" class="hollowFixedBtn" value="合并单据" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.saveBtn')" @click="getList()"/>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" />
</li>
</ul>
......@@ -113,26 +113,26 @@
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th rowspan="2"></th>
<th rowspan="2">所属公司</th>
<th rowspan="2">单号</th>
<th rowspan="2">摘要</th>
<th rowspan="2">汇款人/付款对象</th>
<th rowspan="2">汇款时间/付款时间</th>
<th rowspan="2">交易流水号</th>
<th colspan="3">外币（{{TypeName}}）</th>
<th rowspan="2">兑换率</th>
<th colspan="3">人民币</th>
<th rowspan="2">{{$t('system.query_company')}}</th>
<th rowspan="2">{{$t('fnc.danhao')}}</th>
<th rowspan="2">{{$t('fnc.a_zhaiyao')}}</th>
<th rowspan="2">{{$t('fnc.a_hkrfkduixiang')}}</th>
<th rowspan="2">{{$t('fnc.a_hkfkshijian')}}</th>
<th rowspan="2">{{$t('fnc.jylshuihao')}}</th>
<th colspan="3">{{$t('fnc.waibi')}}（{{TypeName}}）</th>
<th rowspan="2">{{$t('fnc.a_dhuanlv')}}</th>
<th colspan="3">{{$t('fnc.a_rminbi')}}</th>
</tr>
<tr>
<th width="">收入</th>
<th width="">支出</th>
<th width="">余额</th>
<th width="">收入</th>
<th width="">支出</th>
<th width="">余额</th>
<th width="">{{$t('restaurant.res_income')}}</th>
<th width="">{{$t('restaurant.res_outcome')}}</th>
<th width="">{{$t('fnc.yueacc')}}</th>
<th width="">{{$t('restaurant.res_income')}}</th>
<th width="">{{$t('restaurant.res_outcome')}}</th>
<th width="">{{$t('fnc.yueacc')}}</th>
</tr>
<tr>
<td :colspan="7">期初余额：</td>
<td :colspan="7">{{$t('fnc.a_qcyue')}}：</td>
<td></td>
<td></td>
<td> {{ moneyFormat(RStartMoney) }} </td>
......@@ -154,12 +154,12 @@
<p v-for=" ( son , sIndex ) in item.TCIDAndTCNUMList"> <span>{{ son.TCNUM }} ( <span> {{ son.TCID }} </span> )</span> </p>
</td>
<td>
<span v-if=" item.Type === 1">汇款人：{{ item.RemitterName }}</span>
<span v-if=" item.Type === 1">{{$t('fnc.huikuanren')}}：{{ item.RemitterName }}</span>
<span v-if=" item.Type === 2">{{ item.ClientTypeName }}：{{ item.RemitterName }}</span>
</td>
<td>
<span v-if=" item.Type === 1">汇款时间：{{ item.TradeDate }}</span>
<span v-if=" item.Type === 2">付款时间：{{ item.TradeDate }}</span>
<span v-if=" item.Type === 1">{{$t('fnc.hkshijian')}}：{{ item.TradeDate }}</span>
<span v-if=" item.Type === 2">{{$t('fnc.a_fkshijian')}}：{{ item.TradeDate }}</span>
</td>
<td>
{{ item.AccountNumber }}
......@@ -187,7 +187,7 @@
</td>
</tr>
<tr>
<td :colspan="7">合计（共 {{ DataList.length }} 条）</td>
<td :colspan="7">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}} {{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
<td> {{ moneyFormat(wShou) }} </td>
<td> {{ moneyFormat(wZhi) }} </td>
<td> {{ moneyFormat(endRStartMoney) }} </td>
......@@ -198,20 +198,20 @@
</tr>
</table>
</div>
<el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
<p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p>
<el-dialog custom-class='w750' :title="$t('fnc.a_hbdanju')" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
<p class="_addChuNa_tit"><span>{{count}}</span>{{$t('fnc.a_hbtips')}} <span>{{ moneyFormat(allWPrice) }}</span> {{$t('fnc.a_hbtips2')}} <span>{{ moneyFormat(allBPrice) }}</span> </p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center; width: 100%;">
<template>
<tr >
<th height="34px">账户分类</th>
<th height="34px">付款方式</th>
<th height="34px">账户</th>
<th height="34px">{{$t('fnc.zhfenlei')}}</th>
<th height="34px">{{$t('fnc.fkfangshi')}}</th>
<th height="34px">{{$t('fnc.acc')}}</th>
<!-- <th width="100px">账户余额</th> -->
<th height="34px">金额</th>
<th height="34px" width="70">币种</th>
<th height="34px" width="50px">汇率</th>
<th height="34px">{{$t('fnc.jine')}}</th>
<th height="34px" width="70">{{$t('hotel.hotel_Currency')}}</th>
<th height="34px" width="50px">{{$t('hotel.hotel_CurrentRate')}}</th>
<!-- <th>手续费</th> -->
<th height="34px" width="100px">总金额</th>
<th height="34px" width="100px">{{$t('fnc.a_zongjine')}}</th>
<!-- <th>操作</th> -->
</tr>
<template v-for="(item,index) in payMsgList">
......@@ -247,7 +247,7 @@
</el-select>
</td>
<td>
<el-select filterable v-model='item.AccountId' placeholder="请选择账户" @change="setAccountName(item.AccountId,1,index)" class=" _border_b_1">
<el-select filterable v-model='item.AccountId' :placeholder="$t('rule.qxzzhanghu')" @change="setAccountName(item.AccountId,1,index)" class=" _border_b_1">
<el-option v-for='i in accountList'
:label='i.allName'
:value='i.ID'
......@@ -256,7 +256,7 @@
</el-select>
</td>
<td>
<el-input v-model="item.OriginalMoney" @change="Calculation(1,index)" @blur="item.show=false,CalculationMoney" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input>
<el-input v-model="item.OriginalMoney" @change="Calculation(1,index)" @blur="item.show=false,CalculationMoney" :placeholder="$t('rule.qsrjine')" type="number" class=" _border_b_1"></el-input>
</td>
<td>
<p>{{item.CurrenName}}</p>
......@@ -287,7 +287,7 @@
</el-select>
</td>
<td>
<el-select filterable v-model='payMsg.AccountId' placeholder="请选择账户" @change="setAccountName(payMsg.AccountId,2)" class=" _border_b_1">
<el-select filterable v-model='payMsg.AccountId' :placeholder="$t('rule.qxzzhanghu')" @change="setAccountName(payMsg.AccountId,2)" class=" _border_b_1">
<el-option v-for='i in accountList'
:label='i.allName'
:value='i.ID'
......@@ -296,7 +296,7 @@
</el-select>
</td>
<td>
<el-input v-model="payMsg.OriginalMoney" @change="Calculation(2)" @blur="addList()" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input>
<el-input v-model="payMsg.OriginalMoney" @change="Calculation(2)" @blur="addList()" :placeholder="$t('rule.qsrjine')" type="number" class=" _border_b_1"></el-input>
</td>
<td>
<p>{{payMsg.CurrenName}}</p>
......@@ -308,14 +308,14 @@
</tr>
</template>
<tr>
<td height="34px">总金额</td>
<td height="34px">{{$t('fnc.a_zongjine')}}</td>
<td height="34px" colspan="7">
<el-input v-model="listAllMoney" type="number" placeholder="请输入总金额" class=" _border_b_1"></el-input>
<el-input v-model="listAllMoney" type="number" :placeholder="$t('rule.qsrzjine')" class=" _border_b_1"></el-input>
<!--{{moneyFormat(listAllMoney)}}-->
</td>
</tr>
<tr v-if="BillType===2">
<td>交易日期</td>
<td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="7">
<el-date-picker
class="width100b"
......@@ -323,23 +323,23 @@
type="date"
:default-value="TradeDate"
value-format="yyyy-MM-dd"
placeholder="选择日期">
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</td>
</tr>
<tr v-if="BillType===1">
<td>汇款人</td>
<td>{{$t('fnc.huikuanren')}}</td>
<td colspan="2">
<el-input v-model="addMsg.RemitterName" type="text" class=" _border_b_1"></el-input>
</td>
<td>交易日期</td>
<td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="3">
<el-date-picker
class="width100b"
v-model="addMsg.TradeDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</td>
</tr>
......@@ -467,7 +467,7 @@ export default {
this.addMsg.FrIDs = s;
this.addChuNa = true;
}else{
this.$message.error('请选择单据')
this.$message.error(this.$t('fnc.a_qxzdanju'))
}
},
addCheckbox(obj,index){
......@@ -519,8 +519,8 @@ export default {
},
submitAddChuNa(){
// if(this.payMsgList.length===0) return this.$message.error('请选择交易方式！');
if(this.addMsg.TradeDate==='') return this.$message.error('请选择交易日期！');
if(this.BillType===1&&this.addMsg.RemitterName==='') return this.$message.error('请填写汇款人！') ;
if(this.addMsg.TradeDate==='') return this.$message.error(this.$t('fnc.a_qxzjyriqi'));
if(this.BillType===1&&this.addMsg.RemitterName==='') return this.$message.error(this.$t('rule.qtxhkuanren')) ;
let str = '';
this.checkList.forEach(x=>{
if(x.FinanceId){
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 78c4b9f9
......@@ -30,7 +30,7 @@
<el-form class="_info_box clearfix" label-width="110px">
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item label="账户类型">
<el-form-item :label="$t('fnc.zhanghuleixing')">
<el-select filterable v-model='accType' @change="bankaccount_post_GetList">
<el-option v-for='item in AccList'
:label='item.Name'
......@@ -41,7 +41,7 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="银行账户">
<el-form-item :label="$t('fnc.a_yhzhanghu')">
<el-select filterable v-model='AccountId' @change="accountListChange">
<el-option v-for='item in accountList'
:label='item.Alias'
......@@ -61,18 +61,18 @@
</el-form-item>
</el-col> -->
<el-col :span="4" :gutter="35">
<el-form-item label="单据状态">
<el-form-item :label="$t('fnc.a_djztai')">
<el-select filterable v-model='msg.Status' >
<el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
<el-option label='审核中' :value='1'></el-option>
<el-option label='通过' :value='2'></el-option>
<el-option label='驳回' :value='3'></el-option>
<el-option label='出纳暂存' :value='5'></el-option>
<el-option :label='$t("fnc.a_shezhong")' :value='1'></el-option>
<el-option :label='$t("visa.v_tongguo")' :value='2'></el-option>
<el-option :label='$t("fnc.bohui")' :value='3'></el-option>
<el-option :label='$t("fnc.a_cnzancun")' :value='5'></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="付款对象">
<el-form-item :label="$t('fnc.fkduixiang')">
<el-select filterable v-model='msg.ClientID' >
<el-option v-for='item in ClientAccountList'
:label='item.AccountAlias'
......@@ -83,13 +83,13 @@
</el-form-item>
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="汇款/付款日期">
<el-form-item :label="$t('fnc.a_hkfkriqi')">
<el-date-picker class="h34"
@change="timeAdd"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至">
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -97,8 +97,8 @@
</el-form>
<ul>
<li>
<input type="button" class="hollowFixedBtn" value="合并单据" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.saveBtn')" @click="getList()"/>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click=""/></li>
</ul>
</div>
......@@ -107,17 +107,17 @@
<tr>
<th></th>
<th>{{$t('system.query_company')}}</th>
<th>单号</th>
<th>摘要</th>
<th>汇款人/付款对象</th>
<th>汇款时间/付款时间</th>
<th>交易流水号</th>
<th>收款金额</th>
<th>付款金额</th>
<th>余额</th>
<th>{{$t('fnc.danhao')}}</th>
<th>{{$t('fnc.a_zhaiyao')}}</th>
<th>{{$t('fnc.a_hkrfkduixiang')}}</th>
<th>{{$t('fnc.a_hkfkshijian')}}</th>
<th>{{$t('fnc.jylshuihao')}}</th>
<th>{{$t('fnc.skjine')}}</th>
<th>{{$t('fnc.fkjine')}}</th>
<th>{{$t('fnc.yueacc')}}</th>
</tr>
<tr>
<td :colspan="7">期初余额：</td>
<td :colspan="7">{{$t('fnc.a_qcyue')}}：</td>
<td></td>
<td></td>
<td>{{moneyFormat(StartMoney)}}</td>
......@@ -133,12 +133,12 @@
<p v-for=" ( son , sIndex ) in item.TCIDAndTCNUMList"> <span>{{ son.TCNUM }} ( <span> {{ son.TCID }} </span> )</span> </p>
</td>
<td>
<span v-if=" item.Type == 1">汇款人：{{ item.RemitterName }}</span>
<span v-if=" item.Type == 1">{{$t('fnc.hnrdanwei')}}：{{ item.RemitterName }}</span>
<span v-if=" item.Type == 2">{{ item.ClientTypeName }}：{{ item.RemitterName }}</span>
</td>
<td>
<span v-if=" item.Type == 1">汇款时间：{{ item.TradeDate }}</span>
<span v-if=" item.Type == 2">付款时间：{{ item.TradeDate }}</span>
<span v-if=" item.Type == 1">{{$t('fnc.hkshijian')}}：{{ item.TradeDate }}</span>
<span v-if=" item.Type == 2">{{$t('fnc.a_fkshijian')}}：{{ item.TradeDate }}</span>
</td>
<td>
{{ item.AccountNumber }}
......@@ -148,27 +148,27 @@
<td>{{ moneyFormat(item.EndMoney) }}</td>
</tr>
<tr>
<td :colspan="7">合计（共{{ DataList.length }}条）</td>
<td :colspan="7">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
<td>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td>
<td>{{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}</td>
<td>{{ moneyFormat(allMoney) }}</td>
</tr>
</table>
</div>
<el-dialog custom-class='w750 height="34px"' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
<p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p>
<el-dialog custom-class='w750 height="34px"' :title="$t('fnc.a_hbdanju')" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
<p class="_addChuNa_tit"><span>{{count}}</span>{{$t('fnc.a_hbtips')}} <span>{{ moneyFormat(allWPrice) }}</span> {{$t('fnc.a_hbtips2')}} <span>{{ moneyFormat(allBPrice) }}</span> </p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center; width: 100%;">
<template>
<tr >
<th height="34px">账户分类</th>
<th height="34px">付款方式</th>
<th height="34px">账户</th>
<th height="34px">{{$t('fnc.zhfenlei')}}</th>
<th height="34px">{{$t('fnc.fkfangshi')}}</th>
<th height="34px">{{$t('fnc.acc')}}</th>
<!-- <th width="100px">账户余额</th> -->
<th height="34px">金额</th>
<th height="34px" width="70">币种</th>
<th height="34px" width="50px">汇率</th>
<th height="34px">{{$t('fnc.jine')}}</th>
<th height="34px" width="70">{{$t('hotel.hotel_Currency')}}</th>
<th height="34px" width="50px">{{$t('hotel.hotel_CurrentRate')}}</th>
<!-- <th>手续费</th> -->
<th height="34px" width="100px">总金额</th>
<th height="34px" width="100px">{{$t('fnc.a_zongjine')}}</th>
<!-- <th>操作</th> -->
</tr>
<template v-for="(item,index) in payMsgList">
......@@ -204,7 +204,7 @@
</el-select>
</td>
<td>
<el-select filterable v-model='item.AccountId' placeholder="请选择账户" @change="setAccountName(item.AccountId,1,index)" class=" _border_b_1">
<el-select filterable v-model='item.AccountId' :placeholder="$t('rule.qxzzhanghu')" @change="setAccountName(item.AccountId,1,index)" class=" _border_b_1">
<el-option v-for='i in accountList'
:label='i.allName'
:value='i.ID'
......@@ -213,7 +213,7 @@
</el-select>
</td>
<td>
<el-input v-model="item.OriginalMoney" @change="Calculation(1,index)" @blur="item.show=false,CalculationMoney" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input>
<el-input v-model="item.OriginalMoney" @change="Calculation(1,index)" @blur="item.show=false,CalculationMoney" :placeholder="$t('rule.qsrjine')" type="number" class=" _border_b_1"></el-input>
</td>
<td>
<p>{{item.CurrenName}}</p>
......@@ -244,7 +244,7 @@
</el-select>
</td>
<td>
<el-select filterable v-model='payMsg.AccountId' placeholder="请选择账户" @change="setAccountName(payMsg.AccountId,2)" class=" _border_b_1">
<el-select filterable v-model='payMsg.AccountId' :placeholder="$t('rule.qxzzhanghu')" @change="setAccountName(payMsg.AccountId,2)" class=" _border_b_1">
<el-option v-for='i in accountList'
:label='i.allName'
:value='i.ID'
......@@ -253,7 +253,7 @@
</el-select>
</td>
<td>
<el-input v-model="payMsg.OriginalMoney" @change="Calculation(2)" @blur="addList()" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input>
<el-input v-model="payMsg.OriginalMoney" @change="Calculation(2)" @blur="addList()" :placeholder="$t('rule.qsrjine')" type="number" class=" _border_b_1"></el-input>
</td>
<td>
<p>{{payMsg.CurrenName}}</p>
......@@ -266,14 +266,14 @@
</template>
<tr>
<td height="34px">总金额</td>
<td height="34px">{{$t('fnc.a_zongjine')}}</td>
<td height="34px" colspan="7">
<el-input v-model="listAllMoney" type="number" placeholder="请输入总金额" class=" _border_b_1"></el-input>
<el-input v-model="listAllMoney" type="number" :placeholder="$t('rule.qsrzjine')" class=" _border_b_1"></el-input>
<!--{{moneyFormat(listAllMoney)}}-->
</td>
</tr>
<tr v-if="BillType===2">
<td>交易日期</td>
<td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="7">
<el-date-picker
class="width100b"
......@@ -281,23 +281,23 @@
type="date"
:default-value="TradeDate"
value-format="yyyy-MM-dd"
placeholder="选择日期">
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</td>
</tr>
<tr v-if="BillType===1">
<td>汇款人</td>
<td>{{$t('fnc.huikuanren')}}</td>
<td colspan="2">
<el-input v-model="addMsg.RemitterName" type="text" class=" _border_b_1"></el-input>
</td>
<td>交易日期</td>
<td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="3">
<el-date-picker
class="width100b"
v-model="addMsg.TradeDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</td>
</tr>
......@@ -677,8 +677,8 @@ export default {
},
submitAddChuNa(){
// if(this.payMsgList.length===0) return this.$message.error('请选择交易方式！');
if(this.addMsg.TradeDate==='') return this.$message.error('请选择交易日期！');
if(this.BillType===1&&this.addMsg.RemitterName==='') return this.$message.error('请填写汇款人！') ;
if(this.addMsg.TradeDate==='') return this.$message.error(this.$t('fnc.a_qxzjyriqi'));
if(this.BillType===1&&this.addMsg.RemitterName==='') return this.$message.error(this.$t('rule.qtxhkuanren')) ;
let str = '';
this.checkList.forEach(x=>{
if(x.FinanceId){
......@@ -772,7 +772,7 @@ export default {
this.addChuNa = true;
console.log(this.BillType)
}else{
this.$message.error('请选择单据')
this.$message.error(this.$t('fnc.a_qxzdanju'))
}
},
addList(){
......@@ -813,5 +813,3 @@ export default {
}
}
</script>
\ No newline at end of file
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ 78c4b9f9
......@@ -33,7 +33,7 @@
<el-form class="_info_box clearfix" label-width="110px">
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item label="账户类型">
<el-form-item :label="$t('fnc.zhanghuleixing')">
<el-select filterable v-model='accType' @change="bankaccount_post_GetList">
<el-option v-for='item in AccList'
:label='item.Name'
......@@ -44,7 +44,7 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="平台账户">
<el-form-item :label="$t('fnc.a_ptzhanghu')">
<el-select filterable v-model='AccountId' @change="accountListChange">
<el-option v-for='item in accountList'
:label='item.Alias'
......@@ -64,29 +64,29 @@
</el-form-item>
</el-col> -->
<el-col :span="4" :gutter="35">
<el-form-item label="单据状态">
<el-form-item :label="$t('fnc.a_djztai')">
<el-select filterable v-model='msg.Status' >
<el-option label='不限' :value='-1'></el-option>
<el-option label='审核中' :value='1'></el-option>
<el-option label='通过' :value='2'></el-option>
<el-option label='驳回' :value='3'></el-option>
<el-option label='出纳暂存' :value='5'></el-option>
<el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
<el-option :label='$t("fnc.a_shezhong")' :value='1'></el-option>
<el-option :label='$t("visa.v_tongguo")' :value='2'></el-option>
<el-option :label='$t("fnc.bohui")' :value='3'></el-option>
<el-option :label='$t("fnc.a_cnzancun")' :value='5'></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="交易流水号">
<el-input filterable v-model="msg.AccountNumber" placeholder="请输入交易流水号"></el-input>
<el-form-item :label="$t('fnc.jylshuihao')">
<el-input filterable v-model="msg.AccountNumber" :placeholder="$t('fnc.a_qsrjylshuihao')"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="汇款/付款日期">
<el-form-item :label="$t('fnc.a_hkfkriqi')">
<el-date-picker class="h34"
@change="timeAdd"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至">
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -94,27 +94,27 @@
</el-form>
<ul>
<li>
<input type="button" class="hollowFixedBtn" value="合并单据" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()"/>
<input type="button" class="normalBtn" value="导出" @click=""/></li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click=""/></li>
</ul>
</div>
<div class="cm_content">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" 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('system.query_company')}}</th>
<th>{{$t('fnc.danhao')}}</th>
<th>{{$t('fnc.a_zhaiyao')}}</th>
<th>{{$t('fnc.zhidanren')}}</th>
<th>{{$t('fnc.a_hkfkshijian')}}</th>
<th>{{$t('fnc.jylshuihao')}}</th>
<th>{{$t('fnc.skjine')}}</th>
<th>{{$t('fnc.fkjine')}}</th>
<th>{{$t('fnc.yueacc')}}</th>
</tr>
<tr>
<td :colspan="7">期初余额：</td>
<td :colspan="7">{{$t('fnc.a_qcyue')}}：</td>
<td></td>
<td></td>
<td>{{moneyFormat(StartMoney)}}</td>
......@@ -146,7 +146,7 @@
<td>{{ moneyFormat(item.EndMoney) }}</td>
</tr>
<tr>
<td :colspan="7">合计（共{{DataList.length}}条）</td>
<td :colspan="7">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{DataList.length}}{{$t('hotel.hotel_item')}}）</td>
<td>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td>
<td>{{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}</td>
<td>{{ moneyFormat(allMoney) }}</td>
......@@ -154,19 +154,17 @@
</table>
</div>
<el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
<p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p>
<p class="_addChuNa_tit"><span>{{count}}</span>{{$t('fnc.a_hbtips')}} <span>{{ moneyFormat(allWPrice) }}</span> {{$t('fnc.a_hbtips2')}} <span>{{ moneyFormat(allBPrice) }}</span> </p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center;">
<template>
<tr >
<th height="34px">账户分类</th>
<th height="34px">付款方式</th>
<th height="34px">账户</th>
<!-- <th width="100px">账户余额</th> -->
<th height="34px">金额</th>
<th height="34px" width="70">币种</th>
<th height="34px" width="50px">汇率</th>
<!-- <th>手续费</th> -->
<th height="34px" width="100px">总金额</th>
<th height="34px">{{$t('fnc.zhfenlei')}}</th>
<th height="34px">{{$t('fnc.fkfangshi')}}</th>
<th height="34px">{{$t('fnc.acc')}}</th>
<th height="34px">{{$t('fnc.jine')}}</th>
<th height="34px" width="70">{{$t('hotel.hotel_Currency')}}</th>
<th height="34px" width="50px">{{$t('hotel.hotel_CurrentRate')}}</th>
<th height="34px" width="100px">{{$t('fnc.a_zongjine')}}</th>
<!-- <th>操作</th> -->
</tr>
<template v-for="(item,index) in payMsgList">
......@@ -202,7 +200,7 @@
</el-select>
</td>
<td>
<el-select filterable v-model='item.AccountId' placeholder="请选择账户" @change="setAccountName(item.AccountId,1,index)" class=" _border_b_1">
<el-select filterable v-model='item.AccountId' :placeholder="$t('rule.qxzzhanghu')" @change="setAccountName(item.AccountId,1,index)" class=" _border_b_1">
<el-option v-for='i in accountList'
:label='i.allName'
:value='i.ID'
......@@ -211,7 +209,7 @@
</el-select>
</td>
<td>
<el-input v-model="item.OriginalMoney" @change="Calculation(1,index)" @blur="item.show=false,CalculationMoney" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input>
<el-input v-model="item.OriginalMoney" @change="Calculation(1,index)" @blur="item.show=false,CalculationMoney" :placeholder="$t('rule.qsrjine')" type="number" class=" _border_b_1"></el-input>
</td>
<td>
<p>{{item.CurrenName}}</p>
......@@ -242,7 +240,7 @@
</el-select>
</td>
<td>
<el-select filterable v-model='payMsg.AccountId' placeholder="请选择账户" @change="setAccountName(payMsg.AccountId,2)" class=" _border_b_1">
<el-select filterable v-model='payMsg.AccountId' :placeholder="$t('rule.qxzzhanghu')" @change="setAccountName(payMsg.AccountId,2)" class=" _border_b_1">
<el-option v-for='i in accountList'
:label='i.allName'
:value='i.ID'
......@@ -251,7 +249,7 @@
</el-select>
</td>
<td>
<el-input v-model="payMsg.OriginalMoney" @change="Calculation(2)" @blur="addList()" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input>
<el-input v-model="payMsg.OriginalMoney" @change="Calculation(2)" @blur="addList()" :placeholder="$t('rule.qsrjine')" type="number" class=" _border_b_1"></el-input>
</td>
<td>
<p>{{payMsg.CurrenName}}</p>
......@@ -263,7 +261,7 @@
</tr>
</template>
<tr v-if="BillType===2">
<td>交易日期</td>
<td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="7">
<el-date-picker
class="width100b"
......@@ -271,23 +269,23 @@
type="date"
:default-value="TradeDate"
value-format="yyyy-MM-dd"
placeholder="选择日期">
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</td>
</tr>
<tr v-if="BillType===1">
<td>汇款人</td>
<td>{{$t('fnc.huikuanren')}}</td>
<td colspan="2">
<el-input v-model="addMsg.RemitterName" type="text" class=" _border_b_1"></el-input>
</td>
<td>交易日期</td>
<td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="3">
<el-date-picker
class="width100b"
v-model="addMsg.TradeDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</td>
</tr>
......@@ -675,9 +673,9 @@ export default {
this.payMsg.AccountId = '';
},
submitAddChuNa(){
if(this.payMsgList.length===0) return this.$message.error('请选择交易方式！');
if(this.addMsg.TradeDate==='') return this.$message.error('请选择交易日期！');
if(this.BillType===1&&this.addMsg.RemitterName==='') return this.$message.error('请填写汇款人！') ;
if(this.payMsgList.length===0) return this.$message.error(this.$t('fnc.a_qxzjyfangshi'));
if(this.addMsg.TradeDate==='') return this.$message.error(this.$t('fnc.a_qxzjyriqi'));
if(this.BillType===1&&this.addMsg.RemitterName==='') return this.$message.error(this.$t('rule.qtxhkuanren')) ;
let str = '';
this.checkList.forEach(x=>{
if(x.FinanceId){
......@@ -770,7 +768,7 @@ export default {
this.addMsg.FrIDs = s;
this.addChuNa = true;
}else{
this.$message.error('请选择单据')
this.$message.error(this.$t('fnc.a_qxzdanju'))
}
},
addList(){
......
src/components/FinancialModule/accDetail/PoolAccDetail.vue
View file @ 78c4b9f9
......@@ -30,7 +30,7 @@
<el-form class="_info_box clearfix" label-width="110px">
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item label="账户类型">
<el-form-item :label="$t('fnc.zhanghuleixing')">
<el-select filterable v-model='accType' @change="bankaccount_post_GetList">
<el-option v-for='item in AccList'
:label='item.Name'
......@@ -41,7 +41,7 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="资金池账户">
<el-form-item :label="$t('fnc.a_zjczhanghu')">
<el-select filterable v-model='AccountId' @change="accountListChange">
<el-option v-for='item in accountList'
:label='item.Alias'
......@@ -52,16 +52,16 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="出纳审核">
<el-form-item :label="$t('fnc.a_cnyshenhe')">
<el-select filterable v-model='msg.Is_Cashier' >
<el-option label='全部' :value='-1'></el-option>
<el-option label='已审核' :value='1'></el-option>
<el-option label='未审核' :value='0'></el-option>
<el-option :label='$t("advmanager.v_all")' :value='-1'></el-option>
<el-option :label='$t("fnc.a_yshenhe")' :value='1'></el-option>
<el-option :label='$t("fnc.a_wshenhe")' :value='0'></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="付款对象">
<el-form-item :label="$t('fnc.fkduixiang')">
<el-select filterable v-model='msg.ClientID' >
<el-option v-for='item in ClientAccountList'
:label='item.AccountAlias'
......@@ -72,13 +72,13 @@
</el-form-item>
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="汇款/付款日期">
<el-form-item :label="$t('fnc.a_hkfkriqi')">
<el-date-picker class="h34"
@change="timeAdd"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至">
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -86,35 +86,36 @@
</el-form>
<ul>
<li>
<input type="button" class="hollowFixedBtn" value="合并单据" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()"/>
<input type="button" class="normalBtn" value="导出" @click=""/></li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" />
</li>
</ul>
</div>
<div class="cm_content">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th rowspan="2"></th>
<th rowspan="2">所属公司</th>
<th rowspan="2">单号</th>
<th rowspan="2">摘要</th>
<th rowspan="2">汇款人/付款对象</th>
<th rowspan="2">汇款时间/付款时间</th>
<th>交易流水号</th>
<th colspan="3">外币（{{TypeName}}）</th>
<th rowspan="2">兑换率</th>
<th colspan="3">人民币</th>
<th rowspan="2">{{$t('system.query_company')}}</th>
<th rowspan="2">{{$t('fnc.danhao')}}</th>
<th rowspan="2">{{$t('fnc.a_zhaiyao')}}</th>
<th rowspan="2">{{$t('fnc.a_hkrfkduixiang')}}</th>
<th rowspan="2">{{$t('fnc.a_hkfkshijian')}}</th>
<th>{{$t('fnc.jylshuihao')}}</th>
<th colspan="3">{{$t('fnc.waibi')}}（{{TypeName}}）</th>
<th rowspan="2">{{$t('fnc.a_dhuanlv')}}</th>
<th colspan="3">{{$t('fnc.a_rminbi')}}</th>
</tr>
<tr>
<th width="">收入</th>
<th width="">支出</th>
<th width="">余额</th>
<th width="">收入</th>
<th width="">支出</th>
<th width="">余额</th>
<th width="">{{$t('restaurant.res_income')}}</th>
<th width="">{{$t('restaurant.res_outcome')}}</th>
<th width="">{{$t('fnc.yueacc')}}</th>
<th width="">{{$t('restaurant.res_income')}}</th>
<th width="">{{$t('restaurant.res_outcome')}}</th>
<th width="">{{$t('fnc.yueacc')}}</th>
</tr>
<tr>
<td :colspan="6">期初余额：</td>
<td :colspan="6">{{$t('fnc.a_qcyue')}}：</td>
<td></td>
<td></td>
<td> {{ moneyFormat(RStartMoney) }} </td>
......@@ -133,12 +134,12 @@
<p v-for=" ( son , sIndex ) in item.TCIDAndTCNUMList"> <span>{{ son.TCNUM }} ( <span> {{ son.TCID }} </span> )</span> </p>
</td>
<td>
<span v-if=" item.Type == 1">汇款人：{{ item.RemitterName }}</span>
<span v-if=" item.Type == 1">{{$t('fnc.huikuanren')}}：{{ item.RemitterName }}</span>
<span v-if=" item.Type == 2">{{ item.ClientTypeName }}：{{ item.RemitterName }}</span>
</td>
<td>
<span v-if=" item.Type == 1">汇款时间：{{ item.TradeDate }}</span>
<span v-if=" item.Type == 2">付款时间：{{ item.TradeDate }}</span>
<span v-if=" item.Type == 1">{{$t('fnc.hkshijian')}}：{{ item.TradeDate }}</span>
<span v-if=" item.Type == 2">{{$t('fnc.a_fkshijian')}}：{{ item.TradeDate }}</span>
</td>
<td>
{{ item.AccountNumber }}
......@@ -166,7 +167,7 @@
</td>
</tr>
<tr>
<td :colspan="6">合计（共 {{ DataList.length }} 条）</td>
<td :colspan="6">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}} {{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
<td></td>
<td></td>
<td> {{ moneyFormat(endRStartMoney) }} </td>
......@@ -178,20 +179,17 @@
</table>
</div>
<el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
<p class="_addChuNa_tit"><span>{{count}}</span>条合并为1条，外币总金额 <span>{{ moneyFormat(allWPrice) }}</span> ，本位币总金额 <span>{{ moneyFormat(allBPrice) }}</span> </p>
<p class="_addChuNa_tit"><span>{{count}}</span>{{$t('fnc.a_hbtips')}} <span>{{ moneyFormat(allWPrice) }}</span> {{$t('fnc.a_hbtips2')}} <span>{{ moneyFormat(allBPrice) }}</span> </p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center; width: 100%;">
<template>
<tr >
<th height="34px">账户分类</th>
<th height="34px">付款方式</th>
<th height="34px">账户</th>
<!-- <th width="100px">账户余额</th> -->
<th height="34px">金额</th>
<th height="34px" width="70">币种</th>
<th height="34px" width="50px">汇率</th>
<!-- <th>手续费</th> -->
<th height="34px" width="100px">总金额</th>
<!-- <th>操作</th> -->
<th height="34px">{{$t('fnc.zhfenlei')}}</th>
<th height="34px">{{$t('fnc.fkfangshi')}}</th>
<th height="34px">{{$t('fnc.acc')}}</th>
<th height="34px">{{$t('fnc.jine')}}</th>
<th height="34px" width="70">{{$t('hotel.hotel_Currency')}}</th>
<th height="34px" width="50px">{{$t('hotel.hotel_CurrentRate')}}</th>
<th height="34px" width="100px">{{$t('fnc.a_zongjine')}}</th>
</tr>
<template v-for="(item,index) in payMsgList">
<tr v-if="!item.show" @click="payMsgList[index].show=true">
......@@ -226,7 +224,7 @@
</el-select>
</td>
<td>
<el-select filterable v-model='item.AccountId' placeholder="请选择账户" @change="setAccountName(item.AccountId,1,index)" class=" _border_b_1">
<el-select filterable v-model='item.AccountId' :placeholder="$t('rule.qxzzhanghu')" @change="setAccountName(item.AccountId,1,index)" class=" _border_b_1">
<el-option v-for='i in accountList'
:label='i.allName'
:value='i.ID'
......@@ -235,7 +233,7 @@
</el-select>
</td>
<td>
<el-input v-model="item.OriginalMoney" @change="Calculation(1,index)" @blur="item.show=false,CalculationMoney" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input>
<el-input v-model="item.OriginalMoney" @change="Calculation(1,index)" @blur="item.show=false,CalculationMoney" :placeholder="$t('rule.qsrjine')" type="number" class=" _border_b_1"></el-input>
</td>
<td>
<p>{{item.CurrenName}}</p>
......@@ -266,7 +264,7 @@
</el-select>
</td>
<td>
<el-select filterable v-model='payMsg.AccountId' placeholder="请选择账户" @change="setAccountName(payMsg.AccountId,2)" class=" _border_b_1">
<el-select filterable v-model='payMsg.AccountId' :placeholder="$t('rule.qxzzhanghu')" @change="setAccountName(payMsg.AccountId,2)" class=" _border_b_1">
<el-option v-for='i in accountList'
:label='i.allName'
:value='i.ID'
......@@ -275,7 +273,7 @@
</el-select>
</td>
<td>
<el-input v-model="payMsg.OriginalMoney" @change="Calculation(2)" @blur="addList()" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input>
<el-input v-model="payMsg.OriginalMoney" @change="Calculation(2)" @blur="addList()" :placeholder="$t('rule.qsrjine')" type="number" class=" _border_b_1"></el-input>
</td>
<td>
<p>{{payMsg.CurrenName}}</p>
......@@ -287,14 +285,14 @@
</tr>
</template>
<tr>
<td height="34px">总金额</td>
<td height="34px">{{$t('fnc.a_zongjine')}}</td>
<td height="34px" colspan="7">
<el-input v-model="listAllMoney" type="number" placeholder="请输入总金额" class=" _border_b_1"></el-input>
<el-input v-model="listAllMoney" type="number" :placeholder="$t('rule.qsrzjine')" class=" _border_b_1"></el-input>
<!--{{moneyFormat(listAllMoney)}}-->
</td>
</tr>
<tr v-if="BillType===2">
<td>交易日期</td>
<td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="7">
<el-date-picker
class="width100b"
......@@ -302,23 +300,23 @@
type="date"
:default-value="TradeDate"
value-format="yyyy-MM-dd"
placeholder="选择日期">
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</td>
</tr>
<tr v-if="BillType===1">
<td>汇款人</td>
<td>{{$t('fnc.huikuanren')}}</td>
<td colspan="2">
<el-input v-model="addMsg.RemitterName" type="text" class=" _border_b_1"></el-input>
</td>
<td>交易日期</td>
<td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="3">
<el-date-picker
class="width100b"
v-model="addMsg.TradeDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</td>
</tr>
......@@ -693,8 +691,8 @@ export default {
},
submitAddChuNa(){
// if(this.payMsgList.length===0) return this.$message.error('请选择交易方式！');
if(this.addMsg.TradeDate==='') return this.$message.error('请选择交易日期！');
if(this.BillType===1&&this.addMsg.RemitterName==='') return this.$message.error('请填写汇款人！') ;
if(this.addMsg.TradeDate==='') return this.$message.error(this.$t('fnc.a_qxzjyriqi'));
if(this.BillType===1&&this.addMsg.RemitterName==='') return this.$message.error(this.$t('rule.qtxhkuanren')) ;
let str = '';
this.checkList.forEach(x=>{
if(x.FinanceId){
......@@ -786,7 +784,7 @@ export default {
this.addMsg.FrIDs = s;
this.addChuNa = true;
}else{
this.$message.error('请选择单据')
this.$message.error(this.$t('fnc.a_qxzdanju'))
}
},
addList(){
......
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