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
788ae4a8
Commit
788ae4a8
authored
Mar 30, 2019
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
酒店统计修改
parent
9f37be85
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
72 additions
and
71 deletions
+72
-71
HotelProductCalendar.vue
src/components/Hotel/HotelProductCalendar.vue
+6
-21
HotelProductManage2.vue
src/components/Hotel/HotelProductManage2.vue
+14
-3
HotelSalesBoard.vue
src/components/Hotel/HotelSalesBoard.vue
+30
-24
HotelTotalStock.vue
src/components/Hotel/HotelTotalStock.vue
+22
-23
No files found.
src/components/Hotel/HotelProductCalendar.vue
View file @
788ae4a8
...
@@ -82,34 +82,16 @@
...
@@ -82,34 +82,16 @@
}
else
if
(
type
===
4
)
{
}
else
if
(
type
===
4
)
{
return
'hasStock hasStock_4'
return
'hasStock hasStock_4'
}
}
else
if
(
type
===
5
)
{
return
'hasStock hasStock_5'
}
},
},
calendarHide
:
function
()
{
calendarHide
:
function
()
{
this
.
calendar
.
show
=
false
this
.
calendar
.
show
=
false
this
.
calendar
.
data
=
{}
this
.
calendar
.
data
=
{}
},
},
// dateChange: function (type, direction) {
// if (type === 'year') {
// if (direction === 'left') {
// this.msg.currentYear--
// } else if (direction === 'right') {
// this.msg.currentYear++
// }
// } else if (type === 'month') {
// let newDate = new Date(this.$calendarUtils.formatDate(this.msg.currentYear, this.msg.currentMonth, 1));
// if (direction === 'left') {
// newDate.setDate(0);
// } else if (direction === 'right') {
// newDate.setDate(32);
// }
// this.msg.currentYear = newDate.getFullYear()
// this.msg.currentMonth = newDate.getMonth()+1
// }
// this.getCalendarDays()
// },
goUrlA
:
function
(
type
,
item
)
{
goUrlA
:
function
(
type
,
item
)
{
this
.
$emit
(
'goEdit'
,
type
,
item
.
day
)
this
.
$emit
(
'goEdit'
,
type
,
item
.
day
)
// this.$router.push({ name: 'HotelProductEdit', query: { type: type, HotelId: this.hotelId, day: item.day,blank: 'y', tab: '报价管理'} });
},
},
goUrlHotelTeam
:
function
(
item
){
goUrlHotelTeam
:
function
(
item
){
this
.
$router
.
push
({
name
:
'HotelsTeam'
,
query
:
{
HotelId
:
item
.
data
.
HotelId
,
StartDate
:
item
.
data
.
DayStr
,
blank
:
'y'
,
tab
:
'酒店相关团'
}
});
this
.
$router
.
push
({
name
:
'HotelsTeam'
,
query
:
{
HotelId
:
item
.
data
.
HotelId
,
StartDate
:
item
.
data
.
DayStr
,
blank
:
'y'
,
tab
:
'酒店相关团'
}
});
...
@@ -268,6 +250,9 @@
...
@@ -268,6 +250,9 @@
.hotelProductCalendar_day
>
div
>
.hasStock_4
{
.hotelProductCalendar_day
>
div
>
.hasStock_4
{
background-color
:
#ffffff
;
background-color
:
#ffffff
;
}
}
.hotelProductCalendar_day
>
div
>
.hasStock_5
{
background-color
:
#02F78E
;
}
.hotelProductCalendar_day
>
div
>
.noStock
{
.hotelProductCalendar_day
>
div
>
.noStock
{
padding
:
30px
0
0
0
;
padding
:
30px
0
0
0
;
width
:
100%
;
width
:
100%
;
...
...
src/components/Hotel/HotelProductManage2.vue
View file @
788ae4a8
...
@@ -27,6 +27,13 @@
...
@@ -27,6 +27,13 @@
</tr>
</tr>
</tbody>
</tbody>
</table>
</table>
</div>
<div
class=
"hotelProductManage2_tableBox"
>
<span
style=
"color:#000000;background-color: #ff3737;padding:2px 4px;border-radius:5px"
>
红日
</span>
<span
style=
"color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px"
>
旺季
</span>
<span
style=
"color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px"
>
平季
</span>
<span
style=
"color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px"
>
淡季
</span>
<span
style=
"color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px"
>
特别价
</span>
</div>
</div>
<div
class=
"hotelProductManage2_calendar"
>
<div
class=
"hotelProductManage2_calendar"
>
<div
class=
"hotelProductManage2_calendarItem"
v-for=
"(item, index) in days"
:key=
"index"
>
<div
class=
"hotelProductManage2_calendarItem"
v-for=
"(item, index) in days"
:key=
"index"
>
...
@@ -745,13 +752,15 @@
...
@@ -745,13 +752,15 @@
}
else
if
(
type
===
4
)
{
}
else
if
(
type
===
4
)
{
return
'hasStock_4'
return
'hasStock_4'
}
}
else
if
(
type
===
5
)
{
return
'hasStock_5'
}
}
else
{
}
else
{
return
return
}
}
},
},
calendarDayOn
:
function
(
item
,
item2
)
{
calendarDayOn
:
function
(
item
,
item2
)
{
console
.
log
(
item
,
'item'
);
console
.
log
(
item2
,
'item2'
);
if
(
item
.
date
===
item2
.
month
)
{
if
(
item
.
date
===
item2
.
month
)
{
let
dayIndex
=
this
.
msg2
.
DateList
.
indexOf
(
item2
.
day
)
let
dayIndex
=
this
.
msg2
.
DateList
.
indexOf
(
item2
.
day
)
if
(
dayIndex
===
-
1
)
{
if
(
dayIndex
===
-
1
)
{
...
@@ -1233,10 +1242,12 @@
...
@@ -1233,10 +1242,12 @@
.hotelProductManage2_calendarItem
>
.calendarItem_day
>
div
>
.hasStock_3
{
.hotelProductManage2_calendarItem
>
.calendarItem_day
>
div
>
.hasStock_3
{
background-color
:
#bcd6ee
;
background-color
:
#bcd6ee
;
}
}
.hotelProductManage2_calendarItem
>
.calendarItem_day
>
div
>
.hasStock_4
{
.hotelProductManage2_calendarItem
>
.calendarItem_day
>
div
>
.hasStock_4
{
background-color
:
#DDDDDD
;
background-color
:
#DDDDDD
;
}
}
.hotelProductManage2_calendarItem
>
.calendarItem_day
>
div
>
.hasStock_5
{
background-color
:
#02F78E
;
}
/* 页面编辑 */
/* 页面编辑 */
.hotelProductManage2_edit2
{
.hotelProductManage2_edit2
{
...
...
src/components/Hotel/HotelSalesBoard.vue
View file @
788ae4a8
...
@@ -180,20 +180,27 @@
...
@@ -180,20 +180,27 @@
.hotelSalesBoard
.hasStock_1
{
.hotelSalesBoard
.hasStock_1
{
color
:
#FFFFFF
;
color
:
#FFFFFF
;
background-color
:
#ff3737
;
background-color
:
#ff3737
;
padding
:
2px
4px
;
border-radius
:
5px
}
}
.hotelSalesBoard
.hasStock_2
{
.hotelSalesBoard
.hasStock_2
{
background-color
:
#ff99cc
;
background-color
:
#ff99cc
;
padding
:
2px
4px
;
border-radius
:
5px
}
}
.hotelSalesBoard
.hasStock_3
{
.hotelSalesBoard
.hasStock_3
{
background-color
:
#bcd6ee
;
background-color
:
#bcd6ee
;
padding
:
2px
4px
;
border-radius
:
5px
}
}
.hotelSalesBoard
.hasStock_4
{
.hotelSalesBoard
.hasStock_4
{
background-color
:
#ffffff
;
background-color
:
#DDDDDD
;
padding
:
2px
4px
;
border-radius
:
5px
}
.hotelSalesBoard
.hasStock_5
{
background-color
:
#02F78E
;
padding
:
2px
4px
;
border-radius
:
5px
}
}
/* 日期样式结束*/
/* 日期样式结束*/
</
style
>
</
style
>
...
@@ -201,23 +208,18 @@
...
@@ -201,23 +208,18 @@
<div
class=
"flexOne hotelSalesBoard"
>
<div
class=
"flexOne hotelSalesBoard"
>
<div
class=
"query-box Plan_Query"
>
<div
class=
"query-box Plan_Query"
>
<ul>
<ul>
<li
style=
"display:none;"
>
<li>
<span>
<span>
<em>
{{
$t
(
'system.quety_area'
)
}}
</em>
<em>
{{
$t
(
'system.quety_area'
)
}}
</em>
<!--
<el-select
v-model=
"msg.QCountry"
clearable
class=
"w150"
filterable
@
change=
"getProvinceList(msg.QCountry,1)"
<el-select
v-model=
"msg.Province"
filterable
@
change=
"getProvinceList(msg.Province,2)"
:placeholder=
"$t('hotel.hotel_country')"
>
<el-option
v-for=
"item in countryList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
></el-option>
</el-select>
-->
<!--
<el-select
v-model=
"msg.QProvince"
filterable
@
change=
"getProvinceList(msg.QProvince,2)"
:placeholder=
"$t('hotel.hotel_province')"
>
:placeholder=
"$t('hotel.hotel_province')"
>
<el-option
:key=
"0"
:value=
"0"
label=
"请选择"
></el-option>
<el-option
v-for=
"item in provinceList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
></el-option>
<el-option
v-for=
"item in provinceList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
></el-option>
</el-select>
</el-select>
<el-select
v-model=
"msg.QCity"
filterable
@
change=
"getProvinceList(msg.QCity,3)"
:placeholder=
"$t('hotel.hotel_city')"
>
<el-select
v-model=
"msg.City"
filterable
:placeholder=
"$t('hotel.hotel_city')"
>
<el-option
:key=
"0"
:value=
"0"
label=
"请选择"
></el-option>
<el-option
v-for=
"item in cityList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
></el-option>
<el-option
v-for=
"item in cityList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
></el-option>
</el-select>
</el-select>
<el-select
v-model=
"msg.QDistrict"
filterable
:placeholder=
"$t('hotel.hotel_area')"
>
<el-option
v-for=
"item in district"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
></el-option>
</el-select>
-->
</span>
</span>
</li>
</li>
<li>
<li>
...
@@ -243,6 +245,7 @@
...
@@ -243,6 +245,7 @@
<span
class=
"hasStock_2"
>
旺季
</span>
<span
class=
"hasStock_2"
>
旺季
</span>
<span
class=
"hasStock_3"
>
平季
</span>
<span
class=
"hasStock_3"
>
平季
</span>
<span
class=
"hasStock_4"
>
淡季
</span>
<span
class=
"hasStock_4"
>
淡季
</span>
<span
class=
"hasStock_5"
>
特别价
</span>
</div>
</div>
<div
class=
"month"
>
<div
class=
"month"
>
<ul>
<ul>
...
@@ -297,7 +300,9 @@
...
@@ -297,7 +300,9 @@
HotelId
:
0
,
HotelId
:
0
,
//只查询日本
//只查询日本
Country
:
"651"
,
Country
:
"651"
,
loading
:
false
Province
:
0
,
City
:
0
,
loading
:
false
,
},
},
//酒店列表
//酒店列表
HotelList
:
[],
HotelList
:
[],
...
@@ -336,6 +341,10 @@
...
@@ -336,6 +341,10 @@
else
if
(
type
===
4
)
{
else
if
(
type
===
4
)
{
return
'hasStock_4'
return
'hasStock_4'
}
}
//特别价
else
if
(
type
===
5
)
{
return
'hasStock_5'
}
},
},
//调整到订房管理
//调整到订房管理
goUrl
(
path
,
obj
,
dateStr
,
name
)
{
goUrl
(
path
,
obj
,
dateStr
,
name
)
{
...
@@ -452,15 +461,14 @@
...
@@ -452,15 +461,14 @@
Id
:
ID
Id
:
ID
};
};
if
(
type
==
1
)
{
if
(
type
==
1
)
{
this
.
msg
.
QProvince
=
[];
this
.
msg
.
Province
=
0
;
this
.
msg
.
QCity
=
[];
this
.
msg
.
City
=
0
;
this
.
msg
.
QDistrict
=
[];
this
.
provinceList
=
[];
this
.
cityList
=
[];
}
else
if
(
type
==
2
)
{
}
else
if
(
type
==
2
)
{
this
.
msg
.
QCity
=
[];
this
.
msg
.
City
=
0
;
this
.
msg
.
QDistrict
=
[];
this
.
cityList
=
[];
}
else
if
(
type
==
3
)
{
}
this
.
msg
.
QDistrict
=
[];
}
this
.
apipost
(
this
.
apipost
(
"dict_post_Destination_GetChildList"
,
"dict_post_Destination_GetChildList"
,
msg
,
msg
,
...
@@ -469,8 +477,6 @@
...
@@ -469,8 +477,6 @@
this
.
provinceList
=
res
.
data
.
data
;
this
.
provinceList
=
res
.
data
.
data
;
}
else
if
(
type
==
2
)
{
}
else
if
(
type
==
2
)
{
this
.
cityList
=
res
.
data
.
data
;
this
.
cityList
=
res
.
data
.
data
;
}
else
if
(
type
==
3
)
{
this
.
district
=
res
.
data
.
data
;
}
}
},
},
err
=>
{}
err
=>
{}
...
@@ -491,7 +497,7 @@
...
@@ -491,7 +497,7 @@
this
.
GetHotelList
();
this
.
GetHotelList
();
this
.
initCalendar
();
this
.
initCalendar
();
this
.
GetHoltelInventory
();
this
.
GetHoltelInventory
();
//
this.getProvinceList(651,1);
this
.
getProvinceList
(
651
,
1
);
}
}
};
};
...
...
src/components/Hotel/HotelTotalStock.vue
View file @
788ae4a8
...
@@ -333,19 +333,18 @@
...
@@ -333,19 +333,18 @@
<div
class=
"flexOne hotelTS"
>
<div
class=
"flexOne hotelTS"
>
<div
class=
"query-box"
>
<div
class=
"query-box"
>
<ul>
<ul>
<li
style=
"display:none;"
>
<li>
<span>
<span>
<
!--
<
em>
{{
$t
(
'system.quety_area'
)
}}
</em>
<em>
{{
$t
(
'system.quety_area'
)
}}
</em>
<el-select
v-model=
"msg.
QProvince"
filterable
@
change=
"getProvinceList(msg.Q
Province,2)"
<el-select
v-model=
"msg.
Province"
filterable
@
change=
"getProvinceList(msg.
Province,2)"
:placeholder=
"$t('hotel.hotel_province')"
>
:placeholder=
"$t('hotel.hotel_province')"
>
<el-option
:key=
"0"
:value=
"0"
label=
"请选择"
></el-option>
<el-option
v-for=
"item in provinceList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
></el-option>
<el-option
v-for=
"item in provinceList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
></el-option>
</el-select>
</el-select>
<el-select
v-model=
"msg.QCity"
filterable
@
change=
"getProvinceList(msg.QCity,3)"
:placeholder=
"$t('hotel.hotel_city')"
>
<el-select
v-model=
"msg.City"
filterable
:placeholder=
"$t('hotel.hotel_city')"
>
<el-option
:key=
"0"
:value=
"0"
label=
"请选择"
></el-option>
<el-option
v-for=
"item in cityList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
></el-option>
<el-option
v-for=
"item in cityList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
></el-option>
</el-select>
</el-select>
<el-select
v-model=
"msg.QDistrict"
filterable
:placeholder=
"$t('hotel.hotel_area')"
>
<el-option
v-for=
"item in district"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
></el-option>
</el-select>
-->
</span>
</span>
</li>
</li>
<li>
<li>
...
@@ -410,6 +409,10 @@
...
@@ -410,6 +409,10 @@
eDate
:
this
.
setEdate
(),
eDate
:
this
.
setEdate
(),
total
:
0
,
total
:
0
,
currentPage
:
1
,
currentPage
:
1
,
//只查询日本
Country
:
"651"
,
Province
:
0
,
City
:
0
,
},
},
DataList
:
[],
DataList
:
[],
loading
:
true
,
loading
:
true
,
...
@@ -501,15 +504,14 @@
...
@@ -501,15 +504,14 @@
Id
:
ID
Id
:
ID
};
};
if
(
type
==
1
)
{
if
(
type
==
1
)
{
this
.
msg
.
QProvince
=
[];
this
.
msg
.
Province
=
0
;
this
.
msg
.
QCity
=
[];
this
.
msg
.
City
=
0
;
this
.
msg
.
QDistrict
=
[];
this
.
provinceList
=
[];
this
.
cityList
=
[];
}
else
if
(
type
==
2
)
{
}
else
if
(
type
==
2
)
{
this
.
msg
.
QCity
=
[];
this
.
msg
.
City
=
0
;
this
.
msg
.
QDistrict
=
[];
this
.
cityList
=
[];
}
else
if
(
type
==
3
)
{
}
this
.
msg
.
QDistrict
=
[];
}
this
.
apipost
(
this
.
apipost
(
"dict_post_Destination_GetChildList"
,
"dict_post_Destination_GetChildList"
,
msg
,
msg
,
...
@@ -518,21 +520,18 @@
...
@@ -518,21 +520,18 @@
this
.
provinceList
=
res
.
data
.
data
;
this
.
provinceList
=
res
.
data
.
data
;
}
else
if
(
type
==
2
)
{
}
else
if
(
type
==
2
)
{
this
.
cityList
=
res
.
data
.
data
;
this
.
cityList
=
res
.
data
.
data
;
}
else
if
(
type
==
3
)
{
this
.
district
=
res
.
data
.
data
;
}
}
},
},
err
=>
{}
err
=>
{}
);
);
},
}
},
},
mounted
()
{
mounted
()
{
this
.
msg
.
HotelId
=
this
.
$route
.
query
.
HotelId
===
undefined
?
0
:
this
.
$route
.
query
.
HotelId
this
.
msg
.
HotelId
=
this
.
$route
.
query
.
HotelId
===
undefined
?
0
:
this
.
$route
.
query
.
HotelId
;
this
.
getList
();
this
.
GetHotelList
();
this
.
GetHotelList
();
// this.getProvinceList(651,1);
this
.
getProvinceList
(
651
,
1
);
this
.
getList
();
},
},
}
}
</
script
>
</
script
>
\ No newline at end of file
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