Skip to content

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

‘完善 财务-账户国际化’

parent 091ef9cc
Show whitespace changes
Inline Side-by-side
Showing with 120 additions and 66 deletions
src/assets/common/lang/zh.js
View file @ f92813aa
......@@ -711,6 +711,25 @@ export const fnc = {
accBming: '账户别名：',
accType: '账户类型：',
ptjigou: '平台机构：',
tcleibie: '提成类别：',
jiaoyie: '交易额',
retoushu: '人头数',
tcfangshi: '提成方式：',
gdbfenbi: '固定百分比',
jtbfenbi: '阶梯百分比',
tcbili: '提成比例：',
tcyaoqiu: '提成要求：',
shiyongongsi: '适用公司：',
ysdingjin: '已收定金',
wkshouqi: '尾款收齐',
jszhouqi: '结算周期：',
andjiesuan: '按单结算',
anyjiesuan: '按月结算',
jsyaoqiu: '结算要求：',
qzwcsyyq: '强制完成周期内所有订单提成要求',
bqzwancheng: '不用强制完成',
gdjine: '固定金额',
jtjine: '阶梯金额',
khuren: '开户人：',
ptAcc: '平台账户：',
suoshugs: '所属公司：',
......@@ -776,6 +795,17 @@ export const fnc = {
gfyleixing: '个费用类型',
sygongsi: '适用公司',
jttongyong: '集团通用',
sydxianlu: '所有线路',
shiyongxianlu: '适用线路',
symdidi: '适用目的地：',
symudidi: '所有目的地',
qyshijian: '启用时间：',
syxianlu: '适用线路：',
qzrenshu: '起始人数',
zzrenshu: '终止人数',
jcbili: '基础比列',
ewjiangli: '额外奖励',
jttcblsd: '阶梯提成比例设定',
lcrizhi: '流程日志',
zwxgrizhi: '暂无修改日志',
zwkqliucheng: '暂未开启流程',
......@@ -832,6 +862,16 @@ export const fnc = {
jzchuna: '记账出纳',
skchuna: '收款出纳',
xzrenyuan: '选择人员',
addguize: '新增规则',
editguize: '修改规则',
gzmingcheng: '规则名称',
tcguize: '提成规则',
tcjilu: '提成记录',
tczhouqi: '提成周期',
dyjiesuan: '按单结算',
ayjiesuan: '按月结算',
dwala: '必选完成周期内所有的提成要求',
awala: '不强制完成周期内所有的提成要求',
meiyousunyi: '该账户当前还没有损益记录',
}
export const tips = {
......@@ -860,6 +900,11 @@ export const tips = {
qxzbumen: '请选择部门！',
di: '第',
jizhuguan: '级主管',
xzqyshijian: '选择启用时间',
cicaozuoyongjiushanchu: '此操作将永久删除该提成规则, 是否继续?',
shanchutishi: '删除提示',
shanchuchenggong: '删除成功',
baocunchenggong: '保存成功',
}
export const rule = {
company: '请选择公司',
......@@ -888,4 +933,9 @@ export const rule = {
qssrzhhaoma: '请输入账户号码',
qsrzqdzhhaoma: '请输入正确的账户号码',
qsrlcmingcheng: '请输入流程名称',
qsrjcbili: '请输入基础比例',
qsrwmjiangli: '请输入外卖奖励',
qsrgzmingcheng: '请输入规则名称',
qzsxzytxianlu: '请至少选择一个适用线路',
qzsxzyggongsi: '请至少选择一个适用公司',
}
\ No newline at end of file
src/components/FinancialModule/FinancialSubmodule/FlowChartModule.vue
View file @ f92813aa
......@@ -46,7 +46,7 @@
<div class="_liu_block clearfix" :class="[Math.floor((li+1)%3==0?li:(li+1)/3)%2==0?'fl text_l ':'fr text_r ']">
<span class="_array _array_h" :class="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2!=0?'_array_h_left ':''" v-if="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2!=0&&li!=dataList.AuditList.length-1"><span class="iconfont icon-xiaotuziCduan_2"></span></span>
<el-tooltip class="dataList" effect="dark" :content="lc.contentTips" placement="top">
<span :class="lc.AuditType==3?'_bg_org':'_bg_blue'" class="_miaoshu ">{{lc.AuditDescription}} <span v-if="lc.AuditWay!=1">({{lc.AuditWay=="2"?'会签':'或签'}})</span></span>
<span :class="lc.AuditType==3?'_bg_org':'_bg_blue'" class="_miaoshu ">{{lc.AuditDescription}} <span v-if="lc.AuditWay!=1">({{lc.AuditWay=="2"?$t('fnc.huiqian'):$t('fnc.huoqian')}})</span></span>
</el-tooltip>
<span v-if="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2==0&&li!=dataList.AuditList.length-1" :class="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2==0?'_array_h_right ':''" class="_array _array_h"><span class="iconfont icon-xiaotuziCduan_"></span></span>
<div class="_array_h_dbox" v-if="li!=dataList.AuditList.length-1" :class="Math.floor((li+1)%3==0?li:(li+1)/3)%2==0?'':'_array_h_dbox_l'">
......
src/components/FinancialModule/addFinancialProcess.vue
View file @ f92813aa
......@@ -168,7 +168,7 @@
<div class="approval_page_title">{{$t('fnc.sprleibie')}}</div>
<div class="_info_box _info_box_top">
<label>{{$t('fnc.jdmiaoshu')}}</label>
<el-input v-model="AuditDescription" class="w200" size="mini" placeholder="$t('tips.qsrmiaoshu')" maxlength="6"></el-input>
<el-input v-model="AuditDescription" class="w200" size="mini" :placeholder="$t('tips.qsrmiaoshu')" maxlength="6"></el-input>
</div>
<div class="_info_box _info_box_top">
<label>{{$t('fnc.jddongzuo')}}</label>
......@@ -461,7 +461,7 @@
<el-dialog custom-class='w700' :title="dialogTitle" :visible.sync="outerVisible2" center>
<div class="fl" style="width: 300px; margin: 0 20px;">
<p style="margin: 0 0 10px 0;">{{$t('fnc.xzcsongren')}}：<el-input class='w200' :placeholder="$t('fnc.srgjzjxguolv')" v-model="filterText2">
<p style="margin: 0 0 10px 0;">{{$t('fnc.xzcsongren')}}：<el-input class='w200' :placeholder="$t('tips.srgjzjxguolv')" v-model="filterText2">
</el-input>
</p>
<el-tree class='ApprovalProcessBg'
......
src/components/FinancialModule/sellCommissionRules.vue
View file @ f92813aa
......@@ -3,7 +3,7 @@
<div class="query-box">
<ul>
<li>
<input type="button" class="normalBtn" value="新增" @click="addNew">
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="addNew">
</li>
</ul>
</div>
......@@ -28,7 +28,7 @@
></v-table>
<!-- @on-custom-comp="customCompFunc" -->
<div class="bottom-box" v-show="showForm" v-loading="formLoading">
<div class="btm-title">{{addMsg.ID==0?'新增规则':'修改规则'}}</div>
<div class="btm-title">{{addMsg.ID==0?$t('fnc.addguize'):$t('fnc.editguize')}}</div>
<div>
<el-form
class="_info_box clearfix"
......@@ -39,31 +39,31 @@
>
<el-row>
<el-col :span="4" :gutter="20">
<el-form-item label="账户别名：" prop="RuleName">
<el-form-item :label="$t('fnc.accBming')" prop="RuleName">
<el-input v-model="addMsg.RuleName"></el-input>
</el-form-item>
</el-col>
<el-col :span="5" :gutter="20">
<el-form-item label="提成类别：">
<el-form-item :label="$t('fnc.tcleibie')">
<el-select filterable v-model="addMsg.CommissionMethod" class>
<el-option label="交易额" :value="1"></el-option>
<el-option :label="$t('fnc.jiaoyie')" :value="1"></el-option>
<!-- <el-option label="毛利" :value="2"></el-option> -->
<el-option label="人头数" :value="3"></el-option>
<el-option :label="$t('fnc.retoushu')" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5" :gutter="20">
<el-form-item label="提成方式：">
<el-form-item :label="$t('fnc.tcfangshi')">
<el-select filterable v-model="addMsg.CommissionType" class>
<el-option label="固定百分比" :value="1" v-if='addMsg.CommissionMethod==1'></el-option>
<el-option label="阶梯百分比" :value="2" v-if='addMsg.CommissionMethod==1'></el-option>
<el-option label="固定金额" :value="3" v-if='addMsg.CommissionMethod==3'></el-option>
<el-option label="阶梯金额" :value="4" v-if='addMsg.CommissionMethod==3'></el-option>
<el-option :label="$t('fnc.gdbfenbi')" :value="1" v-if='addMsg.CommissionMethod==1'></el-option>
<el-option :label="$t('fnc.jtbfenbi')" :value="2" v-if='addMsg.CommissionMethod==1'></el-option>
<el-option :label="$t('fnc.gdjine')" :value="3" v-if='addMsg.CommissionMethod==3'></el-option>
<el-option :label="$t('fnc.jtjine')" :value="4" v-if='addMsg.CommissionMethod==3'></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5" :gutter="20">
<el-form-item label="提成比例：" prop="CommissionVariable">
<el-form-item :label="$t('fnc.tcbili')" prop="CommissionVariable">
<el-input
v-model="addMsg.CommissionVariable"
type="int"
......@@ -74,33 +74,33 @@
</el-form-item>
</el-col>
<el-col :span="5" :gutter="20">
<el-form-item label="提成要求：">
<el-form-item :label="$t('fnc.tcyaoqiu')">
<el-select v-model="addMsg.Require" class>
<el-option label="已收定金" :value="1"></el-option>
<el-option label="尾款收齐" :value="2"></el-option>
<el-option :label="$t('fnc.ysdingjin')" :value="1"></el-option>
<el-option :label="$t('fnc.wkshouqi')" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" :gutter="20">
<el-form-item label="结算周期：">
<el-form-item :label="$t('fnc.jszhouqi')">
<el-select v-model="addMsg.BalanceCyc" class>
<el-option label="按单结算" :value="1"></el-option>
<el-option label="按月结算" :value="2"></el-option>
<el-option :label="$t('fnc.andjiesuan')" :value="1"></el-option>
<el-option :label="$t('fnc.anyjiesuan')" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5" :gutter="20">
<el-form-item label="结算要求：">
<el-form-item :label="$t('fnc.jsyaoqiu')">
<el-select v-model="addMsg.IsFinishAll" class>
<el-option label="强制完成周期内所有订单提成要求" :value="1"></el-option>
<el-option label="不用强制完成" :value="0"></el-option>
<el-option :label="$t('fnc.qzwcsyyq')" :value="1"></el-option>
<el-option :label="$t('fnc.bqzwancheng')" :value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5" :gutter="20">
<el-form-item label="适用公司：" prop="UsingBranchArray">
<el-form-item :label="$t('fnc.shiyongongsi')" prop="UsingBranchArray">
<el-select
multiple
collapse-tags
......@@ -108,7 +108,7 @@
v-model="addMsg.UsingBranchArray"
class
>
<el-option label="集团通用" value="-1"></el-option>
<el-option :label="$t('fnc.jttongyong')" value="-1"></el-option>
<el-option
v-for="(item, index) in CompanyList"
:label="item.BName"
......@@ -119,7 +119,7 @@
</el-form-item>
</el-col>
<el-col :span="5" :gutter="20">
<el-form-item label="适用线路：" prop="UsingLineArray">
<el-form-item :label="$t('fnc.jttongyong')" prop="UsingLineArray">
<el-select
multiple
collapse-tags
......@@ -127,7 +127,7 @@
v-model="addMsg.UsingLineArray"
class
>
<el-option label="所有线路" value="-1"></el-option>
<el-option :label="$t('fnc.sydxianlu')" value="-1"></el-option>
<el-option
v-for="(item, index) in lines"
:label="item.lineName"
......@@ -138,14 +138,14 @@
</el-form-item>
</el-col>
<el-col :span="5" :gutter="20">
<el-form-item label="适用目的地：">
<el-form-item :label="$t('fnc.symdidi')">
<el-select
multiple
collapse-tags
@change="changeData(3)"
v-model="addMsg.UsingDestinationArray"
>
<el-option label="所有目的地" value="-1"></el-option>
<el-option :label="$t('fnc.symudidi')" value="-1"></el-option>
<el-option
v-for="(item, index) in desctions"
:label="item.PlaceName"
......@@ -159,21 +159,21 @@
</el-row>
<el-row>
<el-col :span="4" :gutter="20">
<el-form-item label="启用时间：">
<el-date-picker v-model="addMsg.EffectDate" type="date" placeholder="选择启用时间"></el-date-picker>
<el-form-item :label="$t('fnc.qyshijian')">
<el-date-picker v-model="addMsg.EffectDate" type="date" :placeholder="$t('tips.xzqyshijian')"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<table class="al-tab" v-show="addMsg.CommissionType%2==0">
<caption>阶梯提成比例设定</caption>
<caption>{{$t('fnc.jttcblsd')}}</caption>
<thead>
<th>序号</th>
<th>起始人数</th>
<th>终止人数</th>
<th>基础比列</th>
<th>额外奖励</th>
<th>操作</th>
<th>{{$t('active.ad_xuhao')}}</th>
<th>{{$t('fnc.qzrenshu')}}</th>
<th>{{$t('fnc.zzrenshu')}}</th>
<th>{{$t('fnc.jcbili')}}</th>
<th>{{$t('fnc.ewjiangli')}}</th>
<th>{{$t('admin.admin_operate')}}</th>
</thead>
<tbody>
<tr v-for="(item, index) in addMsg.RuleClassList" :key="index">
......@@ -199,24 +199,24 @@
</td>
<td>
<el-input
placeholder="请输入基础比例"
:placeholder="$t('rule.qsrjcbili')"
size="small"
v-model="item.BaseVariable"
class="w200"
>
<template slot="append">{{addMsg.CommissionType==2?'%':'/人'}}</template>
<template slot="append">{{addMsg.CommissionType==2?'%':'/'+this.$t('hotel.hotel_people')}}</template>
</el-input>
</td>
<td>
<el-input
placeholder="请输入外卖奖励"
:placeholder="$t('rule.qsrwmjiangli')"
size="small"
v-model="item.AddedVariable"
class="w200 temp"
>
<template slot="append">
<el-select v-model="item.AddedMethod" class>
<el-option label="/人" :value="2"></el-option>
<el-option :label="'/'+this.$t('hotel.hotel_people')" :value="2"></el-option>
<el-option label="%" :value="1"></el-option>
</el-select>
</template>
......@@ -247,8 +247,8 @@
</el-form>
</div>
<div class="btm-opera-btn">
<input type="button" class="normalBtn" value="保存" @click="save">
<input type="button" class="cancelBtn" value="取消" @click="changeShow(0)">
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="save">
<input type="button" class="cancelBtn" :value="$t('pub.cancelBtn')" @click="changeShow(0)">
</div>
</div>
</div>
......@@ -284,13 +284,13 @@ export default {
lines: [],
rules: {
RuleName: [
{ required: true, message: "请输入规则名称", trigger: "blur" }
{ required: true, message: this.$t('rule.qsrgzmingcheng'), trigger: "blur" }
],
UsingLineArray: [
{
type: "array",
required: true,
message: "请至少选择一个适用线路",
message: this.$t('rule.qzsxzytxianlu'),
trigger: "blur"
}
],
......@@ -298,7 +298,7 @@ export default {
{
type: "array",
required: true,
message: "请至少选择一个适用公司",
message: this.$t('rule.qzsxzyggongsi'),
trigger: "blur"
}
],
......@@ -323,9 +323,9 @@ export default {
}
},
delete(id) {
this.$confirm("此操作将永久删除该提成规则, 是否继续?", "删除提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
this.$confirm(this.$t('tips.cicaozuoyongjiushanchu'), this.$t('tips.shanchutishi'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: "warning"
})
.then(() => {
......@@ -334,7 +334,7 @@ export default {
};
this.apipost("sellcommission_rule_delete", msg, x => {
if (x.data.resultCode == 1) {
this.Success("删除成功");
this.Success(this.$t('tips.shanchuchenggong'));
this.getData()
} else {
this.Error(this.data.message);
......@@ -401,7 +401,7 @@ export default {
this.apipost("sellcommission_rule_set", this.addMsg, x => {
if (x.data.resultCode == 1) {
this.changeShow(0);
this.Success("保存成功");
this.Success(this.$t('tips.baocunchenggong'));
this.getData();
} else {
this.Error(x.data.message);
......@@ -437,7 +437,7 @@ export default {
this.isReady = false;
let that = this;
let RuleName = {
title: "规则名称",
title: that.$t('fnc.gzmingcheng'),
field: "RuleName",
titleAlign: "left",
columnAlign: "left",
......@@ -458,7 +458,7 @@ export default {
});
let BranchName = {
field: "BranchName",
title: "适用公司",
title: that.$t('fnc.sygongsi'),
width: 40,
titleAlign: "left",
columnAlign: "left",
......@@ -478,7 +478,7 @@ export default {
});
let LineName = {
field: "LineName",
title: "适用线路",
title: that.$t('fnc.shiyongxianlu'),
width: 80,
titleAlign: "left",
columnAlign: "left",
......@@ -489,7 +489,7 @@ export default {
isFrozen: true,
formatter: function(rowData, rowIndex, pagingIndex, field) {
if (rowData.UsingLine == "-1") {
return "所有线路";
return that.$t('fnc.sydxianlu');
} else {
let lineNames = "";
rowData.UsingLine.split(",").forEach(x => {
......@@ -504,7 +504,7 @@ export default {
}
};
let Rules = {
title: "提成规则",
title: that.$t('fnc.tcguize'),
field: "RuleDescription",
titleAlign: "left",
columnAlign: "left",
......@@ -513,7 +513,7 @@ export default {
};
let EffectDate = {
field: "EffectDate",
title: "生效日期",
title: that.$t('active.cl_sxriqi'),
titleAlign: "left",
columnAlign: "left",
isResize: true,
......@@ -523,7 +523,7 @@ export default {
}
};
let CommissionLog = {
title: "提成记录",
title: that.$t('fnc.tcjilu'),
titleAlign: "left",
columnAlign: "left",
isResize: true,
......@@ -534,28 +534,32 @@ export default {
// }
};
let Cyc = {
title: "提成周期",
title: that.$t('fnc.tczhouqi'),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
formatter: function(rowData, rowIndex, pagingIndex, field) {
let cyc = "";
let dyjiesuan = that.$t('fnc.dyjiesuan')
let ayjiesuan = that.$t('fnc.ayjiesuan')
let dwala = that.$t('dwala')
let awala = that.$t('awala')
if (rowData.BalanceCyc == "1") {
cyc = "按单结算（";
cyc = dyjiesuan+"（";
} else {
cyc = "按月结算（";
cyc = ayjiesuan+"（";
}
if (rowData.IsFinishAll == "1") {
cyc += "必选完成周期内所有的提成要求）";
cyc += dwala +"）";
} else {
cyc += "不强制完成周期内所有的提成要求）";
cyc += awala +"）";
}
return cyc;
}
};
let opera = {
title: "操作",
title: that.$t('system.table_operation'),
titleAlign: "left",
columnAlign: "left",
width: 80,
......
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