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
67411ed1
Commit
67411ed1
authored
Nov 20, 2024
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
ad8546ed
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
2 deletions
+12
-2
fill.js
src/assets/common/lang/EN/fill.js
+2
-0
fill.js
src/assets/common/lang/zhCN/fill.js
+2
-0
fill.js
src/assets/common/lang/zhTW/fill.js
+2
-0
TicketUserDetails.vue
...nts/FinancialModule/TradeCommission/TicketUserDetails.vue
+2
-0
sale.vue
src/components/sale/sale.vue
+4
-2
No files found.
src/assets/common/lang/EN/fill.js
View file @
67411ed1
...
@@ -5036,6 +5036,7 @@ export const obj = {
...
@@ -5036,6 +5036,7 @@ export const obj = {
qitxrs
:
'Other line numbers '
,
qitxrs
:
'Other line numbers '
,
qitxjl
:
'Other line Rewards '
,
qitxjl
:
'Other line Rewards '
,
zhuzjl
:
'Team Leader reward '
,
zhuzjl
:
'Team Leader reward '
,
ozxfk
:
'European Line Fine'
,
daifa
:
'Ready to go '
,
daifa
:
'Ready to go '
,
nianzmx
:
'Year-end Details '
,
nianzmx
:
'Year-end Details '
,
huizrs
:
'Aggregate number of people '
,
huizrs
:
'Aggregate number of people '
,
...
@@ -6031,6 +6032,7 @@ export const obj = {
...
@@ -6031,6 +6032,7 @@ export const obj = {
xiaozhuzanji
:
'Team record '
,
xiaozhuzanji
:
'Team record '
,
minqazhztxyinw
:
'First name (please fill in according to passport)(English)'
,
minqazhztxyinw
:
'First name (please fill in according to passport)(English)'
,
jian
:
'Award '
,
jian
:
'Award '
,
fakuan
:
'Fine '
,
fenxiangbqren
:
'Share and confirm '
,
fenxiangbqren
:
'Share and confirm '
,
jinshirftdd
:
"Delivery of group orders within 10 days"
,
jinshirftdd
:
"Delivery of group orders within 10 days"
,
chutuansjian
:
'Out time '
,
chutuansjian
:
'Out time '
,
...
...
src/assets/common/lang/zhCN/fill.js
View file @
67411ed1
...
@@ -5036,6 +5036,7 @@ export const obj = {
...
@@ -5036,6 +5036,7 @@ export const obj = {
qitxrs
:
'其他线人数'
,
qitxrs
:
'其他线人数'
,
qitxjl
:
'其他线奖励'
,
qitxjl
:
'其他线奖励'
,
zhuzjl
:
'组长奖励'
,
zhuzjl
:
'组长奖励'
,
ozxfk
:
'欧洲线罚款'
,
daifa
:
'待发'
,
daifa
:
'待发'
,
nianzmx
:
'年终明细'
,
nianzmx
:
'年终明细'
,
huizrs
:
'汇总人数'
,
huizrs
:
'汇总人数'
,
...
@@ -6031,6 +6032,7 @@ export const obj = {
...
@@ -6031,6 +6032,7 @@ export const obj = {
xiaozhuzanji
:
'小组战绩'
,
xiaozhuzanji
:
'小组战绩'
,
minqazhztxyinw
:
'名(请按照护照填写)(英文)'
,
minqazhztxyinw
:
'名(请按照护照填写)(英文)'
,
jian
:
'奖'
,
jian
:
'奖'
,
fakuan
:
'罚'
,
fenxiangbqren
:
'分享并确认'
,
fenxiangbqren
:
'分享并确认'
,
jinshirftdd
:
'近十日发团订单'
,
jinshirftdd
:
'近十日发团订单'
,
chutuansjian
:
'出团时间'
,
chutuansjian
:
'出团时间'
,
...
...
src/assets/common/lang/zhTW/fill.js
View file @
67411ed1
...
@@ -5036,6 +5036,7 @@ export const obj = {
...
@@ -5036,6 +5036,7 @@ export const obj = {
qitxrs
:
'其他線人數'
,
qitxrs
:
'其他線人數'
,
qitxjl
:
'其他線獎勵'
,
qitxjl
:
'其他線獎勵'
,
zhuzjl
:
'組長獎勵'
,
zhuzjl
:
'組長獎勵'
,
ozxfk
:
'欧洲线罚款'
,
daifa
:
'待發'
,
daifa
:
'待發'
,
nianzmx
:
'年終明細'
,
nianzmx
:
'年終明細'
,
huizrs
:
'彙總人數'
,
huizrs
:
'彙總人數'
,
...
@@ -6031,6 +6032,7 @@ export const obj = {
...
@@ -6031,6 +6032,7 @@ export const obj = {
xiaozhuzanji
:
'小組戰績'
,
xiaozhuzanji
:
'小組戰績'
,
minqazhztxyinw
:
'名(請按照護照填寫)(英文)'
,
minqazhztxyinw
:
'名(請按照護照填寫)(英文)'
,
jian
:
'獎'
,
jian
:
'獎'
,
fakuan
:
'罚'
,
fenxiangbqren
:
'分享並確認'
,
fenxiangbqren
:
'分享並確認'
,
jinshirftdd
:
'近十日發團訂單'
,
jinshirftdd
:
'近十日發團訂單'
,
chutuansjian
:
'出團時間'
,
chutuansjian
:
'出團時間'
,
...
...
src/components/FinancialModule/TradeCommission/TicketUserDetails.vue
View file @
67411ed1
...
@@ -201,6 +201,7 @@
...
@@ -201,6 +201,7 @@
<th>
{{
$t
(
'objFill.v101.FinancialModule.ribrnxjl'
)
}}
</th>
<th>
{{
$t
(
'objFill.v101.FinancialModule.ribrnxjl'
)
}}
</th>
<th>
{{
$t
(
'objFill.v101.FinancialModule.ouzxrs'
)
}}
</th>
<th>
{{
$t
(
'objFill.v101.FinancialModule.ouzxrs'
)
}}
</th>
<th>
{{
$t
(
'objFill.v101.FinancialModule.ouzxjl'
)
}}
</th>
<th>
{{
$t
(
'objFill.v101.FinancialModule.ouzxjl'
)
}}
</th>
<th>
{{
$t
(
'objFill.v101.FinancialModule.ozxfk'
)
}}
</th>
<th>
{{
$t
(
'objFill.v101.FinancialModule.qitxrs'
)
}}
</th>
<th>
{{
$t
(
'objFill.v101.FinancialModule.qitxrs'
)
}}
</th>
<th>
{{
$t
(
'objFill.v101.FinancialModule.qitxjl'
)
}}
</th>
<th>
{{
$t
(
'objFill.v101.FinancialModule.qitxjl'
)
}}
</th>
<th
v-if=
"userInfo.RB_Group_id=2&&userInfo.RB_Branch_id==0"
>
{{
$t
(
'objFill.v101.FinancialModule.zhuzjl'
)
}}
</th>
<th
v-if=
"userInfo.RB_Group_id=2&&userInfo.RB_Branch_id==0"
>
{{
$t
(
'objFill.v101.FinancialModule.zhuzjl'
)
}}
</th>
...
@@ -219,6 +220,7 @@
...
@@ -219,6 +220,7 @@
<td>
{{
item
.
PeopleMoney
?
item
.
PeopleMoney
:
'-'
}}
<span
v-if=
"item.WaitPeopleMoney"
>
(
{{
$t
(
'objFill.v101.FinancialModule.daifa'
)
}}
{{
item
.
WaitPeopleMoney
}}
)
</span></td>
<td>
{{
item
.
PeopleMoney
?
item
.
PeopleMoney
:
'-'
}}
<span
v-if=
"item.WaitPeopleMoney"
>
(
{{
$t
(
'objFill.v101.FinancialModule.daifa'
)
}}
{{
item
.
WaitPeopleMoney
}}
)
</span></td>
<td>
{{
item
.
EuropePNum
?
item
.
EuropePNum
:
'-'
}}
</td>
<td>
{{
item
.
EuropePNum
?
item
.
EuropePNum
:
'-'
}}
</td>
<td>
{{
item
.
EuropeMoney
?
item
.
EuropeMoney
:
'-'
}}
<span
v-if=
"item.WaitEuropeMoney"
>
(
{{
$t
(
'objFill.v101.FinancialModule.daifa'
)
}}
{{
item
.
WaitEuropeMoney
}}
)
</span></td>
<td>
{{
item
.
EuropeMoney
?
item
.
EuropeMoney
:
'-'
}}
<span
v-if=
"item.WaitEuropeMoney"
>
(
{{
$t
(
'objFill.v101.FinancialModule.daifa'
)
}}
{{
item
.
WaitEuropeMoney
}}
)
</span></td>
<td
:style=
"
{'color': item.EuDonationsMoney?'red':''}">
{{
item
.
EuDonationsMoney
?
item
.
EuDonationsMoney
:
'-'
}}
</td>
<td>
{{
item
.
OtherPNum
?
item
.
OtherPNum
:
'-'
}}
</td>
<td>
{{
item
.
OtherPNum
?
item
.
OtherPNum
:
'-'
}}
</td>
<td>
{{
item
.
OtherMoney
?
item
.
OtherMoney
:
'-'
}}
<span
v-if=
"item.WaitOtherMoney"
>
(
{{
$t
(
'objFill.v101.FinancialModule.daifa'
)
}}
{{
item
.
WaitOtherMoney
}}
)
</span></td>
<td>
{{
item
.
OtherMoney
?
item
.
OtherMoney
:
'-'
}}
<span
v-if=
"item.WaitOtherMoney"
>
(
{{
$t
(
'objFill.v101.FinancialModule.daifa'
)
}}
{{
item
.
WaitOtherMoney
}}
)
</span></td>
<td
v-if=
"userInfo.RB_Group_id=2&&userInfo.RB_Branch_id==0"
<td
v-if=
"userInfo.RB_Group_id=2&&userInfo.RB_Branch_id==0"
...
...
src/components/sale/sale.vue
View file @
67411ed1
...
@@ -86,10 +86,12 @@
...
@@ -86,10 +86,12 @@
</div>
</div>
</p>
</p>
<p
style=
"color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;"
>
{{
data
.
periodsName
}}{{
$t
(
'objFill.qi'
)
}}
<el-tag
<p
style=
"color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;"
>
{{
data
.
periodsName
}}{{
$t
(
'objFill.qi'
)
}}
<el-tag
v-if=
"data.peopelBonus"
size=
"mini"
type=
"danger"
effect=
"dark"
v-if=
"data.peopelBonus
||data.fineMoney
"
size=
"mini"
type=
"danger"
effect=
"dark"
style=
"color: #ffff;position: absolute;left: 70px;bottom: 23px;font-size: 11px;"
style=
"color: #ffff;position: absolute;left: 70px;bottom: 23px;font-size: 11px;"
:class=
"[isView?'':'HiddenNum']"
>
:class=
"[isView?'':'HiddenNum']"
>
{{
$t
(
'objFill.v101.Rest.jian'
)
}}
+
{{
isView
?
data
.
peopelBonus
:
'***'
}}
</el-tag>
<template
v-if=
"data.peopelBonus"
>
{{
$t
(
'objFill.v101.Rest.jian'
)
}}
+
{{
isView
?
data
.
peopelBonus
:
'***'
}}
</
template
>
<
template
v-if=
"data.fineMoney"
>
{{
$t
(
'objFill.v101.Rest.fakuan'
)
}}{{
isView
?
data
.
fineMoney
:
'***'
}}
</
template
>
</el-tag>
</p>
</p>
</div>
</div>
<div
stye=
"font-size: 16px;color: #666666;display: block;display: inline-block;"
>
<div
stye=
"font-size: 16px;color: #666666;display: block;display: inline-block;"
>
...
...
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