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
63fe4161
Commit
63fe4161
authored
May 05, 2019
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
d474efd3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
832 deletions
+14
-832
TravelDaysTrip_Direct.vue
...elmanager/oldTravelGroupControl/TravelDaysTrip_Direct.vue
+13
-22
dinnerTrip_disDirect.vue
...velmanager/oldTravelGroupControl/dinnerTrip_disDirect.vue
+0
-298
hotelTrip_disDirect.vue
...avelmanager/oldTravelGroupControl/hotelTrip_disDirect.vue
+0
-267
scienTrip_disDirect.vue
...avelmanager/oldTravelGroupControl/scienTrip_disDirect.vue
+0
-242
titleTrip.vue
...ents/newTravelmanager/oldTravelGroupControl/titleTrip.vue
+1
-3
No files found.
src/components/newTravelmanager/oldTravelGroupControl/TravelDaysTrip_Direct.vue
View file @
63fe4161
...
@@ -67,9 +67,7 @@
...
@@ -67,9 +67,7 @@
<el-tooltip
class=
"item"
effect=
"dark"
content=
"删除"
placement=
"top-start"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"删除"
placement=
"top-start"
>
<i
class=
"iconfont icon-xingzhuang"
@
click=
"removeDaysTrip(index)"
></i>
<i
class=
"iconfont icon-xingzhuang"
@
click=
"removeDaysTrip(index)"
></i>
</el-tooltip>
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" content="编辑" placement="top-start">
<i class="iconfont icon-bianji" @click=""></i>
</el-tooltip> -->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"添加"
placement=
"top-start"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"添加"
placement=
"top-start"
>
<i
class=
"iconfont icon-mui-icon-add"
@
click=
"addDaysTrip(index)"
></i>
<i
class=
"iconfont icon-mui-icon-add"
@
click=
"addDaysTrip(index)"
></i>
</el-tooltip>
</el-tooltip>
...
@@ -83,7 +81,7 @@
...
@@ -83,7 +81,7 @@
<div
class=
"d"
>
第{{index+1}}天
</div>
<div
class=
"d"
>
第{{index+1}}天
</div>
<div
class=
"title-box"
>
<div
class=
"title-box"
>
<div
class=
"t"
>
<div
class=
"t"
>
{{item.TitleObj.Title}}
{{item.dayArray[0].childItem.Title}}
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -95,7 +93,7 @@
...
@@ -95,7 +93,7 @@
<div
class=
"daycnt"
>
<div
class=
"daycnt"
>
<div
class=
"d"
>
第{{index+1}}天
</div>
<div
class=
"d"
>
第{{index+1}}天
</div>
<div
class=
"title-box"
>
<div
class=
"title-box"
>
<titleTrip
:isOpenGroup=
"isOpenGroup"
v-bind:subItemObj=
"
subConfig.DayList[0].TitleObj.Title
"
>
<titleTrip
:isOpenGroup=
"isOpenGroup"
v-bind:subItemObj=
"
item.dayArray[0]
"
>
</titleTrip>
</titleTrip>
</div>
</div>
</div>
</div>
...
@@ -114,9 +112,7 @@
...
@@ -114,9 +112,7 @@
v-bind:subTotalIndex=
"item.dayArray.length"
></hotelTrip>
v-bind:subTotalIndex=
"item.dayArray.length"
></hotelTrip>
</span>
</span>
<span
v-else
>
<span
v-else
>
<hotelTripdisDirect
v-bind:subItemObj=
"subItem"
v-bind:DefaultList=
"hotelSameList"
v-bind:subIndex=
"subIndex"
v-bind:DinnerList=
"DinnerList"
v-bind:index=
"index"
:isOpenGroup=
"isOpenGroup"
v-bind:subTotalIndex=
"item.dayArray.length"
></hotelTripdisDirect>
</span>
</span>
</div>
</div>
<div
v-if=
"subItem.Type==$tripUtils.TypeKey.scenic"
>
<div
v-if=
"subItem.Type==$tripUtils.TypeKey.scenic"
>
...
@@ -124,10 +120,7 @@
...
@@ -124,10 +120,7 @@
<scienTrip
v-bind:subItemObj=
"subItem"
v-bind:DefaultList=
"scenicSameList"
v-bind:subIndex=
"subIndex"
<scienTrip
v-bind:subItemObj=
"subItem"
v-bind:DefaultList=
"scenicSameList"
v-bind:subIndex=
"subIndex"
v-bind:index=
"index"
:isOpenGroup=
"isOpenGroup"
v-bind:subTotalIndex=
"item.dayArray.length"
></scienTrip>
v-bind:index=
"index"
:isOpenGroup=
"isOpenGroup"
v-bind:subTotalIndex=
"item.dayArray.length"
></scienTrip>
</span>
</span>
<span
v-else
>
<scienTripdisDirect
v-bind:subItemObj=
"subItem"
v-bind:DefaultList=
"scenicSameList"
v-bind:subIndex=
"subIndex"
v-bind:index=
"index"
:isOpenGroup=
"isOpenGroup"
v-bind:subTotalIndex=
"item.dayArray.length"
></scienTripdisDirect>
</span>
</div>
</div>
<div
v-if=
"subItem.Type==$tripUtils.TypeKey.dinner"
>
<div
v-if=
"subItem.Type==$tripUtils.TypeKey.dinner"
>
<span
v-if=
"IsDirect==1"
>
<span
v-if=
"IsDirect==1"
>
...
@@ -136,9 +129,7 @@
...
@@ -136,9 +129,7 @@
v-bind:subTotalIndex=
"item.dayArray.length"
></dinnerTrip>
v-bind:subTotalIndex=
"item.dayArray.length"
></dinnerTrip>
</span>
</span>
<span
v-else
>
<span
v-else
>
<dinnerTripdisDirect
v-bind:subItemObj=
"subItem"
v-bind:DefaultList=
"dinnerSameList"
v-bind:subIndex=
"subIndex"
v-bind:HotelList=
"HotelList"
v-bind:index=
"index"
:isOpenGroup=
"isOpenGroup"
v-bind:subTotalIndex=
"item.dayArray.length"
></dinnerTripdisDirect>
</span>
</span>
</div>
</div>
<div
v-if=
"subItem.Type==$tripUtils.TypeKey.freedom"
>
<div
v-if=
"subItem.Type==$tripUtils.TypeKey.freedom"
>
...
@@ -171,15 +162,14 @@
...
@@ -171,15 +162,14 @@
<
script
>
<
script
>
import
trifficTrip
from
"../oldTravelGroupControl/trifficTrip"
;
import
trifficTrip
from
"../oldTravelGroupControl/trifficTrip"
;
import
scienTrip
from
"../oldTravelGroupControl/scienTrip_Direct"
;
import
scienTrip
from
"../oldTravelGroupControl/scienTrip_Direct"
;
import
scienTripdisDirect
from
"../oldTravelGroupControl/scienTrip_disDirect"
;
import
hotelTrip
from
"../oldTravelGroupControl/hotelTrip_Direct"
;
import
hotelTrip
from
"../oldTravelGroupControl/hotelTrip_Direct"
;
import
hotelTripdisDirect
from
"../oldTravelGroupControl/hotelTrip_disDirect"
;
import
dinnerTrip
from
"../oldTravelGroupControl/dinnerTrip_Direct"
;
import
dinnerTrip
from
"../oldTravelGroupControl/dinnerTrip_Direct"
;
import
dinnerTripdisDirect
from
"../oldTravelGroupControl/dinnerTrip_disDirect"
;
import
freedomTrip
from
"../oldTravelGroupControl/freedomTrip"
;
import
freedomTrip
from
"../oldTravelGroupControl/freedomTrip"
;
import
warmtipTrip
from
"../oldTravelGroupControl/warmtipTrip"
;
import
warmtipTrip
from
"../oldTravelGroupControl/warmtipTrip"
;
...
@@ -289,13 +279,13 @@ export default {
...
@@ -289,13 +279,13 @@ export default {
trifficTrip
:
trifficTrip
,
trifficTrip
:
trifficTrip
,
scienTrip
:
scienTrip
,
scienTrip
:
scienTrip
,
scienTripdisDirect
:
scienTripdisDirect
,
hotelTrip
:
hotelTrip
,
hotelTrip
:
hotelTrip
,
hotelTripdisDirect
:
hotelTripdisDirect
,
dinnerTrip
:
dinnerTrip
,
dinnerTrip
:
dinnerTrip
,
dinnerTripdisDirect
:
dinnerTripdisDirect
,
freedomTrip
:
freedomTrip
,
freedomTrip
:
freedomTrip
,
warmtipTrip
:
warmtipTrip
,
warmtipTrip
:
warmtipTrip
,
...
@@ -358,6 +348,7 @@ export default {
...
@@ -358,6 +348,7 @@ export default {
}
}
this
.
subConfig
.
DayList
.
length
=
this
.
subConfig
.
DayNum
;
this
.
subConfig
.
DayList
.
length
=
this
.
subConfig
.
DayNum
;
}
}
console
.
log
(
"this.sub"
,
this
.
subConfig
);
},
},
//点击往后追加
//点击往后追加
...
...
src/components/newTravelmanager/oldTravelGroupControl/dinnerTrip_disDirect.vue
deleted
100644 → 0
View file @
d474efd3
This diff is collapsed.
Click to expand it.
src/components/newTravelmanager/oldTravelGroupControl/hotelTrip_disDirect.vue
deleted
100644 → 0
View file @
d474efd3
This diff is collapsed.
Click to expand it.
src/components/newTravelmanager/oldTravelGroupControl/scienTrip_disDirect.vue
deleted
100644 → 0
View file @
d474efd3
This diff is collapsed.
Click to expand it.
src/components/newTravelmanager/oldTravelGroupControl/titleTrip.vue
View file @
63fe4161
...
@@ -3,9 +3,7 @@
...
@@ -3,9 +3,7 @@
<div
class=
"TCtraffic clearfix"
>
<div
class=
"TCtraffic clearfix"
>
<div>
<div>
<span
class=
"datePickContent"
style=
"background-color:transparent"
>
<span
class=
"datePickContent"
style=
"background-color:transparent"
>
<!--
<span
v-if=
"isOpenGroup"
>
{{
subItemObj
.
childItem
.
Title
}}
</span>
-->
<el-form-item>
<el-form-item>
<el-input
v-model=
"subItemObj.childItem.Title"
class=
""
placeholder=
"行程大点"
></el-input>
<el-input
v-model=
"subItemObj.childItem.Title"
class=
""
placeholder=
"行程大点"
></el-input>
</el-form-item>
</el-form-item>
...
...
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