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
0308eb18
Commit
0308eb18
authored
Mar 13, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改报名清单
parent
8b867c14
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
77 additions
and
28 deletions
+77
-28
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+49
-2
config.js
src/router/config.js
+28
-26
No files found.
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
0308eb18
...
...
@@ -1539,6 +1539,8 @@
</td>
</tr>
</tbody>
<!-- 其他类型 -->
<template
v-for=
"(subItem,subIndex) in OrderDataList.OtherOrderList"
>
<tr>
<td
colspan=
"14"
>
...
...
@@ -1675,7 +1677,8 @@
<div
@
click=
"toTrip(childItem)"
>
出团通知书(
{{
SetNoticeMsg
.
OutNotice
==
1
?
'OK'
:
'暂定'
}}
)
</div>
<div
v-if=
"userId==1"
@
click=
"getSalerInfo(childItem)"
>
修改业务员
</div>
<div
@
click=
"transfer(childItem)"
>
订单转团
</div>
<div
@
click=
'zhuanLoading = true,OPRemarkMsg.OrderId = childItem.OrderId'
>
OP备注
</div>
<div
@
click=
"OrderLoading=true,OrderLossInfo(childItem)"
>
订单收损
</div>
<div
@
click=
'zhuanLoading = true,OPRemarkMsg.OrderId = childItem.OrderId,OPRemarkMsg.OP_Remarks=childItem.OP_Remarks'
>
OP备注
</div>
<div
v-if=
"OrderDataList.IsUpdateOrderCommission"
@
click=
'TCMsg.OrderId = childItem.OrderId, TCMsg.CommissionMinusRate = childItem.CommissionMinusRate,TCMsg.LatestCommissionMoney=childItem.LatestCommissionMoney, TiChengLoading = true'
>
修改提成
</div>
<div
v-if=
"childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"
@
click=
'deleteItem(childItem)'
>
...
...
@@ -1761,6 +1764,9 @@
</td>
</tr>
</tbody>
<!-- 取消订单 -->
<tr
v-if=
"OrderDataList.cancelList!=null && OrderDataList.cancelList.length>0"
>
<td
colspan=
"14"
>
<span
class=
"RL-redType"
@
click=
"isShowCancelOrder=!isShowCancelOrder"
style=
"cursor:pointer"
title=
"点击查看"
>
取消订单(
<span
...
...
@@ -1898,7 +1904,7 @@
<div
class=
"groupTourOrder_more"
>
<div
@
click=
"toTrip(item)"
>
出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})
</div>
<div
v-if=
"userId==1"
@
click=
"getSalerInfo(item)"
>
修改业务员
</div>
<div
@
click=
'zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'
>
OP备注
</div>
<div
@
click=
'zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId
,OPRemarkMsg.OP_Remarks=item.OP_Remarks
'
>
OP备注
</div>
<div
v-if=
"OrderDataList.IsUpdateOrderCommission"
@
click=
'TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate,TCMsg.LatestCommissionMoney=item.LatestCommissionMoney, TiChengLoading = true'
>
修改提成
</div>
<div
v-if=
"item.OrderState=='2'||item.OrderState=='3'"
@
click=
'deleteItem(item)'
>
删除
</div>
</div>
...
...
@@ -2081,6 +2087,23 @@
<div
class=
"combottomDiv"
v-if=
"showChangeSales"
style=
"height:200px;"
>
<updateSalesMan
@
closeUpdiv=
"closeSalseDiv"
@
getList=
"getList"
:subInfo=
"subInfo"
></updateSalesMan>
</div>
<!-- 订单收损弹窗 -->
<el-dialog
custom-class=
'w350'
title=
"修改订单收损"
:visible
.
sync=
"OrderLoading"
center
>
<!--zhaunMsg.TCNUM-->
<el-form
label-width=
"110px"
>
<el-form-item
label=
"收损人数:"
class=
"w280"
>
<el-input
:rows=
"2"
v-model=
"OrderLossMsg.PeopleNum"
></el-input>
</el-form-item>
<el-form-item
label=
"收损金额:"
class=
"w280"
>
<el-input
:rows=
"2"
v-model=
"OrderLossMsg.LossMoney"
></el-input>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"OrderLossOk"
>
{{$t('pub.saveBtn')}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"OrderLoading=false"
>
{{$t('pub.cancelBtn')}}
</button>
</div>
</el-dialog>
<el-dialog
custom-class=
'w350'
title=
"修改OP备注"
:visible
.
sync=
"zhuanLoading"
center
:before-close=
"initOPRemarkMsg"
>
<!--zhaunMsg.TCNUM-->
<el-form
label-width=
"110px"
>
...
...
@@ -2123,6 +2146,12 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
export
default
{
data
()
{
return
{
OrderLoading
:
false
,
OrderLossMsg
:{
OrderId
:
""
,
PeopleNum
:
0
,
LossMoney
:
0
,
},
pickerOptions0
:
{
disabledDate
:
time
=>
{
let
starTime
=
new
Date
(
this
.
starTime
);
...
...
@@ -2485,6 +2514,24 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
updateSalesMan
:
updateSalesMan
},
methods
:
{
// 获取订单收损详情
OrderLossInfo
(
childItem
){
this
.
OrderLossMsg
.
OrderId
=
childItem
.
OrderId
;
this
.
OrderLossMsg
.
LossMoney
=
childItem
.
OpSetLossMoney
;
this
.
OrderLossMsg
.
PeopleNum
=
childItem
.
OpSetLossPeople
;
},
// 修改订单收损
OrderLossOk
(){
this
.
apipost
(
'sellorder_post_SetOrderRevenueLoss'
,
this
.
OrderLossMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
$message
.
success
(
res
.
data
.
message
)
this
.
getList
()
this
.
OrderLoading
=
false
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
}
},
null
)
},
//跳转
goUrlTS
(
path
,
id
,
orderId
,
title
)
{
this
.
$router
.
push
({
...
...
src/router/config.js
View file @
0308eb18
...
...
@@ -1032,22 +1032,22 @@ export default {
title
:
'机票列表'
},
},
//
{
//
path: '/individualTicket', //散客机票
//
name: 'individualTicket',
//
component: resolve => require(['@/components/Ticketing/individualTicket'], resolve),
//
meta: {
//
title: '散客机票'
//
},
//
},
//
,{
//
path: '/IndividualTicketOrder', //散客今日机票订单
//
name: 'IndividualTicketOrder',
//
component: resolve => require(['@/components/Ticketing/IndividualTicketOrder'], resolve),
//
meta: {
//
title: '散客机票今日订单'
//
},
//
},
{
path
:
'/individualTicket'
,
//散客机票
name
:
'individualTicket'
,
component
:
resolve
=>
require
([
'@/components/Ticketing/individualTicket'
],
resolve
),
meta
:
{
title
:
'散客机票'
},
},
,{
path
:
'/IndividualTicketOrder'
,
//散客今日机票订单
name
:
'IndividualTicketOrder'
,
component
:
resolve
=>
require
([
'@/components/Ticketing/IndividualTicketOrder'
],
resolve
),
meta
:
{
title
:
'散客机票今日订单'
},
},
{
path
:
'/IndividualTicketOrderDetails'
,
//散客机票订单详情
name
:
'IndividualTicketOrderDetails'
,
...
...
@@ -1500,11 +1500,13 @@ export default {
meta
:
{
title
:
'旅客名单'
},
},
{
},
{
path
:
'/RegistrationList'
,
name
:
'RegistrationList'
,
component
:
resolve
=>
require
([
'@/components/TravelManager/TravelList/RegistrationList'
],
resolve
)
},
{
},
{
path
:
'/DistributionTransport'
,
//分销联运
name
:
'DistributionTransport'
,
component
:
resolve
=>
require
([
'@/components/TravelManager/TravelList/DistributionTransport'
],
resolve
),
...
...
@@ -1868,14 +1870,14 @@ export default {
title
:
'机票订单'
},
},
//
{ // 销售 散卖机票订单
//
path: '/BulkAirTicketOrders',
//
name: 'BulkAirTicketOrders',
//
component: resolve => require(['@/components/SalesModule/BulkAirTicketOrders'], resolve),
//
meta: {
//
title: '散卖机票订单'
//
},
//
},
{
// 销售 散卖机票订单
path
:
'/BulkAirTicketOrders'
,
name
:
'BulkAirTicketOrders'
,
component
:
resolve
=>
require
([
'@/components/SalesModule/BulkAirTicketOrders'
],
resolve
),
meta
:
{
title
:
'散卖机票订单'
},
},
{
// 销售 报名统计
path
:
'/enrollTotal'
,
...
...
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