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
92b1f46e
Commit
92b1f46e
authored
May 17, 2019
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
取消判断
parent
04317503
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
8 deletions
+11
-8
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+6
-4
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+5
-4
No files found.
src/components/SalesModule/groupTourOrder.vue
View file @
92b1f46e
...
@@ -59,14 +59,11 @@
...
@@ -59,14 +59,11 @@
border-bottom
:
2px
solid
#333
;
border-bottom
:
2px
solid
#333
;
}
}
.groupTourOrderSearchTable
tbody
{}
.groupTourOrderSearchTable
tr
th
{
.groupTourOrderSearchTable
tr
th
{
background
:
#e6e6e6
;
background
:
#e6e6e6
;
height
:
30px
;
height
:
30px
;
font-size
:
12px
;
font-size
:
12px
;
text-align
:
left
;
text-align
:
center
;
text-indent
:
15px
;
border-top
:
1px
solid
#cccccc
;
border-top
:
1px
solid
#cccccc
;
border-left
:
1px
solid
#cccccc
;
border-left
:
1px
solid
#cccccc
;
}
}
...
@@ -2362,6 +2359,10 @@
...
@@ -2362,6 +2359,10 @@
},
err
=>
{})
},
err
=>
{})
},
},
deleteItem
(
obj
)
{
deleteItem
(
obj
)
{
if
(
obj
.
isCanClear
==
1
){
this
.
Error
(
'OP已确认订单 如需取消请联系当团OP!'
);
return
;
}
this
.
$confirm
(
'是否取消?'
,
'提示'
,
{
this
.
$confirm
(
'是否取消?'
,
'提示'
,
{
confirmButtonText
:
'确定'
,
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
...
@@ -3555,6 +3556,7 @@
...
@@ -3555,6 +3556,7 @@
this
.
loading
=
false
this
.
loading
=
false
this
.
total
=
res
.
data
.
data
.
count
this
.
total
=
res
.
data
.
data
.
count
this
.
list
=
res
.
data
.
data
.
pageData
;
this
.
list
=
res
.
data
.
data
.
pageData
;
console
.
log
(
this
.
list
,
'list'
);
}
else
{
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
)
this
.
$message
.
error
(
res
.
data
.
message
)
}
}
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
92b1f46e
...
@@ -40,9 +40,6 @@
...
@@ -40,9 +40,6 @@
border-right
:
1px
solid
#cccccc
;
border-right
:
1px
solid
#cccccc
;
border-collapse
:
collapse
;
border-collapse
:
collapse
;
}
}
.groupTourOrderSearchTable
tr
{
/* border-bottom: 2px solid #333; */
}
.groupTourOrderSearchTable
tbody
tr
:last-child
{
.groupTourOrderSearchTable
tbody
tr
:last-child
{
border-bottom
:
2px
solid
#333
;
border-bottom
:
2px
solid
#333
;
}
}
...
@@ -2791,6 +2788,10 @@ export default {
...
@@ -2791,6 +2788,10 @@ export default {
},
},
deleteItem
(
obj
)
{
deleteItem
(
obj
)
{
if
(
obj
.
isCanClear
==
1
){
this
.
Error
(
'OP已确认订单 如需取消请联系当团OP!'
);
return
;
}
this
.
$confirm
(
"是否取消?"
,
"提示"
,
{
this
.
$confirm
(
"是否取消?"
,
"提示"
,
{
confirmButtonText
:
"确定"
,
confirmButtonText
:
"确定"
,
cancelButtonText
:
"取消"
,
cancelButtonText
:
"取消"
,
...
@@ -4052,7 +4053,7 @@ submitYSZEForm(){
...
@@ -4052,7 +4053,7 @@ submitYSZEForm(){
//单机票
//单机票
this
.
seat
.
SingleAirTicketCount
=
res
.
data
.
data
.
pageData
.
singleAirTicketCount
;
this
.
seat
.
SingleAirTicketCount
=
res
.
data
.
data
.
pageData
.
singleAirTicketCount
;
}
else
{
}
else
{
this
.
$message
.
e
rror
(
res
.
data
.
message
);
this
.
E
rror
(
res
.
data
.
message
);
}
}
},
},
err
=>
{}
err
=>
{}
...
...
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