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
0bfaa62c
Commit
0bfaa62c
authored
Jul 16, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
2646412f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
41 additions
and
81 deletions
+41
-81
HotelTrip.vue
src/components/newTravelmanager/travelLineTrip/HotelTrip.vue
+41
-81
No files found.
src/components/newTravelmanager/travelLineTrip/HotelTrip.vue
View file @
0bfaa62c
...
@@ -29,6 +29,7 @@
...
@@ -29,6 +29,7 @@
.Ht_hotelSelect
.el-input
{
.Ht_hotelSelect
.el-input
{
height
:
auto
!important
;
height
:
auto
!important
;
}
}
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"Traveltrip-item-box"
>
<div
class=
"Traveltrip-item-box"
>
...
@@ -101,10 +102,9 @@
...
@@ -101,10 +102,9 @@
<td
valign=
"middle"
colspan=
"5"
>
<td
valign=
"middle"
colspan=
"5"
>
<!--酒店-->
<!--酒店-->
<el-select
v-if=
"!dayObj.isRead &&IsDirect==1&&TeamType!=2"
class=
"w478 Ht_hotelSelect"
size=
"mini"
<el-select
v-if=
"!dayObj.isRead &&IsDirect==1&&TeamType!=2"
class=
"w478 Ht_hotelSelect"
size=
"mini"
v-model=
"HotelChooseArray"
v-model=
"HotelChooseArray"
multiple
:multiple-limit=
"(TeamType==0||TeamType==3)?3:1"
multiple
:multiple-limit=
"(TeamType==0||TeamType==3)?3:1"
@
visible-change=
"getHotelList($event)"
@
visible-change=
"getHotelList($event)"
@
change=
"changeHotelList()"
filterable
placeholder=
"请选择"
@
change=
"changeHotelList()"
:disabled=
"IsOpenHotel==1?true:false"
>
filterable
placeholder=
"请选择"
:disabled=
"IsOpenHotel==1?true:false"
>
<el-option
v-for=
"item in QHotelList"
:label=
"item.Name"
:value=
"item.ID"
:key=
"item.ID"
>
<el-option
v-for=
"item in QHotelList"
:label=
"item.Name"
:value=
"item.ID"
:key=
"item.ID"
>
<span
style=
"float: left"
>
{{
getHotelItemLabel
(
item
)
}}
</span>
<span
style=
"float: left"
>
{{
getHotelItemLabel
(
item
)
}}
</span>
<span
style=
"float: right; color: #8492a6; font-size: 13px"
>
{{
item
.
Inventory
}}
</span>
<span
style=
"float: right; color: #8492a6; font-size: 13px"
>
{{
item
.
Inventory
}}
</span>
...
@@ -117,8 +117,8 @@
...
@@ -117,8 +117,8 @@
</span>
</span>
<span
v-if=
"hotelArray.length>0"
>
/或同级
</span>
<span
v-if=
"hotelArray.length>0"
>
/或同级
</span>
</span>
</span>
<el-input
type=
"text"
v-if=
"!dayObj.isRead&&IsDirect==0&&hotelArray[0]"
v-model=
"hotelArray[0].HotelName"
@
change=
"noDirectHotelChange"
<el-input
type=
"text"
v-if=
"!dayObj.isRead&&IsDirect==0&&hotelArray[0]"
v-model=
"hotelArray[0].HotelName"
class=
"w478"
></el-input>
@
change=
"noDirectHotelChange"
class=
"w478"
></el-input>
<span
class=
"TC-hotelName"
v-if=
"dayObj.isRead&&IsDirect==0"
>
<span
class=
"TC-hotelName"
v-if=
"dayObj.isRead&&IsDirect==0"
>
{{
hotelArray
[
0
].
HotelName
}}
/或同级
{{
hotelArray
[
0
].
HotelName
}}
/或同级
</span>
</span>
...
@@ -130,7 +130,7 @@
...
@@ -130,7 +130,7 @@
</
template
>
</
template
>
<
script
>
<
script
>
export
default
{
export
default
{
props
:
[
"dayObj"
,
"DayList"
,
"CurrentIndex"
,
"WarmTripDescribe"
,
"IsDirect"
,
"subConfig"
,
"TeamType"
,
props
:
[
"dayObj"
,
"DayList"
,
"CurrentIndex"
,
"WarmTripDescribe"
,
"IsDirect"
,
"subConfig"
,
"TeamType"
,
"IsOpenHotel"
//0可以添加删除酒店,1-不能修改酒店信息
"IsOpenHotel"
//0可以添加删除酒店,1-不能修改酒店信息
],
],
data
()
{
data
()
{
...
@@ -139,68 +139,13 @@
...
@@ -139,68 +139,13 @@
QDinnerList
:
[],
QDinnerList
:
[],
QDinnerList2
:
[],
QDinnerList2
:
[],
DefaultSelectValue
:
0
,
DefaultSelectValue
:
0
,
breakFirstList
:
[{
breakFirstList
:
[
],
Id
:
1
,
name
:
"酒店内享用早餐"
},
{
Id
:
2
,
name
:
"酒店外享用早餐"
},
{
Id
:
4
,
name
:
"机上简餐或自理"
},
{
Id
:
3
,
name
:
"方便游玩敬请自理"
},
{
Id
:
5
,
name
:
"酒店内早餐或酒店外用餐"
}
],
showDining
:
false
,
showDining
:
false
,
HotelChooseArray
:
this
.
dayObj
.
HotelChooseArray
,
HotelChooseArray
:
this
.
dayObj
.
HotelChooseArray
,
dinnerArray
:
this
.
dayObj
.
DinnerArray
,
dinnerArray
:
this
.
dayObj
.
DinnerArray
,
hotelArray
:
this
.
dayObj
.
HotelArray
,
hotelArray
:
this
.
dayObj
.
HotelArray
,
otherDinner
:
[{
otherDinner
:
[],
ID
:
-
1
,
hotelHotSpringDinner
:
[],
Name
:
"机上简餐或自理"
,
City
:
0
,
About
:
""
,
PicPath
:
""
},
{
ID
:
-
2
,
Name
:
"酒店享用"
,
City
:
0
,
About
:
""
,
PicPath
:
""
},
{
ID
:
-
5
,
Name
:
"方便游玩敬请自理"
,
City
:
0
,
About
:
""
,
PicPath
:
""
}
],
hotelHotSpringDinner
:
[{
ID
:
-
3
,
Name
:
"温泉御膳料理"
,
City
:
0
,
About
:
""
,
PicPath
:
""
},
{
ID
:
-
4
,
Name
:
"酒店自助百汇"
,
City
:
0
,
About
:
""
,
PicPath
:
""
}
],
isFirstInitDinner
:
false
//初始含有酒店列表,加载完酒店数据在初始化餐厅列表
isFirstInitDinner
:
false
//初始含有酒店列表,加载完酒店数据在初始化餐厅列表
};
};
},
},
...
@@ -208,13 +153,14 @@
...
@@ -208,13 +153,14 @@
// 非直采酒店
// 非直采酒店
noDirectHotelChange
:
function
()
{
noDirectHotelChange
:
function
()
{
if
(
this
.
hotelArray
[
0
].
MD5Sign
===
''
)
{
if
(
this
.
hotelArray
[
0
].
MD5Sign
===
''
)
{
this
.
hotelArray
[
0
].
MD5Sign
=
this
.
md5
(
`DayNum=
${
this
.
hotelArray
[
0
].
DayNum
}
&Type=3
${
new
Date
()}
`
)
this
.
hotelArray
[
0
].
MD5Sign
=
this
.
md5
(
`DayNum=
${
this
.
hotelArray
[
0
].
DayNum
}
&Type=3
${
new
Date
()}
`
)
}
}
},
},
//非直采餐厅
//非直采餐厅
noDirectDinnerChange
:
function
(
dIndex
)
{
noDirectDinnerChange
:
function
(
dIndex
)
{
if
(
this
.
dinnerArray
[
dIndex
].
MD5Sign
===
''
)
{
if
(
this
.
dinnerArray
[
dIndex
].
MD5Sign
===
''
)
{
this
.
dinnerArray
[
dIndex
].
MD5Sign
=
this
.
md5
(
`DayNum=
${
this
.
dinnerArray
[
dIndex
].
DayNum
}
&Type=2
${
new
Date
()}
`
);
this
.
dinnerArray
[
dIndex
].
MD5Sign
=
this
.
md5
(
`DayNum=
${
this
.
dinnerArray
[
dIndex
].
DayNum
}
&Type=2
${
new
Date
()}
`
);
}
}
},
},
//获取交通城市
//获取交通城市
...
@@ -293,7 +239,6 @@
...
@@ -293,7 +239,6 @@
let
hotelDescribeObj
=
this
.
$tripUtils
.
tripDescribeObj
();
let
hotelDescribeObj
=
this
.
$tripUtils
.
tripDescribeObj
();
hotelDescribeObj
.
Id
=
hotelObj
.
HotelId
;
hotelDescribeObj
.
Id
=
hotelObj
.
HotelId
;
hotelDescribeObj
.
Describe
=
obj
.
WarmTip
;
hotelDescribeObj
.
Describe
=
obj
.
WarmTip
;
//this.WarmTripDescribe.HotelDescribeArr.push(hotelDescribeObj);
if
(
hotelDescribeObj
.
Describe
!=
null
&&
hotelDescribeObj
.
Describe
!=
""
)
{
if
(
hotelDescribeObj
.
Describe
!=
null
&&
hotelDescribeObj
.
Describe
!=
""
)
{
this
.
dayObj
.
WarmTipObj
.
Description
+=
"<p>"
+
hotelDescribeObj
.
Describe
+
"</p>"
;
this
.
dayObj
.
WarmTipObj
.
Description
+=
"<p>"
+
hotelDescribeObj
.
Describe
+
"</p>"
;
}
}
...
@@ -377,8 +322,7 @@
...
@@ -377,8 +322,7 @@
this
.
QDinnerList2
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
QDinnerList
));
this
.
QDinnerList2
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
QDinnerList
));
}
}
},
},
err
=>
{
err
=>
{}
}
);
);
}
}
},
},
...
@@ -423,7 +367,6 @@
...
@@ -423,7 +367,6 @@
dinnerDescribeObj
.
Id
=
dinnerObj
.
DinnerId
;
dinnerDescribeObj
.
Id
=
dinnerObj
.
DinnerId
;
dinnerDescribeObj
.
Describe
=
obj
.
About
;
dinnerDescribeObj
.
Describe
=
obj
.
About
;
dinnerDescribeObj
.
Sort
=
dinnerObj
.
UseDinnerType
;
dinnerDescribeObj
.
Sort
=
dinnerObj
.
UseDinnerType
;
//this.WarmTripDescribe.DinnerDescribeArr.push(dinnerDescribeObj);
if
(
dinnerDescribeObj
.
Describe
!=
null
&&
dinnerDescribeObj
.
Describe
!=
""
)
{
if
(
dinnerDescribeObj
.
Describe
!=
null
&&
dinnerDescribeObj
.
Describe
!=
""
)
{
this
.
dayObj
.
WarmTipObj
.
Description
+=
"<p>"
+
dinnerDescribeObj
.
Describe
+
"</p>"
;
this
.
dayObj
.
WarmTipObj
.
Description
+=
"<p>"
+
dinnerDescribeObj
.
Describe
+
"</p>"
;
}
}
...
@@ -624,7 +567,7 @@
...
@@ -624,7 +567,7 @@
});
});
});
});
this
.
dayObj
.
DinnerArray
.
forEach
(
x
=>
{
this
.
dayObj
.
DinnerArray
.
forEach
(
x
=>
{
if
(
x
.
DinnerId
!=
0
&&
x
.
UseDinnerType
!=
1
)
{
if
(
x
.
DinnerId
!=
0
&&
x
.
UseDinnerType
!=
1
)
{
if
(
!
this
.
checkDinnerExists
(
this
.
QDinnerList
,
x
.
DinnerId
))
{
if
(
!
this
.
checkDinnerExists
(
this
.
QDinnerList
,
x
.
DinnerId
))
{
this
.
QDinnerList
.
push
({
this
.
QDinnerList
.
push
({
ID
:
x
.
DinnerId
,
ID
:
x
.
DinnerId
,
...
@@ -654,6 +597,23 @@
...
@@ -654,6 +597,23 @@
});
});
return
isExist
;
return
isExist
;
},
},
//获取配置餐厅信息
getConfigDinnerList
()
{
this
.
apipost
(
"travel_get_GetConfigDinnerList"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
breakFirstList
=
res
.
data
.
data
.
breakFirstList
;
this
.
otherDinner
=
res
.
data
.
data
.
otherDinner
;
this
.
hotelHotSpringDinner
=
res
.
data
.
data
.
hotelHotSpringDinner
;
}
},
err
=>
{}
);
}
},
created
()
{
this
.
getConfigDinnerList
();
},
},
mounted
()
{
mounted
()
{
this
.
initializationData
();
this
.
initializationData
();
...
...
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