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
122642c2
Commit
122642c2
authored
Nov 13, 2019
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
签证订单修改
parent
50f79d5b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
20 deletions
+31
-20
VisaProductEditOrder.vue
src/components/SalesVisa/VisaProductEditOrder.vue
+21
-14
VisaProductOrder.vue
src/components/SalesVisa/VisaProductOrder.vue
+10
-6
No files found.
src/components/SalesVisa/VisaProductEditOrder.vue
View file @
122642c2
...
...
@@ -112,22 +112,23 @@
</div>
<table
class=
"VisaProductTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
'loading'
>
<tr>
<th
width=
"
10
%"
>
{{
$t
(
'fnc.danhao'
)
}}
</th>
<th
width=
"
10
%"
>
{{
$t
(
'hotel.product_name'
)
}}
</th>
<th
width=
"
9
%"
>
{{
$t
(
'fnc.danhao'
)
}}
</th>
<th
width=
"
8
%"
>
{{
$t
(
'hotel.product_name'
)
}}
</th>
<th
width=
"4%"
>
{{
$t
(
'admin.admin_personNumber'
)
}}
</th>
<th
width=
"
8
%"
>
{{
$t
(
'hotel.hotel_StarDate'
)
}}
</th>
<th
width=
"
7
%"
>
{{
$t
(
'hotel.hotel_StarDate'
)
}}
</th>
<th
width=
"8%"
>
{{
$t
(
'fnc.yszonge'
)
}}
</th>
<th
width=
"8%"
>
{{
$t
(
'fnc.shishou'
)
}}
</th>
<th
width=
"8%"
>
{{
$t
(
'fnc.tuikuan'
)
}}
</th>
<th
width=
"8%"
>
{{
$t
(
'fnc.ptshuijin'
)
}}
</th>
<!--
<th
width=
"8%"
>
预计提成
</th>
-->
<th
width=
"6%"
>
{{
$t
(
'fnc.tuikuan'
)
}}
</th>
<th
width=
"6%"
>
{{
$t
(
'fnc.ptshuijin'
)
}}
</th>
<th
width=
"6%"
>
优惠
</th>
<th
width=
"6%"
>
待收
</th>
<th
width=
"8%"
>
{{
$t
(
'fnc.bmriqi'
)
}}
</th>
<th
width=
"
8
%"
>
{{
$t
(
'admin.admin_status'
)
}}
</th>
<th
width=
"
5
%"
>
{{
$t
(
'admin.admin_status'
)
}}
</th>
<th
width=
"10%"
>
{{
$t
(
'system.table_operation'
)
}}
</th>
</tr>
<tbody
v-for=
'item in dataList'
>
<tr>
<td>
{{
item
.
visaTCNUM
}}
</td>
<td>
{{
item
.
visaTCNUM
}}
(
{{
item
.
id
}}
)
</td>
<td>
{{
item
.
name
}}
</td>
<td>
{{
item
.
peopleNum
}}
</td>
<td>
{{
item
.
departDate
}}
</td>
...
...
@@ -144,26 +145,32 @@
<td>
<span>
¥
{{
moneyFormat
(
item
.
platformTax
)
}}
</span>
</td>
<td>
<span>
¥
{{
moneyFormat
(
item
.
discountMoney
)
}}
</span>
</td>
<td>
<span>
¥
{{
moneyFormat
(
item
.
dueInMoney
)
}}
</span>
</td>
<!--
<td>
<span
class=
"peopleNum"
>
¥
{{
moneyFormat
(
item
.
commission
)
}}
</span>
</td>
-->
<td>
{{
item
.
createTime
}}
</td>
<td>
{{
item
.
visaOrderStatus
==
1
?
"正常"
:
"取消"
}}
</td>
<td>
{{
item
.
visaOrderStatus
==
1
?
"正常"
:
item
.
visaOrderStatus
==
3
?
"待付款"
:
"取消"
}}
</td>
<td
class=
"groupTourOrderIcon"
>
<el-button-group>
<el-tooltip
v-if=
"item.income
<
=
0
&&
item
.
visaOrderStatus=
=1
&&item.visaStatus==1"
class=
"item"
effect=
"dark"
:content=
"$t('system.table_edit')"
placement=
"top-start"
>
<el-tooltip
v-if=
"item.income
<
=
0
&&
(
item
.
visaOrderStatus=
=1||item.visaOrderStatus==3)
&&item.visaStatus==1"
class=
"item"
effect=
"dark"
:content=
"$t('system.table_edit')"
placement=
"top-start"
>
<el-button
type=
"primary"
style=
'background:#409EFF; border-color:#409EFF'
icon=
"iconfont icon-img_bianji_small"
@
click=
'getDetail(item,false)'
></el-button>
</el-tooltip>
<el-tooltip
v-else
class=
"item"
effect=
"dark"
:content=
"$t('salesModule.UpRemarks')"
placement=
"top-start"
>
<el-button
type=
"primary"
style=
'background:#409EFF; border-color:#409EFF'
icon=
"iconfont icon-img_bianji_small"
@
click=
'getDetail(item,true)'
></el-button>
</el-tooltip>
<el-tooltip
v-if=
"item.visaOrderStatus==1"
effect=
"dark"
:content=
"$t('salesModule.SFK')"
placement=
"top-start"
>
<el-tooltip
v-if=
"item.visaOrderStatus==1
||item.visaOrderStatus==3
"
effect=
"dark"
:content=
"$t('salesModule.SFK')"
placement=
"top-start"
>
<el-button
type=
"primary"
style=
'background:#5EBB64; border-color:#5EBB64'
@
click=
'goUrl(item)'
icon=
"iconfont icon-qian"
></el-button>
</el-tooltip>
<el-tooltip
v-if=
"
item.visaOrderStatus==1
&&item.visaStatus==1"
effect=
"dark"
:content=
"$t('salesModule.LKMD')"
placement=
"top-start"
>
<el-tooltip
v-if=
"
(item.visaOrderStatus==1||item.visaOrderStatus==3)
&&item.visaStatus==1"
effect=
"dark"
:content=
"$t('salesModule.LKMD')"
placement=
"top-start"
>
<el-button
v-show=
'item.visaManagementId>0'
type=
"primary"
style=
'background:#00a1f1; border-color:#00a1f1'
@
click=
'goUrlT(item)'
icon=
"iconfont icon-bumen"
></el-button>
</el-tooltip>
<el-tooltip
v-if=
"item.income
<
=
0
&&
item
.
visaOrderStatus=
=1
"
class=
"item"
effect=
"dark"
:content=
"$t('pub.cancelBtn')"
placement=
"top-start"
>
<el-tooltip
v-if=
"item.income
<
=
0
&&
(
item
.
visaOrderStatus=
=1||item.visaOrderStatus==3)
"
class=
"item"
effect=
"dark"
:content=
"$t('pub.cancelBtn')"
placement=
"top-start"
>
<el-button
type=
"primary"
style=
'background:#E95252; border-color:#E95252;'
icon=
"iconfont icon-xingzhuangkaobei"
@
click=
'cancelOrder(item)'
></el-button>
</el-tooltip>
</el-button-group>
...
...
@@ -171,7 +178,7 @@
</tr>
<tr>
<td
colspan=
"1
2
"
class=
"RL_Order"
style=
"height:40px;"
>
<td
colspan=
"1
6
"
class=
"RL_Order"
style=
"height:40px;"
>
<span
class=
"VD-remarkTitle"
>
{{
$t
(
'salesModule.MD'
)
}}
:
</span>
<span
class=
"VD-redType VD-remarkCon"
v-if=
"item.guestList.length>0"
>
<span
v-for=
"(childItem) in item.guestList"
style=
"margin-right:10px;"
>
{{
childItem
.
userName
}}
</span>
...
...
src/components/SalesVisa/VisaProductOrder.vue
View file @
122642c2
...
...
@@ -129,18 +129,19 @@
</div>
<table
class=
"VisaProductTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
'loading'
>
<tr>
<th
width=
"1
0
%"
>
单号
</th>
<th
width=
"
8
%"
>
业务员
</th>
<th
width=
"1
1
%"
>
单号
</th>
<th
width=
"
6
%"
>
业务员
</th>
<th
width=
"4%"
>
人数
</th>
<th
width=
"8%"
>
出发日期
</th>
<th
width=
"8%"
>
报名日期
</th>
<th
width=
"8%"
>
应收总额
</th>
<th
width=
"8%"
>
实收
</th>
<th
width=
"8%"
>
退款
</th>
<th
width=
"8%"
>
平台税金
</th>
<th
width=
"6%"
>
退款
</th>
<th
width=
"6%"
>
平台税金
</th>
<th
width=
"6%"
>
优惠
</th>
<th
width=
"5%"
>
待收
</th>
<th
width=
"5%"
>
在途
</th>
<th
width=
"
7
%"
>
订单状态
</th>
<th
width=
"
6
%"
>
订单状态
</th>
<th
width=
"5%"
>
状态
</th>
<th
width=
"12%"
>
操作
</th>
</tr>
...
...
@@ -173,6 +174,9 @@
<td>
<span>
¥
{{
moneyFormat
(
item
.
PlatformTax
)
}}
</span>
</td>
<td>
<span>
¥
{{
moneyFormat
(
item
.
DiscountMoney
)
}}
</span>
</td>
<td>
<span>
¥
{{
moneyFormat
(
item
.
DueInMoney
)
}}
</span>
</td>
...
...
@@ -212,7 +216,7 @@
</tr>
<tr>
<td
colspan=
"1
4
"
class=
"RL_Order"
style=
"height:40px;"
>
<td
colspan=
"1
5
"
class=
"RL_Order"
style=
"height:40px;"
>
<span
class=
"VO-remarkTitle"
>
名单:
</span>
<span
class=
"VO-redType VO-remarkCon"
v-if=
"item.GuestList.length>0"
style=
"cursor:pointer"
>
<span
v-for=
"(childItem) in item.GuestList"
style=
"margin-right:10px;"
@
click=
"goUrl2('VisapassengerList',item.Id,'旅客名单')"
>
{{
childItem
.
userName
}}
</span>
...
...
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