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
6339ad46
Commit
6339ad46
authored
Aug 30, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
3a5f180b
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
144 additions
and
86 deletions
+144
-86
tripIndexNew.css
src/assets/css/tripIndexNew.css
+19
-1
invoicesManager.vue
src/components/FinancialModule/invoicesManager.vue
+3
-0
header.vue
src/components/LeaveGroupDownload/components/header.vue
+3
-3
travelDays.vue
src/components/LeaveGroupDownload/travelDays.vue
+91
-77
confirmationOrderDownLoadNew.vue
src/components/confirmationOrderDownLoadNew.vue
+28
-5
No files found.
src/assets/css/tripIndexNew.css
View file @
6339ad46
...
...
@@ -191,7 +191,9 @@
margin-left
:
21px
;
}
.travelDaysTitlle-right-text
{
padding
:
25px
25px
25px
36px
;
min-height
:
124px
;
/* padding: 25px 25px 25px 36px; */
padding
:
0
25px
0
36px
;
border-radius
:
100px
0px
0px
100px
;
-webkit-border-radius
:
100px
0px
0px
100px
;
-moz-border-radius
:
100px
0px
0px
100px
;
...
...
@@ -204,6 +206,9 @@
overflow
:
hidden
;
}
.travelDaysMasterMap
img
{
left
:
0
;
top
:
0
;
right
:
0
;
width
:
100%
;
height
:
100%
;
}
...
...
@@ -290,6 +295,19 @@
padding
:
0
;
margin
:
0
;
}
.LeaveGroupDownload-form
.travelControlTrip
.module-title
{
text-align
:
center
;
font-size
:
18px
;
color
:
#333
;
padding-top
:
30px
;
padding-bottom
:
30px
;
}
.LeaveGroupDownload-form
.expense
{
padding
:
0
20px
;
}
.LeaveGroupDownload-form
.expense
.right
{
margin-bottom
:
20px
;
}
.UpgradedVersion-box
{
width
:
1123px
;
height
:
1588px
;
...
...
src/components/FinancialModule/invoicesManager.vue
View file @
6339ad46
...
...
@@ -138,6 +138,9 @@
<el-option
:value=
"1"
label=
"跟团游"
></el-option>
<el-option
:value=
"2"
label=
"签证"
></el-option>
<el-option
:value=
"4"
label=
"单机票"
></el-option>
<el-option
:value=
"5"
label=
"车"
></el-option>
<el-option
:value=
"6"
label=
"酒店"
></el-option>
<el-option
:value=
"7"
label=
"门票"
></el-option>
</el-select>
</el-form-item>
</el-col>
...
...
src/components/LeaveGroupDownload/components/header.vue
View file @
6339ad46
...
...
@@ -6,7 +6,7 @@
</div>
<div
class=
"UpgradedVersion-header-right"
>
<div
class=
"UpgradedVersion-header-title"
>
<span
class=
"edit_div"
>
{{
LineShort
Name
}}
</span>
<span
class=
"edit_div"
>
{{
orderMsg
.
line
Name
}}
</span>
</div>
</div>
</div>
...
...
@@ -18,7 +18,7 @@
},
props
:
[
'TripColor'
,
'
FeatureItem
'
'
orderMsg
'
],
data
()
{
return
{
...
...
@@ -41,7 +41,7 @@
deep
:
false
,
immediate
:
true
},
FeatureItem
:
{
orderMsg
:
{
handler
(
val
,
oldVal
)
{
},
...
...
src/components/LeaveGroupDownload/travelDays.vue
View file @
6339ad46
This diff is collapsed.
Click to expand it.
src/components/confirmationOrderDownLoadNew.vue
View file @
6339ad46
...
...
@@ -202,6 +202,7 @@
<div
id=
"pdfNode"
class=
"LeaveGroupDownload-form"
>
<div
id=
"pdfDom"
style=
"padding:0 20px;"
>
<!-- 首页 -->
<!--
<LeaveGroupDownload
:vshowJ="vshowJ"
:vshowL="vshowL"
...
...
@@ -210,10 +211,27 @@
:orderTripdiff="orderTripdiff"
:vshowLLR="vshowLLR"
:vshowB="vshowB"
:lineId=
"lineId"
></LeaveGroupDownload>
:lineId="lineId"></LeaveGroupDownload> -->
<!-- 行程特色 -->
<ItineraryFeatures
:feature=
"feature"
></ItineraryFeatures>
<travelDays
:TripColor=
"TripColor"
></travelDays>
<!-- <ItineraryFeatures :feature="feature"></ItineraryFeatures> -->
<!-- 行程天数 -->
<!-- <travelDays
:dataAll="dataAll"
:orderMsg="orderMsg"
:orderTripdiff="orderTripdiff"
:tripList="tripList"
:vshowD="vshowD"
:vshowK="vshowK"
></travelDays> -->
<!-- 团队说明 -->
<!-- <TourFareDescription
:vshowE="vshowE"
:vshowF="vshowF"
:dataList="dataList"
:feature="feature"></TourFareDescription> -->
</div>
</div>
...
...
@@ -230,6 +248,7 @@
import
LeaveGroupDownload
from
'./LeaveGroupDownload/index'
import
ItineraryFeatures
from
'./LeaveGroupDownload/ItineraryFeatures'
import
travelDays
from
'./LeaveGroupDownload/travelDays'
import
TourFareDescription
from
'./LeaveGroupDownload/TourFareDescription'
import
{
setTimeout
}
from
'timers'
;
...
...
@@ -245,11 +264,12 @@
fiveday
,
LeaveGroupDownload
,
ItineraryFeatures
,
travelDays
travelDays
,
TourFareDescription
},
data
()
{
return
{
TripColor
:
'#CC0066'
,
dataAll
:
null
,
isShowTime
:
true
,
CurrentUserInfo
:
{},
//当前用户信息
Typevalue
:
-
1
,
...
...
@@ -961,9 +981,12 @@
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
(
res
.
data
.
data
);
this
.
dataAll
=
data
this
.
orderTripdiff
=
data
.
orderTripdiff
;
this
.
lineId
=
data
.
lineId
;
this
.
orderMsg
=
data
.
orderMsg
;
console
.
log
(
this
.
orderTripdiff
)
console
.
log
(
this
.
orderMsg
,
'------'
)
if
(
this
.
orderTripdiff
&&
this
.
orderTripdiff
.
flightInfoJson
)
{
this
.
orderTripdiff
.
travelOrderFlightList
=
JSON
.
parse
(
this
.
orderTripdiff
.
flightInfoJson
);
if
(
this
.
orderMsg
.
outNotice
==
1
)
{
...
...
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