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
20684036
Commit
20684036
authored
Jul 03, 2019
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
87cf6186
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
87 deletions
+46
-87
TravelManager2.vue
...ts/newTravelmanager/TravelGroupControl/TravelManager2.vue
+12
-19
TravelDaysTrip_Direct.vue
...newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue
+34
-68
No files found.
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @
20684036
...
...
@@ -176,7 +176,8 @@
RemoveImg
:
[],
//移除的图片
//线路行程天数
DayList
:
[],
isFileUpload
:
false
//是否是一键上传行程
isFileUpload
:
false
,
//是否是一键上传行程
IsUpdateTrip
:
0
,
//是否联动行程特色
},
PostPrice
:
""
,
//报价信息
//线路
...
...
@@ -349,6 +350,7 @@
basicData
.
WarmTipList
=
this
.
PostDaysTrip
.
WarmTipList
;
basicData
.
TitleList
=
this
.
PostDaysTrip
.
TitleList
;
basicData
.
RemoveImg
=
this
.
PostDaysTrip
.
RemoveImg
;
this
.
journeyList
.
IsUpdateTrip
=
this
.
PostDaysTrip
.
IsUpdateTrip
;
//行程特色数据
var
TripFeature
=
{};
if
(
this
.
PostFeature
==
""
)
{
...
...
@@ -362,26 +364,14 @@
TripFeature
.
FeatureHtmlJsonDelete
=
TripFeature
.
FeatureHtmlJsonDelete
?
JSON
.
stringify
(
TripFeature
.
FeatureHtmlJsonDelete
)
:
""
;
var
htmlObj
=
document
.
getElementById
(
"newFeatureBox"
);
if
(
htmlObj
)
{
if
(
htmlObj
.
innerHTML
!=
null
||
htmlObj
.
innerHTML
!=
""
)
{}
}
else
if
(
TripFeature
.
FeatureType
>=
4
)
{
this
.
$confirm
(
'是否更新行程特色?'
,
'提示'
,
{
confirmButtonText
:
'更新'
,
cancelButtonText
:
'不更新'
,
type
:
'warning'
}).
then
(()
=>
{
this
.
MsgBus
.
$emit
(
'comUpTravel'
);
this
.
isSubmit
=
false
;
}).
catch
(()
=>
{
TripFeature
.
FeatureHtmlJson
=
this
.
FeatureHtmlJson
;
TripFeature
.
FeatureHtmlJsonDelete
=
this
.
FeatureHtmlJsonDelete
;
this
.
MsgBus
.
$emit
(
'resetFresh'
);
this
.
custormAnchor
(
'thirdAnchor'
,
3
);
this
.
isSubmit
=
false
;
});
if
(
TripFeature
.
FeatureType
>=
4
)
{
var
htmlObj
=
document
.
getElementById
(
"newFeatureBox"
);
if
(
htmlObj
&&
htmlObj
.
innerHTML
!=
null
&&
htmlObj
.
innerHTML
!=
""
)
{}
else
{
this
.
MsgBus
.
$emit
(
'comUpTravel'
);
}
}
TripFeature
.
FeeInclude
=
this
.
PostNotice
.
FeeInclude
;
TripFeature
.
FeeNonInclude
=
this
.
PostNotice
.
FeeNonInclude
;
TripFeature
.
ImportantTip
=
this
.
PostNotice
.
ImportantTip
;
...
...
@@ -690,6 +680,7 @@
this
.
PostConfig
.
OpenTeamDescribe
=
tempData
.
OpenTeamDescribe
;
this
.
PostConfig
.
IsOpenHotel
=
tempData
.
IsOpenHotel
;
this
.
NoticeParameters
.
ConfigId
=
tempData
.
ConfigId
;
this
.
NoticeParameters
.
CountryID
=
tempData
.
CountryID
;
this
.
NoticeParameters
.
IsDirect
=
tempData
.
IsDirect
;
...
...
@@ -721,6 +712,8 @@
this
.
PostConfig
.
SelfpayingList
=
tempData
.
SelfpayingList
;
}
//默认不联动行程特色
this
.
journeyList
.
IsUpdateTrip
=
0
;
this
.
journeyList
.
DayNum
=
tempData
.
DayNum
;
this
.
journeyList
.
NightNum
=
tempData
.
NightNum
;
this
.
journeyList
.
ReturnArriveCityId
=
tempData
.
ReturnArriveCityId
;
...
...
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue
View file @
20684036
...
...
@@ -46,6 +46,7 @@
.TC-newTop
{
margin-top
:
40px
!important
;
}
</
style
>
<
template
>
...
...
@@ -61,22 +62,16 @@
<span
class=
"TDTextspan"
>
行程天数
</span>
<span
class=
"TDInputspan"
>
<el-form-item
prop=
"DayNum"
>
<el-input
class=
"w120 LowNum"
v-model=
"subConfig.DayNum"
@
keyup
.
native=
"checkInteger(subConfig,'DayNum');createLineTrip()"
>
<el-input
class=
"w100 LowNum"
v-model=
"subConfig.DayNum"
maxlength=
"2"
@
keyup
.
native=
"checkInteger(subConfig,'DayNum');createLineTrip()"
>
<template
slot=
"append"
>
天
</
template
>
</el-input>
</el-form-item>
</span>
<span
class=
"TDInputspan"
>
<el-form-item
prop=
"NightNum"
>
<el-input
class=
"w120 LowNum"
v-model=
"subConfig.NightNum"
@
keyup
.
native=
"checkInteger(subConfig,'NightNum')"
>
<el-input
class=
"w100 LowNum"
v-model=
"subConfig.NightNum"
maxlength=
"2"
@
keyup
.
native=
"checkInteger(subConfig,'NightNum')"
>
<
template
slot=
"append"
>
晚
</
template
>
</el-input>
</el-form-item>
...
...
@@ -84,71 +79,48 @@
<span
class=
"TDTextspan"
>
集合出发城市
</span>
<span>
<el-form-item
prop=
"StartCityId"
>
<el-select
class=
"w200"
:placeholder=
"$t('pub.pleaseSel')"
v-model=
"subConfig.StartCityId"
filterable
>
<el-select
class=
"w120"
:placeholder=
"$t('pub.pleaseSel')"
v-model=
"subConfig.StartCityId"
filterable
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"SelectDefaultValue"
></el-option>
<el-option
v-for=
"item in StartCity"
:label=
"item.startCityName"
:value=
"item.ID"
:key=
"item.ID"
></el-option>
<el-option
v-for=
"item in StartCity"
:label=
"item.startCityName"
:value=
"item.ID"
:key=
"item.ID"
>
</el-option>
</el-select>
</el-form-item>
</span>
<span
class=
"TDTextspan"
>
返回抵达城市
</span>
<span>
<el-form-item
prop=
"ReturnArriveCityId"
>
<el-select
class=
"w200"
:placeholder=
"$t('pub.pleaseSel')"
v-model=
"subConfig.ReturnArriveCityId"
filterable
>
<el-select
class=
"w120"
:placeholder=
"$t('pub.pleaseSel')"
v-model=
"subConfig.ReturnArriveCityId"
filterable
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"SelectDefaultValue"
></el-option>
<el-option
v-for=
"item in StartCity"
:label=
"item.startCityName"
:value=
"item.ID"
:key=
"item.ID"
></el-option>
<el-option
v-for=
"item in StartCity"
:label=
"item.startCityName"
:value=
"item.ID"
:key=
"item.ID"
>
</el-option>
</el-select>
</el-form-item>
</span>
<span
class=
"TDTextspan"
style=
"display:none;"
>
是否更新行程特色
</span>
<span
style=
"display:none;"
>
<el-form-item
prop=
"ReturnArriveCityId"
>
<el-select
class=
"w120"
:placeholder=
"$t('pub.pleaseSel')"
v-model=
"subConfig.IsUpdateTrip"
>
<el-option
label=
"不更新"
:value=
"0"
></el-option>
<el-option
label=
"更新"
:value=
"1"
></el-option>
</el-select>
</el-form-item>
</span>
</div>
<div
class=
"newTravelDayContent clearfix"
>
<div
class=
"vertical-line"
></div>
<div
class=
"TC-days-box TC-box"
v-for=
"(item,index) in subConfig.DayList"
:key=
"item.subCode"
>
<div
class=
"TC-days-box TC-box"
v-for=
"(item,index) in subConfig.DayList"
:key=
"item.subCode"
>
<div
class=
"days-box TC-box"
>
<div
class=
"leftDayLine"
>
<div
class=
"dayCircle"
>
D{{item.DayNum}}
</div>
</div>
<div
class=
"newDayContent"
>
<travelDaysTrip
v-bind:dayObj=
"item"
v-bind:CurrentIndex=
"index"
v-bind:TotalCount=
"subConfig.DayList.length"
v-bind:isOpenGroup=
"isOpenGroup"
v-bind:AllCityList=
"AllCityList"
v-bind:StartCity=
"StartCity"
v-bind:UseTypeArray=
"UseTypeArray"
v-bind:AirPickUp=
"AirPickUp"
v-bind:AirSend=
"AirSend"
v-bind:DayList=
"subConfig.DayList"
v-bind:NoticeParameters=
"NoticeParameters"
v-bind:subConfig=
"subConfig"
@
change=
"handlerChangeDateList"
:TeamType=
"TeamType"
:IsOpenHotel=
"IsOpenHotel"
></travelDaysTrip>
<travelDaysTrip
v-bind:dayObj=
"item"
v-bind:CurrentIndex=
"index"
v-bind:TotalCount=
"subConfig.DayList.length"
v-bind:isOpenGroup=
"isOpenGroup"
v-bind:AllCityList=
"AllCityList"
v-bind:StartCity=
"StartCity"
v-bind:UseTypeArray=
"UseTypeArray"
v-bind:AirPickUp=
"AirPickUp"
v-bind:AirSend=
"AirSend"
v-bind:DayList=
"subConfig.DayList"
v-bind:NoticeParameters=
"NoticeParameters"
v-bind:subConfig=
"subConfig"
@
change=
"handlerChangeDateList"
:TeamType=
"TeamType"
:IsOpenHotel=
"IsOpenHotel"
></travelDaysTrip>
</div>
</div>
</div>
...
...
@@ -204,9 +176,7 @@
createLineTrip
()
{
if
(
this
.
subConfig
.
DayNum
>
this
.
subConfig
.
DayList
.
length
)
{
for
(
var
i
=
this
.
subConfig
.
DayList
.
length
;
i
<
this
.
subConfig
.
DayNum
;
i
++
var
i
=
this
.
subConfig
.
DayList
.
length
;
i
<
this
.
subConfig
.
DayNum
;
i
++
)
{
//去掉以前默认的交通
var
dayItem
=
this
.
$tripUtils
.
tripDayobj
();
...
...
@@ -236,9 +206,7 @@
}
else
{
//删除多余的项
for
(
var
i
=
this
.
subConfig
.
DayNum
;
i
<
this
.
subConfig
.
DayList
.
length
;
i
++
var
i
=
this
.
subConfig
.
DayNum
;
i
<
this
.
subConfig
.
DayList
.
length
;
i
++
)
{
var
dayObj
=
this
.
subConfig
.
DayList
[
i
];
this
.
commonRemove
(
dayObj
);
...
...
@@ -354,7 +322,8 @@
ScenicList
:
ScenicList
,
TrafficList
:
TrafficList
,
WarmTipList
:
WarmTipList
,
TitleList
:
TitleList
TitleList
:
TitleList
,
IsUpdateTrip
:
this
.
subConfig
.
IsUpdateTrip
};
this
.
HotelList
=
HotelList
;
this
.
DinnerList
=
DinnerList
;
...
...
@@ -362,7 +331,7 @@
}
},
created
()
{
},
computed
:
{
//获取行程天数
...
...
@@ -390,10 +359,6 @@
},
//监听直采和非直采的编号
getLineId
(
newValue
,
oldValue
)
{
// if (newValue != oldValue) {
// this.subConfig.DayList = [];
// this.createLineTrip();
// }
},
subConfig
:
{
handler
:
function
(
newValue
,
oldValue
)
{
...
...
@@ -403,4 +368,5 @@
}
}
};
</
script
>
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