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
7f8226ff
Commit
7f8226ff
authored
May 26, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
727ffaae
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
190 additions
and
103 deletions
+190
-103
App.vue
src/App.vue
+7
-0
OpComPersonDetails.vue
...nents/FinancialModule/OpCommission/OpComPersonDetails.vue
+3
-6
commissionDialog.vue
...ents/FinancialModule/TradeCommission/commissionDialog.vue
+98
-43
OrderList.vue
src/components/Hotel/reservation/OrderList.vue
+21
-16
groupTourOrderOne.vue
src/components/SalesModule/groupTourOrderOne.vue
+11
-4
visaOrderList.vue
src/components/SalesVisa/components/visaOrderList.vue
+21
-14
orderList.vue
...omponents/busManagement/BookAcar/components/orderList.vue
+9
-5
OrderList.vue
src/components/scenicSpot/reservation/OrderList.vue
+20
-15
No files found.
src/App.vue
View file @
7f8226ff
...
...
@@ -322,4 +322,11 @@
.cursor-p.active
{
color
:
#409EFF
;
}
.float-l
{
float
:
left
;
}
.width100-float-l
{
width
:
100%
;
float
:
left
;
}
</
style
>
src/components/FinancialModule/OpCommission/OpComPersonDetails.vue
View file @
7f8226ff
...
...
@@ -212,7 +212,8 @@
EmployeeId
:
-
1
,
PeriodsId
:
-
1
,
OrderType
:
-
1
,
Way
:
-
1
,
Way
:
'-1'
,
TCID
:
''
,
TCNUM
:
''
,
RB_Department_Id
:
-
1
,
//部门ID
EmBranchId
:
-
1
,
//公司ID
...
...
@@ -267,7 +268,6 @@
this
.
getDepartment
()
this
.
getCompany
()
this
.
GetOrderTypeEnumList
()
this
.
GetCommissionPeroidsList
()
//期数
},
mounted
()
{
let
userInfo
=
this
.
getLocalStorage
();
...
...
@@ -285,7 +285,6 @@
}
}
this
.
msg
.
TCNUM
=
this
.
$route
.
query
.
TCNUM
?
this
.
$route
.
query
.
TCNUM
:
''
this
.
msg
.
PeriodsId
=
this
.
$route
.
query
.
PeriodId
?
Number
(
this
.
$route
.
query
.
PeriodId
):
-
1
this
.
msg
.
RB_Branch_Id
=
this
.
$route
.
query
.
OutBranchId
?
Number
(
this
.
$route
.
query
.
OutBranchId
):
-
1
this
.
msg
.
EmBranchId
=
this
.
$route
.
query
.
RB_Branch_Id
?
Number
(
this
.
$route
.
query
.
RB_Branch_Id
):
Number
(
userInfo
.
RB_Branch_id
)
this
.
msg
.
EmployeeId
=
this
.
$route
.
query
.
UserId
?
Number
(
this
.
$route
.
query
.
UserId
):
Number
(
userInfo
.
EmployeeId
)
...
...
@@ -482,9 +481,7 @@
"opcommission_GetNewOPCommissionPeroidsList"
,{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
PeroidsList
=
res
.
data
.
data
;
if
(
!
this
.
$route
.
query
.
PeriodId
){
this
.
msg
.
PeriodsId
=
this
.
PeroidsList
[
0
].
Id
}
this
.
msg
.
PeriodsId
=
this
.
$route
.
query
.
PeriodId
?
Number
(
this
.
$route
.
query
.
PeriodId
):
this
.
PeroidsList
[
0
].
ID
this
.
getList
()
}
else
{
this
.
Error
(
res
.
data
.
message
);
...
...
src/components/FinancialModule/TradeCommission/commissionDialog.vue
View file @
7f8226ff
...
...
@@ -20,14 +20,19 @@
</
style
>
<
template
>
<div
style=
"float: left;"
>
<span
class=
"cF1416C"
:class=
"
{'cursor-pointer':!type||(type=='跟团游订单'
&&
objNew.startDate
&&
objNew.startDate>=new Date('2023-04-01').Format('yyyy-MM-dd'))}"
@click="!type||(type=='跟团游订单'
&&
objNew.startDate
&&
objNew.startDate>=new Date('2023-04-01').Format('yyyy-MM-dd'))
<span
class=
"cF1416C"
:class=
"
{'cursor-pointer':!type||(type=='跟团游订单'
&&
objNew.startDate
&&
objNew.startDate>=new Date('2023-04-01').Format('yyyy-MM-dd'))}"
@click="!type||(type=='跟团游订单'
&&
objNew.startDate
&&
objNew.startDate>=new Date('2023-04-01').Format('yyyy-MM-dd'))
||objNew.createDate
||objNew.CreateTime?DetailsOfRoyalty():''">
<span
class=
"fz15 fbold"
>
<!--
{{
objNew
.
commissionCurrency
?
objNew
.
commissionCurrency
:
objNew
.
CurrencyName
!=
'人民币'
?
objNew
.
CurrencyName
:
'¥'
}}
-->
{{
objNew
.
commissionMoney
?
moneyFormat
(
objNew
.
commissionMoney
):
objNew
.
SellCommission
}}
<template
v-if=
"OP"
>
{{
moneyFormat
(
objNew
.
OPCommission
)
}}
</
template
>
<
template
v-else
>
{{
objNew
.
commissionMoney
?
moneyFormat
(
objNew
.
commissionMoney
):
objNew
.
SellCommission
}}
</
template
>
</span>
</span>
<el-dialog
width=
"1000px"
title=
"提成详情"
:visible
.
sync=
"outerVisible"
center
>
...
...
@@ -36,11 +41,11 @@
class=
"cm_content"
style=
"width: 100%;margin-bottom: 35px; "
>
<div
style=
"margin-bottom: 20px;display: flex;justify-content: space-between;"
>
<div>
<span>
总人数:{{dataObj.TotalNum}}
</span>
<span
style=
"margin-left: 20px;"
>
总提成:
{{
dataObj
.
TotalMoney
}}
</span>
<span
style=
"margin-left: 20px;"
>
总提成:{{dataObj.TotalMoney}}
</span>
</div>
<input
type=
"button"
class=
"normalBtn"
value=
"查看提成明细"
@
click=
"goUrl"
/>
...
...
@@ -54,58 +59,60 @@
<tr>
<th
style=
"width: 100px;"
>
出团公司
</th>
<th
style=
"width: 80px;"
>
类型
</th>
<th
style=
"width: 80px;"
>
订单号
</th>
<th
style=
"width: 80px;"
>
{{OP?'团/订单':'订单号'}}
</th>
<th
style=
"width: 150px;"
>
团号
</th>
<!-- <th style="width: 100px;">所属公司</th> -->
<!-- <th style="width: 100px;">部门</th> -->
<th
style=
"width: 100px;"
>
姓名
</th>
<!-- <th style="width: 100px;">线路</th> -->
<!-- <th style="width: 100px;">是否欧洲订单</th> -->
<th
style=
"width: 100px;"
>
订单
人数
</th>
<th
style=
"width: 100px;"
>
{{OP?'':'订单'}}
人数
</th>
<!-- <th style="width: 100px;">团队总人数</th> -->
<th
style=
"width: 100px;"
>
提成方式
</th>
<th
style=
"width: 100px;"
>
提成比例
</th>
<th
style=
"width: 100px;"
>
当月利润
</th>
<th
style=
"width: 100px;"
>
团队
利润
</th>
<th
style=
"width: 100px;"
v-if=
"!OP"
>
当月利润
</th>
<th
style=
"width: 100px;"
>
{{OP?'':'团队'}}
利润
</th>
<th
style=
"width: 100px;"
>
提成金额
</th>
<th
style=
"width: 100px;"
>
期数
</th>
<th
width=
'200'
>
备注
</th>
</tr>
<tr
v-for=
"(item,index) in dataList"
:key=
"index"
>
<td>
{{item.OutBranchName?item.OutBranchName:'-'}}
</td>
<td>
{{item.OrderTypeName}}
</td>
<td>
{{
item
.
OrderId
}}
</td>
<td><span
v-if=
"item.TCNUM"
>
{{
item
.
TCNUM
}}
(
{{
item
.
TCID
}}
)
</span></td>
<!--
<td>
{{
item
.
BranchName
?
item
.
BranchName
:
'-'
}}
</td>
-->
<!--
<td>
{{
item
.
DeptName
?
item
.
DeptName
:
'-'
}}
</td>
-->
<td>
{{OP?item.TCID:item.OrderId}}
</td>
<td><span
v-if=
"item.TCNUM"
>
{{item.TCNUM}}
<
template
v-if=
"!OP"
>
(
{{
item
.
TCID
}}
)
</
template
>
</span></td>
<td>
{{item.UserName}}
</td>
<!--
<td>
{{
item
.
LineName
}}
</td>
-->
<!--
<td>
{{
item
.
IsEurope
==
1
?
'是'
:
'否'
}}
</td>
-->
<td>
{{
item
.
PeopleNum
}}
</td>
<!--
<td>
{{
item
.
TCGuestNum
}}
</td>
-->
<td>
{{
item
.
Way
==
1
?
'销售额'
:
'利润比'
}}
</td>
<td>
{{
item
.
Rate
?
item
.
Rate
+
'%'
:
'-'
}}
</td>
<td>
{{
item
.
OrderProfit
}}
</td>
<td>
{{OP?item.PeopleCount:item.PeopleNum}}
</td>
<td>
<
template
v-if=
"OP"
>
{{
item
.
Way
==
1
?
'人头奖励'
:
'利润比例'
}}
</
template
>
<
template
>
{{
item
.
Way
==
1
?
'销售额'
:
'利润比'
}}
</
template
>
</td>
<td>
<
template
v-if=
"OP"
>
{{
item
.
Rate
&&
item
.
Way
==
2
?
item
.
Rate
+
'%'
:
item
.
Rate
&&
item
.
Way
==
1
?
item
.
Rate
+
'/人'
:
'-'
}}
</
template
>
<
template
v-else
>
{{
item
.
Rate
?
item
.
Rate
+
'%'
:
'-'
}}
</
template
>
</td>
<td
v-if=
"!OP"
>
{{item.OrderProfit}}
</td>
<td>
{{item.TCProfit}}
</td>
<td>
{{item.CommissionMoney?item.CommissionMoney:'-'}}
</td>
<td>
{{
item
.
Periods
}}
</td>
<td>
{{
OP?item.PeriodsReissue:
item.Periods}}
</td>
<td>
{{item.Description?item.Description:'-'}}
</td>
</tr>
<tr
v-if=
"dataList.length==0"
>
<td
style=
"text-align:center"
colspan=
"13"
>
暂无数据
</td>
</tr>
</table>
<!--
<div
v-if=
"dataList.length==0"
style=
"width: 100%;border:1px solid #fff;display: flex;align-items: center;justify-content: center;height: 60px;margin-top: 30px;"
>
暂无数据
</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>
</div>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"hollowFixedBtn"
@
click=
"outerVisible = false"
>
取消
</button>
...
...
@@ -117,7 +124,7 @@
<
script
>
export
default
{
props
:[
'objNew'
,
'type'
],
props
:[
'objNew'
,
'type'
,
'OP'
],
data
()
{
return
{
dataObj
:{},
...
...
@@ -142,6 +149,7 @@
watch
:{
objNew
:
{
handler
(
val
,
oldVal
)
{
this
.
objNew
=
val
this
.
msg
.
OrderId
=
val
.
id
?
val
.
id
:
val
.
OrderId
?
val
.
OrderId
:
val
.
orderId
this
.
msg
.
PeriodId
=
this
.
$route
.
query
.
PeriodId
?
this
.
$route
.
query
.
PeriodId
:
-
1
},
...
...
@@ -150,13 +158,19 @@
},
},
mounted
()
{
},
methods
:
{
goUrl
(){
this
.
outerVisible
=
false
let
name
if
(
this
.
OP
){
name
=
'OpComPersonDetails'
}
else
{
name
=
'TradeTicketUserDetails'
}
this
.
$router
.
push
({
path
:
'TradeTicketUserDetails'
,
path
:
name
,
query
:
{
blank
:
'y'
,
tab
:
'提成明细'
...
...
@@ -170,19 +184,60 @@
// 获取员工生成比例
getList
(){
this
.
loading
=
true
this
.
apipost
(
"sellcommission_GetTYSaleCommissionSingleDetailsList"
,
this
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
loading
=
false
this
.
dataObj
=
res
.
data
.
data
this
.
dataList
=
res
.
data
.
data
.
pmodel
.
pageData
;
this
.
total
=
res
.
data
.
data
.
pmodel
.
count
;
}
else
{
this
.
loading
=
false
this
.
Error
(
res
.
data
.
message
);
}
}
);
if
(
!
this
.
OP
){
this
.
GetTYSaleCommission
()
}
else
{
this
.
GetNewOPCommission
()
}
},
// 销售提成
GetTYSaleCommission
(){
this
.
apipost
(
"sellcommission_GetTYSaleCommissionSingleDetailsList"
,
this
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
loading
=
false
this
.
dataObj
=
res
.
data
.
data
this
.
dataList
=
res
.
data
.
data
.
pmodel
.
pageData
;
this
.
total
=
res
.
data
.
data
.
pmodel
.
count
;
}
else
{
this
.
loading
=
false
this
.
Error
(
res
.
data
.
message
);
}
}
);
},
// op提成
GetNewOPCommission
(){
let
msg
=
{
pageIndex
:
1
,
pageSize
:
5
,
EmployeeId
:
-
1
,
PeriodsId
:
-
1
,
OrderType
:
-
1
,
Way
:
-
1
,
TCID
:
this
.
objNew
.
OrderId
,
TCNUM
:
''
,
RB_Department_Id
:
-
1
,
//部门ID
EmBranchId
:
-
1
,
//公司ID
RB_Branch_Id
:
-
1
,
//出团公司ID
}
if
(
msg
.
TCID
==
''
)
{
msg
.
TCID
=
0
}
this
.
apipost
(
"opcommission_GetNewOPCommissionDetailsPageList"
,
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
);
}
}
);
},
handleCurrentChange
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
...
...
@@ -190,4 +245,4 @@
}
}
</
script
>
\ No newline at end of file
</
script
>
src/components/Hotel/reservation/OrderList.vue
View file @
7f8226ff
...
...
@@ -510,7 +510,7 @@
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
Refund
?
scope
.
row
.
Refund
:
"-"
}}
</span>
</
template
>
</el-table-column>
<!-- <el-table-column label="手配费应收" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold">{{
...
...
@@ -535,14 +535,19 @@
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
Income
-
scope
.
row
.
CostMoney
-
scope
.
row
.
Refund
>
0
?(
scope
.
row
.
Income
-
scope
.
row
.
CostMoney
-
scope
.
row
.
Refund
).
toFixed
(
2
):
'-'
}}
</span>
</
template
>
</el-table-column>
<el-table-column
v-if=
"
item.SellCommission&&item.SellCommission>0
"
label=
"提成"
style=
"background:#EAEAEA"
>
<el-table-column
v-if=
"
(item.SellCommission&&item.SellCommission>0)||(item.OPCommission&&item.OPCommission>0)
"
label=
"提成"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<commissionDialog
:objNew=
"item"
></commissionDialog>
<div
class=
"width100-float-l"
v-if=
"item.SellCommission&&item.SellCommission>0"
><span
class=
"float-l"
>
销售:
</span>
<commissionDialog
:objNew=
"item"
:OP=
"0"
></commissionDialog>
</div>
<div
class=
"width100-float-l"
v-if=
"item.OPCommission&&item.OPCommission>0"
><span
class=
"float-l"
>
OP:
</span>
<commissionDialog
:objNew=
"item"
:OP=
"1"
></commissionDialog>
</div>
</
template
>
</el-table-column>
</el-table>
<div
class=
"row justify-sb mt mb20"
v-if=
"item.OrderStatus!=3"
>
<div
class=
"row pt20"
style=
"margin-right: 10px;width: 300px;"
<div
class=
"row pt20"
style=
"margin-right: 10px;width: 300px;"
v-if=
"item.GuestFileList.length > 0||((item.CustomerPayType==1 || item.CustomerPayType==3)&&pagesTitle)"
>
<!-- <i class="el-icon-warning cF57A98 fz15 mr"></i> -->
<div
class=
"column"
>
...
...
@@ -580,10 +585,10 @@
</div>
<div
class=
"row fz12 see-rec mt"
>
<el-upload
ref=
"my-upload"
:http-request=
"uploadFileBtn"
v-loading=
"loading"
:multiple=
"true"
:multiple=
"true"
:show-file-list=
"false"
action=
""
>
<div
:class=
"
{'cursor-pointer seeLK c059FF6':!loading,
'cursor-pointer see c04C8C8':loading}"
'cursor-pointer see c04C8C8':loading}"
@click="uploadOrderId=item.OrderId">上车旅客名单
</div>
</el-upload>
</div>
...
...
@@ -594,7 +599,7 @@
<div
class=
"fz12"
>
收款单据
</div>
<div
class=
"row wrap orderNo fz12 py"
>
<span
class=
"cursor-pointer radius5 mr px5"
class=
"cursor-pointer radius5 mr px5"
:class=
"{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for=
"(x, i) in item.IncomeList"
...
...
@@ -622,7 +627,7 @@
<div
class=
"fz12"
>
退款单据
</div>
<div
class=
"row wrap orderNo fz12 py"
>
<span
class=
"cursor-pointer radius5 mr px5"
class=
"cursor-pointer radius5 mr px5"
:class=
"{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for=
"(x, i) in item.RefundList"
...
...
@@ -650,7 +655,7 @@
<div
class=
"fz12"
>
成本单据
</div>
<div
class=
"row wrap orderNo fz12 py"
>
<span
class=
"cursor-pointer radius5 mr px5"
class=
"cursor-pointer radius5 mr px5"
:class=
"{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for=
"(x, i) in item.CostList"
...
...
@@ -677,7 +682,7 @@
<div class="fz12">手配费单据</div>
<div class="row wrap orderNo fz12 py">
<span
class="cursor-pointer radius5 mr px5"
class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for="(x, i) in item.HandFittingFinanceList"
...
...
@@ -973,7 +978,7 @@ export default {
},
watch
:
{
pagesTitle
(
val
,
oldval
){
},
OrderList
:{
handler
(
val
,
oldVal
){
...
...
@@ -1006,7 +1011,7 @@ export default {
setTimeout
(()
=>
{
this
.
cdState
=
true
},
100
)
},
editRemark
(
item
){
this
.
postMsg
.
OrderId
=
item
.
OrderId
...
...
@@ -1044,7 +1049,7 @@ export default {
}
})
}
},
uploadFileBtn
(
file
){
let
ft
=
file
.
file
.
name
.
substring
(
file
.
file
.
name
.
lastIndexOf
(
'.'
)
+
1
,
file
.
file
.
name
.
length
).
toUpperCase
();
...
...
@@ -1210,7 +1215,7 @@ export default {
this
.
Error
(
res
.
data
.
message
);
}
}).
catch
(
err
=>
{
this
.
Error
(
err
.
message
)
this
.
Error
(
err
.
message
)
this
.
loading0
=
false
})
}).
catch
(()
=>
{
...
...
@@ -1260,9 +1265,9 @@ export default {
this
.
loading0
=
false
;
}
);
},
saveUpdate
()
{
this
.
$confirm
(
"是否确认设置收损?"
,
"提示"
,
{
confirmButtonText
:
"确定"
,
...
...
src/components/SalesModule/groupTourOrderOne.vue
View file @
7f8226ff
...
...
@@ -1467,9 +1467,16 @@
<p
style=
"min-width: 180px;"
>
{{$t('hotel.hotel_StartTeam')}}:{{item.startDate}}
</p>
<p>
{{$t('restaurant.res_oderTime')}}:{{item.createDate}}
</p>
<p
v-if=
"item.tradeWay ==1"
>
{{item.platformOrder}}
</p>
<p
v-if=
'item.commissionMoney'
style=
"color:red"
>
<span
style=
"float: left;"
>
{{$t('salesModule.Commission')}}:
</span>
<commissionDialog
:objNew=
"item"
></commissionDialog>
<p
v-if=
'(item.commissionMoney&&item.commissionMoney>0)||(item.opcommission&&item.opcommission>0)'
style=
"color:red"
>
<
template
v-if=
"item.commissionMoney&&item.commissionMoney>0"
>
<span
style=
"float: left;"
>
销售
{{
$t
(
'salesModule.Commission'
)
}}
:
</span>
<commissionDialog
:objNew=
"item"
:OP=
"0"
></commissionDialog>
</
template
>
<
template
v-if=
"item.opcommission&&item.opcommission>0"
>
<span
style=
"float: left; margin-left: 10px;"
>
OP提成:
</span>
<commissionDialog
:objNew=
"item"
:OP=
"1"
></commissionDialog>
</
template
>
<!-- {{item.commissionMoney}} -->
</p>
<p
v-else-if=
"item.latestCommissionMoney"
style=
"color:red"
>
...
...
@@ -3409,7 +3416,7 @@
}
})
},
cancelSubmit
()
{
this
.
isShowLayer
=
false
this
.
$refs
[
'addMsg'
].
resetFields
()
...
...
src/components/SalesVisa/components/visaOrderList.vue
View file @
7f8226ff
...
...
@@ -528,12 +528,12 @@
<span
class=
"mr"
>
{{
item
.
createName
}}
</span>
<el-image
class=
"mr"
v-if=
"item.createPhoto"
style=
"width: 20px; height: 20px;border-radius: 50%;"
:src=
"item.createPhoto"
:src=
"item.createPhoto"
:preview-src-list=
"[item.createPhoto]"
>
</el-image>
</
template
>
</div>
<span>
下单时间:
</span>
<span>
{{ item.createTime }}
</span>
</div>
...
...
@@ -610,10 +610,17 @@
</span>
</
template
>
</el-table-column>
<el-table-column
v-if=
"item.commissionMoney&&item.commissionMoney>0"
label=
"提成"
style=
"background:#EAEAEA"
>
<el-table-column
label=
"提成"
style=
"background:#EAEAEA"
v-if=
"(item.commissionMoney&&item.commissionMoney>0)||(item.opCommission&&item.opCommission>0)"
>
<
template
slot-scope=
"scope"
>
<span
class=
"cF1416C"
style=
"float: left;"
>
¥
</span>
<commissionDialog
:objNew=
"scope.row"
></commissionDialog>
<div
class=
"width100-float-l"
v-if=
"item.commissionMoney&&item.commissionMoney>0"
>
<span
class=
"float-l"
>
销售:
<span
class=
"cF1416C"
>
¥
</span></span>
<commissionDialog
:objNew=
"scope.row"
:OP=
"0"
></commissionDialog>
</div>
<div
class=
"width100-float-l"
v-if=
"item.opCommission&&item.opCommission>0"
>
<span
class=
"float-l"
>
OP:
<span
class=
"cF1416C"
>
¥
</span></span>
<commissionDialog
:objNew=
"scope.row"
:OP=
"1"
></commissionDialog>
</div>
</
template
>
</el-table-column>
<
template
slot=
"append"
>
...
...
@@ -634,7 +641,7 @@
</el-tooltip>
</div>
</div>
<div
class=
"row justify-sb"
>
<div
class=
"row-c justify-sb px15 bgf5 radius5 flex-g pa relative"
style=
"min-width: 200px;max-width: 400px;"
>
<div
class=
"row-c"
>
...
...
@@ -734,13 +741,13 @@
</div>
</div>
</div>
</template>
</el-table>
</div>
</div>
<div
class=
"_mc_edit _scrollbar"
:class=
"addShow==true?'edHeight':''"
>
<p
class=
"_tit"
>
{{$t('salesModule.UpOrder')}}
...
...
@@ -891,7 +898,7 @@ export default {
userInfo
:
{},
qjGroupId
:
-
1
,
F_InvoiceManagement
:
false
,
F_Finance_Create
:
false
,
F_Finance_Create
:
false
,
msg
:
{
pageIndex
:
1
,
pageSize
:
12
,
...
...
@@ -981,7 +988,7 @@ export default {
setTimeout
(()
=>
{
this
.
cdState
=
true
},
100
)
},
PerferPrice
()
{
this
.
apipost
(
'dmc_get_visa_SetVisaOrderPrice'
,
this
.
EditMsg
,
res
=>
{
...
...
@@ -1237,7 +1244,7 @@ export default {
this
.
addMsg
.
EnterCountryFlight
=
x
[
0
].
EnterCountryFlight
this
.
addMsg
.
LeaveCountryFlight
=
x
[
0
].
LeaveCountryFlight
this
.
addMsg
.
VisaPlanId
=
x
[
0
].
VisaPlanId
//this.addMsg.DepartDate=x[0].DepartDate
//this.addMsg.DepartDate=x[0].DepartDate
this
.
addMsg
.
ClientType
=
x
[
0
].
ClientType
.
toString
()
}
...
...
@@ -1324,7 +1331,7 @@ export default {
SourceID
:
row
.
visaId
,
TCIDList
:
TCIDARR
,
ReFinanceId2
:
num
,
MatchFrId
:
0
MatchFrId
:
0
}
let
query
=
{};
query
=
{
...
...
src/components/busManagement/BookAcar/components/orderList.vue
View file @
7f8226ff
...
...
@@ -384,7 +384,7 @@
border-bottom
:
1px
solid
#ebeef5
;
}
</
style
>
<
template
>
<div>
<div
...
...
@@ -663,12 +663,17 @@
</
template
>
</el-table-column>
<el-table-column
v-if=
"
item.SellCommission && item.SellCommission > 0
"
v-if=
"
(item.SellCommission&&item.SellCommission>0)||(item.OPCommission&&item.OPCommission>0)
"
label=
"提成"
style=
"background: #eaeaea"
>
<
template
slot-scope=
"scope"
>
<commissionDialog
:objNew=
"item"
></commissionDialog>
<div
class=
"width100-float-l"
v-if=
"item.SellCommission&&item.SellCommission>0"
><span
class=
"float-l"
>
销售:
</span>
<commissionDialog
:objNew=
"item"
:OP=
"0"
></commissionDialog>
</div>
<div
class=
"width100-float-l"
v-if=
"item.OPCommission&&item.OPCommission>0"
><span
class=
"float-l"
>
OP:
</span>
<commissionDialog
:objNew=
"item"
:OP=
"1"
></commissionDialog>
</div>
</
template
>
</el-table-column>
</el-table>
...
...
@@ -1610,6 +1615,5 @@ export default {
},
};
</
script
>
<
style
></
style
>
\ No newline at end of file
src/components/scenicSpot/reservation/OrderList.vue
View file @
7f8226ff
...
...
@@ -614,7 +614,7 @@
</el-table-column>
<el-table-column
label=
"待收"
min-width=
"100"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
<span
class=
"fz15 fbold"
:class=
"
{'cF1416C':item.DaiShou>0}">
{{
item
.
DaiShou
}}
</span>
...
...
@@ -625,13 +625,18 @@
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
Income
-
scope
.
row
.
CostMoney
-
scope
.
row
.
Refund
>
0
?(
scope
.
row
.
Income
-
scope
.
row
.
CostMoney
-
scope
.
row
.
Refund
).
toFixed
(
2
):
'-'
}}
</span>
</
template
>
</el-table-column>
<el-table-column
v-if=
"
item.SellCommission&&item.SellCommission>0
"
label=
"提成"
style=
"background:#EAEAEA"
>
<el-table-column
v-if=
"
(item.SellCommission&&item.SellCommission>0)||(item.OPCommission&&item.OPCommission>0)
"
label=
"提成"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<commissionDialog
:objNew=
"item"
></commissionDialog>
<div
class=
"width100-float-l"
v-if=
"item.SellCommission&&item.SellCommission>0"
><span
class=
"float-l"
>
销售:
</span>
<commissionDialog
:objNew=
"item"
:OP=
"0"
></commissionDialog>
</div>
<div
class=
"width100-float-l"
v-if=
"item.OPCommission&&item.OPCommission>0"
><span
class=
"float-l"
>
OP:
</span>
<commissionDialog
:objNew=
"item"
:OP=
"1"
></commissionDialog>
</div>
</
template
>
</el-table-column>
</el-table>
<div
class=
"row justify-sb mt mb20"
>
<div
class=
"column px15 bjFFF3E0 radius5 flex-g pa relative"
style=
"max-width: 300px;min-width: 150px;"
>
<div
class=
"fz12 row justify-sb"
v-if=
"item.MailingState != 4"
>
...
...
@@ -679,13 +684,13 @@
<span
class=
"cff9800"
>
{{
item
.
UseDate
}}
</span>
前
</div>
<div
class=
"row fz12 see-rec mt"
>
<el-upload
ref=
"my-upload"
:http-request=
"uploadFileBtn"
<el-upload
ref=
"my-upload"
:http-request=
"uploadFileBtn"
v-loading=
"loadingDZP"
:multiple=
"true"
:multiple=
"true"
:show-file-list=
"false"
action=
""
>
<div
:class=
"
{'cursor-pointer seeLK c059FF6':!loadingDZP,
'cursor-pointer see c04C8C8':loadingDZP}"
'cursor-pointer see c04C8C8':loadingDZP}"
@click="uploadOrderId=item.OrderId">上传电子券
</div>
</el-upload>
</div>
...
...
@@ -701,7 +706,7 @@
<div
class=
"column px15 bgf5 radius5 ml flex-g pa relative"
style=
"min-width: 150px;max-width:400px"
>
<div
class=
"fz12"
>
收款单据
</div>
<div
class=
"row wrap orderNo fz12 py"
>
<span
class=
"cursor-pointer radius5 mr mb px5"
<span
class=
"cursor-pointer radius5 mr mb px5"
:class=
"{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for=
"(x, i) in item.IncomeList"
@
click=
"openDetails(x)"
>
{{ x.FrID }}
</span>
...
...
@@ -717,7 +722,7 @@
<div
class=
"column px15 bgf5 radius5 ml flex-g pa relative"
style=
"min-width: 150px;max-width:400px"
>
<div
class=
"fz12"
>
退款单据
</div>
<div
class=
"row wrap orderNo fz12 py"
>
<span
class=
"cursor-pointer radius5 mr mb px5"
<span
class=
"cursor-pointer radius5 mr mb px5"
:class=
"{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for=
"(x, i) in item.RefundList"
@
click=
"openDetails(x)"
>
{{ x.FrID }}
</span>
...
...
@@ -733,7 +738,7 @@
<div
class=
"column px15 bgf5 radius5 ml flex-g pa relative"
style=
"min-width: 150px;max-width:400px"
>
<div
class=
"fz12"
>
成本单据
</div>
<div
class=
"row wrap orderNo fz12 py"
>
<span
class=
"cursor-pointer radius5 mr mb px5"
<span
class=
"cursor-pointer radius5 mr mb px5"
:class=
"{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for=
"(x, i) in item.CostList"
@
click=
"openDetails(x)"
>
{{ x.FrID }}
</span>
...
...
@@ -752,7 +757,7 @@
@
click=
"isOffset(item, index, 3)"
></i>
</el-tooltip>
</div>
</div>
<div
class=
"column justify-c px15 bgf5 radius5 ml flex-g pa20"
style=
"min-width: 230px;"
>
<div
class=
"row-c justify-sb pb5"
:class=
"{'borderD':item.MailingMoney>0||item.DiscountsMoney>0}"
>
...
...
@@ -1166,7 +1171,7 @@ export default {
setTimeout
(()
=>
{
this
.
cdState
=
true
},
100
)
},
editRemark
(
item
){
this
.
postMsg
.
OrderId
=
item
.
OrderId
...
...
@@ -1319,7 +1324,7 @@ export default {
this
.
BillMakingMsg
.
ReFinanceId
=
row
.
OrderId
;
this
.
BillMakingMsg
.
ReFinanceId2
=
num
;
this
.
BillMakingMsg
.
OtherType
=
66
;
let
text
=
""
;
let
query
=
{};
if
(
num
==
1
)
{
...
...
@@ -1329,7 +1334,7 @@ export default {
}
else
if
(
num
==
3
)
{
text
=
"成本"
;
}
query
=
{
blank
:
"y"
,
tab
:
`新增
${
text
}
单据`
,
...
...
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