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
18de3810
Commit
18de3810
authored
Jul 31, 2019
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
预览行程新增日期
parent
f0e4ee52
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
414 additions
and
396 deletions
+414
-396
commonTeamInfo.vue
src/components/commonPage/commonTeamInfo.vue
+410
-392
dmcTotalTable.vue
src/components/dmc/manager/dmcTotalTable.vue
+4
-4
No files found.
src/components/commonPage/commonTeamInfo.vue
View file @
18de3810
<
style
>
<
style
>
@import
"../../assets/css/trip/index.css"
;
@import
"../../assets/css/trip/index.css"
;
</
style
>
</
style
>
<
template
>
<
template
>
...
@@ -13,7 +14,12 @@
...
@@ -13,7 +14,12 @@
</div>
</div>
<div
class=
"trip-block-commonTeam"
v-for=
"(item,i) in tripList"
:key=
"i"
>
<div
class=
"trip-block-commonTeam"
v-for=
"(item,i) in tripList"
:key=
"i"
>
<div
class=
"trip-title"
>
<div
class=
"trip-title"
>
<div
class=
"day"
>
第
<span
v-if=
'item.dayNum
<10
'
>
0
</span>
{{
item
.
dayNum
}}
天
</div>
<div>
<p
class=
"day"
>
第
<span
v-if=
'item.dayNum
<10
'
>
0
</span>
{{
item
.
dayNum
}}
天
</p>
<template
v-if=
"startDate&&startDate!=''"
>
<p>
{{
GetDayStr
(
startDate
,
item
.
dayNum
-
1
)
}}
</p>
</
template
>
</div>
<div
class=
"desc"
v-html=
"item.title"
></div>
<div
class=
"desc"
v-html=
"item.title"
></div>
</div>
</div>
<oneday
v-if=
"item.details && item.details.length==1"
:day=
'item'
></oneday>
<oneday
v-if=
"item.details && item.details.length==1"
:day=
'item'
></oneday>
...
@@ -25,17 +31,18 @@
...
@@ -25,17 +31,18 @@
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
oneday
from
"../commonPage/TravelTripPreview/oneday"
;
import
oneday
from
"../commonPage/TravelTripPreview/oneday"
;
import
twoday
from
"../commonPage/TravelTripPreview/twoday"
;
import
twoday
from
"../commonPage/TravelTripPreview/twoday"
;
import
threeday
from
"../commonPage/TravelTripPreview/threeday"
;
import
threeday
from
"../commonPage/TravelTripPreview/threeday"
;
import
fourday
from
"../commonPage/TravelTripPreview/fourday"
;
import
fourday
from
"../commonPage/TravelTripPreview/fourday"
;
import
fiveday
from
"../commonPage/TravelTripPreview/fiveday"
;
import
fiveday
from
"../commonPage/TravelTripPreview/fiveday"
;
export
default
{
export
default
{
props
:
[
"subConfig"
],
props
:
[
"subConfig"
],
data
()
{
data
()
{
return
{
return
{
tripList
:
[],
tripList
:
[],
loading
:
false
loading
:
false
,
startDate
:
""
};
};
},
},
components
:
{
components
:
{
...
@@ -47,19 +54,31 @@ export default {
...
@@ -47,19 +54,31 @@ export default {
},
},
mounted
()
{},
mounted
()
{},
methods
:
{
methods
:
{
GetTrip
(
id
)
{
GetDayStr
(
dateStr
,
dayNum
)
{
this
.
tripList
=
[];
return
this
.
$commonUtils
.
AddDay
(
dateStr
,
dayNum
);
},
GetTrip
(
id
,
TCID
)
{
this
.
tripList
=
[];
this
.
startDate
=
''
;
var
nTCID
=
0
;
if
(
TCID
)
{
nTCID
=
TCID
;
}
var
msg
=
{
configId
:
id
,
tcid
:
nTCID
};
if
(
id
!==
undefined
)
{
if
(
id
!==
undefined
)
{
//根据ID 获取行程内容
//根据ID 获取行程内容
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
apipost
(
this
.
apipost
(
"b2b_get_GetB2BTravelInfoNoDes"
,
"b2b_get_GetB2BTravelInfoNoDes"
,
msg
,
{
configId
:
id
},
res
=>
{
res
=>
{
this
.
loading
=
false
;
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
data
.
priceList
&&
res
.
data
.
data
.
priceList
.
length
>
0
)
{
this
.
startDate
=
res
.
data
.
data
.
priceList
[
0
].
startDate
;
}
this
.
tripList
=
res
.
data
.
data
.
dayList
;
this
.
tripList
=
res
.
data
.
data
.
dayList
;
this
.
init
();
this
.
init
();
}
}
...
@@ -224,10 +243,8 @@ export default {
...
@@ -224,10 +243,8 @@ export default {
let
obj
=
{
let
obj
=
{
title
:
y
.
childItem
.
title
,
title
:
y
.
childItem
.
title
,
content
:
y
.
childItem
.
description
,
content
:
y
.
childItem
.
description
,
img
:
img
:
y
.
childItem
.
imaArray
&&
y
.
childItem
.
imaArray
.
length
>
0
?
y
.
childItem
.
imaArray
&&
y
.
childItem
.
imaArray
.
length
>
0
y
.
childItem
.
imaArray
[
0
].
url
:
""
,
?
y
.
childItem
.
imaArray
[
0
].
url
:
""
,
ticketName
:
""
,
ticketName
:
""
,
playTimeHour
:
null
,
playTimeHour
:
null
,
playTimeMinutes
:
null
playTimeMinutes
:
null
...
@@ -358,11 +375,11 @@ export default {
...
@@ -358,11 +375,11 @@ export default {
details
=
activy
;
details
=
activy
;
}
}
x
.
title
=
x
.
title
=
dadian
.
length
>
0
dadian
.
length
>
0
?
?
dadian
[
0
].
title
dadian
[
0
].
title
:
:
jiao
.
length
>
0
jiao
.
length
>
0
?
?
jiao
[
0
].
title
jiao
[
0
].
title
:
:
"集合出发"
;
"集合出发"
;
x
.
details
=
details
;
x
.
details
=
details
;
if
(
x
.
details
.
length
==
0
)
{
if
(
x
.
details
.
length
==
0
)
{
...
@@ -415,5 +432,6 @@ export default {
...
@@ -415,5 +432,6 @@ export default {
}
}
}
}
}
}
};
};
</
script
>
</
script
>
src/components/dmc/manager/dmcTotalTable.vue
View file @
18de3810
...
@@ -515,7 +515,7 @@
...
@@ -515,7 +515,7 @@
<tr>
<tr>
<td
colspan=
"22"
style=
"text-align: left!important;padding:0 20px;"
>
<td
colspan=
"22"
style=
"text-align: left!important;padding:0 20px;"
>
<div
class=
"link"
>
<div
class=
"link"
>
<p
@
click=
"getJourney(item
.ConfigID,item.Title
)"
style=
"padding-top:4px;"
>
{{item.Title}}
</p>
<p
@
click=
"getJourney(item)"
style=
"padding-top:4px;"
>
{{item.Title}}
</p>
<div
v-if=
"outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''"
<div
v-if=
"outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''"
class=
"colorE95252"
style=
"padding-top:5px;"
>
地接备注团号:{{outItem.PriceCommonList[index].DMCNum}}
class=
"colorE95252"
style=
"padding-top:5px;"
>
地接备注团号:{{outItem.PriceCommonList[index].DMCNum}}
</div>
</div>
...
@@ -690,11 +690,11 @@
...
@@ -690,11 +690,11 @@
return
"(临时领队)"
return
"(临时领队)"
}
}
},
},
getJourney
(
i
d
,
title
)
{
getJourney
(
i
tem
)
{
var
that
=
this
;
var
that
=
this
;
this
.
tripTitle
=
t
itle
;
this
.
tripTitle
=
item
.
T
itle
;
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
that
.
$refs
.
comTeam
.
GetTrip
(
i
d
);
that
.
$refs
.
comTeam
.
GetTrip
(
i
tem
.
ConfigID
,
item
.
TCID
);
});
});
that
.
teamVisible
=
true
;
that
.
teamVisible
=
true
;
},
},
...
...
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