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
bc6e4562
Commit
bc6e4562
authored
Jun 02, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
2373c2f6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
87 additions
and
85 deletions
+87
-85
progressComm.vue
src/components/temp/components/progressComm.vue
+2
-2
operation.vue
src/components/temp/operation.vue
+85
-83
No files found.
src/components/temp/components/progressComm.vue
View file @
bc6e4562
...
...
@@ -52,8 +52,8 @@
border-radius
:
0
!important
;
}
/
deep
/
.relative-position
.el-progress-bar__inner
{
text-align
:
left
;
text-indent
:
10px
;
text-align
:
center
;
/* text-indent: 10px; */
border-radius
:
0
!important
;
}
/
deep
/
.relative-position
:first-child
.el-progress
{
...
...
src/components/temp/operation.vue
View file @
bc6e4562
...
...
@@ -77,15 +77,15 @@
.CommissionLadder .title{
font-size: 19px;
font-weight: bold;
padding: 0 0 5px 0;
display: flex;
justify-content: space-between;
}
.CommissionLadder p {
padding: 5px 0
0
px 0;
padding: 5px 0
5
px 0;
font-size: 15px;
display: flex;
justify-content: space-between;
color: #333333;
}
.CommissionLadder p span:last-child{
color: red;
...
...
@@ -117,17 +117,19 @@
display: flex;
align-items: center;
justify-content: space-between;
padding:
10px
0 5px 0;
padding:
0
0 5px 0;
}
.commissionProjectZL{
display: flex;align-items: center;justify-content: space-between;
padding: 0 0 5px 0;
/* padding: 0 0 5px 0; */
}
.commissionProject>div>div{
}
.ProjectTitle{
font-size: 16px;font-weight: bold;
color: black;
font-size: 16px;
font-weight: bold;
}
.ProjectTitle>span{
margin-left: 5px; font-size: 15px;font-weight: 100;
...
...
@@ -166,32 +168,33 @@
}
.ladder-form{
width: 100%;
max-width: 1526px;
overflow-x: auto;
display: flex;
flex-wrap: nowrap;
flex-wrap: wrap;
overflow: hidden;
}
.ladder-form-box{
/* height: 72px; */
padding: 0 0 10px 0;
overflow: auto
;
flex: 1
;
display: flex;
flex-wrap:
no
wrap;
flex-wrap: wrap;
}
.ladder-list{
flex: 1;
min-width: 450px;
/* max-width: 450px; */
display: flex;
flex-direction: column;
margin-right: 40px;
margin-bottom: 10px;
}
.ladder-list:last-child{
margin-right: 0;
}
.ladder-title{
width: 100%;
font-size: 1
3
px;
padding:
0 0 5px
0;
font-size: 1
5
px;
padding:
5px 0 0
0;
color: black;
font-weight: bold;
}
...
...
@@ -285,34 +288,33 @@
</div>
<
template
v-for=
"(item,index) in dataRlueList"
>
<div
class=
"CommissionLadder-form"
style=
"flex-direction: column;"
>
<div
class=
"CommissionLadder Line"
:style=
"
{'margin': index>0?'10px 0 0 0':'0 0 0 0'}">
<div
class=
"title"
>
<span>
{{
item
.
RuleName
}}
</span>
<span>
{{
item
.
RuleName
}}
线
</span>
<div>
<!--
<detailsButtom
:type=
"1"
:obj=
"commissionMsg"
:Month=
"Month"
/>
-->
</div>
</div>
<template
v-if=
"data.postName.indexOf('签证')==-1"
>
<p
style=
"font-size: 16px;font-weight: bold;"
>
小包团、落地团以及单项提成
</p>
<template
v-if=
"isVisa"
>
<div
class=
"commissionProject"
style=
"display: flex;flex-wrap: wrap;padding: 0 0 10px 0;"
>
<div>
<div
style=
"padding: 0 0 5px 0;"
>
<span
class=
"ProjectTitle"
>
公司所有国内出发线路(单团.散拚)
<span></span></span>
</div>
<div
class=
"groupTourOrder"
>
<span>
团队数:
<span>
{{
item
.
PeopleAward
.
TravelNum
}}
</span></span>
<span>
人头数:
<span>
{{
item
.
PeopleAward
.
PeopelNum
}}
</span></span>
<span>
提成方式:
<span>
{{
item
.
PeopleAward
.
Rate
}}{{
item
.
PeopleAward
.
Way
==
1
?
'元/人'
:
'%'
}}
</span></span>
<span>
预期提成:
<span>
{{
item
.
PeopleAward
.
Commission
}}
</span></span>
</div>
</div>
</div>
</
template
>
<
template
v-if=
"isVisa"
>
<p
style=
"font-size: 16px;font-weight: bold;color: black;"
>
小包团
{{
!
isBranchCompany
?
'、落地团'
:
''
}}
以及单项提成
</p>
<template
v-for=
"(s,indexs) in item.BranchList"
>
<!--
<div
class=
"CommissionInfor"
>
<span>
当月团数:
<span>
{{
s
.
TravelNum
}}
</span>
</span>
<span>
单项订单数:
<span>
{{
s
.
SingleOrderNum
}}
</span>
</span>
<span>
预期利润:
<span>
{{
s
.
Profit
}}
</span>
</span>
<span>
预期比例:
<span>
{{
s
.
Rate
}}{{
s
.
Way
==
1
?
'元/人'
:
'%'
}}
</span>
</span>
<span>
预期提成:
<span>
{{
s
.
Commission
}}
</span>
</span>
</div>
-->
<div
class=
"ladder-form"
>
<div
class=
"ladder-form-box"
>
<div
class=
"ladder-list"
>
...
...
@@ -337,71 +339,62 @@
<progressComm
:type=
"2"
:CommissionRateList=
"s.GradeRuleList"
:Profit=
"s.Profit"
></progressComm>
</div>
<div
class=
"ladder-list"
v-if=
"(isVisa||!isBranchCompany)&&item.BranchList.length-1==indexs"
>
<div
class=
"ladder-title"
>
额外奖励 (不含落地团)
</div>
<div
class=
"CommissionInfor"
>
<span>
当月团数:
<span>
{{
item
.
TravelAward
.
TravelNum
}}
</span>
</span>
<span>
奖励:
<span>
{{
item
.
TravelAward
.
AwardMoney
}}
</span>
</span>
</div>
<progressComm
:type=
"1"
:CommissionRateList=
"item.TravelAward.GradeRuleList"
:Profit=
"item.TravelAward.TravelNum"
></progressComm>
</div>
</div>
</div>
</
template
>
</template>
<div
class=
"commissionProject"
style=
"display: flex;flex-wrap: wrap;"
>
<
template
v-if=
"data.postName.indexOf('签证')==-1"
>
<div
style=
"width: 450px;"
>
<div>
<span
class=
"ProjectTitle"
>
额外奖励
<span>
<span>
当月团数:
<span
style=
"color: red;"
>
{{
item
.
TravelAward
.
TravelNum
}}
</span>
</span>
<span
style=
"margin-left: 10px;"
>
奖励:
<span
style=
"color: red;"
>
{{
item
.
TravelAward
.
AwardMoney
}}
</span>
</span></span>
</span>
</div>
<div>
<progressComm
:type=
"1"
:CommissionRateList=
"item.TravelAward.GradeRuleList"
:Profit=
"item.TravelAward.TravelNum"
></progressComm>
</div>
</div>
</
template
>
<div>
<div>
<span
class=
"ProjectTitle"
>
单项签证
</span>
</div>
<div
class=
"groupTourOrder"
>
<span>
订单数:
<span>
{{item.SingleVisa.OrderNum}}
</span></span>
<span>
预期利润:
<span>
{{item.SingleVisa.Profit}}
</span></span>
<span>
提成比例:
<span>
{{item.SingleVisa.Rate}}{{item.SingleVisa.Way==1?'元/人':'%'}}
</span></span>
<span>
预期提成:
<span>
{{item.SingleVisa.Commission}}
</span></span>
</div>
</div>
<div>
<div
style=
"display: flex;"
>
<div>
<span
class=
"ProjectTitle"
>
团队签证
</span>
<div
class=
"commissionProjectZL"
>
<span
class=
"ProjectTitle"
>
签证提成
</span>
</div>
<p>
单项签证
</p>
<div
class=
"groupTourOrder"
>
<span>
订单数:
<span>
{{item.SingleVisa.OrderNum}}
</span></span>
<span>
预期利润:
<span>
{{item.SingleVisa.Profit}}
</span></span>
<span>
提成比例:
<span>
{{item.SingleVisa.Rate}}{{item.SingleVisa.Way==1?'元/人':'%'}}
</span></span>
<span>
预期提成:
<span>
{{item.SingleVisa.Commission}}
</span></span>
</div>
</div>
<div
class=
"groupTourOrder"
>
<span>
签证人数:
<span>
{{item.TravelVisa.VisaNum}}
</span></span>
<span>
单价:
<span>
{{item.TravelVisa.Rate}}{{item.TravelVisa.Way==1?'元/人':'%'}}
</span></span>
<span>
预期提成:
<span>
{{item.TravelVisa.Commission}}
</span></span>
<div
style=
"margin-left: 40px;"
>
<div
class=
"commissionProjectZL"
>
<span
class=
"ProjectTitle"
>
<span></span></span>
</div>
<p>
团队签证
</p>
<div
class=
"groupTourOrder"
>
<span>
签证人数:
<span>
{{item.TravelVisa.VisaNum}}
</span></span>
<span>
单价:
<span>
{{item.TravelVisa.Rate}}{{item.TravelVisa.Way==1?'元/人':'%'}}
</span></span>
<span>
预期提成:
<span>
{{item.TravelVisa.Commission}}
</span></span>
</div>
</div>
</div>
<
template
v-if=
"data.postName.indexOf('签证')==-1"
>
<div>
<div>
<span
class=
"ProjectTitle"
>
人头奖励
<span>
公司所有国内出发线路(单团.散拚)
</span></span>
</div>
<div
class=
"groupTourOrder"
>
<span>
团队数:
<span>
{{
item
.
PeopleAward
.
TravelNum
}}
</span></span>
<span>
人头数:
<span>
{{
item
.
PeopleAward
.
PeopelNum
}}
</span></span>
<span>
提成方式:
<span>
{{
item
.
PeopleAward
.
Rate
}}{{
item
.
PeopleAward
.
Way
==
1
?
'元/人'
:
'%'
}}
</span></span>
<span>
预期提成:
<span>
{{
item
.
PeopleAward
.
Commission
}}
</span></span>
</div>
</div>
<
template
v-if=
"isVisa||!isBranchCompany"
>
<div
v-if=
"!index"
>
<div
style=
"display: flex;"
>
<div>
<div
class=
"commissionProjectZL"
>
<span
class=
"ProjectTitle"
>
助理奖励
<
span>
系列团助理op人头提成
</span><
/span>
</span>
</div>
<p>
系列团助理op人头提成
</p>
<div
class=
"groupTourOrder"
>
<span>
报名人数:
<span>
{{
ZLOPAward
.
TravelPeopleNum
}}
</span></span>
<span>
单价:
<span>
{{
ZLOPAward
.
TravelUnitPrice
}}
元/人
</span></span>
...
...
@@ -410,9 +403,10 @@
</div>
<div
style=
"margin-left: 40px;"
>
<div
class=
"commissionProjectZL"
>
<span
class=
"ProjectTitle"
>
助理奖励
<span>
落地散、单项人头奖励
</span></span>
<span
class=
"ProjectTitle"
>
<span></span></span>
</div>
<p>
落地散、单项人头奖励
</p>
<div
class=
"groupTourOrder"
>
<span>
报名人数:
<span>
{{
ZLOPAward
.
SinglePeopleNum
}}
</span></span>
<span>
单价:
<span>
{{
ZLOPAward
.
SingleUnitPrice
}}
元/人
</span></span>
...
...
@@ -547,6 +541,8 @@
export
default
{
data
(){
return
{
isBranchCompany
:
false
,
isVisa
:
false
,
jianjin
:
0
,
yuqiticheng
:
0
,
groupNum
:
0
,
...
...
@@ -753,6 +749,9 @@
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
data
=
res
.
data
.
data
;
Info
=
res
.
data
.
data
if
(
Info
.
postName
.
indexOf
(
'签证'
)
==-
1
){
this
.
isVisa
=
true
}
this
.
apipost
(
'opcommission_GetLatelyOPCommission'
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
data
=
res
.
data
.
data
;
...
...
@@ -801,6 +800,9 @@
}
let
userInfo
=
this
.
getLocalStorage
();
if
(
userInfo
.
RB_Branch_id
>
0
){
this
.
isBranchCompany
=
true
}
// 年终奖权限 销售, 引流, 市场, 票务 , 票務,总经理,总经理
if
(
userInfo
.
PostName
.
indexOf
(
'销售'
)
||
userInfo
.
PostName
.
indexOf
(
'引流'
)
||
userInfo
.
PostName
.
indexOf
(
'市场,'
)
||
userInfo
.
PostName
.
indexOf
(
'票务'
)
||
...
...
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