Skip to content

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

update

parents 1157479f 10279fe8
Hide whitespace changes
Inline Side-by-side
Showing with 271 additions and 31 deletions
src/App.vue
View file @ b873e1fd
......@@ -13,7 +13,7 @@ export default {
</script>
<style>
@import "//at.alicdn.com/t/font_1544586_kc9j119l3w.css";
@import "//at.alicdn.com/t/font_1635628_r9erjx8y0oe.css";
@import "./assets/css/common.css";
@import './assets/global/font.css';
@import "./assets/css/reset.css";
......
src/components/assetsman/HotelInfo.vue
View file @ b873e1fd
......@@ -363,6 +363,9 @@
this.hotelService.push(x);
});
}
this.addMsg.SHotelImgCoverArray.forEach(x=>{
this.HotelImageArray.push(x);
})
} else {
this.Error(res.data.message);
}
......
src/components/assetsman/HotelList.vue
View file @ b873e1fd
......@@ -14,19 +14,35 @@
新たに</span>
</div>
<div class="padContent">
<ul v-show="morequery" class="queryul">
<ul v-show="morequery" class="queryul">
<li>
<el-input class="w200" size="small" v-model="msg.SHotelName" placeholder="ホテル名"></el-input>
</li>
<li>
<el-select size="small" v-model="msg.Status" placeholder="ホテル状態" >
<el-select size="small" v-model="msg.SCountryId" placeholder="国家" @change="getProvinceList(msg.SCountryId,1)">
<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-date-picker v-model="dateList" type="daterange" range-separator="至" value-format="yyyy-MM-dd"
start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
<el-select size="small" v-model="msg.SProvinceId" placeholder="省"
@change="getProvinceList(msg.SProvinceId,2)">
<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-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>
</li>
<li>
<el-select size="small" v-model="msg.Status" placeholder="ホテル状態">
<el-option label="すべて" :value='-1'></el-option>
<el-option label="正常" :value='0'></el-option>
<el-option label="削除" :value='1'></el-option>
</el-select>
</li>
</ul>
<vxe-table stripe style="margin-top:15px" :loading="loading" :data="dataList">
......@@ -42,17 +58,20 @@
<vxe-table-column field="SHotelInfo" title="ホテル案内"></vxe-table-column>
<vxe-table-column field="UpdateByName" title="修正者"></vxe-table-column>
<vxe-table-column field="Name" title="修正時間">
<template v-slot="{row}">
<span>{{getDate(row.UpdateTime)}}</span>
</template>
<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="操作">
<template v-slot="{ row }">
<el-tooltip class="item" effect="dark" content="修正" placement="top" >
<img @click="Edit(row)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="" />
</el-tooltip>
</template>
<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>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="房型列表" placement="top">
<el-button type="primary" @click="goUrl(row)" icon="iconfont iconicon-" circle style="padding:5px;"></el-button>
</el-tooltip>
</template>
</vxe-table-column>
</vxe-table>
<el-pagination @current-change="currentChange" background :page-size="msg.pageSize" layout="prev, pager, next"
......@@ -71,17 +90,24 @@
currentPage: 1,
dataList: [],
loading: false,
morequery:false,
morequery: false,
total: 0,
msg: {
pageIndex: 1,
pageSize: 15,
SHotelName:"",//酒店名称
Status:-1,//酒店状态
SHotelName: "", //酒店名称
Status: -1, //酒店状态
SCountryId: 651, //国家编号
SProvinceId: 0, //省份编号
SCityId: 0, //城市编号
},
countryList: [], //国家列表
provinceList: [], //省份列表
cityList: [], //城市列表
};
},
mounted() {
this.getCountryList();
this.getList();
},
methods: {
......@@ -91,20 +117,58 @@
},
getList() {
this.apipost("scm_get_GetSCMHotelPageListService", this.msg,
res => {
res => {
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
console.log("this.dataList", this.dataList)
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
console.log("this.dataList", this.dataList)
} else {
this.Error(res.data.message);
this.Error(res.data.message);
}
});
});
},
addHotel(){
this.$router.push({path: 'HotelInfo'})
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 => {}
);
}
},
getDate(date){
//获取国家
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");
},
//修改
......@@ -116,6 +180,15 @@
}
})
},
//跳转
goUrl(item){
this.$router.push({
path: 'RoomList',
query: {
SID: item.SID
}
})
}
}
};
......
src/components/assetsman/HotelOrder.vue 0 → 100644
View file @ b873e1fd
<template>
<div class="assetsList">
<div class="routerTitle">
<span class="pageTitle">酒店订单</span>
</div>
</div>
</template>
<script>
import moment from 'moment'
export default {
name: "assetsList",
components: {},
data() {
return {
currentPage: 1,
dataList: [],
loading: false,
morequery: false,
total: 0,
msg: {
pageIndex: 1,
pageSize: 15,
HotelId:0,
RoomId:0,
RoomType:0,
StartTime:"",
EndTime:"",
OrderStatus:0,
CreateBy:0,
OrderForm:0
},
};
},
mounted() {
this.getCountryList();
this.getList();
},
methods: {
currentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList() {
this.apipost("scm_get_GetSCMHotelOrderPageList", this.msg,
res => {
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
console.log("this.dataList", this.dataList)
} else {
this.Error(res.data.message);
}
});
},
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({
path: 'HotelInfo',
query: {
SID: item.SID
}
})
},
}
};
</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 {
width: 100%;
height: 100%;
}
</style>
src/components/global/Nav.vue
View file @ b873e1fd
......@@ -26,6 +26,9 @@
<el-menu-item-group class="itemgroup">
<el-menu-item index="2-2-2" @click="goUrl('RoomList')"><span>房型列表</span></el-menu-item>
</el-menu-item-group>
<el-menu-item-group class="itemgroup">
<el-menu-item index="2-2-3" @click="goUrl('HotelOrder')"><span>酒店订单</span></el-menu-item>
</el-menu-item-group>
</el-submenu>
<!-- <el-submenu :index="String(index+1)" v-for="(item,index) in menuList" :key="index">
......@@ -53,11 +56,11 @@
<span class="f14"><span style="color:#BEBEBE">Hello</span>，{{zcuserInfo.Name}}</span>
</li>
<li @click="showUpdateBoard()" style="cursor: pointer;margin-top:12px">
<i style="color:#FFA475" class="iconfont icon-tuichudenglu"></i>
<i style="color:#FFA475" class="iconfont iconxiugaiziliao"></i>
<span style="margin-left:6px">修改资料</span>
</li>
<li @click="LoginOut" style="cursor: pointer;margin-top:12px">
<i style="color:#FFA475" class="iconfont icon-tuichudenglu"></i>
<i style="color:#FFA475" class="iconfont icontuichudenglu"></i>
<span style="margin-left:6px">退出登录</span>
</li>
</ul>
......
src/router/config.js
View file @ b873e1fd
......@@ -64,9 +64,13 @@ export default {
path: '/Quotation',
name: 'Quotation',
component: resolve => require(['@/components/assetsman/Quotation'], resolve),
},
//酒店订单
{
path: '/HotelOrder',
name: 'HotelOrder',
component: resolve => require(['@/components/assetsman/HotelOrder'], resolve),
}
]
},
]
......
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