Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
罗超
SuperMan
Commits
f92813aa
Commit
f92813aa
authored
Mar 22, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
‘完善 财务-账户国际化’
parent
091ef9cc
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
120 additions
and
66 deletions
+120
-66
zh.js
src/assets/common/lang/zh.js
+50
-0
FlowChartModule.vue
...ts/FinancialModule/FinancialSubmodule/FlowChartModule.vue
+1
-1
addFinancialProcess.vue
src/components/FinancialModule/addFinancialProcess.vue
+2
-2
sellCommissionRules.vue
src/components/FinancialModule/sellCommissionRules.vue
+67
-63
No files found.
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
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment