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
39bbbaff
Commit
39bbbaff
authored
Jul 25, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
41a504bc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
3 deletions
+48
-3
addPassenger.vue
src/components/SalesModule/addPassenger.vue
+36
-0
TravelControlList.vue
...components/TravelManager/TravelList/TravelControlList.vue
+5
-2
TravelPassengerList2.vue
...ponents/TravelManager/TravelList/TravelPassengerList2.vue
+7
-1
No files found.
src/components/SalesModule/addPassenger.vue
View file @
39bbbaff
<
style
>
.heightauto
.el-input
{
height
:
auto
!important
;
}
.addPassenger
.btmTitle
{
padding
:
0
10px
;
margin
:
20px
0
20px
0
;
...
...
@@ -366,6 +369,16 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"景点"
>
<el-select
v-model=
"addMsg.CouponsIds"
multiple
placeholder=
"请选择"
class=
"heightauto"
>
<el-option
v-for=
"item in JingDianList"
:key=
"item.CouponsId"
:label=
"item.CouponsName"
:value=
"item.CouponsId"
>
</el-option>
</el-select>
</el-form-item>
</li>
<li
v-for=
'(item,index) in EconomicCapabilityS'
>
<el-form-item
:label=
"item.Name"
v-if=
'item.isShow'
:key=
'index'
>
...
...
@@ -664,6 +677,7 @@
SafeReplaceId
:
"0"
,
VisaState
:
0
,
//签证状态
HouseId
:
''
,
//房间信息
CouponsIds
:
[]
},
EconomicCapabilityS
:
[],
rules
:
{
...
...
@@ -780,9 +794,29 @@
LineId
:
0
,
EndDateStr
:
''
,
guoqi
:
false
,
JingDianList
:
[]
};
},
methods
:
{
getJingDIan
:
function
(){
this
.
apipost
(
"sellorder_post_GetGuestScenicRefundList"
,
{
TCID
:
this
.
addMsg
.
TCID
,
OrderId
:
this
.
addMsg
.
OrderId
,
GuestId
:
this
.
addMsg
.
Id
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
console
.
log
(
res
.
data
.
data
)
this
.
JingDianList
=
res
.
data
.
data
}
else
{
this
.
$message
.
error
(
'操作失败'
)
}
},
err
=>
{}
);
},
CompareDate
(
d1
,
d2
){
return
((
new
Date
(
d1
.
replace
(
/-/g
,
"
\
/"
)))
<
(
new
Date
(
d2
.
replace
(
/-/g
,
"
\
/"
))));
},
...
...
@@ -2001,6 +2035,7 @@
}
},
mounted
()
{
this
.
getCountry
();
this
.
getMarriageType
();
this
.
getVisaDeparturesType
();
...
...
@@ -2027,6 +2062,7 @@
this
.
addMsg
.
PassportAddress
=
"湖南"
;
}
this
.
addMsg
.
IssuingAuthority
=
"公安部出入境管理局"
;
this
.
getJingDIan
();
}
};
</
script
>
src/components/TravelManager/TravelList/TravelControlList.vue
View file @
39bbbaff
...
...
@@ -497,8 +497,11 @@
<commonHotelInfo
:HotelObj=
"item.HotelOrderListReports"
:showHotelObj=
"showHotelObj"
:TCID=
"item.TCID"
:DMCNum=
"item.DMCNum"
:TCNUM=
"item.TCNUM"
@
SetShouPeiShu=
"SetShouPeiShu(item.TCID,item.ShouPeiStatus)"
></commonHotelInfo>
<span
slot=
"reference"
class=
"price"
style=
"cursor:pointer;text-decoration:underline;"
>
酒店预订状况
</span>
<div
slot=
"reference"
>
<span
class=
"price"
style=
"cursor:pointer;text-decoration:underline;"
>
酒店预订状况
</span>
<span
style=
"color: #e95252"
>
op{{item.OpSureHouse==2 ? '已确认' : '未确认'}}分房
</span>
</div>
</el-popover>
</p>
<p
class=
"travelnowrap"
v-if=
"item.LineID==14 && item.IsOpenHotel==1"
>
...
...
src/components/TravelManager/TravelList/TravelPassengerList2.vue
View file @
39bbbaff
...
...
@@ -41,6 +41,11 @@
.PassengerList2
input
.houseno
:focus
{
border-bottom
:
1px
solid
#e95252
;
}
.tips__
{
color
:
#e95252
;
text-align
:
center
;
margin
:
10px
;
}
</
style
>
<
template
>
...
...
@@ -64,11 +69,12 @@
</table>
</li>
<li>
<input
type=
"button"
class=
"normalBtn"
value=
"分房表确认"
@
click=
"querenHotel()"
>
<input
type=
"button"
class=
"normalBtn"
v
-if=
"!allDIs"
v
alue=
"分房表确认"
@
click=
"querenHotel()"
>
<input
type=
"button"
class=
"normalBtn"
value=
"导出报表"
@
click=
"exportExcel()"
>
</li>
</ul>
</div>
<p
class=
"tips__"
v-if=
"allDIs"
>
op已确认分房,不能在进行任何操作
</p>
<table
style=
"margin-bottom: 50px;"
class=
"travelpassengerlist"
...
...
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