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
b1e7e989
Commit
b1e7e989
authored
Oct 23, 2019
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
790b293d
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
36 additions
and
14 deletions
+36
-14
newTravelManager.css
src/assets/css/newTravelManager.css
+1
-1
TravelControlList.vue
...components/TravelManager/TravelList/TravelControlList.vue
+5
-1
TravelConfig.vue
...ents/newTravelmanager/TravelGroupControl/TravelConfig.vue
+8
-6
TravelManager2.vue
...ts/newTravelmanager/TravelGroupControl/TravelManager2.vue
+14
-6
config.js
src/router/config.js
+8
-0
No files found.
src/assets/css/newTravelManager.css
View file @
b1e7e989
...
@@ -499,7 +499,7 @@
...
@@ -499,7 +499,7 @@
}
}
.TDTextspan
{
.TDTextspan
{
display
:
inline-block
;
display
:
inline-block
;
margin
:
0
12px
0
30
px
;
margin
:
0
12px
0
23
px
;
}
}
.TDTextspan
:first-child
{
.TDTextspan
:first-child
{
margin-left
:
0px
;
margin-left
:
0px
;
...
...
src/components/TravelManager/TravelList/TravelControlList.vue
View file @
b1e7e989
...
@@ -752,7 +752,10 @@
...
@@ -752,7 +752,10 @@
<el-dropdown-item
@
click
.
native=
"goToOpenTravel('TravelManager2',item.ID,0)"
>
<el-dropdown-item
@
click
.
native=
"goToOpenTravel('TravelManager2',item.ID,0)"
>
{{$t('Operation.Op_xilieModyfi')}}
{{$t('Operation.Op_xilieModyfi')}}
</el-dropdown-item>
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"goTonowTeam('TravelManager2',item.ID,item.TCID,item.TCNUM)"
>
<el-dropdown-item
v-if=
"item.TeamType==0"
@
click
.
native=
"goTonowTeam('TravelManager2',item.ID,item.TCID,item.TCNUM)"
>
{{$t('Operation.Op_dangtuanModify')}}
</el-dropdown-item>
<el-dropdown-item
v-if=
"item.TeamType==3"
@
click
.
native=
"goTonowTeam('TravelManager6',item.ID,item.TCID,item.TCNUM)"
>
{{$t('Operation.Op_dangtuanModify')}}
{{$t('Operation.Op_dangtuanModify')}}
</el-dropdown-item>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown-menu>
...
@@ -1300,6 +1303,7 @@
...
@@ -1300,6 +1303,7 @@
this
.
queryMsg
.
TCID
=
""
;
this
.
queryMsg
.
TCID
=
""
;
}
}
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
console
.
log
(
res
,
'resssssssss'
);
this
.
queryCommonData
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
queryCommonData
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
queryMsg
.
total
=
res
.
data
.
data
.
count
this
.
queryMsg
.
total
=
res
.
data
.
data
.
count
this
.
queryMsg
.
noData
=
!
this
.
queryMsg
.
total
>
0
this
.
queryMsg
.
noData
=
!
this
.
queryMsg
.
total
>
0
...
...
src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue
View file @
b1e7e989
...
@@ -110,7 +110,7 @@
...
@@ -110,7 +110,7 @@
</el-form-item>
</el-form-item>
</div>
</div>
</div>
</div>
<div>
<div
v-if=
"isShowOther"
>
<el-form-item
label=
"PDF别名"
>
<el-form-item
label=
"PDF别名"
>
<el-input
type=
"text"
v-model=
"PostConfig.PDFAlias"
></el-input>
<el-input
type=
"text"
v-model=
"PostConfig.PDFAlias"
></el-input>
</el-form-item>
</el-form-item>
...
@@ -121,19 +121,19 @@
...
@@ -121,19 +121,19 @@
placeholder="请填写团队标题">
</el-input>
placeholder="请填写团队标题">
</el-input>
</el-form-item>
</el-form-item>
</div>
</div>
<div>
<div
v-if=
"isShowOther"
>
<el-form-item
label=
"本团卖点"
>
<el-form-item
label=
"本团卖点"
>
<el-input
v-model=
"PostConfig.ProductRecommend"
type=
"textarea"
:autosize=
"
{minRows: 3, maxRows: 3 }"
<el-input
v-model=
"PostConfig.ProductRecommend"
type=
"textarea"
:autosize=
"
{minRows: 3, maxRows: 3 }"
resize="none" placeholder="本团卖点" maxlength="2000">
</el-input>
resize="none" placeholder="本团卖点" maxlength="2000">
</el-input>
</el-form-item>
</el-form-item>
</div>
</div>
<div>
<div
v-if=
"isShowOther"
>
<el-form-item
label=
"备注"
>
<el-form-item
label=
"备注"
>
<el-input
v-model=
"PostConfig.OpenTeamDescribe"
type=
"textarea"
:autosize=
"
{minRows: 1, maxRows: 2 }"
<el-input
v-model=
"PostConfig.OpenTeamDescribe"
type=
"textarea"
:autosize=
"
{minRows: 1, maxRows: 2 }"
resize="none" placeholder="此备注只在开团行程列表中显示" maxlength="300">
</el-input>
resize="none" placeholder="此备注只在开团行程列表中显示" maxlength="300">
</el-input>
</el-form-item>
</el-form-item>
</div>
</div>
<div
class=
"_VideoStr_box"
>
<div
class=
"_VideoStr_box"
v-if=
"isShowOther"
>
<el-form-item
label=
"视频地址"
>
<el-form-item
label=
"视频地址"
>
<el-input
v-model=
"PostConfig.VideoStr"
type=
"textarea"
:autosize=
"
{minRows: 1, maxRows: 1 }"
<el-input
v-model=
"PostConfig.VideoStr"
type=
"textarea"
:autosize=
"
{minRows: 1, maxRows: 1 }"
placeholder="https//:video.mp4" @blur="loadVideo">
</el-input>
placeholder="https//:video.mp4" @blur="loadVideo">
</el-input>
...
@@ -154,7 +154,7 @@
...
@@ -154,7 +154,7 @@
<div
v-if=
"GGMapShow"
>
<div
v-if=
"GGMapShow"
>
<GGMap></GGMap>
<GGMap></GGMap>
</div>
</div>
<div
class=
"Travel_ImgList clearfix"
>
<div
class=
"Travel_ImgList clearfix"
v-if=
"isShowOther"
>
<div
class=
"TFimgList"
v-for=
"(item,index) in PostConfig.fileList"
:key=
"item.subCode"
>
<div
class=
"TFimgList"
v-for=
"(item,index) in PostConfig.fileList"
:key=
"item.subCode"
>
<img
v-if=
"!item.Url"
src=
"../../../assets/img/bg_c3@3x.png"
>
<img
v-if=
"!item.Url"
src=
"../../../assets/img/bg_c3@3x.png"
>
<img
v-else
:src=
'compressImg(item.Url, "filt", 170, "")'
>
<img
v-else
:src=
'compressImg(item.Url, "filt", 170, "")'
>
...
@@ -210,7 +210,7 @@
...
@@ -210,7 +210,7 @@
import
GGMap
from
"../../commonPage/GGMap"
;
import
GGMap
from
"../../commonPage/GGMap"
;
export
default
{
export
default
{
/*接收父组件传递的参数*/
/*接收父组件传递的参数*/
props
:
[
"PostConfig"
,
"LineList"
,
"TCNUM"
],
props
:
[
"PostConfig"
,
"LineList"
,
"TCNUM"
,
"isShowOther"
],
data
()
{
data
()
{
return
{
return
{
//系列列表
//系列列表
...
@@ -437,6 +437,7 @@
...
@@ -437,6 +437,7 @@
//线路监听
//线路监听
LineList
:
{
LineList
:
{
handler
:
function
(
val
,
oldVal
)
{
handler
:
function
(
val
,
oldVal
)
{
console
.
log
(
this
.
PostConfig
,
'pppppppppp'
);
if
(
this
.
PostConfig
.
LineId
==
0
)
{
if
(
this
.
PostConfig
.
LineId
==
0
)
{
this
.
PostConfig
.
LineId
=
this
.
LineList
[
0
].
LineID
;
this
.
PostConfig
.
LineId
=
this
.
LineList
[
0
].
LineID
;
this
.
PostConfig
.
LineName
=
this
.
LineList
[
0
].
LineName
;
this
.
PostConfig
.
LineName
=
this
.
LineList
[
0
].
LineName
;
...
@@ -450,6 +451,7 @@
...
@@ -450,6 +451,7 @@
//深度监听,可监听到对象、数组的变化
//深度监听,可监听到对象、数组的变化
handler
:
function
(
val
,
oldVal
)
{
handler
:
function
(
val
,
oldVal
)
{
this
.
$emit
(
"headCallBack"
,
this
.
PostConfig
);
this
.
$emit
(
"headCallBack"
,
this
.
PostConfig
);
console
.
log
(
this
.
PostConfig
,
'postConfigggg'
);
},
},
deep
:
true
deep
:
true
},
},
...
...
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @
b1e7e989
<
style
>
<
style
>
@import
"../../../assets/css/newTravelManager.css"
;
@import
"../../../assets/css/newTravelManager.css"
;
@import
"../../../assets/css/endTravelManager.css"
;
@import
"../../../assets/css/endTravelManager.css"
;
.showOther
{
display
:
none
;
}
</
style
>
</
style
>
<
template
>
<
template
>
<div>
<div>
...
@@ -31,19 +33,19 @@
...
@@ -31,19 +33,19 @@
</div>
</div>
<div
class=
"newTravelRight"
v-loading=
"loading"
>
<div
class=
"newTravelRight"
v-loading=
"loading"
>
<TravelConfig
@
headCallBack=
"getConfig"
@
setTravelUploadData=
"setTravelUploadData"
:PostConfig=
"PostConfig"
<TravelConfig
@
headCallBack=
"getConfig"
@
setTravelUploadData=
"setTravelUploadData"
:PostConfig=
"PostConfig"
:TCNUM=
"TCNUM"
id=
"firstAnchor"
:LineList=
"LineList"
></TravelConfig>
:TCNUM=
"TCNUM"
id=
"firstAnchor"
:LineList=
"LineList"
:isShowOther=
"isShowOther"
></TravelConfig>
<TravelDaysTripDirect
id=
"secondAnchor"
@
headCallBack=
"getDaysTrip"
:NoticeParameters=
"NoticeParameters"
<TravelDaysTripDirect
id=
"secondAnchor"
@
headCallBack=
"getDaysTrip"
:NoticeParameters=
"NoticeParameters"
:subConfig=
"journeyList"
:isOpenGroup=
"false"
:IsDirect=
"PostConfig.IsDirect"
v-bind:AllCityList=
"AllCityList"
:subConfig=
"journeyList"
:isOpenGroup=
"false"
:IsDirect=
"PostConfig.IsDirect"
v-bind:AllCityList=
"AllCityList"
v-bind:StartCity=
"StartCity"
:UseTypeArray=
"UseTypeArray"
:AirPickUp=
"AirPickUp"
:AirSend=
"AirSend"
v-bind:StartCity=
"StartCity"
:UseTypeArray=
"UseTypeArray"
:AirPickUp=
"AirPickUp"
:AirSend=
"AirSend"
@
change=
"handlerChangeData"
:TeamType=
"TeamType"
:IsOpenHotel=
"PostConfig.IsOpenHotel"
></TravelDaysTripDirect>
@
change=
"handlerChangeData"
:TeamType=
"TeamType"
:IsOpenHotel=
"PostConfig.IsOpenHotel"
></TravelDaysTripDirect>
<TravelFeature
ref=
"TravelFeature"
id=
"thirdAnchor"
@
featureCallBack=
"getFeature"
:FeatureData=
"FeatureData"
<TravelFeature
:class=
"
{'showOther':!isShowOther}"
ref="TravelFeature" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData"
:TeamType="TeamType" :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit">
</TravelFeature>
:TeamType="TeamType" :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit">
</TravelFeature>
<TravelNotice
ref=
"TravelNotice"
id=
"fourAnchor"
@
headCallBack=
"getNotice"
:subArray=
"NoticeParameters"
<TravelNotice
:class=
"
{'showOther':!isShowOther}"
ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters"
:NoticeData="NoticeData" v-bind:PostConfig="PostConfig" v-bind:AllCityList="AllCityList"
:NoticeData="NoticeData" v-bind:PostConfig="PostConfig" v-bind:AllCityList="AllCityList"
v-bind:CountryID="PostConfig.CountryID">
</TravelNotice>
v-bind:CountryID="PostConfig.CountryID">
</TravelNotice>
<TravelPrice
@
saveMsg=
"SaveData(1)"
ref=
"TravelPrice"
id=
"fiveAnchor"
@
headCallBack=
"getPrice"
<TravelPrice
@
saveMsg=
"SaveData(1)"
ref=
"TravelPrice"
id=
"fiveAnchor"
@
headCallBack=
"getPrice"
:priceList=
"PriceList"
v-if=
"TeamType==0"
:PostConfig=
"PostConfig"
:modifyTcid=
"modifyTcid"
:priceList=
"PriceList"
v-if=
"TeamType==0
||TeamType==3
"
:PostConfig=
"PostConfig"
:modifyTcid=
"modifyTcid"
:TeamType=
"TeamType"
></TravelPrice>
:TeamType=
"TeamType"
></TravelPrice>
<TravelPrice2
ref=
"TravelPrice"
id=
"fiveAnchor"
@
headCallBack=
"getPrice"
:PostDaysTrip=
"PostDaysTrip"
<TravelPrice2
ref=
"TravelPrice"
id=
"fiveAnchor"
@
headCallBack=
"getPrice"
:PostDaysTrip=
"PostDaysTrip"
v-if=
"TeamType==1"
:priceList=
"PriceList"
:PostConfig=
"PostConfig"
:modifyTcid=
"modifyTcid"
v-if=
"TeamType==1"
:priceList=
"PriceList"
:PostConfig=
"PostConfig"
:modifyTcid=
"modifyTcid"
...
@@ -84,6 +86,8 @@
...
@@ -84,6 +86,8 @@
},
},
data
()
{
data
()
{
return
{
return
{
//判断是否显示其他项
isShowOther
:
true
,
IsShowBtn
:
false
,
//是否显示按钮
IsShowBtn
:
false
,
//是否显示按钮
ConfigId
:
0
,
//地址栏查询参数
ConfigId
:
0
,
//地址栏查询参数
IsHaveOffer
:
0
,
//是否有报价单
IsHaveOffer
:
0
,
//是否有报价单
...
@@ -609,6 +613,10 @@
...
@@ -609,6 +613,10 @@
if
(
routeName
==
'TravelManager4'
)
{
if
(
routeName
==
'TravelManager4'
)
{
this
.
TeamType
=
2
;
this
.
TeamType
=
2
;
}
}
if
(
routeName
==
'TravelManager6'
){
this
.
TeamType
=
3
;
this
.
isShowOther
=
false
;
}
let
configId
=
this
.
$route
.
query
.
configId
;
let
configId
=
this
.
$route
.
query
.
configId
;
this
.
modifyTcid
=
this
.
$route
.
query
.
tcid
;
this
.
modifyTcid
=
this
.
$route
.
query
.
tcid
;
this
.
TCNUM
=
this
.
$route
.
query
.
TCNUM
;
this
.
TCNUM
=
this
.
$route
.
query
.
TCNUM
;
...
...
src/router/config.js
View file @
b1e7e989
...
@@ -1854,6 +1854,14 @@ export default {
...
@@ -1854,6 +1854,14 @@ export default {
title
:
'自主开团'
title
:
'自主开团'
},
},
},
},
{
path
:
'/TravelManager6'
,
name
:
'TravelManager6'
,
component
:
resolve
=>
require
([
'@/components/newTravelManager/TravelGroupControl/TravelManager2'
],
resolve
),
meta
:
{
title
:
'地接开团'
},
},
{
{
path
:
'/BasicOpenGroup'
,
//基础班团控配置
path
:
'/BasicOpenGroup'
,
//基础班团控配置
name
:
'BasicOpenGroup'
,
name
:
'BasicOpenGroup'
,
...
...
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