Skip to content

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

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

parents d3d02ffe 1b59a7f0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 315 additions and 224 deletions
src/assets/css/common.css
View file @ a60baa08
......@@ -28,6 +28,16 @@
border: none;
color: #fff;
}
.disClick {
background-color: #d1d1d1;
color: #fff;
border: 1px solid #d1d1d1;
}
.disClick:hover {
background-color: #d1d1d1 !important;
cursor: default !important;
box-shadow: none !important;
}
.chaxunSpan {
width: 90px;
......
src/components/assetsman/HotelInfo.vue
View file @ a60baa08
This diff is collapsed.
src/components/assetsman/HotelList.vue
View file @ a60baa08
......@@ -19,20 +19,20 @@
<el-input class="w200" size="small" v-model="msg.SHotelName" placeholder="ホテル名"></el-input>
</li>
<li>
<el-select size="small" v-model="msg.SCountryId" placeholder="国家" @change="getProvinceList(msg.SCountryId,1)">
<el-select size="small" v-model="msg.SCountryId" placeholder="国家" @change="getProvinceList(msg.SCountryId,1)" filterable>
<el-option label="すべて" :value='0'></el-option>
<el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</li>
<li>
<el-select size="small" v-model="msg.SProvinceId" placeholder="省"
@change="getProvinceList(msg.SProvinceId,2)">
@change="getProvinceList(msg.SProvinceId,2)" filterable>
<el-option label="すべて" :value='0'></el-option>
<el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</li>
<li>
<el-select size="small" v-model="msg.SCityId" placeholder="市">
<el-select size="small" v-model="msg.SCityId" placeholder="市" filterable>
<el-option label="すべて" :value='0'></el-option>
<el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
......@@ -54,7 +54,6 @@
</vxe-table-column>
<vxe-table-column field="SHotelAddress" title="ホテルの住所"></vxe-table-column>
<vxe-table-column field="SHotelStar" title="ホテル星"></vxe-table-column>
<vxe-table-column field="SHotelImgCover" title="ホテルの表紙"></vxe-table-column>
<vxe-table-column field="SHotelInfo" title="ホテル案内"></vxe-table-column>
<vxe-table-column field="UpdateByName" title="修正者"></vxe-table-column>
<vxe-table-column field="Name" title="修正時間">
......
src/components/assetsman/HotelOrder.vue
View file @ a60baa08
<template>
<div class="assetsList">
<div class="HotelOrder">
<div class="routerTitle">
<span class="pageTitle">酒店订单</span>
<span @click="getList" style="margin-left:20px" class="chaxunSpan">照会</span>
</div>
<div class="padContent">
<!-- <ul v-show="morequery" class="queryul">
<li>
<el-input class="w200" size="small" v-model="msg.RoomName" placeholder="型の名称"></el-input>
</li>
<li>
<el-select size="small" v-model="msg.HotelId" placeholder="ホテル" clearable filterable>
<el-option v-for="item in HotelList" :key="item.SID" :label="item.SHotelName" :value="item.SID">
</el-option>
</el-select>
</li>
<li>
<el-select size="small" v-model="msg.RoomType" placeholder="房型タイプ" clearable filterable>
<el-option v-for="item in RoomTypeList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</li>
<li>
<el-select clearable size="small" v-model="msg.RoomStatus" placeholder="状态">
<el-option label="决断" :value="0"></el-option>
<el-option label="やむを得ず" :value="1"></el-option>
<el-option label="下機" :value="2"></el-option>
</el-select>
</li>
</ul> -->
<vxe-table stripe style="margin-top:15px" :loading="loading" :data="dataList">
<vxe-table-column field="OrderId" title="订单id"></vxe-table-column>
<vxe-table-column field="HotelId" title="酒店id"></vxe-table-column>
<vxe-table-column field="RoomName" title="房型名称"></vxe-table-column>
<vxe-table-column field="RoomNum" title="房间数量"></vxe-table-column>
<vxe-table-column field="Money" title="总金额"></vxe-table-column>
<vxe-table-column field="CheckInDate" title="入住日期"></vxe-table-column>
<vxe-table-column field="CheckOutDate" title="退房日期"></vxe-table-column>
<vxe-table-column field="Email" title="邮箱"></vxe-table-column>
<vxe-table-column field="Mobile" title="手机号码"></vxe-table-column>
<vxe-table-column field="OrderForm" title="订单来源">
<template v-slot="{ row }">
<p>{{ row.OrderForm==1?'同行':'直客'}}</p>
</template>
</vxe-table-column>
<vxe-table-column field="OrderStatus" title="订单状态">
<template v-slot="{ row }">
<p>{{ row.OrderStatus==1?'正常':'取消'}}</p>
</template>
</vxe-table-column>
<vxe-table-column field="SHotelName" title="酒店名称"></vxe-table-column>
<vxe-table-column field="SHotelStar" title="星级"></vxe-table-column>
<vxe-table-column field="PredictTime" title="预计到店时间"></vxe-table-column>
<vxe-table-column field="EmName" title="创建人"></vxe-table-column>
<vxe-table-column field="CreateTime" title="创建时间"></vxe-table-column>
</vxe-table>
<el-pagination @current-change="currentChange" background :page-size="msg.pageSize" layout="prev, pager, next"
:total="total">
</el-pagination>
</div>
</div>
</template>
<script>
import moment from 'moment'
export default {
name: "assetsList",
name: "HotelOrder",
components: {},
data() {
return {
......@@ -28,14 +81,11 @@
StartTime:"",
EndTime:"",
OrderStatus:0,
CreateBy:0,
OrderForm:0
},
};
},
mounted() {
this.getCountryList();
this.getList();
},
methods: {
......@@ -44,9 +94,12 @@
this.getList();
},
getList() {
this.loading=true;
this.apipost("scm_get_GetSCMHotelOrderPageList", this.msg,
res => {
this.loading=false;
if (res.data.resultCode == 1) {
console.log(res,'resss');
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
console.log("this.dataList", this.dataList)
......@@ -55,50 +108,6 @@
}
});
},
getProvinceList(ID, type) {
//根据省份获取城市
let msg = {
Id: ID
};
if (type == 1) {
this.msg.SProvinceId = 0;
this.msg.SCityId = 0;
} else if (type == 2) {
this.msg.SCityId = 0;
}
if (this.msg.SCountryId !== 0) {
this.apipost(
"dict_post_Destination_GetChildList",
msg,
res => {
if (type == 1) {
this.provinceList = res.data.data;
} else if (type == 2) {
this.cityList = res.data.data;
}
},
err => {}
);
}
},
//获取国家
getCountryList() {
this.apipost(
"dict_post_Destination_GetCountry", {},
res => {
this.countryList = res.data.data;
},
err => {}
);
},
addHotel() {
this.$router.push({
path: 'HotelInfo'
})
},
getDate(date) {
return moment(date).format("YYYY-MM-DD HH:mm:ss");
},
//修改
Edit(item) {
this.$router.push({
......@@ -110,48 +119,10 @@
},
}
};
</script>
<style>
.assetsList .MyEditForm .baseform .el-form-item:nth-child(4n) {
margin-right: 0;
}
.assetsList .zczt1 {
background: #ffe4d5;
color: #ffa87c;
}
.assetsList .zczt2 {
background: #beeff0;
color: #089bab;
}
.assetsList .zczt3 {
background: #ffd6d5;
color: #ff7874;
}
.assetsList .zczt4 {
background: #d7d6ff;
color: #7b78ff;
}
.assetsList .Commonzczt {
display: inline-block;
width: 24px;
height: 24px;
line-height: 24px;
text-align: center;
border-radius: 50%;
font-size: 12px;
font-family: "Microsoft YaHei";
}
.assetsList {
.HotelOrder {
width: 100%;
height: 100%;
}
</style>
src/components/global/Nav.vue
View file @ a60baa08
......@@ -144,7 +144,7 @@ export default {
},
getMenu(){
let menu= this.getLocalStorage().UserMenu
this.menuList =menu[0].ChildMenu;
//this.menuList =menu[0].ChildMenu;
},
//点击弹出框
showUpdateBoard(){
......
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