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
266bb59a
Commit
266bb59a
authored
Nov 21, 2019
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加周几显示
parent
a89b2416
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
40 additions
and
4 deletions
+40
-4
commonHotelInfo.vue
src/components/commonPage/commonHotelInfo.vue
+10
-1
TravelPrice.vue
...nents/newTravelmanager/TravelGroupControl/TravelPrice.vue
+10
-1
TravelPrice3.vue
...ents/newTravelmanager/TravelGroupControl/TravelPrice3.vue
+10
-1
TravelPrice4.vue
...ents/newTravelmanager/TravelGroupControl/TravelPrice4.vue
+10
-1
No files found.
src/components/commonPage/commonHotelInfo.vue
View file @
266bb59a
...
@@ -59,7 +59,7 @@
...
@@ -59,7 +59,7 @@
<template
v-for=
"(hotelItem,index) in HotelObj"
>
<template
v-for=
"(hotelItem,index) in HotelObj"
>
<tr
v-for=
"(hotelSubItem,hotelSubIndex) in hotelItem.SubList"
>
<tr
v-for=
"(hotelSubItem,hotelSubIndex) in hotelItem.SubList"
>
<td
width=
"120"
v-if=
"hotelSubIndex==0"
:rowspan=
"hotelItem.SubList.length"
style=
"white-space:nowrap; "
>
<td
width=
"120"
v-if=
"hotelSubIndex==0"
:rowspan=
"hotelItem.SubList.length"
style=
"white-space:nowrap; "
>
{{
hotelItem
.
UseDay
}}
{{
hotelItem
.
UseDay
}}
(
{{
getDayByDate
(
hotelItem
.
UseDay
)
}}
)
</td>
</td>
<td
style=
"text-align:left;padding-left:3px;"
>
<td
style=
"text-align:left;padding-left:3px;"
>
<template
v-if=
"hotelSubItem.HotelName!=hotelSubItem.NewHotelName && hotelSubItem.NewHotelName!=''"
>
<template
v-if=
"hotelSubItem.HotelName!=hotelSubItem.NewHotelName && hotelSubItem.NewHotelName!=''"
>
...
@@ -221,6 +221,15 @@
...
@@ -221,6 +221,15 @@
this
.
Confirm
(
str
,
function
()
{
this
.
Confirm
(
str
,
function
()
{
that
.
$emit
(
'SetShouPeiShu'
);
that
.
$emit
(
'SetShouPeiShu'
);
});
});
},
//根据日期返回星期几
getDayByDate
(
dateString
){
if
(
dateString
){
var
date
;
var
dateArray
=
dateString
.
split
(
"-"
);
date
=
new
Date
(
dateArray
[
0
],
parseInt
(
dateArray
[
1
]
-
1
),
dateArray
[
2
]);
return
"日一二三四五六"
.
charAt
(
date
.
getDay
());
}
}
}
},
},
mounted
()
{}
mounted
()
{}
...
...
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @
266bb59a
...
@@ -872,7 +872,7 @@
...
@@ -872,7 +872,7 @@
<
template
v-for=
"(subItem,subIndex) in priceData.PriceHotelList"
>
<
template
v-for=
"(subItem,subIndex) in priceData.PriceHotelList"
>
<tr
v-for=
"(childItem,childIndex) in subItem.SubList"
>
<tr
v-for=
"(childItem,childIndex) in subItem.SubList"
>
<td
style=
"background-color:#E6E6E6;color:#333;"
v-if=
"childIndex==0"
:rowspan=
"subItem.SubList.length"
>
<td
style=
"background-color:#E6E6E6;color:#333;"
v-if=
"childIndex==0"
:rowspan=
"subItem.SubList.length"
>
{{
subItem
.
UseDay
}}
</td>
{{
subItem
.
UseDay
}}
(
{{
getDayByDate
(
subItem
.
UseDay
)
}}
)
</td>
<td
style=
"text-align:left;padding-left:3px;"
>
<td
style=
"text-align:left;padding-left:3px;"
>
{{
childItem
.
HotelName
}}
{{
childItem
.
HotelName
}}
</td>
</td>
...
@@ -1775,6 +1775,15 @@
...
@@ -1775,6 +1775,15 @@
);
);
});
});
},
},
//根据日期返回星期几
getDayByDate
(
dateString
){
if
(
dateString
){
var
date
;
var
dateArray
=
dateString
.
split
(
"-"
);
date
=
new
Date
(
dateArray
[
0
],
parseInt
(
dateArray
[
1
]
-
1
),
dateArray
[
2
]);
return
"日一二三四五六"
.
charAt
(
date
.
getDay
());
}
}
},
},
mounted
()
{
mounted
()
{
var
dateObj
=
this
.
$calendarUtils
.
getCurrentDate
();
var
dateObj
=
this
.
$calendarUtils
.
getCurrentDate
();
...
...
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @
266bb59a
...
@@ -787,7 +787,7 @@
...
@@ -787,7 +787,7 @@
<el-dialog
custom-class=
'Tp_hotelDialog'
title=
"酒店使用情况"
:visible
.
sync=
"outerVisible"
center
>
<el-dialog
custom-class=
'Tp_hotelDialog'
title=
"酒店使用情况"
:visible
.
sync=
"outerVisible"
center
>
<table
class=
"TphotelTable"
border=
"0"
cellspacing=
'1'
v-if=
"priceData.TCID>0"
>
<table
class=
"TphotelTable"
border=
"0"
cellspacing=
'1'
v-if=
"priceData.TCID>0"
>
<tr
v-if=
"priceData.PriceHotelList"
v-for=
"item in priceData.PriceHotelList"
>
<tr
v-if=
"priceData.PriceHotelList"
v-for=
"item in priceData.PriceHotelList"
>
<td
style=
"background-color:#E6E6E6;color:#333;"
width=
"120"
>
{{item.UseDay}}
</td>
<td
style=
"background-color:#E6E6E6;color:#333;"
width=
"120"
>
{{item.UseDay}}
({{getDayByDate(item.UseDay)}})
</td>
<td>
<td>
<div
class=
"tp_divList"
v-for=
"(subItem,index) in item.SubList"
>
<div
class=
"tp_divList"
v-for=
"(subItem,index) in item.SubList"
>
<div>
<div>
...
@@ -1595,6 +1595,15 @@
...
@@ -1595,6 +1595,15 @@
err
=>
{}
err
=>
{}
);
);
}
}
},
//根据日期返回星期几
getDayByDate
(
dateString
){
if
(
dateString
){
var
date
;
var
dateArray
=
dateString
.
split
(
"-"
);
date
=
new
Date
(
dateArray
[
0
],
parseInt
(
dateArray
[
1
]
-
1
),
dateArray
[
2
]);
return
"日一二三四五六"
.
charAt
(
date
.
getDay
());
}
}
}
},
},
mounted
()
{
mounted
()
{
...
...
src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue
View file @
266bb59a
...
@@ -873,7 +873,7 @@
...
@@ -873,7 +873,7 @@
<
template
v-for=
"(subItem,subIndex) in priceData.PriceHotelList"
>
<
template
v-for=
"(subItem,subIndex) in priceData.PriceHotelList"
>
<tr
v-for=
"(childItem,childIndex) in subItem.SubList"
>
<tr
v-for=
"(childItem,childIndex) in subItem.SubList"
>
<td
style=
"background-color:#E6E6E6;color:#333;"
v-if=
"childIndex==0"
:rowspan=
"subItem.SubList.length"
>
<td
style=
"background-color:#E6E6E6;color:#333;"
v-if=
"childIndex==0"
:rowspan=
"subItem.SubList.length"
>
{{
subItem
.
UseDay
}}
</td>
{{
subItem
.
UseDay
}}
(
{{
getDayByDate
(
subItem
.
UseDay
)
}}
)
</td>
<td
style=
"text-align:left;padding-left:3px;"
>
<td
style=
"text-align:left;padding-left:3px;"
>
{{
childItem
.
HotelName
}}
{{
childItem
.
HotelName
}}
</td>
</td>
...
@@ -1776,6 +1776,15 @@
...
@@ -1776,6 +1776,15 @@
);
);
});
});
},
},
//根据日期返回星期几
getDayByDate
(
dateString
){
if
(
dateString
){
var
date
;
var
dateArray
=
dateString
.
split
(
"-"
);
date
=
new
Date
(
dateArray
[
0
],
parseInt
(
dateArray
[
1
]
-
1
),
dateArray
[
2
]);
return
"日一二三四五六"
.
charAt
(
date
.
getDay
());
}
}
},
},
mounted
()
{
mounted
()
{
var
dateObj
=
this
.
$calendarUtils
.
getCurrentDate
();
var
dateObj
=
this
.
$calendarUtils
.
getCurrentDate
();
...
...
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