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
88558143
Commit
88558143
authored
Jul 17, 2019
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
d6048ce2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
15 deletions
+21
-15
TravelManager2.vue
...ts/newTravelmanager/TravelGroupControl/TravelManager2.vue
+7
-1
TravelPrice.vue
...nents/newTravelmanager/TravelGroupControl/TravelPrice.vue
+12
-12
TravelDaysTrip_Direct.vue
...newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue
+2
-2
No files found.
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @
88558143
...
@@ -369,7 +369,11 @@
...
@@ -369,7 +369,11 @@
if
(
TripFeature
.
FeatureType
>=
4
)
{
if
(
TripFeature
.
FeatureType
>=
4
)
{
var
htmlObj
=
document
.
getElementById
(
"newFeatureBox"
);
var
htmlObj
=
document
.
getElementById
(
"newFeatureBox"
);
if
(
htmlObj
&&
htmlObj
.
innerHTML
!=
null
&&
htmlObj
.
innerHTML
!=
""
)
{}
else
{
if
(
htmlObj
&&
htmlObj
.
innerHTML
!=
null
&&
htmlObj
.
innerHTML
!=
""
)
{}
else
{
this
.
MsgBus
.
$emit
(
'comUpTravel'
);
//更新行程特色
if
(
this
.
journeyList
.
IsUpdateTrip
==
1
)
{
this
.
MsgBus
.
$emit
(
'comUpTravel'
);
}
}
}
}
}
...
@@ -399,6 +403,7 @@
...
@@ -399,6 +403,7 @@
}
}
basicData
.
TeamType
=
this
.
TeamType
;
basicData
.
TeamType
=
this
.
TeamType
;
basicData
.
IsUpdateHotel
=
this
.
PostConfig
.
IsUpdateHotel
;
basicData
.
IsUpdateHotel
=
this
.
PostConfig
.
IsUpdateHotel
;
this
.
apipost
(
this
.
apipost
(
"travel_post_SetTravelConfigInfo"
,
"travel_post_SetTravelConfigInfo"
,
basicData
,
basicData
,
...
@@ -625,6 +630,7 @@
...
@@ -625,6 +630,7 @@
res
=>
{
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
var
tempData
=
res
.
data
.
data
;
var
tempData
=
res
.
data
.
data
;
if
(
tempData
.
Feature
!=
null
)
{
if
(
tempData
.
Feature
!=
null
)
{
this
.
FeatureData
.
ID
=
tempData
.
Feature
.
ID
;
this
.
FeatureData
.
ID
=
tempData
.
Feature
.
ID
;
this
.
FeatureData
.
ConfigId
=
tempData
.
Feature
.
ConfigId
;
this
.
FeatureData
.
ConfigId
=
tempData
.
Feature
.
ConfigId
;
...
...
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @
88558143
...
@@ -664,6 +664,13 @@
...
@@ -664,6 +664,13 @@
<
template
slot=
"prepend"
>
集合标识
</
template
>
<
template
slot=
"prepend"
>
集合标识
</
template
>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
<el-form-item>
<span
class=
"TP_Sendprepend"
style=
"margin-left:0;width:120px;"
>
可退景点
</span>
<el-select
class=
"w180"
v-model=
"priceData.ChooseBackScenicArr"
multiple
>
<el-option
v-for=
"item in priceData.scenicBackList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-form-item>
<el-input
placeholder=
"请输入"
class=
"w460 ComSeat"
v-model=
"priceData.AirportService"
>
<el-input
placeholder=
"请输入"
class=
"w460 ComSeat"
v-model=
"priceData.AirportService"
>
<
template
slot=
"prepend"
>
机场服务
</
template
>
<
template
slot=
"prepend"
>
机场服务
</
template
>
...
@@ -1053,7 +1060,6 @@
...
@@ -1053,7 +1060,6 @@
var
objItem
=
""
;
var
objItem
=
""
;
if
(
this
.
returnPriceList
.
length
>
0
)
{
if
(
this
.
returnPriceList
.
length
>
0
)
{
objItem
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
returnPriceList
[
0
]));
objItem
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
returnPriceList
[
0
]));
console
.
log
(
"objItem"
,
objItem
);
objItem
.
OPRemark
=
""
;
objItem
.
OPRemark
=
""
;
objItem
.
AirTicketId
=
0
;
objItem
.
AirTicketId
=
0
;
objItem
.
AirticketBindList
=
[];
objItem
.
AirticketBindList
=
[];
...
@@ -1136,6 +1142,10 @@
...
@@ -1136,6 +1142,10 @@
ChooseHotelArray
:
[],
ChooseHotelArray
:
[],
//销售清位时间
//销售清位时间
SaleClearOrderHour
:
0
,
SaleClearOrderHour
:
0
,
//可退景点选择列表
chooseBackScenicArr
:[],
//可退景点下拉列表
scenicBackList
:[],
};
};
}
}
this
.
returnPriceList
.
push
(
objItem
);
this
.
returnPriceList
.
push
(
objItem
);
...
@@ -1282,14 +1292,6 @@
...
@@ -1282,14 +1292,6 @@
err
=>
{}
err
=>
{}
);
);
},
},
compareDay
(
day
)
{
var
_string
=
this
.
getDayStr
(
day
);
if
(
_string
==
this
.
chooseDay
)
{
return
true
;
}
else
{
return
false
;
}
},
validateForm
()
{
validateForm
()
{
//表单验证
//表单验证
let
flag
=
true
;
let
flag
=
true
;
...
@@ -1602,7 +1604,6 @@
...
@@ -1602,7 +1604,6 @@
this
.
priceData
.
IsNew
=
true
;
this
.
priceData
.
IsNew
=
true
;
}
}
}
}
},
},
//保存酒店使用情况
//保存酒店使用情况
saveHoteluseDetail
(
type
)
{
saveHoteluseDetail
(
type
)
{
...
@@ -1765,5 +1766,4 @@
...
@@ -1765,5 +1766,4 @@
commonPHInfo
:
commonPHlInfo
commonPHInfo
:
commonPHlInfo
}
}
};
};
</
script
>
</
script
>
\ No newline at end of file
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue
View file @
88558143
...
@@ -97,8 +97,8 @@
...
@@ -97,8 +97,8 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</span>
</span>
<span
class=
"TDTextspan"
style=
"display:none;"
>
是否更新行程特色
</span>
<span
class=
"TDTextspan"
>
是否更新行程特色
</span>
<span
style=
"display:none;"
>
<span>
<el-form-item
prop=
"ReturnArriveCityId"
>
<el-form-item
prop=
"ReturnArriveCityId"
>
<el-select
class=
"w120"
:placeholder=
"$t('pub.pleaseSel')"
v-model=
"subConfig.IsUpdateTrip"
>
<el-select
class=
"w120"
:placeholder=
"$t('pub.pleaseSel')"
v-model=
"subConfig.IsUpdateTrip"
>
<el-option
label=
"不更新"
:value=
"0"
></el-option>
<el-option
label=
"不更新"
:value=
"0"
></el-option>
...
...
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