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
dc5e6c80
Commit
dc5e6c80
authored
Feb 12, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
879e21c5
5796f555
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+2
-2
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+2
-2
No files found.
src/components/SalesModule/groupTourOrder.vue
View file @
dc5e6c80
...
...
@@ -1355,8 +1355,8 @@
<div
v-if=
"item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')"
@
click=
'getHouse(item)'
>
修改房型
</div>
<div
v-if=
"item.isOrder=='1'&&item.orderState!='4'"
@
click=
"transfer(item)"
>
订单转团
</div>
<div
v-if=
"item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2')"
@
click=
'setChargeLoss(item)'
>
<span
v-if=
"item.isChargeLossOrders==1"
>
恢复收损
</span>
<span
v-else
>
设为收损
</span>
<span
v-if=
"item.isChargeLossOrders==1"
>
恢复收损
单
</span>
<span
v-else
>
设为收损
单
</span>
</div>
<div
v-if=
"item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')"
@
click=
'deleteItem(item)'
>
取消
</div>
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
dc5e6c80
...
...
@@ -1573,8 +1573,8 @@
<!-- v-if="item.isUpdateOrderCommission" -->
<div
@
click=
'TCMsg.OrderId = item.orderId, TCMsg.CommissionMinusRate = item.commissionMinusRate, TiChengLoading = true'
>
修改提成
</div>
<div
v-if=
"item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2')"
@
click=
'setChargeLoss(item)'
>
<span
v-if=
"item.isChargeLossOrders==1"
>
恢复收损
</span>
<span
v-else
>
设为收损
</span>
<span
v-if=
"item.isChargeLossOrders==1"
>
恢复收损
单
</span>
<span
v-else
>
设为收损
单
</span>
</div>
<div
v-if=
"item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')"
@
click=
'deleteItem(item)'
>
取消
</div>
</div>
...
...
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