Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
HotelProject
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
zhengke
HotelProject
Commits
a0d6885c
Commit
a0d6885c
authored
Feb 13, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
0caaa4ce
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
59 additions
and
48 deletions
+59
-48
HotelOrder.vue
src/components/assetsman/HotelOrder.vue
+33
-28
RoomList.vue
src/components/assetsman/RoomList.vue
+26
-20
No files found.
src/components/assetsman/HotelOrder.vue
View file @
a0d6885c
<
style
>
.common
More
Table
{
.common
Order
Table
{
width
:
100%
;
font-size
:
12px
;
color
:
#000000
;
border-collapse
:
collapse
;
}
.common
More
Table
{
.common
Order
Table
{
width
:
100%
;
/* min-width: 1500px; */
font-size
:
14px
;
...
...
@@ -14,7 +14,7 @@
border-collapse
:
collapse
;
}
.common
More
Table
tr
th
{
.common
Order
Table
tr
th
{
color
:
#000000
;
height
:
50px
;
font-family
:
"muil"
;
...
...
@@ -23,7 +23,7 @@
text-indent
:
15px
;
}
.common
More
Table
tr
td
{
.common
Order
Table
tr
td
{
min-height
:
60px
;
height
:
auto
;
padding
:
10px
;
...
...
@@ -35,6 +35,12 @@
.HotelOderName
{
margin-right
:
10px
;
}
.commonOrderTable
.tdLeft
{
text-align
:
left
;
}
.commonOrderTable
.tdCenter
{
text-align
:
center
;
}
</
style
>
<
template
>
...
...
@@ -90,30 +96,30 @@
</el-date-picker>
</li>
</ul>
<table
class=
"common
More
Table"
v-loading=
"loading"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<table
class=
"common
Order
Table"
v-loading=
"loading"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
<th
title=
"订单号"
>
注文番号
</th>
<th
title=
"酒店信息"
>
ホテル情報
</th>
<th
title=
"订房数量"
>
注文数
</th>
<th
title=
"总金额"
>
総額
</th>
<th
title=
"入住信息"
>
入居情報
</th>
<th
title=
"联系信息"
>
連絡先情報
</th>
<th
title=
"订单状态
"
>
注文状態
</th>
<th
title=
"创建人/创建时间"
>
作成者/作成時間
</th>
<th
title=
"操作"
>
操作
</th>
<th
title=
"订单号"
class=
"tdCenter"
>
注文番号
</th>
<th
title=
"酒店信息"
class=
"tdCenter"
>
ホテル情報
</th>
<th
title=
"订房数量"
class=
"tdCenter"
>
注文数
</th>
<th
title=
"总金额"
class=
"tdCenter"
>
総額
</th>
<th
title=
"入住信息"
class=
"tdCenter"
>
入居情報
</th>
<th
title=
"联系信息"
class=
"tdCenter"
>
連絡先情報
</th>
<th
title=
"订单状态
"
class=
"tdCenter
"
>
注文状態
</th>
<th
title=
"创建人/创建时间"
class=
"tdCenter"
>
作成者/作成時間
</th>
<th
title=
"操作"
class=
"tdCenter"
>
操作
</th>
</tr>
<tbody
v-for=
"(item,index) in dataList"
:key=
"index"
>
<tr>
<td
rowspan=
"2"
>
{{
item
.
OrderId
}}
</td>
<td
rowspan=
"2"
>
<td
rowspan=
"2"
class=
"tdCenter"
>
{{
item
.
OrderId
}}
</td>
<td
rowspan=
"2"
class=
"tdLeft"
>
<span
class=
"colorRed"
>
{{
item
.
SHotelName
}}
</span>
<br
/>
型の名称:
<span
title=
"房型信息"
class=
"colorRed"
>
{{
item
.
RoomName
}}
</span>
<br
/>
星:
<span
title=
"酒店星级"
class=
"colorRed"
>
{{
item
.
SHotelStar
}}
星
</span>
</td>
<td>
{{
item
.
RoomNum
}}
</td>
<td>
<td
class=
"tdCenter"
>
{{
item
.
RoomNum
}}
</td>
<td
class=
"tdCenter"
>
<el-popover
width=
"300"
trigger=
"click"
>
<table
style=
"width:100%;"
class=
"myTable miniTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
...
...
@@ -130,26 +136,25 @@
</span>
</el-popover>
</td>
<td>
<td
class=
"tdLeft"
>
入居期日:
<span
title=
"入住日期"
class=
"colorRed"
>
{{
item
.
CheckInDate
}}
</span>
<br
/>
チェックアウト日時:
<span
title=
"退房日期"
class=
"colorRed"
>
{{
item
.
CheckOutDate
}}
</span>
<br
/>
お店まで時間を取る予定です:
<span
title=
"预计到店时间"
class=
"colorRed"
>
{{
item
.
PredictTime
}}
</span>
</td>
<td>
<td
class=
"tdLeft"
>
メール:
{{
item
.
Email
}}
<br
/>
電話:
{{
item
.
Mobile
}}
</td>
<td>
<td
class=
"tdCenter"
>
<!--
{{
item
.
OrderForm
==
1
?
'同行'
:
'直客'
}}
-->
{{
item
.
OrderStatus
==
1
?
'正常'
:
'取消'
}}
</td>
<td>
{{
item
.
EmName
}}
/
{{
item
.
CreateTime
}}
<td
class=
"tdCenter"
>
{{
item
.
EmName
}}
<br/>
{{
item
.
CreateTime
}}
</td>
<td>
<td
class=
"tdCenter"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"キャンセル"
placement=
"top"
>
<img
@
click=
"DeleteOrder(item)"
style=
"width:24px;height:24px"
src=
"../../assets/img/qx.png"
alt=
""
/>
</el-tooltip>
...
...
@@ -160,7 +165,7 @@
</td>
</tr>
<tr>
<td
colspan=
"13"
title=
"旅客名单"
>
<td
colspan=
"13"
title=
"旅客名单"
class=
"tdLeft"
>
旅客名簿:
<span
class=
"HotelOderName"
v-for=
"(subItem,subIndex) in item.GuestList"
:key=
"subIndex"
>
{{
subItem
.
Name
}}
</span>
</td>
...
...
@@ -168,7 +173,7 @@
</tbody>
<tbody
v-if=
"dataList.length==0"
>
<tr>
<td
colspan=
"9"
style=
"text-align:center;
"
title=
"暂无数据"
>
一時データ
</td>
<td
colspan=
"9"
class=
"tdCenter
"
title=
"暂无数据"
>
一時データ
</td>
</tr>
</tbody>
</table>
...
...
src/components/assetsman/RoomList.vue
View file @
a0d6885c
...
...
@@ -40,39 +40,39 @@
</ul>
<table
class=
"commonMoreTable"
v-loading=
"loading"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
<th
title=
"房型"
style=
"width:100px;
text-align:center;
"
>
房型
</th>
<th
title=
"类型"
style=
"width:100px;
text-align:center;
"
>
タイプ
</th>
<th
title=
"成本价"
style=
"width:80px;
text-align:center;
"
>
原価
</th>
<th
title=
"售卖价"
style=
"width:80px;
text-align:center;
"
>
ばいばい価格
</th>
<th
title=
"今日卖价"
style=
"width:80px;
text-align:center;
"
>
きょうばいか
</th>
<th
title=
"状态"
style=
"width:80px;
text-align:center;
"
>
状态
</th>
<th
title=
"图片"
style=
"width:80px;
text-align:center;
"
>
写真
</th>
<th
title=
"创建人/创建时间"
style=
"width:80px;
text-align:center;
"
>
操作者/時間
</th>
<th
title=
"操作"
style=
"width:150px;
text-align:center;
"
>
操作
</th>
<th
title=
"房型"
style=
"width:100px;
"
class=
"tdCenter
"
>
房型
</th>
<th
title=
"类型"
style=
"width:100px;
"
class=
"tdCenter
"
>
タイプ
</th>
<th
title=
"成本价"
style=
"width:80px;
"
class=
"tdCenter
"
>
原価
</th>
<th
title=
"售卖价"
style=
"width:80px;
"
class=
"tdCenter
"
>
ばいばい価格
</th>
<th
title=
"今日卖价"
style=
"width:80px;
"
class=
"tdCenter
"
>
きょうばいか
</th>
<th
title=
"状态"
style=
"width:80px;
"
class=
"tdCenter
"
>
状态
</th>
<th
title=
"图片"
style=
"width:80px;
"
class=
"tdCenter
"
>
写真
</th>
<th
title=
"创建人/创建时间"
style=
"width:80px;
"
class=
"tdCenter
"
>
操作者/時間
</th>
<th
title=
"操作"
style=
"width:150px;
"
class=
"tdCenter
"
>
操作
</th>
</tr>
<tbody
v-for=
"(item,index) in dataList"
:key=
"index"
>
<tr>
<td
rowspan=
"2"
>
{{
item
.
RoomName
}}
</td>
<td
rowspan=
"2"
>
{{
item
.
RoomTypeName
}}
</td>
<td>
{{
item
.
CostPrice
}}
</td>
<td>
{{
item
.
Money
}}
</td>
<td>
<td
rowspan=
"2"
class=
"tdLeft"
>
{{
item
.
RoomName
}}
</td>
<td
rowspan=
"2"
class=
"tdLeft"
>
{{
item
.
RoomTypeName
}}
</td>
<td
class=
"tdCenter"
>
{{
item
.
CostPrice
}}
</td>
<td
class=
"tdCenter"
>
{{
item
.
Money
}}
</td>
<td
class=
"tdCenter"
>
<span
v-if=
"item.ToDayMoney==0"
>
未設定
</span>
<span
v-else
>
{{
item
.
ToDayMoney
}}
</span>
</td>
<td>
<td
class=
"tdCenter"
>
<span
v-if=
"item.RoomStatus==1"
>
けんかを仕掛ける
</span>
<span
v-if=
"item.RoomStatus==2"
>
棚をおりる
</span>
</td>
<td>
<td
class=
"tdCenter"
>
<span
style=
"cursor: pointer;"
v-if=
"item.ImageList.length>0"
@
click=
"SeeImg(item)"
>
部屋の写真を見る
</span>
<span
v-if=
"item.ImageList.length==0"
>
しばらく
</span>
</td>
<td>
<td
class=
"tdCenter"
>
<p>
{{
item
.
UpdateByName
}}
</p>
<p>
{{
item
.
UpdateTime
}}
</p>
</td>
<td>
<td
class=
"tdCenter"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"修正"
placement=
"top"
>
<img
@
click=
"Edit(item)"
style=
"width:24px;height:24px"
src=
"../../assets/img/edit.png"
alt=
""
/>
</el-tooltip>
...
...
@@ -88,7 +88,7 @@
</td>
</tr>
<tr>
<td
colspan=
"13"
title=
"描述"
>
<td
colspan=
"13"
title=
"描述"
class=
"tdLeft"
>
<span>
記述:
{{
item
.
Description
}}
</span>
<span
v-if=
"item.Area && item.Area!=''"
>
、面積:
{{
item
.
Area
}}
</span>
<span
v-if=
"item.Floor && item.Floor!=''"
>
、階:
{{
item
.
Floor
}}
</span>
...
...
@@ -594,5 +594,11 @@
.HotelOderName
{
margin-right
:
10px
;
}
.commonMoreTable
.tdLeft
{
text-align
:
left
;
}
.commonMoreTable
.tdCenter
{
text-align
:
center
;
}
</
style
>
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