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
72260c57
Commit
72260c57
authored
Jun 01, 2023
by
wuchun
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
61f64a15
fc98dd5d
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
87 additions
and
62 deletions
+87
-62
OPCommissionDetail.vue
...nents/FinancialModule/OpCommission/OPCommissionDetail.vue
+31
-30
ServiceCommissionUser.vue
...nancialModule/ServiceCommission/ServiceCommissionUser.vue
+2
-6
OPsalesCommissionUser.vue
...onents/FinancialModule/domestic/OPsalesCommissionUser.vue
+2
-1
progressComm.vue
src/components/temp/components/progressComm.vue
+1
-1
operation.vue
src/components/temp/operation.vue
+51
-24
No files found.
src/components/FinancialModule/OpCommission/OPCommissionDetail.vue
View file @
72260c57
...
...
@@ -289,10 +289,7 @@
this
.
getCompanyMsg
.
RB_Group_Id
=
userInfo
.
RB_Group_id
;
//集团ID
this
.
departmentMsg
.
RB_Group_Id
=
userInfo
.
RB_Group_id
;
//集团
this
.
departmentMsg
.
RB_Branch_Id
=
userInfo
.
RB_Branch_Id
;
this
.
GetCommissionPeroidsList
()
//期数
this
.
getEmployee
()
//人员
this
.
getDepartment
()
this
.
getCompany
()
},
mounted
()
{
let
userInfo
=
this
.
getLocalStorage
();
...
...
@@ -308,11 +305,15 @@
this
.
msg
.
OutBranchId
=
-
1
this
.
msg
.
RB_Branch_Id
=
-
1
// this.msg.RB_Department_Id = -1
this
.
msg
.
EmployeeId
=
-
1
this
.
msg
.
EmployeeId
=
this
.
$route
.
query
.
UserId
?
Number
(
this
.
$route
.
query
.
UserId
):
-
1
}
else
{
this
.
disabled
=
true
;
this
.
msg
.
EmployeeId
=
this
.
$route
.
query
.
UserId
?
Number
(
this
.
$route
.
query
.
UserId
):
Number
(
userInfo
.
EmployeeId
)
}
this
.
GetCommissionPeroidsList
()
//期数
this
.
getEmployee
()
//人员
this
.
getDepartment
()
this
.
getCompany
()
},
methods
:
{
...
...
@@ -338,7 +339,7 @@
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
PeroidsList
=
res
.
data
.
data
;
if
(
!
this
.
$route
.
query
.
PeriodId
){
this
.
msg
.
PeriodsId
=
this
.
PeroidsList
[
0
].
I
d
this
.
msg
.
PeriodsId
=
this
.
PeroidsList
[
0
].
I
D
}
this
.
getList
()
}
else
{
...
...
src/components/FinancialModule/ServiceCommission/ServiceCommissionUser.vue
View file @
72260c57
...
...
@@ -157,13 +157,9 @@
this
.
msg
.
UserId
=
this
.
$route
.
query
.
UserId
?
Number
(
this
.
$route
.
query
.
UserId
):
-
1
}
else
{
this
.
disabled
=
true
;
// this.msg.UserId = Number(userInfo.EmployeeId)
if
(
!
this
.
$route
.
query
.
UserId
){
this
.
msg
.
UserId
=
Number
(
userInfo
.
EmployeeId
)
}
else
{
this
.
msg
.
UserId
=
this
.
$route
.
query
.
UserId
?
Number
(
this
.
$route
.
query
.
UserId
):
Number
(
userInfo
.
EmployeeId
)
}
}
this
.
msg
.
Type
=
this
.
$route
.
query
.
Type
?
this
.
$route
.
query
.
Type
:
''
this
.
msg
.
PeriodId
=
this
.
$route
.
query
.
PeriodId
?
Number
(
this
.
$route
.
query
.
PeriodId
):
0
this
.
getqishilist
()
this
.
getCompanyList
()
//获取公司
...
...
src/components/FinancialModule/domestic/OPsalesCommissionUser.vue
View file @
72260c57
...
...
@@ -136,9 +136,10 @@
let
ActionMenuCode
=
userInfo
.
ActionMenuCode
;
if
(
ActionMenuCode
.
indexOf
(
'home_CommissionSeeAll'
)
!=
-
1
)
{
//是否有看所有人的权限
this
.
disabled
=
false
;
this
.
msg
.
UserId
=
this
.
$route
.
query
.
UserId
?
Number
(
this
.
$route
.
query
.
UserId
):
-
1
}
else
{
this
.
disabled
=
true
;
this
.
msg
.
UserId
=
Number
(
userInfo
.
EmployeeId
)
this
.
msg
.
UserId
=
this
.
$route
.
query
.
UserId
?
Number
(
this
.
$route
.
query
.
UserId
):
Number
(
userInfo
.
EmployeeId
)
}
this
.
msg
.
PeriodId
=
this
.
$route
.
query
.
PeriodId
?
Number
(
this
.
$route
.
query
.
PeriodId
):
0
this
.
getList
();
...
...
src/components/temp/components/progressComm.vue
View file @
72260c57
...
...
@@ -119,7 +119,7 @@
methods
:
{
// 设置进度
setItemProgress
(
data
)
{
if
(
this
.
Profit
&&
this
.
Profit
>=
data
.
StartValue
&&
this
.
Profit
<=
data
.
EndValue
){
if
(
this
.
Profit
>
0
&&
this
.
Profit
>=
data
.
StartValue
&&
this
.
Profit
<=
data
.
EndValue
){
return
data
.
EndValue
<
999999
?
this
.
Profit
/
data
.
StartValue
:
this
.
Profit
/
data
.
EndValue
}
else
{
return
0
...
...
src/components/temp/operation.vue
View file @
72260c57
...
...
@@ -172,7 +172,8 @@
flex-wrap: nowrap;
}
.ladder-form-box{
height: 92px;
/* height: 72px; */
padding: 0 0 10px 0;
overflow: auto;
display: flex;
flex-wrap: nowrap;
...
...
@@ -271,8 +272,9 @@
</div>
<div
style=
"display: flex;align-items: center; justify-content: space-between;padding: 20px 20px 0 20px;"
>
<div
class=
"headerTitle"
>
<p><span>
总订单数:
</span>
<span></span></p>
<p><span>
总人头数:
</span><span></span></p>
<!-- <p><span>总团队数:</span> <span>{{groupNum}}</span></p> -->
<p><span>
总订单数:
</span>
<span>
{{OrderNum}}
</span></p>
<p><span>
总人头数:
</span><span>
{{EopleNum}}
</span></p>
<p><span>
总预期奖金:
</span><span>
{{CommissionJJ}}
</span></p>
<p><span>
总预期提成:
</span><span>
{{CommissionTC}}
</span></p>
</div>
...
...
@@ -296,6 +298,9 @@
<span>
当月团数:
<span>
{{
s
.
TravelNum
}}
</span>
</span>
<span>
单项订单数:
<span>
{{
s
.
SingleOrderNum
}}
</span>
</span>
<span>
预期利润:
<span>
{{
s
.
Profit
}}
</span>
</span>
...
...
@@ -339,7 +344,7 @@
<span
class=
"ProjectTitle"
>
单项签证
</span>
</div>
<div
class=
"groupTourOrder"
>
<span>
报名
单数:
<span>
{{item.SingleVisa.OrderNum}}
</span></span>
<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>
...
...
@@ -361,13 +366,13 @@
<span>
公司所有国内出发线路(单团.散拚)
</span></span>
</div>
<div
class=
"groupTourOrder"
>
<span>
订单
数:
<span>
{{item.PeopleAward.TravelNum}}
</span></span>
<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>
<div
v-if=
"!index"
>
<div
style=
"display: flex;"
>
<div>
<div
class=
"commissionProjectZL"
>
...
...
@@ -526,6 +531,11 @@
export
default
{
data
(){
return
{
jianjin
:
0
,
yuqiticheng
:
0
,
groupNum
:
0
,
OrderNum
:
0
,
EopleNum
:
0
,
defaultHeadImg
:
'this.src="'
+
require
(
"../../assets/img/default_head_img.jpg"
)
+
'"'
,
data
:{},
loading
:
true
,
...
...
@@ -602,18 +612,14 @@
}
else
if
(
type
==
3
){
//历史单项
name
=
'ServiceCommissionUser'
}
if
(
type
!=
5
&&
name
){
this
.
$router
.
push
({
name
:
name
,
query
:
{
UserId
:
Number
(
userInfo
.
EmployeeId
),
Type
:
2
,
isSale
:
1
,
blank
:
'y'
}
});
}
},
goMore
(){
...
...
@@ -621,9 +627,6 @@
name
:
'TravelControlList'
,
query
:
{
blank
:
'y'
,
// Q_IsCollect: "2",
// DepartSTime: this.commissionMsg.DepartSTime,
// DepartETime: this.commissionMsg.DepartETime
}
});
},
...
...
@@ -635,16 +638,41 @@
this
.
msg
.
Month
=
this
.
Year
+
'-'
+
(
this
.
LastMonthTime
>
10
?
this
.
LastMonthTime
:
'0'
+
this
.
LastMonthTime
)
}
this
.
getList
()
this
.
GetGNSaleExpectCommission
()
},
// 获取规则列表数据
getList
()
{
this
.
loading
=
true
this
.
apipost
(
"opcommission_GetOPExpectCommission"
,
this
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
OrderNum
=
0
this
.
groupNum
=
0
this
.
EopleNum
=
0
this
.
jianjin
=
0
this
.
yuqiticheng
=
0
this
.
dataRlueList
=
res
.
data
.
data
.
RlueList
this
.
dataRlueList
.
forEach
(
item
=>
{
this
.
groupNum
+=
item
.
TravelAward
.
TravelNum
this
.
groupNum
+=
item
.
PeopleAward
.
TravelNum
this
.
OrderNum
+=
item
.
SingleVisa
.
OrderNum
this
.
jianjin
+=
(
item
.
TravelAward
.
AwardMoney
*
100
)
this
.
yuqiticheng
+=
(
item
.
SingleVisa
.
Commission
*
100
)
this
.
yuqiticheng
+=
(
item
.
TravelVisa
.
Commission
*
100
)
this
.
yuqiticheng
+=
(
item
.
PeopleAward
.
Commission
*
100
)
item
.
BranchList
.
forEach
(
s
=>
{
this
.
groupNum
+=
s
.
TravelNum
this
.
OrderNum
+=
s
.
SingleOrderNum
this
.
yuqiticheng
+=
(
s
.
Commission
*
100
)
})
this
.
EopleNum
+=
item
.
PeopleAward
.
PeopelNum
})
this
.
ZLOPAward
=
res
.
data
.
data
.
ZLOPAward
// console.log(res.data.data,'---')
this
.
OrderNum
+=
this
.
ZLOPAward
.
SinglePeopleNum
this
.
yuqiticheng
+=
(
this
.
ZLOPAward
.
TravelCommission
*
100
)
this
.
yuqiticheng
+=
(
this
.
ZLOPAward
.
SingleCommission
*
10
)
this
.
yuqiticheng
=
this
.
yuqiticheng
/
100
this
.
jianjin
=
this
.
jianjin
/
100
this
.
GetGNSaleExpectCommission
()
}
else
{
this
.
Error
(
res
.
data
.
message
)
}
...
...
@@ -657,12 +685,12 @@
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
DomesticLine
=
res
.
data
.
data
this
.
GNOrderNum
=
0
this
.
GNEopleNum
=
0
//
this.GNOrderNum = 0
//
this.GNEopleNum = 0
this
.
GNCommission
=
0
this
.
DomesticLine
.
Rlist
.
forEach
(
item
=>
{
this
.
GNOrderNum
+=
Number
(
item
.
OrderNum
)
this
.
GNEopleNum
+=
Number
(
item
.
PeopleNum
)
//
this.GNOrderNum+=Number(item.OrderNum)
//
this.GNEopleNum+=Number(item.PeopleNum)
this
.
GNCommission
+=
Number
(
item
.
Commission
)
})
...
...
@@ -673,8 +701,8 @@
this
.
DomesticLine
.
Rlist
[
0
],
this
.
DomesticLine
.
Rlist
[
1
]]
this
.
newRlist
=
[
this
.
DomesticLine
.
Rlist
[
2
]]
let
arr1
=
[
this
.
CommissionInfor
.
PeopleMoney
,
this
.
CommissionInfor
.
EuropeMoney
]
let
arr2
=
[
this
.
CommissionInfor
.
SalesCommission
,
this
.
CommissionInfor
.
JapanCommission
,
this
.
CommissionInfor
.
EuropeCommission
,
this
.
GNCommission
]
let
arr1
=
[
this
.
jianjin
]
let
arr2
=
[
this
.
GNCommission
,
this
.
yuqiticheng
]
this
.
CommissionJJ
=
this
.
CalculatePrice
(
arr1
,
0
)
this
.
CommissionTC
=
this
.
CalculatePrice
(
arr2
,
2
)
}
...
...
@@ -685,7 +713,7 @@
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
res
.
data
.
data
.
pageData
if
(
data
.
length
>
5
){
if
(
data
&&
data
.
length
>
5
){
for
(
let
i
=
0
;
i
<
5
;
i
++
){
this
.
OrderList
.
push
(
data
[
i
])
}
...
...
@@ -776,7 +804,6 @@
this
.
iWorkbench
()
this
.
GetOrderPageList
()
this
.
getList
()
this
.
GetGNSaleExpectCommission
()
},
}
...
...
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