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
ab3a3ea6
Commit
ab3a3ea6
authored
Oct 28, 2024
by
youjie
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
71407e66
632af3e3
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
670 additions
and
18 deletions
+670
-18
FinancialDocumentsDetail.vue
src/components/FinancialModule/FinancialDocumentsDetail.vue
+8
-2
TicketCommission.vue
...ents/FinancialModule/TradeCommission/TicketCommission.vue
+13
-3
YearBonusCommission.vue
...s/FinancialModule/TradeCommission/YearBonusCommission.vue
+277
-0
YearBonusDetails.vue
...ents/FinancialModule/TradeCommission/YearBonusDetails.vue
+338
-0
TravelContractView.vue
src/components/TravelContractView.vue
+2
-5
onedayTripContract.vue
src/components/onedayTripContract.vue
+1
-2
ExpectedCommission.vue
src/components/sale/ExpectedCommission.vue
+1
-1
sale.vue
src/components/sale/sale.vue
+14
-5
config.js
src/router/config.js
+16
-0
No files found.
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @
ab3a3ea6
...
@@ -878,7 +878,7 @@
...
@@ -878,7 +878,7 @@
((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64) -->
((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64) -->
<span
v-if=
"(GetDetail.OtherType&&(GetDetail.OtherType==43 || GetDetail.OtherType==48
<span
v-if=
"(GetDetail.OtherType&&(GetDetail.OtherType==43 || GetDetail.OtherType==48
|| GetDetail.OtherType==63 || GetDetail.OtherType==64 || GetDetail.OtherType==69
|| GetDetail.OtherType==63 || GetDetail.OtherType==64 || GetDetail.OtherType==69
|| GetDetail.OtherType==70 || GetDetail.OtherType==72 || GetDetail.OtherType==76
|| GetDetail.OtherType==70 || GetDetail.OtherType==72 || GetDetail.OtherType==76
|| GetDetail.OtherType==85
|| GetDetail.OtherType==73 || GetDetail.OtherType==77 || GetDetail.OtherType==78))
|| GetDetail.OtherType==73 || GetDetail.OtherType==77 || GetDetail.OtherType==78))
|| ((GetDetail.TemplateId==28 || GetDetail.TemplateId==30)
|| ((GetDetail.TemplateId==28 || GetDetail.TemplateId==30)
&& GetDetail.OtherType!=63 && GetDetail.OtherType!=64&&GetDetail.OtherType!=55&&GetDetail.OtherType!=56
&& GetDetail.OtherType!=63 && GetDetail.OtherType!=64&&GetDetail.OtherType!=55&&GetDetail.OtherType!=56
...
@@ -2126,7 +2126,13 @@
...
@@ -2126,7 +2126,13 @@
path
=
GetDetail
.
OtherType
==
72
?
'TradeTicketDetails'
:
'TradeTicketUserDetails'
path
=
GetDetail
.
OtherType
==
72
?
'TradeTicketDetails'
:
'TradeTicketUserDetails'
obj
.
RB_Branch_Id
=
String
(
GetDetail
.
RB_Branch_Id
)
obj
.
RB_Branch_Id
=
String
(
GetDetail
.
RB_Branch_Id
)
obj
.
OutBranchId
=
null
obj
.
OutBranchId
=
null
}
else
if
(
GetDetail
.
OtherType
==
73
||
GetDetail
.
OtherType
==
77
)
{
//OP提成详情
}
else
if
(
GetDetail
.
OtherType
==
85
)
{
//销售年终奖励
obj
.
tab
=
'年终奖励详情'
path
=
'YearBonusDetails'
obj
.
RB_Branch_Id
=
String
(
GetDetail
.
RB_Branch_Id
)
obj
.
Year
=
GetDetail
.
ReFinanceId
}
else
if
(
GetDetail
.
OtherType
==
73
||
GetDetail
.
OtherType
==
77
)
{
//OP提成详情
obj
.
tab
=
'出境OP提成详情'
obj
.
tab
=
'出境OP提成详情'
path
=
GetDetail
.
OtherType
==
73
?
'OpComPersonDetails'
:
'OPCommissionDetail'
path
=
GetDetail
.
OtherType
==
73
?
'OpComPersonDetails'
:
'OPCommissionDetail'
}
else
if
(
GetDetail
.
OtherType
==
78
)
{
//票务提成详情
}
else
if
(
GetDetail
.
OtherType
==
78
)
{
//票务提成详情
...
...
src/components/FinancialModule/TradeCommission/TicketCommission.vue
View file @
ab3a3ea6
...
@@ -54,9 +54,8 @@
...
@@ -54,9 +54,8 @@
<el-button
size=
"mini"
type=
"danger"
style=
"border-radius:14px"
:loading=
"btnLoading"
<el-button
size=
"mini"
type=
"danger"
style=
"border-radius:14px"
:loading=
"btnLoading"
@
click=
"generateTable"
>
{{
$t
(
'objFill.v101.FinancialModule.shengchengtc'
)
}}
</el-button>
@
click=
"generateTable"
>
{{
$t
(
'objFill.v101.FinancialModule.shengchengtc'
)
}}
</el-button>
</li>
</li>
<li
v-show=
"btnShow2"
>
<li>
<el-button
size=
"mini"
type=
"danger"
style=
"border-radius:14px"
:loading=
"btnLoading2"
<el-button
size=
"mini"
type=
"danger"
style=
"border-radius:14px"
@
click=
"goBonusUrl('YearBonusCommission')"
>
查看年终奖励
</el-button>
@
click=
"generateTable2"
>
{{
$t
(
'objFill.v101.FinancialModule.shengcnz'
)
}}
</el-button>
</li>
</li>
</ul>
</ul>
</div>
</div>
...
@@ -214,6 +213,17 @@
...
@@ -214,6 +213,17 @@
}
}
});
});
},
},
goBonusUrl
(
path
)
{
let
title
=
''
title
=
'年终奖励'
this
.
$router
.
push
({
path
:
path
,
query
:
{
blank
:
'y'
,
tab
:
title
}
});
},
//获取数据
//获取数据
getList
()
{
getList
()
{
this
.
loading
=
true
;
this
.
loading
=
true
;
...
...
src/components/FinancialModule/TradeCommission/YearBonusCommission.vue
0 → 100644
View file @
ab3a3ea6
<
style
scoped
>
.CM_look
{
padding
:
4px
!important
;
position
:
relative
;
top
:
1px
;
}
.opUl
li
{
display
:
inline-block
;
margin
:
10px
15px
10px
0
;
}
.domesticCommission
.singeRowTable
tr
td
{
padding
:
8px
5px
;
}
.domesticCommission
.hoverSpan
span
:hover
{
cursor
:
pointer
;
text-decoration
:
underline
;
color
:
red
;
}
/
deep
/
.el-checkbox__input.is-checked
.el-checkbox__inner
{
background-color
:
#E95252
!important
;
border-color
:
#E95252
!important
;
}
/
deep
/
.el-checkbox__input.is-indeterminate
.el-checkbox__inner
{
background-color
:
#E95252
!important
;
border-color
:
#E95252
!important
;
}
</
style
>
<
template
>
<div
class=
"flexOne domesticCommission"
>
<div>
<ul
class=
"opUl"
>
<li>
<em>
公司别
</em>
<el-select
filterable
v-model=
'msg.BranchId'
@
change=
'handleCurrentChange(1)'
:disabled=
"disabled"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"-1"
:key=
"-1"
></el-option>
<el-option
v-for=
"item in companyList"
:label=
'item.BName'
:value=
'item.Id'
:key=
'item.Id'
></el-option>
</el-select>
</li>
<li
v-show=
"btnShow"
>
<el-button
size=
"mini"
type=
"danger"
style=
"border-radius:14px"
:loading=
"btnLoading2"
@
click=
"generateTable2"
>
生成年终
</el-button>
</li>
</ul>
</div>
<table
v-loading=
"loading"
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
<th>
年份
</th>
<th>
总奖金
</th>
<th>
公司奖金
</th>
<th
style=
"width: 50%;"
>
财务单据
</th>
<th>
操作时间
</th>
<th>
{{
$t
(
'system.table_operation'
)
}}
</th>
</tr>
<tr
v-for=
"item in dataList"
>
<td>
{{
item
.
Year
}}
</td>
<td>
{{
item
.
Money
}}
</td>
<td>
{{
item
.
BranchCommission
}}
</td>
<td>
<template
v-if=
"item.FinanceIdList.length>0"
>
<span
v-for=
"(x,y) in item.FinanceIdList"
>
<span
style=
"cursor: pointer;text-decoration: underline;"
@
click=
'gofinancialdetail(x)'
>
{{
x
}}
</span>
{{
item
.
FinanceIdList
.
length
==
y
+
1
?
''
:
'、'
}}
</span>
<span
style=
"float: right;"
>
{{
$t
(
'objFill.v101.FinancialModule.yizhidje'
)
}}
:
{{
item
.
FinanceMoney
}}
</span>
</
template
>
</td>
<td>
<div>
{{item.CreateTime}}
</div>
</td>
<td>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('fnc.chakanmingxi')"
placement=
"top"
>
<el-button
type=
"primary"
class=
"CM_look"
@
click=
"goUrl('YearBonusDetails',item.Year)"
icon=
"iconfont icon-chakan"
circle
></el-button>
</el-tooltip>
<el-tooltip
v-if=
"cMaker==true"
class=
"item"
effect=
"dark"
:content=
"$t('objFill.v101.FinancialModule.tichengzd')"
placement=
"top"
>
<el-button
@
click=
"YijianZD(item)"
type=
"danger"
class=
"CM_look"
v-if=
"cMaker==true"
icon=
"iconfont icon-mui-icon-add"
circle
></el-button>
</el-tooltip>
</td>
</tr>
</table>
<div
v-if=
"dataList.length==0"
>
<div
style=
"text-align:center"
>
{{$t('system.content_noData')}}
</div>
</div>
<!-- 分页 -->
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"msg.pageIndex"
layout=
"total,prev, pager, next, jumper"
:page-size=
'msg.pageSize'
:total=
'total'
>
</el-pagination>
</div>
</template>
<
script
>
import
moment
from
"moment"
export
default
{
data
()
{
return
{
getCompanyMsg
:{
RB_Group_Id
:
'0'
,
Status
:
'0'
,
},
companyList
:
[],
Month
:
moment
().
subtract
(
1
,
'months'
).
format
(
"YYYY-MM"
),
msg
:
{
pageIndex
:
1
,
pageSize
:
20
,
BranchId
:
-
1
},
loading
:
false
,
//数据源
dataList
:
[],
total
:
0
,
btnShow
:
false
,
btnLoading2
:
false
,
cMaker
:
false
,
//是否可以制单
disabled
:
true
}
},
mounted
()
{
let
userInfo
=
this
.
getLocalStorage
();
this
.
getCompanyMsg
.
RB_Group_Id
=
userInfo
.
RB_Group_id
;
//集团ID
let
ActionMenuCode
=
userInfo
.
ActionMenuCode
;
this
.
msg
.
BranchId
=
userInfo
.
RB_Branch_id
;
if
(
ActionMenuCode
.
indexOf
(
'F_DCommissionSend'
)
!=
-
1
)
{
this
.
btnShow
=
true
;
}
if
(
ActionMenuCode
.
indexOf
(
'home_DCommissionZD'
)
!=
-
1
)
{
this
.
cMaker
=
true
;
}
if
(
ActionMenuCode
.
indexOf
(
'S_CheckBranchOrder'
)
!=
-
1
||
ActionMenuCode
.
indexOf
(
'S_CheckAllOrder'
)
!=-
1
||
ActionMenuCode
.
indexOf
(
'F_Query_AllIncomPay'
)
!=-
1
)
{
//是否有看所有人的权限
this
.
disabled
=
false
;
}
else
{
this
.
disabled
=
true
;
}
this
.
getCompany
()
this
.
getList
()
},
methods
:
{
getCompany
(){
this
.
apipost
(
'admin_get_BranchGetList'
,
this
.
getCompanyMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
this
.
companyList
=
res
.
data
.
data
;
}
else
{}
},
err
=>
{})
},
handleCurrentChange
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
},
goUrl
(
path
,
id
)
{
let
title
=
''
title
=
'年终明细'
this
.
$router
.
push
({
path
:
path
,
query
:
{
Year
:
id
,
blank
:
'y'
,
tab
:
title
}
});
},
//获取数据
getList
()
{
this
.
loading
=
true
;
this
.
apipost
(
'sellcommission_GetTYYearBonusPageList'
,
this
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
loading
=
false
;
this
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
total
=
res
.
data
.
data
.
count
;
}
else
{
this
.
loading
=
false
;
this
.
Error
(
res
.
data
.
message
)
}
},
err
=>
{}
)
},
//生成提成报表
generateTable2
()
{
this
.
$confirm
(
this
.
$t
(
'objFill.v101.FinancialModule.nianzjlmr'
),
this
.
$t
(
'tips.tips'
),
{
confirmButtonText
:
this
.
$t
(
'pub.sureBtn'
),
cancelButtonText
:
this
.
$t
(
'pub.cancelBtn'
),
type
:
"warning"
}).
then
(()
=>
{
this
.
btnLoading2
=
true
;
this
.
apipost
(
"sellcommission_SetTYSaleYearBonusSend"
,
{
Month
:
this
.
Month
,
IsForceSend
:
1
},
res
=>
{
this
.
btnLoading2
=
false
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
handleCurrentChange
(
1
);
this
.
Success
(
this
.
$t
(
'objFill.v101.FinancialModule.nianzsccg'
))
}
})
})
.
catch
(()
=>
{
});
},
// 点击制单
YijianZD
(
item
)
{
if
(
this
.
msg
.
BranchId
==-
1
){
this
.
Error
(
this
.
$t
(
'objFill.qingxzctgs'
))
return
;
}
let
Money
if
(
item
.
BranchCommission
!=
0
){
Money
=
item
.
BranchCommission
}
else
{
this
.
Error
(
this
.
$t
(
'objFill.v101.FinancialModule.gongstcwnbnzd'
))
return
;
}
let
obj
=
{
CostType
:
186
,
Money
:
Money
,
CurrencyId
:
1
,
XSTC
:
1
,
OtherType
:
85
,
ReFinanceId
:
item
.
Year
,
isRB_Branch_Id
:
true
,
RB_Branch_Id
:
this
.
msg
.
BranchId
}
let
query
=
{
blank
:
"y"
,
tab
:
"新增付款单据"
,
Type
:
2
,
IsUploadPic
:
1
,
orderObj
:
JSON
.
stringify
(
obj
)
}
if
(
this
.
msg
.
BranchId
>
0
){
query
.
id
=
87
query
.
Name
=
"分公司年终奖励单"
}
else
{
query
.
id
=
86
query
.
Name
=
"总部年终奖励单"
}
this
.
$router
.
push
({
path
:
"/addFinancialDocuments"
,
query
});
},
gofinancialdetail
(
item
)
{
let
arr
=
item
.
split
(
'-'
)
this
.
$router
.
push
({
name
:
'FinancialDocumentsDetail'
,
query
:
{
id
:
arr
[
0
],
blank
:
'y'
,
tab
:
this
.
$t
(
'objFill.documentparticulars'
)
}
})
}
}
}
</
script
>
src/components/FinancialModule/TradeCommission/YearBonusDetails.vue
0 → 100644
View file @
ab3a3ea6
<
style
>
.CM_look
{
padding
:
4px
!important
;
position
:
relative
;
top
:
1px
;
}
.opUl
li
{
display
:
inline-block
;
margin
:
10px
15px
10px
0
;
}
.domesticCommissiondetails
.opUl
li
input
{
height
:
34px
!important
;
}
.domesticCommissiondetails
.singeRowTable
tr
td
{
padding
:
8px
5px
;
}
.domesticCommissiondetails
.singeRowTable
tr
th
{
border
:
1px
solid
#bbc0cc
;
height
:
30px
!important
;
}
.domesticCommissiondetails
.hoverSpan
span
:hover
{
cursor
:
pointer
;
text-decoration
:
underline
;
color
:
red
;
}
.cursor-p
{
cursor
:
pointer
;
}
.cursor-p
:hover
{
color
:
#409EFF
;
}
</
style
>
<
template
>
<div
class=
"flexOne domesticCommissiondetails"
>
<div
style=
"min-height: 70px;"
>
<ul
class=
"opUl"
>
<li>
<em>
{{
$t
(
'system.query_company'
)
}}
</em>
<el-select
filterable
v-model=
'msg.BranchId'
@
change=
'getDepartment();handleCurrentChange(1)'
:disabled=
"disabled"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"-1"
:key=
"-1"
></el-option>
<el-option
v-for=
"item in companyList"
:label=
'item.BName'
:value=
'item.Id'
:key=
'item.Id'
></el-option>
</el-select>
</li>
<li>
<em>
{{
$t
(
'admin.admin_Department'
)
}}
</em>
<el-select
filterable
v-model=
'msg.RB_Department_Id'
@
change=
'getEmployee();handleCurrentChange(1)'
:disabled=
"disabled"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"-1"
></el-option>
<el-option
v-for=
'item in departmentList'
:label=
'item.DepartmentName'
:value=
'item.DepartmentID'
:key=
'item.DepartmentID'
>
</el-option>
</el-select>
</li>
<li>
<em>
{{
$t
(
'salesModule.Personnel'
)
}}
</em>
<el-select
v-model=
"msg.EmpId"
size=
"mini"
@
change=
"handleCurrentChange(1)"
:disabled=
"disabled"
filterable
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"-1"
></el-option>
<!--
<el-option
:label=
"$t('objFill.weitu')"
:value=
"-2"
></el-option>
-->
<el-option
v-for=
"(item,index) in searchList"
:key=
"item.index"
:label=
"item.name"
:value=
"item.empId"
></el-option>
</el-select>
</li>
<li><el-checkbox
v-model=
"IsShowDetail"
>
显示明细
</el-checkbox></li>
<li
style=
"position: fixed;right: 3px;top: 51px;"
><input
type=
"button"
class=
"normalBtn"
:value=
"$t('visa.v_daochu')"
@
click=
"exportExcel"
></li>
</ul>
</div>
<!-- 统计版块 -->
<div
class=
"groupTourOrder_count"
>
<el-row
:gutter=
"20"
>
<el-col
:xs=
"8"
:sm=
"8"
:md=
"8"
:lg=
"8"
:xl=
"6"
>
<div
class=
"groupTourOrder_count_item HT_total"
>
<p
style=
"margin-top: 10px;"
>
<span>
{{
$t
(
'objFill.zongrenshu'
)
}}
:
{{
total
}}
</span>
<span
style=
"margin-left: 20px;"
>
总奖金:
{{
dataObj
.
TotalMoney
}}
</span>
</p>
</div>
</el-col>
</el-row>
</div>
<div
style=
"width: 100%; overflow: auto;"
>
<table
v-loading=
"loading"
class=
"singeRowTable"
style=
"margin-top: 10px; "
:style=
"IsShowDetail?'width: 4200px;':''"
>
<template
v-if=
"IsShowDetail"
>
<tr
style=
"height: 30px !important;"
>
<th
rowspan=
"2"
width=
"70px"
>
年度
</th>
<th
rowspan=
"2"
width=
"80px"
>
公司
</th>
<th
rowspan=
"2"
width=
"100px"
>
姓名
</th>
<th
rowspan=
"2"
width=
"80px"
>
达标月数
</th>
<th
rowspan=
"2"
width=
"100px"
>
奖励金额
</th>
<th
colspan=
"5"
width=
"300px"
v-for=
"item in dataObj.MonthList"
>
{{
item
}}
</th>
</tr>
<tr
style=
"height: 30px !important;"
>
<template
v-for=
"item in dataObj.MonthList"
>
<th>
总人数
</th>
<th>
团队人数
</th>
<th>
单项人数
</th>
<th>
欧洲人数
</th>
<th>
达标
</th>
</
template
>
</tr>
<tr
v-for=
"item in dataList"
>
<td>
{{item.Year}}
</td>
<td>
{{item.BranchName}}
</td>
<td>
{{item.EmName}}
</td>
<td>
{{item.MonthNum}}
</td>
<td>
{{item.Money}}
</td>
<
template
v-for=
"qitem in item.DetailList"
>
<td><span
:style=
"qitem.IsStandard==1?'color:red':''"
>
{{
qitem
.
TotalPNum
}}
</span></td>
<td><span
:style=
"qitem.IsStandard==1?'color:red':''"
>
{{
qitem
.
TravelPNum
}}
</span></td>
<td><span
:style=
"qitem.IsStandard==1?'color:red':''"
>
{{
qitem
.
SinglePNum
}}
</span></td>
<td><span
:style=
"qitem.IsStandard==1?'color:red':''"
>
{{
qitem
.
EuropePNum
}}
</span></td>
<td><span
:style=
"qitem.IsStandard==1?'color:red':''"
>
{{
qitem
.
IsStandard
==
1
?
'√'
:
''
}}
</span></td>
</
template
>
</tr>
<tr
v-if=
"dataList.length==0"
>
<td
style=
"text-align:center"
colspan=
"18"
>
{{$t('system.content_noData')}}
</td>
</tr>
</template>
<
template
v-else
>
<tr
style=
"height: 30px !important;"
>
<th
width=
"70px"
>
年度
</th>
<th
width=
"80px"
>
公司
</th>
<th
width=
"100px"
>
姓名
</th>
<th
width=
"80px"
>
达标月数
</th>
<th
width=
"100px"
>
奖励金额
</th>
<th
v-for=
"item in dataObj.MonthList"
>
{{
item
}}
</th>
</tr>
<tr
v-for=
"item in dataList"
>
<td>
{{
item
.
Year
}}
</td>
<td>
{{
item
.
BranchName
}}
</td>
<td>
{{
item
.
EmName
}}
</td>
<td>
{{
item
.
MonthNum
}}
</td>
<td>
{{
item
.
Money
}}
</td>
<template
v-for=
"qitem in item.DetailList"
>
<td><span
:style=
"qitem.IsStandard==1?'color:red':''"
>
{{
qitem
.
TotalPNum
}}
</span></td>
</
template
>
</tr>
<tr
v-if=
"dataList.length==0"
>
<td
style=
"text-align:center"
colspan=
"18"
>
{{$t('system.content_noData')}}
</td>
</tr>
</template>
</table>
</div>
<!-- 分页 -->
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"msg.pageIndex"
layout=
"total,prev, pager, next, jumper"
:page-size=
'msg.pageSize'
:total=
'total'
>
</el-pagination>
</div>
</template>
<
script
>
import
moment
from
"moment"
export
default
{
components
:{
},
data
()
{
return
{
dataObj
:{},
Month
:
moment
().
format
(
"YYYY-MM"
),
IsShowDetail
:
false
,
msg
:
{
pageIndex
:
1
,
pageSize
:
20
,
EmpId
:
-
1
,
Year
:
2024
,
BranchId
:
-
1
,
//公司ID
},
loading
:
false
,
//数据源
dataList
:
[],
total
:
0
,
btnShow
:
false
,
searchList
:
[],
TotalMoney
:
0
,
TotalNum
:
0
,
disabled
:
true
,
departmentList
:[],
companyList
:
[],
getCompanyMsg
:{
RB_Group_Id
:
'0'
,
Status
:
'0'
,
},
departmentMsg
:
{
RB_Group_Id
:
'0'
,
RB_Branch_Id
:
'0'
,
Status
:
'0'
,
ParentId
:
'-1'
,
Tier
:
'0'
,
},
S_CheckBranchOrder
:
false
,
S_CheckAllOrder
:
false
,
disabled
:
true
,
outerVisible
:
false
,
//提成比例弹窗
rateDataList
:
[],
DigName
:
''
}
},
created
(){
let
userInfo
=
this
.
getLocalStorage
();
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
.
msg
.
BranchId
=
this
.
$route
.
query
.
RB_Branch_Id
?
Number
(
this
.
$route
.
query
.
RB_Branch_Id
):
Number
(
userInfo
.
RB_Branch_id
)
this
.
msg
.
EmpId
=
this
.
$route
.
query
.
EmpId
?
Number
(
this
.
$route
.
query
.
EmpId
):
Number
(
userInfo
.
EmployeeId
),
this
.
msg
.
Year
=
this
.
$route
.
query
.
Year
?
this
.
$route
.
query
.
Year
:
-
1
let
ActionMenuCode
=
userInfo
.
ActionMenuCode
;
if
(
ActionMenuCode
.
indexOf
(
'S_CheckBranchOrder'
)
!=
-
1
||
ActionMenuCode
.
indexOf
(
'S_CheckAllOrder'
)
!=-
1
||
ActionMenuCode
.
indexOf
(
'F_Query_AllIncomPay'
)
!=-
1
)
{
//是否有看所有人的权限
this
.
msg
.
BranchId
=
this
.
$route
.
query
.
RB_Branch_Id
?
Number
(
this
.
$route
.
query
.
RB_Branch_Id
):
-
1
this
.
msg
.
EmpId
=
this
.
$route
.
query
.
EmpId
?
Number
(
this
.
$route
.
query
.
EmpId
):
-
1
}
this
.
getEmployee
()
//人员
this
.
getDepartment
()
this
.
getCompany
()
this
.
getList
()
},
mounted
()
{
let
userInfo
=
this
.
getLocalStorage
();
let
ActionMenuCode
=
userInfo
.
ActionMenuCode
;
// 判断是否销售
if
(
ActionMenuCode
.
indexOf
(
'S_CheckBranchOrder'
)
!=
-
1
)
{
this
.
S_CheckBranchOrder
=
true
}
if
(
ActionMenuCode
.
indexOf
(
'S_CheckAllOrder'
)
!=
-
1
)
{
this
.
S_CheckAllOrder
=
true
}
if
(
ActionMenuCode
.
indexOf
(
'S_CheckBranchOrder'
)
!=
-
1
||
ActionMenuCode
.
indexOf
(
'S_CheckAllOrder'
)
!=-
1
||
ActionMenuCode
.
indexOf
(
'F_Query_AllIncomPay'
)
!=-
1
)
{
//是否有看所有人的权限
this
.
disabled
=
false
;
this
.
msg
.
BranchId
=
this
.
$route
.
query
.
RB_Branch_Id
?
Number
(
this
.
$route
.
query
.
RB_Branch_Id
):
-
1
this
.
msg
.
EmpId
=
this
.
$route
.
query
.
EmpId
?
Number
(
this
.
$route
.
query
.
EmpId
):
-
1
}
else
{
this
.
disabled
=
true
;
}
},
methods
:
{
getDepartment
()
{
this
.
apipost
(
'admin_get_DepartmentGetList'
,
this
.
departmentMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
departmentList
=
res
.
data
.
data
;
}
},
err
=>
{})
},
getCompany
(){
this
.
apipost
(
'admin_get_BranchGetList'
,
this
.
getCompanyMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
this
.
companyList
=
res
.
data
.
data
;
}
else
{}
},
err
=>
{})
},
getEmployee
()
{
//所有人员下拉
let
employeeMsg
=
{
RB_Group_id
:
"0"
,
RB_Branch_id
:
"-1"
,
departmentId
:
"0"
,
IsLeave
:
"-1"
}
this
.
apipost
(
"app_get_company_employee"
,
employeeMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
searchList
=
res
.
data
.
data
;
}
},
err
=>
{}
);
},
handleCurrentChange
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
},
goUrl
(
path
,
id
)
{
this
.
$router
.
push
({
path
:
path
,
query
:
{
PeriodId
:
id
,
blank
:
'y'
,
tab
:
'期数详情'
}
});
},
//获取数据
getList
()
{
let
msg
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
msg
))
this
.
loading
=
true
;
this
.
apipost
(
"sellcommission_GetTYYearBonusDetailPageList"
,
msg
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
dataObj
=
res
.
data
.
data
this
.
dataList
=
res
.
data
.
data
.
pmodel
.
pageData
;
this
.
total
=
res
.
data
.
data
.
pmodel
.
count
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
}
);
},
exportExcel
()
{
//导出
let
msg
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
msg
))
let
userInfo
=
this
.
getLocalStorage
();
msg
.
EmployeeIdUser
=
userInfo
.
EmployeeId
msg
.
IsShowDetail
=
this
.
IsShowDetail
?
1
:
0
;
var
fileName
=
"年终奖励明细.xls"
;
this
.
GetLocalFile
(
"sellcommission_GetTYYearBonusDetailListToExcel"
,
msg
,
fileName
);
}
}
}
</
script
>
src/components/TravelContractView.vue
View file @
ab3a3ea6
...
@@ -1635,8 +1635,7 @@
...
@@ -1635,8 +1635,7 @@
<
/template
>
<
/template
>
<
/div
>
<
/div
>
<
br
/>
<
br
/>
<
div
style
=
"color:red;"
v
-
if
=
"CtObj.CType!=3"
>
注:用房
<
div
style
=
"color:red;"
v
-
if
=
"CtObj.CType!=3"
>
注:用房全程酒店均为二人一间,如您的订单产生单房,在未补单房差的情况下,我社将尽量安排您与其它客人拼房或是与同行者入住三人房,不可选择房型。敬请配合,服从调配。
<
/div
>
:全程酒店均为二人一间,如您的订单产生单房,在未补单房差的情况下,我社将尽量安排您与其它客人拼房或是与同行者入住三人房,不可选择房型。敬请配合,服从调配。
<
/div
>
<
/div
>
<
/div
>
<!--
自愿购物
-->
<!--
自愿购物
-->
<
div
class
=
"shoppings"
:
class
=
"{'checkedNav':ActiveTab==6
}
"
>
<
div
class
=
"shoppings"
:
class
=
"{'checkedNav':ActiveTab==6
}
"
>
...
@@ -2146,9 +2145,7 @@
...
@@ -2146,9 +2145,7 @@
<
/template
>
<
/template
>
<
/div
>
<
/div
>
<
br
>
<
br
>
<
div
style
=
"color:red;"
v
-
if
=
"CtObj.CType!=3"
>
注:用房
<
div
style
=
"color:red;"
v
-
if
=
"CtObj.CType!=3"
>
注:用房全程酒店均为二人一间,如您的订单产生单房,在未补单房差的情况下,我社将尽量安排您与其它客人拼房或是与同行者入住三人房,不可选择房型。敬请配合,服从调配。
<
/div
>
:全程酒店均为二人一间,如您的订单产生单房,在未补单房差的情况下,我社将尽量安排您与其它客人拼房或是与同行者入住三人房,不可选择房型。敬请配合,服从调配。
<
/div
>
<
/div
>
<
/div
>
<!--
自愿补充协议
-->
<!--
自愿补充协议
-->
<
div
class
=
"activitys"
:
class
=
"{'checkedNav':ActiveTab==7
}
"
>
<
div
class
=
"activitys"
:
class
=
"{'checkedNav':ActiveTab==7
}
"
>
...
...
src/components/onedayTripContract.vue
View file @
ab3a3ea6
...
@@ -1033,8 +1033,7 @@
...
@@ -1033,8 +1033,7 @@
火车:普通车/空调车/动车组(其中:软卧/硬卧/软座/硬座);
火车:普通车/空调车/动车组(其中:软卧/硬卧/软座/硬座);
</div>
</div>
<div
style=
"color: red"
v-if=
"CtObj.CType!=3"
>
<div
style=
"color: red"
v-if=
"CtObj.CType!=3"
>
注:用房
注:用房全程酒店均为二人一间,如您的订单产生单房,在未补单房差的情况下,我社将尽量安排您与其它客人拼房或是与同行者入住三人房,不可选择房型。敬请配合,服从调配。
:全程酒店均为二人一间,如您的订单产生单房,在未补单房差的情况下,我社将尽量安排您与其它客人拼房或是与同行者入住三人房,不可选择房型。敬请配合,服从调配。
</div>
</div>
<
template
v-if=
"CtObj.TeamType == 2"
>
<
template
v-if=
"CtObj.TeamType == 2"
>
<div>
<div>
...
...
src/components/sale/ExpectedCommission.vue
View file @
ab3a3ea6
...
@@ -337,7 +337,7 @@
...
@@ -337,7 +337,7 @@
<p
style=
"padding: 0 0 10px 0;text-align: left;"
><span
style=
"font-size: 13px;color: red;"
>
注:年终奖励从每年11月起始
</span></p>
<p
style=
"padding: 0 0 10px 0;text-align: left;"
><span
style=
"font-size: 13px;color: red;"
>
注:年终奖励从每年11月起始
</span></p>
<div
class=
"CommissionInfor"
>
<div
class=
"CommissionInfor"
>
<span
@
click=
"IsYearBonus=true"
style=
"cursor: pointer;"
>
达标
<span
style=
"margin-left: 5px;margin-right: 5px;"
>
{{CommissionInfor.BonusNum}}
</span>
个月(点击查看)
</span>
<span
@
click=
"IsYearBonus=true"
style=
"cursor: pointer;"
>
达标
<span
style=
"margin-left: 5px;margin-right: 5px;"
>
{{CommissionInfor.BonusNum}}
</span>
个月(点击查看)
</span>
<span><span>
每月人数{{CommissionInfor.BonusMinPNum}}人以上
</span><span
v-if=
"CommissionInfor.TaskNum>0"
>
,
{{CommissionInfor.EnableDate}}起欧洲产品收客需达到 {{CommissionInfor.TaskNum}}人*New
</span></span>
<span><span>
每月人数{{CommissionInfor.BonusMinPNum}}人以上
</span><span
v-if=
"CommissionInfor.TaskNum>0"
>
,并且
{{CommissionInfor.EnableDate}}起欧洲产品收客需达到 {{CommissionInfor.TaskNum}}人*New
</span></span>
</div>
</div>
<div>
<div>
<progressComm
:commissionratioList=
"AnnualBonus"
></progressComm>
<progressComm
:commissionratioList=
"AnnualBonus"
></progressComm>
...
...
src/components/sale/sale.vue
View file @
ab3a3ea6
...
@@ -115,7 +115,7 @@
...
@@ -115,7 +115,7 @@
</div>
</div>
</div>
</div>
<div
style=
"border-left: 1px solid #eeeeee;width: 1px;"
>
</div>
<div
style=
"border-left: 1px solid #eeeeee;width: 1px;"
>
</div>
<div
style=
"cursor: pointer;margin-left: 0;"
class=
"royalty"
@
click=
"goAnticipate(3)"
>
<div
v-if=
"!(CurrentUserInfo.RB_Group_id==2&&CurrentUserInfo.RB_Branch_id==1245)"
style=
"cursor: pointer;margin-left: 0;"
class=
"royalty"
@
click=
"goAnticipate(3)"
>
<div
class=
"tc"
>
<div
class=
"tc"
>
<p>
<p>
<span>
¥
</span>
<span>
¥
</span>
...
@@ -124,10 +124,10 @@
...
@@ -124,10 +124,10 @@
<p
style=
"color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;"
>
{{data.dxPeriodsName}}期
</p>
<p
style=
"color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;"
>
{{data.dxPeriodsName}}期
</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;"
>
<span>
历史单项提成
</span>
<span>
年终奖励
</span>
</div>
</div>
</div>
</div>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"预期提成"
placement=
"top"
>
<el-tooltip
v-if=
"!(CurrentUserInfo.RB_Group_id==2&&CurrentUserInfo.RB_Branch_id==1245)"
class=
"item"
effect=
"dark"
content=
"预期提成"
placement=
"top"
>
<img
src=
"../../assets/img/xiaosouYQ.png"
@
click=
"goAnticipate(4)"
<img
src=
"../../assets/img/xiaosouYQ.png"
@
click=
"goAnticipate(4)"
style=
"width: 20px;height: auto; position: absolute;right: -0;top: -13px;cursor: pointer;color: #33B3FF;"
></img>
style=
"width: 20px;height: auto; position: absolute;right: -0;top: -13px;cursor: pointer;color: #33B3FF;"
></img>
</el-tooltip>
</el-tooltip>
...
@@ -672,7 +672,16 @@
...
@@ -672,7 +672,16 @@
}
else
if
(
type
==
2
)
{
//国内
}
else
if
(
type
==
2
)
{
//国内
name
=
'domesticCommissionUser'
name
=
'domesticCommissionUser'
}
else
if
(
type
==
3
)
{
//历史单项
}
else
if
(
type
==
3
)
{
//历史单项
name
=
'ServiceCommissionUser'
if
(
this
.
data
.
dxPeriodsName
==
'-'
){
return
;}
name
=
'YearBonusDetails'
this
.
$router
.
push
({
name
:
name
,
query
:
{
Year
:
this
.
data
.
dxPeriodsName
,
EmployeeId
:
Number
(
userInfo
.
EmployeeId
),
blank
:
'y'
}
});
}
else
if
(
type
==
4
)
{
//预期提成
}
else
if
(
type
==
4
)
{
//预期提成
name
=
'saleExpectedCommission'
name
=
'saleExpectedCommission'
}
else
if
(
type
==
5
)
{
//排名
}
else
if
(
type
==
5
)
{
//排名
...
@@ -685,7 +694,7 @@
...
@@ -685,7 +694,7 @@
}
}
});
});
}
}
if
(
type
!=
5
&&
name
)
{
if
(
type
!=
5
&&
type
!=
3
&&
name
)
{
this
.
$router
.
push
({
this
.
$router
.
push
({
name
:
name
,
name
:
name
,
query
:
{
query
:
{
...
...
src/router/config.js
View file @
ab3a3ea6
...
@@ -5380,6 +5380,22 @@ export default {
...
@@ -5380,6 +5380,22 @@ export default {
title
:
'同业提成'
title
:
'同业提成'
}
}
},
},
{
path
:
'/YearBonusCommission'
,
name
:
'YearBonusCommission'
,
component
:
resolve
=>
require
([
'@/components/FinancialModule/TradeCommission/YearBonusCommission'
],
resolve
),
meta
:
{
title
:
'年终奖励'
}
},
{
path
:
'/YearBonusDetails'
,
name
:
'YearBonusDetails'
,
component
:
resolve
=>
require
([
'@/components/FinancialModule/TradeCommission/YearBonusDetails'
],
resolve
),
meta
:
{
title
:
'年终奖励明细'
}
},
{
{
path
:
'/TradeTicketUserDetails'
,
path
:
'/TradeTicketUserDetails'
,
name
:
'TradeTicketUserDetails'
,
name
:
'TradeTicketUserDetails'
,
...
...
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