Skip to content

H
HotelProject
Commit d8c48a66 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/zk123/hotelproject

parents 9a1a3944 2c2abf2f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 349 additions and 400 deletions
src/components/assetsman/HotelList.vue
View file @ d8c48a66
......@@ -46,26 +46,26 @@
</li>
</ul>
<vxe-table stripe style="margin-top:15px" :loading="loading" :data="dataList">
<vxe-table-column field="SID" title="ホテル番号"></vxe-table-column>
<vxe-table-column field="Name" title="ホテル名">
<vxe-table-column field="SID" title="ホテル番号" width="90" align="center"></vxe-table-column>
<vxe-table-column field="Name" title="ホテル名" width="290" align="left">
<template v-slot="{ row }">
<span>{{ row.SHotelName }}</span>
</template>
</vxe-table-column>
<vxe-table-column field="Name" title="地域">
<vxe-table-column field="Name" title="地域" width="120" align="center">
<template v-slot="{ row }">
<span>{{row.SCountryName}}-{{row.SProvinceName}}-{{row.SCityName}}</span>
</template>
</vxe-table-column>
<vxe-table-column field="SHotelStar" title="ホテル星"></vxe-table-column>
<vxe-table-column field="UpdateByName" title="修正者"></vxe-table-column>
<vxe-table-column field="Name" title="修正時間">
<vxe-table-column field="SHotelStar" title="ホテル星" width="100" align="center"></vxe-table-column>
<vxe-table-column field="UpdateByName" title="修正者" width="120" align="center"></vxe-table-column>
<vxe-table-column field="Name" title="修正時間" width="140" align="center">
<template v-slot="{row}">
<span>{{getDate(row.UpdateTime)}}</span>
</template>
</vxe-table-column>
<vxe-table-column field="StatusStr" title="ホテル状態"></vxe-table-column>
<vxe-table-column field="address" title="操作">
<vxe-table-column field="StatusStr" title="ホテル状態" width="100" align="center"></vxe-table-column>
<vxe-table-column field="address" title="操作" width="120" align="center">
<template v-slot="{ row }">
<el-tooltip class="item" effect="dark" content="修正" placement="top">
<el-button type="success" @click="Edit(row)" icon="iconfont iconxiugaiziliao" circle style="padding:5px;"></el-button>
......
src/components/assetsman/HotelOrder.vue
View file @ d8c48a66
<style>
.commonMoreTable {
.commonOrderTable {
width: 100%;
font-size: 12px;
font-size: 14px;
color: #000000;
border-collapse: collapse;
}
.commonMoreTable {
.commonOrderTable {
width: 100%;
/* min-width: 1500px; */
font-size: 14px;
color: #333;
border-collapse: collapse;
}
.commonMoreTable tr th {
.commonOrderTable tr th {
color: #000000;
height: 50px;
font-family: "muil";
......@@ -23,17 +22,31 @@
text-indent: 15px;
}
.commonMoreTable tr td {
.commonOrderTable tr td {
min-height: 60px;
height: auto;
padding: 10px;
padding: 5px;
background-color: #fff;
font-size: 12px;
font-size: 13px;
border: 1px solid #E2E4EB;
}
.HotelOderName {
margin-right: 10px;
color: blue;
}
.commonOrderTable .tdLeft {
text-align: left;
}
.commonOrderTable .tdCenter {
text-align: center;
}
.commonOrderTable tbody tr:last-child,
.commonOrderTable tr:first-child td:first-child {
border-bottom: 2px solid #333;
}
</style>
......@@ -90,30 +103,32 @@
</el-date-picker>
</li>
</ul>
<table class="commonMoreTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<table class="commonOrderTable" 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="订单号" style="width:75px" class="tdCenter">注文番号</th>
<th title="酒店信息" style="width:140px" class="tdCenter">ホテル情報</th>
<th title="订房数量" style="width:60px" class="tdCenter">注文数</th>
<th title="总金额" style="width:60px" class="tdCenter">総額</th>
<th title="入住信息" style="width:130px" class="tdCenter">入居情報</th>
<th title="订单状态" style="width:70px" class="tdCenter">注文状態</th>
<th title="操作" style="width:100px" 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}}<br />
{{item.EmName}}<br />
{{item.CreateTime}}
</td>
<td 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 +145,20 @@
</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>
お店まで時間を取る予定です： <span title="预计到店时间" class="colorRed">{{item.PredictTime}}</span><br />
メール: {{item.Email}} <br />
電話：{{item.Mobile}}<br />
</td>
<td>
メール: {{item.Email}} <br />
電話：{{item.Mobile}}
</td>
<td>
<td class="tdCenter">
<!-- {{item.OrderForm==1?'同行':'直客'}} -->
{{item.OrderStatus==1?'正常':'取消'}}
</td>
<td>
{{item.EmName}}/{{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,23 +169,22 @@
</td>
</tr>
<tr>
<td colspan="13" title="旅客名单">
旅客名簿：<span class="HotelOderName" v-for="(subItem,subIndex) in item.GuestList"
<td colspan="7" title="旅客名单" class="tdLeft">
客リスト：<span class="HotelOderName" v-for="(subItem,subIndex) in item.GuestList"
:key="subIndex">{{subItem.Name}}</span>
</td>
</tr>
</tbody>
<tbody v-if="dataList.length==0">
<tr>
<td colspan="9" style="text-align:center;" title="暂无数据">一時データ</td>
</tr>
<tr>
<td colspan="8" class="tdCenter" title="暂无数据">一時データ</td>
</tr>
</tbody>
</table>
<el-pagination @current-change="currentChange" background :page-size="msg.pageSize" layout="prev, pager, next"
:total="total">
</el-pagination>
</div>
<!-- 操作日志 -->
<el-dialog title="操作日志" :visible.sync="caozuoState" top="0" width="600px">
<table style="min-width:100%" class="myTable miniTable" v-loading="loading2" border="0" cellspacing="0"
......@@ -313,7 +321,6 @@
this.apipost("scm_get_GetSCMHotelRoomDropList", msg,
res => {
if (res.data.resultCode == 1) {
console.log(res, 'ressss')
this.roomIdList = res.data.data;
} else {
this.Error(res.data.message);
......@@ -387,14 +394,12 @@
res => {
this.loading2 = false;
if (res.data.resultCode == 1) {
console.log(res, 'resssss');
this.OperationList = res.data.data.pageData;
this.total1 = res.data.data.count;
} else {
this.Error(res.data.message);
}
});
}
}
};
......
src/components/assetsman/RoomList.vue
View file @ d8c48a66
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment