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
2f307dee
Commit
2f307dee
authored
Jun 20, 2023
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
25420239
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
4310 additions
and
3748 deletions
+4310
-3748
BasicDocuments.vue
src/components/FinancialModule/BasicDocuments.vue
+3507
-2966
EasyReport.vue
src/components/FinancialModule/ReportForm/EasyReport.vue
+0
-1
addReceivablesDocuments.vue
src/components/FinancialModule/addReceivablesDocuments.vue
+0
-7
UserCredit.vue
src/components/FinancialModule/components/UserCredit.vue
+113
-102
OPsalesCommissionUser.vue
...onents/FinancialModule/domestic/OPsalesCommissionUser.vue
+246
-244
enrollTotal.vue
src/components/SalesModule/enrollTotal.vue
+1
-2
TicketTransport.vue
src/components/Ticketing/TicketTransport.vue
+14
-4
TravelControlList.vue
...components/TravelManager/TravelList/TravelControlList.vue
+12
-4
CommissionDetail.vue
src/components/administrative/CommissionDetail.vue
+407
-413
dmcTotalTable.vue
src/components/dmc/manager/dmcTotalTable.vue
+10
-5
No files found.
src/components/FinancialModule/BasicDocuments.vue
View file @
2f307dee
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @
2f307dee
...
...
@@ -911,7 +911,6 @@ export default {
}
if
(
rowIndex
<
15
){
console
.
log
(
rowData
.
ZhaiYao
,
'----11111111111'
)
if
(
BranchId
==
1245
){
that
.
$router
.
push
({
name
:
"TeamRevenueReport"
,
query
:{
"StartTime"
:
startDate
,
"EndTime"
:
endDate
,
BranchId
:
BranchId
,
OutBranchId
:
BranchId
,
StandardCurrencyId
,
blank
:
'y'
,
tab
:
"营收报表"
}
})
}
else
if
(
rowData
.
ZhaiYao
==
"联运收入"
){
...
...
src/components/FinancialModule/addReceivablesDocuments.vue
View file @
2f307dee
...
...
@@ -1743,13 +1743,6 @@
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
GetCostTypeList
=
res
.
data
.
data
;
// let ids = res.data.data.forEach(x=> {
// if(x.ID==1546){
// console.log(x,'==========')
// return x.ID
// }
// })
if
(
type
)
{
this
.
msg
.
detailList
.
forEach
(
x
=>
{
this
.
GetCostTypeList
.
forEach
(
y
=>
{
...
...
src/components/FinancialModule/components/UserCredit.vue
View file @
2f307dee
<
style
>
@import
url('../../../assets/css/domestic/TicketingModule.css')
;
.sanjiao-box
{
position
:
relative
;
.sanjiao-box
{
position
:
relative
;
}
.sanjiao-box
.Receipt_table
td
{
padding
:
0
10px
;
}
.hover_text
span
{
cursor
:
pointer
;
text-decoration
:
underline
;
}
.sanjiao-box
.Receipt_table
td
{
padding
:
0
10px
;
}
.hover_text
span
{
cursor
:
pointer
;
text-decoration
:
underline
;
}
.czBillModule
td
{
text-align
:
center
!important
;
padding
:
6px
0
!important
;
}
._tit2
{
.czBillModule
td
{
text-align
:
center
!important
;
padding
:
6px
0
!important
;
}
._tit2
{
border
:
none
!important
;
}
</
style
>
<
template
>
<div
class=
"m_TicketingModule"
v-if=
"DataList&&DataList.length>0"
>
<div>
<div
class=
"_tit"
>
<span
class=
"_text"
>
预存客户
</span>
<!--
<div>
}
</
style
>
<
template
>
<div
class=
"m_TicketingModule"
v-if=
"DataList&&DataList.length>0"
>
<div>
<div
class=
"_tit"
>
<span
class=
"_text"
>
预存客户
</span>
<!--
<div>
<span
class=
"_btn"
v-if=
"tableShow"
@
click=
"tableShow=false"
>
收起
<i
class=
"iconfont icon-gengduo _rotate"
></i>
</span>
<span
class=
"_btn"
v-else
@
click=
"tableShow=true"
>
展开
<i
class=
"iconfont icon-gengduo"
></i>
</span>
</div>
-->
<div>
<span
class=
"_btn"
@
click=
"goPrestorageManagement"
>
查看更多
</span>
</div>
</div>
<div
v-show=
"tableShow"
class=
"sanjiao-box _padding_20_15"
>
<div>
<span
class=
"_btn"
@
click=
"goPrestorageManagement"
>
查看更多
</span>
</div>
</div>
<div
v-show=
"tableShow"
class=
"sanjiao-box _padding_20_15"
>
<table
class=
"singeRowTable"
style=
"border:1px solid #E6E6E6;"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
<th>
客户
</th>
<th>
联系人/电话
</th>
<th>
已存入
</th>
<th>
待存入
</th>
<th>
退款
</th>
<th>
已使用
</th>
<th>
期末余额
</th>
</tr>
<tr
class=
"_color_b"
v-for=
"(item,index) in DataList"
:key=
"index"
>
<td>
{{
item
.
CustomerName
}}
</td>
<td>
{{
item
.
Contact
+
'/'
+
item
.
ContactNumber
}}
</td>
<td>
{{
item
.
Income
}}
</td>
<td>
{{
item
.
WaitIncome
}}
</td>
<td>
{{
item
.
Refund
}}
</td>
<td>
{{
item
.
UseMoney
}}
</td>
<td>
{{
item
.
DepositMoney
}}
(
{{
item
.
DepositCurrencyName
}}
)
</td>
</tr>
</table>
</div>
</div>
</div>
</
template
>
<table
class=
"singeRowTable"
style=
"border:1px solid #E6E6E6;"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
<th>
客户
</th>
<th>
联系人/电话
</th>
<th>
已存入
</th>
<th>
待存入
</th>
<th>
退款
</th>
<th>
已使用
</th>
<th>
期末余额
</th>
</tr>
<tr
class=
"_color_b"
v-for=
"(item,index) in DataList"
:key=
"index"
>
<td>
{{
item
.
CustomerName
}}
</td>
<td>
{{
item
.
Contact
+
'/'
+
item
.
ContactNumber
}}
</td>
<td>
{{
item
.
Income
}}
</td>
<td>
{{
item
.
WaitIncome
}}
</td>
<td>
{{
item
.
Refund
}}
</td>
<td>
{{
item
.
UseMoney
}}
</td>
<td>
{{
item
.
DepositMoney
}}
(
{{
item
.
DepositCurrencyName
}}
)
</td>
</tr>
</table>
</div>
</div>
</div>
</
template
>
<
script
>
export
default
{
props
:
[
"GetDetail"
],
data
()
{
return
{
loading
:
true
,
cdtotal
:
0
,
ybtotal
:
0
,
tableShow
:
true
,
DataList
:
[],
msg
:
{
pageIndex
:
1
,
pageSize
:
10
,
RemitterName
:
''
,
ClientIdStr
:
''
,
QStartDate
:
''
,
QEndDate
:
''
,
}
}
},
watch
:
{
GetDetail
:{
<
script
>
export
default
{
props
:
[
"GetDetail"
],
data
()
{
return
{
loading
:
true
,
cdtotal
:
0
,
ybtotal
:
0
,
tableShow
:
true
,
DataList
:
[],
msg
:
{
pageIndex
:
1
,
pageSize
:
10
,
RemitterName
:
''
,
ClientIdStr
:
''
,
QStartDate
:
''
,
QEndDate
:
''
,
}
}
},
watch
:
{
GetDetail
:
{
handler
(
val
,
oldVal
)
{
if
(
this
.
GetDetail
&&
this
.
GetDetail
.
OtherType
==
74
&&
this
.
GetDetail
.
ReFinanceId
)
{
if
(
this
.
GetDetail
&&
this
.
GetDetail
.
OtherType
==
74
&&
this
.
GetDetail
.
ReFinanceId
)
{
this
.
msg
.
ClientIdStr
=
this
.
GetDetail
.
ReFinanceId
}
else
if
(
this
.
GetDetail
&&
this
.
GetDetail
.
DepositCustomerId
)
{
}
else
if
(
this
.
GetDetail
&&
this
.
GetDetail
.
DepositCustomerId
)
{
this
.
msg
.
ClientIdStr
=
this
.
GetDetail
.
DepositCustomerId
}
this
.
GetFinanceDepositPageList
();
...
...
@@ -91,41 +97,46 @@
deep
:
true
,
immediate
:
true
,
}
},
created
(){
},
created
()
{
},
mounted
(){
},
mounted
()
{
},
methods
:
{
goPrestorageManagement
(){
this
.
$router
.
push
(
{
name
:
'prestoreList'
,
query
:
{
// ClientIdStr:this.msg.ClientIdStr,
blank
:
'y'
,
tab
:
'客户预存管理'
}
},
methods
:
{
goPrestorageManagement
()
{
this
.
$router
.
push
(
{
name
:
'prestoreList'
,
query
:
{
// ClientIdStr:this.msg.ClientIdStr,
blank
:
'y'
,
tab
:
'客户预存管理'
}
)
}
)
},
goDetail
(
id
){
this
.
$router
.
push
(
{
name
:
'FinancialDocumentsDetail'
,
query
:{
"id"
:
id
,
blank
:
'y'
,
tab
:
'单据详情'
}
goDetail
(
id
)
{
this
.
$router
.
push
({
name
:
'FinancialDocumentsDetail'
,
query
:
{
"id"
:
id
,
blank
:
'y'
,
tab
:
'单据详情'
}
)
}
)
},
// 客户存储余额列表
GetFinanceDepositPageList
(){
GetFinanceDepositPageList
()
{
this
.
apipost
(
'Financial_post_GetFinanceDepositPageList'
,
this
.
msg
,
res
=>
{
this
.
loading
=
false
if
(
res
.
data
.
resultCode
==
1
)
{
console
.
log
(
res
.
data
.
data
.
pageData
)
this
.
DataList
=
res
.
data
.
data
.
pageData
;
}
})
this
.
msg
,
res
=>
{
this
.
loading
=
false
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
DataList
=
res
.
data
.
data
.
pageData
;
}
})
},
}
}
</
script
>
}
</
script
>
src/components/FinancialModule/domestic/OPsalesCommissionUser.vue
View file @
2f307dee
<
style
>
.CM_look
{
padding
:
4px
!important
;
position
:
relative
;
top
:
1px
;
}
.CM_look
{
padding
:
4px
!important
;
position
:
relative
;
top
:
1px
;
}
.opUl
li
{
display
:
inline-block
;
margin
:
10px
15px
10px
0
;
}
.domesticCommissionUser
.opUl
li
input
{
height
:
34px
!important
;
}
.domesticCommissionUser
.singeRowTable
tr
td
{
padding
:
8px
5px
;
}
.opUl
li
{
display
:
inline-block
;
margin
:
10px
15px
10px
0
;
}
.domesticCommissionUser
.opUl
li
input
{
height
:
34px
!important
;
}
.domesticCommissionUser
.singeRowTable
tr
td
{
padding
:
8px
5px
;
}
.domesticCommissionUser
.hoverSpan
span
:hover
{
cursor
:
pointer
;
text-decoration
:
underline
;
color
:
red
;
}
.domesticCommissionUser
.hoverSpan
span
:hover
{
cursor
:
pointer
;
text-decoration
:
underline
;
color
:
red
;
}
</
style
>
<
template
>
<div
class=
"flexOne domesticCommissionUser"
>
<div>
<ul
class=
"opUl"
>
<li>
<em>
期数
</em>
<el-select
v-model=
"msg.PeriodId"
size=
"mini"
@
change=
"handleCurrentChange(1)"
>
<el-option
label=
"不限"
:value=
"0"
></el-option>
<el-option
v-for=
"(item,index) in PeriodsList"
:key=
"item.index"
:label=
"item.Name"
:value=
"item.Id"
>
</el-option>
</el-select>
</li>
<li>
<em>
人员
</em>
<el-select
v-model=
"msg.UserId"
size=
"mini"
@
change=
"handleCurrentChange(1)"
filterable
:disabled=
'disabled'
>
<el-option
label=
"不限"
:value=
"-1"
></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>
<em>
出团公司
</em>
<el-select
v-model=
"msg.OutBranchId"
size=
"mini"
@
change=
"handleCurrentChange(1)"
:disabled=
'disabled'
>
<el-option
label=
"不限"
:value=
"-1"
></el-option>
<el-option
v-for=
"(item,index) in BranchList"
:key=
"item.index"
:label=
"item.BName"
:value=
"item.Id"
>
</el-option>
</el-select>
</li>
<li>
<em>
公司
</em>
<el-select
v-model=
"msg.RB_Branch_Id"
size=
"mini"
@
change=
"handleCurrentChange(1)"
:disabled=
'disabled'
>
<el-option
label=
"不限"
:value=
"-1"
></el-option>
<el-option
v-for=
"(item,index) in BranchList"
:key=
"item.index"
:label=
"item.BName"
:value=
"item.Id"
>
</el-option>
</el-select>
</li>
<li>
<em>
部门
</em>
<el-select
v-model=
"msg.RB_Department_Id"
size=
"mini"
@
change=
"handleCurrentChange(1)"
:disabled=
'disabled'
>
<el-option
label=
"不限"
:value=
"-1"
></el-option>
<el-option
v-for=
"(item,index) in departMentList"
:key=
"item.index"
:label=
"item.DepartmentName"
:value=
"item.DepartmentID"
></el-option>
</el-select>
</li>
<div
class=
"flexOne domesticCommissionUser"
>
<div>
<ul
class=
"opUl"
>
<li>
<em>
期数
</em>
<el-select
v-model=
"msg.PeriodId"
size=
"mini"
@
change=
"handleCurrentChange(1)"
>
<el-option
label=
"不限"
:value=
"0"
></el-option>
<el-option
v-for=
"(item,index) in PeriodsList"
:key=
"item.index"
:label=
"item.Name"
:value=
"item.Id"
>
</el-option>
</el-select>
</li>
<li>
<em>
人员
</em>
<el-select
v-model=
"msg.UserId"
size=
"mini"
@
change=
"handleCurrentChange(1)"
filterable
:disabled=
'disabled'
>
<el-option
label=
"不限"
:value=
"-1"
></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>
<em>
出团公司
</em>
<el-select
v-model=
"msg.OutBranchId"
size=
"mini"
@
change=
"handleCurrentChange(1)"
:disabled=
'disabled'
>
<el-option
label=
"不限"
:value=
"-1"
></el-option>
<el-option
v-for=
"(item,index) in BranchList"
:key=
"item.index"
:label=
"item.BName"
:value=
"item.Id"
>
</el-option>
</el-select>
</li>
<li>
<em>
公司
</em>
<el-select
v-model=
"msg.RB_Branch_Id"
size=
"mini"
@
change=
"handleCurrentChange(1)"
:disabled=
'disabled'
>
<el-option
label=
"不限"
:value=
"-1"
></el-option>
<el-option
v-for=
"(item,index) in BranchList"
:key=
"item.index"
:label=
"item.BName"
:value=
"item.Id"
>
</el-option>
</el-select>
</li>
<li>
<em>
部门
</em>
<el-select
v-model=
"msg.RB_Department_Id"
size=
"mini"
@
change=
"handleCurrentChange(1)"
:disabled=
'disabled'
>
<el-option
label=
"不限"
:value=
"-1"
></el-option>
<el-option
v-for=
"(item,index) in departMentList"
:key=
"item.index"
:label=
"item.DepartmentName"
:value=
"item.DepartmentID"
></el-option>
</el-select>
</li>
</ul>
</div>
<table
v-loading=
"loading"
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
<th>
公司
</th>
<th>
部门
</th>
<th>
员工名称
</th>
<th>
人数
</th>
<th>
提成
</th>
<th>
期数
</th>
<th>
操作
</th>
</tr>
<tr
v-for=
"item in dataList"
>
<td>
{{
item
.
BranchName
}}
</td>
<td>
{{
item
.
DeptName
}}
</td>
<td>
{{
item
.
UserName
}}
</td>
<td>
{{
item
.
PeopleCount
}}
</td>
</ul>
</div>
<table
v-loading=
"loading"
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
<th>
公司
</th>
<th>
部门
</th>
<th>
员工名称
</th>
<th>
人数
</th>
<th>
提成
</th>
<th>
期数
</th>
<th>
操作
</th>
</tr>
<tr
v-for=
"item in dataList"
>
<td>
{{
item
.
BranchName
}}
</td>
<td>
{{
item
.
DeptName
}}
</td>
<td>
{{
item
.
UserName
}}
</td>
<td>
{{
item
.
PeopleCount
}}
</td>
<td>
{{
item
.
CommissionMoney
}}
</td>
<td>
{{
item
.
CommissionMoney
}}
</td>
<td>
{{
item
.
Periods
}}
</td>
<td>
{{
item
.
Periods
}}
</td>
<td>
<td>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"查看"
placement=
"top"
>
<el-button
type=
"primary"
class=
"CM_look"
@
click=
"goUrl('OPsalesCommissiondetails',item)"
icon=
"iconfont icon-chakan"
circle
></el-button>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"查看"
placement=
"top"
>
<el-button
type=
"primary"
class=
"CM_look"
@
click=
"goUrl('OPsalesCommissiondetails',item)"
icon=
"iconfont icon-chakan"
circle
></el-button>
</el-tooltip>
</td>
</tr>
<tr
v-if=
"dataList.length==0"
>
<td
style=
"text-align:center"
colspan=
"10"
>
暂无数据
</td>
</tr>
</table>
<!-- 分页 -->
<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>
</td>
</tr>
<tr
v-if=
"dataList.length==0"
>
<td
style=
"text-align:center"
colspan=
"10"
>
暂无数据
</td>
</tr>
</table>
<!-- 分页 -->
<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>
</div>
</
template
>
<
script
>
import
moment
from
"moment"
export
default
{
data
()
{
return
{
Month
:
moment
().
format
(
"YYYY-MM"
),
msg
:
{
pageIndex
:
1
,
pageSize
:
20
,
PeriodId
:
0
,
UserId
:
-
1
,
RB_Branch_Id
:
-
1
,
RB_Department_Id
:
-
1
,
OutBranchId
:
-
1
,
},
loading
:
false
,
//数据源
dataList
:
[],
total
:
0
,
disabled
:
true
,
PeriodsList
:
[],
BranchList
:
[],
searchList
:
[],
departMentList
:[],
}
import
moment
from
"moment"
export
default
{
data
()
{
return
{
Month
:
moment
().
format
(
"YYYY-MM"
),
msg
:
{
pageIndex
:
1
,
pageSize
:
20
,
PeriodId
:
0
,
UserId
:
-
1
,
RB_Branch_Id
:
-
1
,
RB_Department_Id
:
-
1
,
OutBranchId
:
-
1
,
},
mounted
()
{
let
userInfo
=
this
.
getLocalStorage
();
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
=
this
.
$route
.
query
.
UserId
?
Number
(
this
.
$route
.
query
.
UserId
):
Number
(
userInfo
.
EmployeeId
)
loading
:
false
,
//数据源
dataList
:
[],
total
:
0
,
disabled
:
true
,
PeriodsList
:
[],
BranchList
:
[],
searchList
:
[],
departMentList
:
[],
}
},
mounted
()
{
let
userInfo
=
this
.
getLocalStorage
();
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
=
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
();
this
.
getqishilist
()
this
.
getCompanyList
()
//获取公司
this
.
getEmployee
()
//人员
this
.
getDerpartMent
()
//部门
},
methods
:
{
getDerpartMent
()
{
//获取部门
this
.
apipost
(
"admin_get_DepartmentGetList"
,
this
.
getDepartmentMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
departMentList
=
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
;
}
this
.
msg
.
PeriodId
=
this
.
$route
.
query
.
PeriodId
?
Number
(
this
.
$route
.
query
.
PeriodId
):
0
console
.
log
(
this
.
msg
.
PeriodId
,
'===='
)
this
.
getList
();
this
.
getqishilist
()
this
.
getCompanyList
()
//获取公司
this
.
getEmployee
()
//人员
this
.
getDerpartMent
()
//部门
},
methods
:
{
getDerpartMent
()
{
//获取部门
this
.
apipost
(
"admin_get_DepartmentGetList"
,
this
.
getDepartmentMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
departMentList
=
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
=>
{
}
);
},
//初始化公司
getCompanyList
()
{
let
userInfo
=
this
.
getLocalStorage
();
var
RB_Group_id
=
userInfo
.
RB_Group_id
;
let
msg
=
{
Status
:
0
,
is_show
:
0
,
RB_Group_Id
:
RB_Group_id
};
this
.
apipost
(
"admin_get_BranchGetList"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
BranchList
=
res
.
data
.
data
;
},
err
=>
{}
);
},
//初始化公司
getCompanyList
()
{
let
userInfo
=
this
.
getLocalStorage
();
var
RB_Group_id
=
userInfo
.
RB_Group_id
;
let
msg
=
{
Status
:
0
,
is_show
:
0
,
RB_Group_Id
:
RB_Group_id
};
this
.
apipost
(
"admin_get_BranchGetList"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
BranchList
=
res
.
data
.
data
;
}
},
err
=>
{
}
);
},
getqishilist
()
{
this
.
apipost
(
"opcommission_GetGNOPCommissionPeriodsList"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
PeriodsList
=
res
.
data
.
data
;
if
(
!
this
.
$route
.
query
.
PeriodId
&&
this
.
PeriodsList
&&
this
.
PeriodsList
.
length
>
0
)
{
this
.
msg
.
PeriodId
=
Number
(
this
.
PeriodsList
[
0
].
Id
)
}
}
},
err
=>
{}
);
},
getqishilist
()
{
this
.
apipost
(
"opcommission_GetGNOPCommissionPeriodsList"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
PeriodsList
=
res
.
data
.
data
;
if
(
!
this
.
$route
.
query
.
PeriodId
&&
this
.
PeriodsList
&&
this
.
PeriodsList
.
length
>
0
)
{
this
.
msg
.
PeriodId
=
Number
(
this
.
PeriodsList
[
0
].
Id
)
}
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
},
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
},
handleCurrentChange
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
},
goUrl
(
path
,
item
)
{
this
.
$router
.
push
({
path
:
path
,
query
:
{
PeriodId
:
this
.
msg
.
PeriodId
,
UserId
:
item
.
UserId
,
RB_Branch_Id
:
item
.
RB_Branch_Id
,
RB_Department_Id
:
item
.
RB_Department_Id
,
blank
:
'y'
,
tab
:
'国内提现详情'
}
});
},
//获取数据
getList
()
{
this
.
loading
=
true
;
this
.
apipost
(
"opcommission_GetGNOPCommissionDetailsListForUser"
,
this
.
msg
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
total
=
res
.
data
.
data
.
count
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
},
handleCurrentChange
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
},
goUrl
(
path
,
item
)
{
this
.
$router
.
push
({
path
:
path
,
query
:
{
PeriodId
:
this
.
msg
.
PeriodId
,
UserId
:
item
.
UserId
,
RB_Branch_Id
:
item
.
RB_Branch_Id
,
RB_Department_Id
:
item
.
RB_Department_Id
,
blank
:
'y'
,
tab
:
'国内提现详情'
}
});
},
//获取数据
getList
()
{
this
.
loading
=
true
;
this
.
apipost
(
"opcommission_GetGNOPCommissionDetailsListForUser"
,
this
.
msg
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
total
=
res
.
data
.
data
.
count
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
},
}
}
}
</
script
>
src/components/SalesModule/enrollTotal.vue
View file @
2f307dee
...
...
@@ -617,8 +617,7 @@
<span
style=
"color: red;"
>
{{ item.unionRemark }}
</span>
</div>
<div
v-if=
"item.flightName||item.backFlightName"
>
联运信息:
<span
style=
"color: red"
>
已配联运{{item.configNum}}人,{{item.airticketUnionNotes}}2
联运信息:
<span
style=
"color: red"
>
已配联运{{item.configNum}}人,{{item.airticketUnionNotes}}
<span
v-if=
"item.isSure==1"
style=
"color:rgb(71, 191, 140)"
>
【OK】
</span>
<span
v-else
>
【暂定】
</span>
</span>
<
template
v-if=
"item.flightName"
>
...
...
src/components/Ticketing/TicketTransport.vue
View file @
2f307dee
...
...
@@ -28,7 +28,7 @@
}
.DT_rightList
.DT_Table
{
width
:
1
6
00px
;
width
:
1
7
00px
;
border-collapse
:
collapse
;
}
...
...
@@ -119,6 +119,9 @@
<th
width=
"120"
>
确认状态
</th>
<th
width=
"120"
>
适用旅客
</th>
</tr>
</thead>
<template
v-if=
"UnionList&&UnionList.length>0"
>
...
...
@@ -198,6 +201,9 @@
<el-option
:key=
"1"
:value=
"1"
label=
"确认"
></el-option>
</el-select>
</td>
<td
rowspan=
"2"
>
{{
item
.
GuestNameInfo
}}
</td>
</tr>
<tr>
<td>
返程
</td>
...
...
@@ -231,7 +237,7 @@
</td>
</tr>
<tr>
<td
colspan=
"1
4
"
style=
"text-align:left;font-weight:bold;color:red;"
>
<td
colspan=
"1
5
"
style=
"text-align:left;font-weight:bold;color:red;"
>
订单备注:
{{
item
.
Remarks
}}
<br
/>
联运备注:
{{
item
.
UnionRemark
}}
</td>
...
...
@@ -240,7 +246,7 @@
</
template
>
<tbody
v-else
>
<tr>
<td
colspan=
"1
4
"
>
<td
colspan=
"1
5
"
>
暂无配置联运信息
</td>
</tr>
...
...
@@ -321,7 +327,6 @@
},
res
=>
{
this
.
loading
=
false
;
console
.
log
(
"res"
,
res
.
data
);
if
(
res
.
data
.
resultCode
==
1
)
{
var
array
=
res
.
data
.
data
;
if
(
array
!=
null
&&
array
.
length
>
0
)
{
...
...
@@ -404,6 +409,11 @@
item
.
FlightList
=
[];
item
.
BackFlightList
=
[];
});
if
(
this
.
UnionList
&&
this
.
UnionList
.
length
>
0
)
{
this
.
UnionList
.
forEach
(
item
=>
{
item
.
GuestIds
=
""
;
});
}
let
msg
=
{
SaveData
:
this
.
UnionList
,
TCID
:
this
.
TCID
...
...
src/components/TravelManager/TravelList/TravelControlList.vue
View file @
2f307dee
...
...
@@ -1011,7 +1011,6 @@
<el-dropdown-item
v-else
@
click
.
native=
"goToOpenTravel('TravelManager6',item.ID,0)"
>
{{$t('Operation.Op_xilieModyfi')}}
</el-dropdown-item>
<el-dropdown-item
v-if=
"item.TeamType!=3"
@
click
.
native=
"goTonowTeam('TravelManager2',item.ID,item.TCID,item.TCNUM)"
>
{{$t('Operation.Op_dangtuanModify')}}
...
...
@@ -1027,9 +1026,17 @@
style=
"background:#67c23a; border-color:#67c23a"
>
{{$t('Operation.Op_advertising')}}
{{item.AdvertCount}}
</el-button>
<el-button
v-if=
"item.LineID==14||item.LineID==118"
@
click
.
native=
'PushMessage(item)'
type=
"primary"
style=
"background:#00C6FF; border-color:#00C6FF;"
>
推送消息
</el-button>
<
template
v-if=
"item.LineID==14||item.LineID==118"
>
<el-button
v-if=
"item.IsPush==0"
@
click
.
native=
'PushMessage(item)'
type=
"primary"
style=
"background:#00C6FF; border-color:#00C6FF;"
>
推送消息
</el-button>
<el-button
v-else
@
click
.
native=
'PushMessage(item)'
type=
"primary"
style=
"background:red !important; "
>
已推送
</el-button>
</
template
>
<el-button
@
click=
"ckOPremark(item)"
type=
"primary"
style=
"background:#F16C3C; border-color:#F16C3C"
>
{{$t('Operation.Op_remark')}}
</el-button>
...
...
@@ -1534,6 +1541,7 @@
this
.
apipost
(
"travel_post_PushTravelPriceToQYWork"
,
pMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
Success
(
res
.
data
.
message
);
this
.
getControlList
();
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
...
...
src/components/administrative/CommissionDetail.vue
View file @
2f307dee
<
template
>
<div
class=
"commissionDetails commissionDetails-box"
>
<div
class=
"query-box"
>
<ul>
<li>
<input
type=
"button"
class=
"normalBtn"
value=
"导出"
@
click=
"exportExcel"
>
</li>
</ul>
</div>
<div
v-if=
"isReady"
v-loading=
'loading'
>
<el-table
ref=
"multipleTable"
:data=
"dataList"
tooltip-effect=
"dark"
style=
"width: 100%"
>
<el-table-column
prop=
"bName"
label=
"公司"
></el-table-column>
<el-table-column
prop=
"departmentName"
label=
"部门"
></el-table-column>
<el-table-column
label=
"姓名"
>
<template
slot-scope=
"scope"
>
<div
v-if=
"scope.row.leaveStr && scope.row.leaveStr != ''"
>
{{
scope
.
row
.
createByStr
}}
<span
style=
"color:red;display:inline-block"
>
(
{{
scope
.
row
.
leaveStr
}}
)
</span></div>
<div
v-else
>
{{
scope
.
row
.
createByStr
}}
</div>
</
template
>
</el-table-column>
<el-table-column
label=
"提成金额"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
commissionMoney
.
toFixed
(
2
)
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"额外奖励"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
otherMoney
.
toFixed
(
2
)
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"额外扣除"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
backMoney
.
toFixed
(
2
)
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"应发提成"
>
<
template
slot-scope=
"scope"
>
<span
style=
'color:red'
>
{{
(
scope
.
row
.
otherMoney
+
scope
.
row
.
commissionMoney
-
scope
.
row
.
backMoney
).
toFixed
(
2
)
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"收客人数"
>
<
template
slot-scope=
"scope"
>
<span
style=
'color:blue'
>
{{
scope
.
row
.
peopleCount
}}
人
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"单签证人数"
>
<
template
slot-scope=
"scope"
>
<span
style=
'color:orange'
>
{{
scope
.
row
.
visaPeopleCount
}}
人
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"期数"
>
<
template
slot-scope=
"scope"
>
<div
v-if=
"scope.row.periods != stringPerons"
style=
'height:40px;line-height:40px;color:#f1f1f1;background: red;margin: 0 -5px;;padding-left: 10px;'
>
{{
scope
.
row
.
periods
}}
</div>
<template
v-else
>
{{
scope
.
row
.
periods
}}
</
template
>
</template>
</el-table-column>
<el-table-column
label=
"销售留言"
>
<
template
slot-scope=
"scope"
>
<div
v-if=
"scope.row.remark"
class=
"outDiv"
>
<div
class=
"toolDiv"
>
<div
class=
"triangle_border_up"
>
</div>
{{
scope
.
row
.
remark
}}
</div>
{{
scope
.
row
.
remark
}}
</div>
<template
v-else
>
''
</
template
>
</template>
</el-table-column>
<el-table-column
label=
"操作"
>
<
template
slot-scope=
"scope"
>
<el-button
type=
"primary"
size=
'mini'
icon=
"el-icon-view"
circle
@
click=
"getInfo(scope.row)"
></el-button>
</
template
>
</el-table-column>
</el-table>
<!-- <div style="padding-bottom:15px">
<div
class=
"query-box"
>
<ul>
<li>
<input
type=
"button"
class=
"normalBtn"
value=
"导出"
@
click=
"exportExcel"
>
</li>
</ul>
</div>
<div
v-if=
"isReady"
v-loading=
'loading'
>
<el-table
ref=
"multipleTable"
:data=
"dataList"
tooltip-effect=
"dark"
style=
"width: 100%"
>
<el-table-column
prop=
"bName"
label=
"公司"
></el-table-column>
<el-table-column
prop=
"departmentName"
label=
"部门"
></el-table-column>
<el-table-column
label=
"姓名"
>
<template
slot-scope=
"scope"
>
<div
v-if=
"scope.row.leaveStr && scope.row.leaveStr != ''"
>
{{
scope
.
row
.
createByStr
}}
<span
style=
"color:red;display:inline-block"
>
(
{{
scope
.
row
.
leaveStr
}}
)
</span></div>
<div
v-else
>
{{
scope
.
row
.
createByStr
}}
</div>
</
template
>
</el-table-column>
<el-table-column
label=
"提成金额"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
commissionMoney
.
toFixed
(
2
)
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"额外奖励"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
otherMoney
.
toFixed
(
2
)
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"额外扣除"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
backMoney
.
toFixed
(
2
)
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"应发提成"
>
<
template
slot-scope=
"scope"
>
<span
style=
'color:red'
>
{{
(
scope
.
row
.
otherMoney
+
scope
.
row
.
commissionMoney
-
scope
.
row
.
backMoney
).
toFixed
(
2
)
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"收客人数"
>
<
template
slot-scope=
"scope"
>
<span
style=
'color:blue'
>
{{
scope
.
row
.
peopleCount
}}
人
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"单签证人数"
>
<
template
slot-scope=
"scope"
>
<span
style=
'color:orange'
>
{{
scope
.
row
.
visaPeopleCount
}}
人
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"期数"
>
<
template
slot-scope=
"scope"
>
<div
v-if=
"scope.row.periods != stringPerons"
style=
'height:40px;line-height:40px;color:#f1f1f1;background: red;margin: 0 -5px;;padding-left: 10px;'
>
{{
scope
.
row
.
periods
}}
</div>
<template
v-else
>
{{
scope
.
row
.
periods
}}
</
template
>
</template>
</el-table-column>
<el-table-column
label=
"销售留言"
>
<
template
slot-scope=
"scope"
>
<div
v-if=
"scope.row.remark"
class=
"outDiv"
>
<div
class=
"toolDiv"
>
<div
class=
"triangle_border_up"
>
</div>
{{
scope
.
row
.
remark
}}
</div>
{{
scope
.
row
.
remark
}}
</div>
<template
v-else
>
''
</
template
>
</template>
</el-table-column>
<el-table-column
label=
"操作"
>
<
template
slot-scope=
"scope"
>
<el-button
type=
"primary"
size=
'mini'
icon=
"el-icon-view"
circle
@
click=
"getInfo(scope.row)"
></el-button>
</
template
>
</el-table-column>
</el-table>
<!-- <div style="padding-bottom:15px">
<el-pagination background
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'>
</el-pagination>
</div> -->
<!--
<!--
<v-table is-horizontal-resize column-width-drag
style="width:100%" :columns="columns" :table-data="dataList"
:filter-method="filterMethod" :total="total" :pageSize="msg.pageSize"
...
...
@@ -96,374 +87,377 @@
:multiple-sort="multipleSort" :is-loading="loading" sort-always
@sort-change="sortChange" @on-custom-comp="customCompFunc"></v-table>
-->
</div>
<div
style=
"height:20px;"
>
</div>
</div>
<div
style=
"height:20px;"
>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
Vue
from
'vue'
import
XLSX
from
'xlsx'
var
FileSaver
=
require
(
'file-saver'
)
export
default
{
data
()
{
return
{
activeName
:
"first"
,
commonName
:
"姓名"
,
loading
:
false
,
msg
:
{
pageIndex
:
1
,
pageSize
:
20
,
ParentId
:
0
,
OrderStr
:
"RB_Branch_Id asc"
,
BName
:
-
1
,
RB_Branch_Id
:
-
1
,
Periods
:
''
},
total
:
0
,
currentPage
:
1
,
columns
:
[],
remoteLoading
:
false
,
total
:
0
,
dataList
:
[],
isReady
:
false
,
multipleSort
:
false
,
loading
:
true
,
CompanyList
:
[],
dataListTwo
:
[],
stringPerons
:
''
,
userInfo
:
{},
companyID
:
''
,
disabledCPSelect
:
false
};
},
methods
:
{
exportExcel
()
{
const
defaultCellStyle
=
{
'!cols'
:
[{
wpx
:
60
},
{
wpx
:
200
},
{
wpx
:
60
},
{
wpx
:
150
},
{
wpx
:
60
}]
};
const
wopts
=
{
bookType
:
'xlsx'
,
bookSST
:
false
,
type
:
'binary'
,
defaultCellStyle
:
defaultCellStyle
,
showGridLines
:
true
};
const
wb
=
{
SheetNames
:
[
'提成统计'
],
Sheets
:
{},
Props
:
{}
};
let
data
=
[]
this
.
dataList
.
forEach
(
x
=>
{
let
obj
=
{
'公司'
:
x
.
bName
,
'部门'
:
x
.
departmentName
,
'员工'
:
x
.
createByStr
,
'提成金额'
:
x
.
commissionMoney
.
toFixed
(
2
),
'额外奖励'
:
x
.
otherMoney
.
toFixed
(
2
),
'额外扣除'
:
x
.
backMoney
.
toFixed
(
2
),
'应发提成'
:
x
.
sumMoney
.
toFixed
(
2
),
'收客数'
:
x
.
peopleCount
,
'单签证人数'
:
x
.
visaPeopleCount
,
'所属期数'
:
x
.
periods
}
data
.
push
(
obj
)
})
wb
.
Sheets
[
'提成统计'
]
=
XLSX
.
utils
.
json_to_sheet
(
data
)
data
()
{
return
{
activeName
:
"first"
,
commonName
:
"姓名"
,
loading
:
false
,
msg
:
{
pageIndex
:
1
,
pageSize
:
20
,
ParentId
:
0
,
OrderStr
:
"RB_Branch_Id asc"
,
BName
:
-
1
,
RB_Branch_Id
:
-
1
,
Periods
:
''
},
total
:
0
,
currentPage
:
1
,
columns
:
[],
remoteLoading
:
false
,
total
:
0
,
dataList
:
[],
isReady
:
false
,
multipleSort
:
false
,
loading
:
true
,
CompanyList
:
[],
dataListTwo
:
[],
stringPerons
:
''
,
userInfo
:
{},
companyID
:
''
,
disabledCPSelect
:
false
};
},
methods
:
{
exportExcel
()
{
const
defaultCellStyle
=
{
'!cols'
:
[{
wpx
:
60
},
{
wpx
:
200
},
{
wpx
:
60
},
{
wpx
:
150
},
{
wpx
:
60
}]
};
const
wopts
=
{
bookType
:
'xlsx'
,
bookSST
:
false
,
type
:
'binary'
,
defaultCellStyle
:
defaultCellStyle
,
showGridLines
:
true
};
const
wb
=
{
SheetNames
:
[
'提成统计'
],
Sheets
:
{},
Props
:
{}
};
let
data
=
[]
this
.
dataList
.
forEach
(
x
=>
{
let
obj
=
{
'公司'
:
x
.
bName
,
'部门'
:
x
.
departmentName
,
'员工'
:
x
.
createByStr
,
'提成金额'
:
x
.
commissionMoney
.
toFixed
(
2
),
'额外奖励'
:
x
.
otherMoney
.
toFixed
(
2
),
'额外扣除'
:
x
.
backMoney
.
toFixed
(
2
),
'应发提成'
:
x
.
sumMoney
.
toFixed
(
2
),
'收客数'
:
x
.
peopleCount
,
'单签证人数'
:
x
.
visaPeopleCount
,
'所属期数'
:
x
.
periods
}
data
.
push
(
obj
)
})
wb
.
Sheets
[
'提成统计'
]
=
XLSX
.
utils
.
json_to_sheet
(
data
)
//创建二进制对象写入转换好的字节流
let
tmpDown
=
new
Blob
([
this
.
s2ab
(
XLSX
.
write
(
wb
,
wopts
))],
{
type
:
"application/octet-stream"
})
FileSaver
.
saveAs
(
tmpDown
,
"提成统计.xls"
);
},
s2ab
(
s
)
{
if
(
typeof
ArrayBuffer
!==
'undefined'
)
{
var
buf
=
new
ArrayBuffer
(
s
.
length
);
var
view
=
new
Uint8Array
(
buf
);
for
(
var
i
=
0
;
i
!=
s
.
length
;
++
i
)
view
[
i
]
=
s
.
charCodeAt
(
i
)
&
0xFF
;
return
buf
;
}
else
{
var
buf
=
new
Array
(
s
.
length
);
for
(
var
i
=
0
;
i
!=
s
.
length
;
++
i
)
buf
[
i
]
=
s
.
charCodeAt
(
i
)
&
0xFF
;
return
buf
;
}
},
filterMethod
(
filters
)
{
let
data
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
dataListTwo
))
let
dataListTwo
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
dataListTwo
))
if
(
filters
.
bName
!=
''
&&
filters
.
bName
!=
'__all__'
)
{
data
=
data
.
filter
(
item
=>
item
.
bName
.
indexOf
(
filters
.
bName
)
!=
-
1
);
}
if
(
filters
.
departmentName
!=
''
)
{
data
=
data
.
filter
(
item
=>
item
.
departmentName
.
indexOf
(
filters
.
departmentName
)
!=
-
1
);
}
if
(
filters
.
createByStr
!=
''
)
{
data
=
data
.
filter
(
item
=>
item
.
createByStr
.
indexOf
(
filters
.
createByStr
)
!=
-
1
);
}
if
((
filters
.
bName
===
''
||
filters
.
bName
===
'__all__'
)
&&
filters
.
departmentName
===
''
&&
filters
.
createByStr
===
''
)
{
data
=
dataListTwo
}
this
.
dataList
=
data
},
customCompFunc
(
params
)
{
if
(
params
.
type
===
"see"
)
{
this
.
getInfo
(
params
.
data
)
}
},
getCompanyList
()
{
//获取公司列表
this
.
apipost
(
"admin_get_BranchGetList"
,
this
.
getCompanyMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
res
.
data
.
data
;
data
.
forEach
(
x
=>
{
x
.
disabled
=
false
;
});
if
(
this
.
userInfo
.
RB_Branch_id
!=
0
)
{
this
.
CompanyList
=
data
.
filter
(
x
=>
{
if
(
x
.
BName
==
this
.
userInfo
.
BranchName
)
{
return
x
}
else
return
false
})
}
else
{
this
.
CompanyList
=
data
;
}
this
.
initColums
();
}
else
{}
},
err
=>
{}
);
},
initColums
()
{
this
.
isReady
=
false
;
let
that
=
this
;
let
companyList
=
[];
this
.
CompanyList
.
forEach
(
x
=>
{
let
item
=
{};
item
.
label
=
x
.
BName
;
item
.
value
=
x
.
BName
;
companyList
.
push
(
item
);
//创建二进制对象写入转换好的字节流
let
tmpDown
=
new
Blob
([
this
.
s2ab
(
XLSX
.
write
(
wb
,
wopts
))],
{
type
:
"application/octet-stream"
})
FileSaver
.
saveAs
(
tmpDown
,
"提成统计.xls"
);
},
s2ab
(
s
)
{
if
(
typeof
ArrayBuffer
!==
'undefined'
)
{
var
buf
=
new
ArrayBuffer
(
s
.
length
);
var
view
=
new
Uint8Array
(
buf
);
for
(
var
i
=
0
;
i
!=
s
.
length
;
++
i
)
view
[
i
]
=
s
.
charCodeAt
(
i
)
&
0xFF
;
return
buf
;
}
else
{
var
buf
=
new
Array
(
s
.
length
);
for
(
var
i
=
0
;
i
!=
s
.
length
;
++
i
)
buf
[
i
]
=
s
.
charCodeAt
(
i
)
&
0xFF
;
return
buf
;
}
},
filterMethod
(
filters
)
{
let
data
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
dataListTwo
))
let
dataListTwo
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
dataListTwo
))
if
(
filters
.
bName
!=
''
&&
filters
.
bName
!=
'__all__'
)
{
data
=
data
.
filter
(
item
=>
item
.
bName
.
indexOf
(
filters
.
bName
)
!=
-
1
);
}
if
(
filters
.
departmentName
!=
''
)
{
data
=
data
.
filter
(
item
=>
item
.
departmentName
.
indexOf
(
filters
.
departmentName
)
!=
-
1
);
}
if
(
filters
.
createByStr
!=
''
)
{
data
=
data
.
filter
(
item
=>
item
.
createByStr
.
indexOf
(
filters
.
createByStr
)
!=
-
1
);
}
if
((
filters
.
bName
===
''
||
filters
.
bName
===
'__all__'
)
&&
filters
.
departmentName
===
''
&&
filters
.
createByStr
===
''
)
{
data
=
dataListTwo
}
this
.
dataList
=
data
},
customCompFunc
(
params
)
{
if
(
params
.
type
===
"see"
)
{
this
.
getInfo
(
params
.
data
)
}
},
getCompanyList
()
{
//获取公司列表
this
.
apipost
(
"admin_get_BranchGetList"
,
this
.
getCompanyMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
res
.
data
.
data
;
data
.
forEach
(
x
=>
{
x
.
disabled
=
false
;
});
console
.
log
(
companyList
,
'-------'
)
let
company
=
{}
if
(
this
.
disabledCPSelect
)
{
company
=
{
field
:
"bName"
,
title
:
"公司"
,
width
:
40
,
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
,
};
}
else
{
company
=
{
field
:
"bName"
,
title
:
"公司"
,
width
:
40
,
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
,
result
:
""
,
filterMultiple
:
false
,
filters
:
companyList
,
type
:
"select"
};
}
this
.
isReady
=
true
;
},
sortChange
(
param
)
{
if
(
param
.
sumMoney
==
''
)
{
if
(
param
.
BName
!=
''
)
{
this
.
msg
.
OrderStr
=
'RB_Branch_Id '
+
param
.
bName
}
if
(
param
.
commissionMoney
!=
''
)
{
this
.
msg
.
OrderStr
=
'CommissionMoney '
+
param
.
commissionMoney
}
if
(
param
.
peopleCount
!=
''
)
{
this
.
msg
.
OrderStr
=
'PeopleCount '
+
param
.
peopleCount
}
if
(
param
.
backMoney
!=
''
)
{
this
.
msg
.
OrderStr
=
'BackMoney '
+
param
.
backMoney
}
if
(
param
.
otherMoney
!=
''
)
{
this
.
msg
.
OrderStr
=
'OtherMoney '
+
param
.
otherMoney
}
this
.
getList
();
if
(
this
.
userInfo
.
RB_Branch_id
!=
0
)
{
this
.
CompanyList
=
data
.
filter
(
x
=>
{
if
(
x
.
BName
==
this
.
userInfo
.
BranchName
)
{
return
x
}
else
return
false
})
}
else
{
let
d
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
dataList
))
this
.
dataList
=
this
.
orderBy
(
d
,
[
"sumMoney"
],
param
.
sumMoney
).
results
;
this
.
CompanyList
=
data
;
}
this
.
initColums
();
}
else
{}
},
handleCurrentChange
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
},
getList
()
{
this
.
loading
=
true
;
if
(
this
.
userInfo
.
RB_Branch_id
!=
0
)
{
this
.
msg
.
RB_Branch_Id
=
this
.
userInfo
.
RB_Branch_id
}
err
=>
{}
);
},
initColums
()
{
this
.
isReady
=
false
;
let
that
=
this
;
let
companyList
=
[];
this
.
CompanyList
.
forEach
(
x
=>
{
let
item
=
{};
item
.
label
=
x
.
BName
;
item
.
value
=
x
.
BName
;
companyList
.
push
(
item
);
});
let
company
=
{}
if
(
this
.
disabledCPSelect
)
{
company
=
{
field
:
"bName"
,
title
:
"公司"
,
width
:
40
,
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
,
};
}
else
{
company
=
{
field
:
"bName"
,
title
:
"公司"
,
width
:
40
,
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
,
result
:
""
,
filterMultiple
:
false
,
filters
:
companyList
,
type
:
"select"
};
}
this
.
isReady
=
true
;
},
sortChange
(
param
)
{
if
(
param
.
sumMoney
==
''
)
{
if
(
param
.
BName
!=
''
)
{
this
.
msg
.
OrderStr
=
'RB_Branch_Id '
+
param
.
bName
}
if
(
param
.
commissionMoney
!=
''
)
{
this
.
msg
.
OrderStr
=
'CommissionMoney '
+
param
.
commissionMoney
}
if
(
param
.
peopleCount
!=
''
)
{
this
.
msg
.
OrderStr
=
'PeopleCount '
+
param
.
peopleCount
}
if
(
param
.
backMoney
!=
''
)
{
this
.
msg
.
OrderStr
=
'BackMoney '
+
param
.
backMoney
}
if
(
param
.
otherMoney
!=
''
)
{
this
.
msg
.
OrderStr
=
'OtherMoney '
+
param
.
otherMoney
}
this
.
getList
();
}
else
{
let
d
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
dataList
))
this
.
dataList
=
this
.
orderBy
(
d
,
[
"sumMoney"
],
param
.
sumMoney
).
results
;
}
},
handleCurrentChange
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
},
getList
()
{
this
.
loading
=
true
;
if
(
this
.
userInfo
.
RB_Branch_id
!=
0
)
{
this
.
msg
.
RB_Branch_Id
=
this
.
userInfo
.
RB_Branch_id
}
this
.
apipost
(
"sellcommission_GetDetailsList"
,
this
.
msg
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
total
=
res
.
data
.
data
.
count
;
this
.
dataList
.
forEach
(
x
=>
{
x
.
sumMoney
=
x
.
commissionMoney
+
x
.
otherMoney
-
x
.
backMoney
})
this
.
dataListTwo
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
dataList
))
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
},
//切换排序
handleClick
(
tab
,
event
)
{
if
(
this
.
activeName
==
"first"
)
{
// this.commonName='姓名'
this
.
msg
.
OrderStr
=
"UserId"
;
}
else
{
// this.commonName='公司名'
this
.
msg
.
OrderStr
=
"RB_Branch_Id"
;
}
this
.
getList
();
this
.
apipost
(
"sellcommission_GetDetailsList"
,
this
.
msg
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
total
=
res
.
data
.
data
.
count
;
this
.
dataList
.
forEach
(
x
=>
{
x
.
sumMoney
=
x
.
commissionMoney
+
x
.
otherMoney
-
x
.
backMoney
})
this
.
dataListTwo
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
dataList
))
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
//跳转
getInfo
(
item
)
{
var
dateStr
=
item
.
periods
;
var
year
=
dateStr
.
substring
(
0
,
4
);
var
month
=
dateStr
.
substring
(
4
,
6
);
null
);
},
//切换排序
handleClick
(
tab
,
event
)
{
if
(
this
.
activeName
==
"first"
)
{
// this.commonName='姓名'
this
.
msg
.
OrderStr
=
"UserId"
;
}
else
{
// this.commonName='公司名'
this
.
msg
.
OrderStr
=
"RB_Branch_Id"
;
}
this
.
getList
();
},
//跳转
getInfo
(
item
)
{
var
dateStr
=
item
.
periods
;
var
year
=
dateStr
.
substring
(
0
,
4
);
var
month
=
dateStr
.
substring
(
4
,
6
);
var
nextMonthFirstDay
=
new
Date
(
year
,
month
,
1
);
var
nextMonthFirstDay
=
new
Date
(
year
,
month
,
1
);
var
oneDay
=
1000
*
60
*
60
*
24
;
var
entDay
=
new
Date
(
nextMonthFirstDay
-
oneDay
).
Format
(
"yyyy-MM-dd"
);
var
startDay
=
year
+
"-"
+
month
+
"-"
+
"01"
;
var
userId
=
item
.
userId
;
var
oneDay
=
1000
*
60
*
60
*
24
;
var
entDay
=
new
Date
(
nextMonthFirstDay
-
oneDay
).
Format
(
"yyyy-MM-dd"
);
var
startDay
=
year
+
"-"
+
month
+
"-"
+
"01"
;
var
userId
=
item
.
userId
;
this
.
$router
.
push
({
path
:
"enrollTotal"
,
query
:
{
EmployeeId
:
userId
,
starTime
:
startDay
,
endTime
:
entDay
,
blank
:
'y'
}
});
}
},
mounted
()
{
this
.
msg
.
pageSize
=
10000
;
//不分页
this
.
msg
.
ParentId
=
this
.
$route
.
query
.
ParentId
;
if
(
this
.
$route
.
query
.
companyID
)
{
this
.
companyID
=
this
.
$route
.
query
.
companyID
;
this
.
msg
.
RB_Branch_Id
=
this
.
$route
.
query
.
companyID
;
this
.
msg
.
Periods
=
this
.
$route
.
query
.
periods
;
this
.
disabledCPSelect
=
true
this
.
$router
.
push
({
path
:
"enrollTotal"
,
query
:
{
EmployeeId
:
userId
,
starTime
:
startDay
,
endTime
:
entDay
,
blank
:
'y'
}
let
dt
=
new
Date
()
this
.
stringPerons
=
(
dt
.
getMonth
()
==
0
?
(
dt
.
getFullYear
()
-
1
)
:
dt
.
getFullYear
())
+
''
+
(
dt
.
getMonth
().
toString
().
length
<
2
?
'0'
:
''
)
+
(
dt
.
getMonth
()
==
0
?
12
:
dt
.
getMonth
());
this
.
userInfo
=
this
.
getLocalStorage
();
this
.
getList
();
this
.
getCompanyList
();
},
created
()
{
Vue
.
component
(
'commission-table-operation'
,
{
template
:
`<div style='border-bottom: 1px solid #e5e5e5;border-left: 1px solid #e5e5e5;width:80px;height:40px;background:#fff;text-align:center;position: relative;left:-5px;padding-top: 6px;padding-top:6px;box-sizing:border-box'><el-button type="primary" size='mini' icon="el-icon-view" circle @click="see(rowData,index)"></el-button></div>`
,
props
:
{
rowData
:
{
type
:
Object
},
field
:
{
type
:
String
},
index
:
{
type
:
Number
}
},
methods
:
{
see
()
{
let
params
=
{
type
:
'see'
,
data
:
this
.
rowData
};
this
.
$emit
(
'on-custom-comp'
,
params
);
}
}
})
});
}
},
mounted
()
{
this
.
msg
.
pageSize
=
10000
;
//不分页
this
.
msg
.
ParentId
=
this
.
$route
.
query
.
ParentId
;
if
(
this
.
$route
.
query
.
companyID
)
{
this
.
companyID
=
this
.
$route
.
query
.
companyID
;
this
.
msg
.
RB_Branch_Id
=
this
.
$route
.
query
.
companyID
;
this
.
msg
.
Periods
=
this
.
$route
.
query
.
periods
;
this
.
disabledCPSelect
=
true
}
let
dt
=
new
Date
()
this
.
stringPerons
=
(
dt
.
getMonth
()
==
0
?
(
dt
.
getFullYear
()
-
1
)
:
dt
.
getFullYear
())
+
''
+
(
dt
.
getMonth
()
.
toString
().
length
<
2
?
'0'
:
''
)
+
(
dt
.
getMonth
()
==
0
?
12
:
dt
.
getMonth
());
this
.
userInfo
=
this
.
getLocalStorage
();
this
.
getList
();
this
.
getCompanyList
();
},
created
()
{
Vue
.
component
(
'commission-table-operation'
,
{
template
:
`<div style='border-bottom: 1px solid #e5e5e5;border-left: 1px solid #e5e5e5;width:80px;height:40px;background:#fff;text-align:center;position: relative;left:-5px;padding-top: 6px;padding-top:6px;box-sizing:border-box'><el-button type="primary" size='mini' icon="el-icon-view" circle @click="see(rowData,index)"></el-button></div>`
,
props
:
{
rowData
:
{
type
:
Object
},
field
:
{
type
:
String
},
index
:
{
type
:
Number
}
},
methods
:
{
see
()
{
let
params
=
{
type
:
'see'
,
data
:
this
.
rowData
};
this
.
$emit
(
'on-custom-comp'
,
params
);
}
}
})
}
};
</
script
>
<
style
>
</
script
>
<
style
>
.commissionDetails
.triangle_border_up
{
width
:
0
;
height
:
0
;
border-width
:
0
5px
5px
;
border-style
:
solid
;
border-color
:
transparent
transparent
#303133
;
/*透明 透明 灰*/
position
:
absolute
;
top
:
-5px
;
width
:
0
;
height
:
0
;
border-width
:
0
5px
5px
;
border-style
:
solid
;
border-color
:
transparent
transparent
#303133
;
/*透明 透明 灰*/
position
:
absolute
;
top
:
-5px
;
}
.commissionDetails
.v-table-body-cell
:hover
.outDiv
.toolDiv
{
display
:
block
;
display
:
block
;
}
.commissionDetails
.v-table-body-cell
{
overflow
:
initial
;
cursor
:
pointer
;
overflow
:
initial
;
cursor
:
pointer
;
}
.commissionDetails
.toolDiv
{
position
:
absolute
;
top
:
25px
;
background
:
#303133
;
color
:
#fff
;
z-index
:
20000
;
padding
:
4px
15px
;
max-width
:
220px
;
white-space
:
normal
;
border-radius
:
4px
;
word-wrap
:
break-word
;
display
:
none
;
position
:
absolute
;
top
:
25px
;
background
:
#303133
;
color
:
#fff
;
z-index
:
20000
;
padding
:
4px
15px
;
max-width
:
220px
;
white-space
:
normal
;
border-radius
:
4px
;
word-wrap
:
break-word
;
display
:
none
;
}
.commissionDetails
.outDiv
{
position
:
relative
;
position
:
relative
;
}
.commissionDetails-box
.el-button.is-circle
{
padding
:
5px
!important
;
padding
:
5px
!important
;
}
.commissionDetails-box
.v-table-body-cell
span
{
display
:
block
;
width
:
100%
;
display
:
block
;
width
:
100%
;
}
</
style
>
</
style
>
src/components/dmc/manager/dmcTotalTable.vue
View file @
2f307dee
...
...
@@ -193,7 +193,6 @@
{{
outItem
.
NewCombinationNum
}}
</td>
<td
style=
"position: relative"
>
{{
item
.
OutBranchName
}}
<div
v-if=
"item.IsSetOut&&item.IsSetOut==1"
style=
"color:red;font-weight:bold;"
>
(取消发团)
...
...
@@ -250,6 +249,9 @@
<td>
<div
class=
"link"
>
<p
@
click=
"goUrlT('productQuery',item.TCNUMS,'产品查询')"
>
{{
item
.
TCNUMS
}}
<br
/>
(
{{
item
.
TCID
}}
)
</p>
<div
v-if=
"item.IsSetOut&&item.IsSetOut==1"
style=
"color:red;font-weight:bold;"
>
(取消发团)
</div>
</div>
</td>
<td
style=
"color: #47BF8C;white-space: nowrap;"
>
...
...
@@ -334,7 +336,8 @@
</div>
</td>
<td>
<div
class=
"fz16 fbold linkspan"
@
click=
"goUrl([131,14, 90].includes(item.LineId) ? 'roomReservationsDetails' : 'roomReservationsDetailsNew',item,outItem,'订房详情')"
>
<div
class=
"fz16 fbold linkspan"
@
click=
"goUrl([131,14, 90].includes(item.LineId) ? 'roomReservationsDetails' : 'roomReservationsDetailsNew',item,outItem,'订房详情')"
>
<span
style=
"color: #4BCA81;"
v-if=
"item.HotelResult==1"
>
√
</span>
<span
class=
"colorE95252"
v-else
>
{{
item
.
HotelResult
==
'-1'
?
"x"
:
"O"
}}
</span>
</div>
...
...
@@ -703,7 +706,7 @@
},
methods
:
{
showDialog
(
ConfigId
,
OfferId
)
{
if
(
!
OfferId
)
{
if
(
!
OfferId
)
{
return
}
this
.
dialog
=
{
...
...
@@ -820,7 +823,9 @@
},
err
=>
{})
},
getLineList
()
{
this
.
apipost
(
"line_post_GetList"
,
{
LineDirection
:
2
},
res
=>
{
//
this
.
apipost
(
"line_post_GetList"
,
{
LineDirection
:
2
},
res
=>
{
//
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
queryCommonData
.
LineList
=
res
.
data
.
data
;
this
.
queryCommonData
.
PlaceList
=
[]
...
...
@@ -1234,7 +1239,7 @@
}
var
userInfo
=
this
.
getLocalStorage
();
if
(
userInfo
.
RB_Group_id
==
this
.
QjGroupId
())
{
// this.msg.LineId = 14;
// this.msg.LineId = 14;
}
this
.
getLineList
();
...
...
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