Skip to content

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

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

parents dca5a5d2 c7eecff9
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 21 deletions
src/components/assetsman/HotelList.vue
View file @ 728248b0
......@@ -19,14 +19,15 @@
<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)" filterable>
<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)" filterable>
<el-select size="small" v-model="msg.SProvinceId" placeholder="省" @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>
......@@ -46,8 +47,8 @@
</li>
</ul>
<vxe-table stripe style="margin-top:15px" :loading="loading" :data="dataList">
<vxe-table-column field="SID" title="ホテル番号" width="90" align="center"></vxe-table-column>
<vxe-table-column field="Name" title="ホテル名" width="290" align="left">
<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>
......@@ -57,21 +58,27 @@
<span>{{row.SCountryName}}-{{row.SProvinceName}}-{{row.SCityName}}</span>
</template>
</vxe-table-column>
<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="修正時間" align="center">
<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="修正時間" align="center">
<template v-slot="{row}">
<span>{{getDate(row.UpdateTime)}}</span>
</template>
</vxe-table-column>
<vxe-table-column field="StatusStr" title="ホテル状態" align="center"></vxe-table-column>
<vxe-table-column field="address" title="操作" align="center">
<vxe-table-column field="StatusStr" title="ホテル状態" align="center" ></vxe-table-column>
<vxe-table-column field="address" title="操作" align="center" width="150">
<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-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-button type="primary" @click="goUrl(row)" icon="iconfont iconicon-" circle style="padding:5px;">
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="プレビュー" placement="top" title="预览">
<el-button type="primary" @click="goPreviewUrl(row)" icon="iconfont iconicon-" circle
style="padding:5px;"></el-button>
</el-tooltip>
</template>
</vxe-table-column>
......@@ -118,10 +125,10 @@
this.getList();
},
getList() {
this.loading=true;
this.loading = true;
this.apipost("scm_get_GetSCMHotelPageListService", this.msg,
res => {
this.loading=false;
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
......@@ -183,8 +190,12 @@
}
})
},
goPreviewUrl(item) {
var url = "http://www.oytour.com/#/SupplierView?HotelId="+item.SID;
window.open(url, '_blank')
},
//跳转
goUrl(item){
goUrl(item) {
this.$router.push({
path: 'RoomList',
query: {
......
src/components/assetsman/Quotation.vue
View file @ 728248b0
......@@ -2,8 +2,11 @@
<div class="Quotation">
<div class="routerTitle">
<span class="pageTitle">見積書</span>
<span @click="DeleteAll" style="margin-left:20px" class="addSpan" title="全部删除">一括削除</span>
<span title="返回" @click="goUrlRoom()" style="margin-left:20px" class="addSpan">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/search.png" alt="" />
戻る</span>
</div>
<div class="padContent">
<ul class="queryul">
......@@ -230,6 +233,14 @@
this.getMonths();
},
methods: {
goUrlRoom() {
this.$router.push({
path: 'RoomList',
query: {
SID: this.addMsg.HotelId
}
})
},
//删除报价
DeleteAll() {
let msg = {
......
src/components/assetsman/RoomList.vue
View file @ 728248b0
......@@ -12,6 +12,9 @@
<span @click="addHotel()" style="margin-left:20px" class="addSpan">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="" />
新たに</span>
<span title="返回" @click="goUrlHotel()" style="margin-left:20px" class="addSpan">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/search.png" alt="" />
戻る</span>
</div>
<div class="padContent">
<ul v-show="morequery" class="queryul">
......@@ -403,6 +406,14 @@
}
});
},
goUrlHotel(row) {
this.$router.push({
name: 'HotelList',
query: {
}
});
},
SeeImg(row) {
this.imgList = row.ImageList;
this.imgState = true;
......
src/components/global/index.vue
View file @ 728248b0
......@@ -13,9 +13,11 @@
height: 100%;
border-radius: 50%;
}
.w230{
width:230px!important;
.w230 {
width: 230px !important;
}
</style>
<template>
<div class="App">
......@@ -39,14 +41,17 @@
</el-upload>
<el-form :model="passWordMsg" :rules="rules" ref="passWordMsg" label-width="100px">
<el-form-item label="古い暗号" prop="oldPwd" title="旧密码">
<el-input size="small" class="w230" type="password" v-model="passWordMsg.oldPwd" max-length="20" placeholder="入力してください"></el-input>
<el-input size="small" class="w230" type="password" v-model="passWordMsg.oldPwd" max-length="20"
placeholder="入力してください"></el-input>
</el-form-item>
<el-form-item label="新しい暗号" prop="newPwd" title="新密码">
<el-input size="small" class="w230" type="password" v-model="passWordMsg.newPwd" max-length="20" placeholder="入力してください"></el-input>
<el-input size="small" class="w230" type="password" v-model="passWordMsg.newPwd" max-length="20"
placeholder="入力してください"></el-input>
</el-form-item>
</el-form>
<div class="btnformItem" style="text-align:center;margin:50px 0 20px 0;">
<span class="chaxunSpan" type="primary" @click="submitForm('passWordMsg')" style="margin-right:20px;" title="确定">確定</span>
<span class="chaxunSpan" type="primary" @click="submitForm('passWordMsg')" style="margin-right:20px;"
title="确定">確定</span>
<span class="addSpan" @click="updateInfo = false,resetMsg()" title="取消">キャンセル</span>
</div>
</div>
......@@ -124,6 +129,7 @@
this.apipost("scm_post_UpdateHeadImgService", this.imgMsg, response => {
//修改添加接口
if (response.data.resultCode == 1) {
this.scmAccount.HeadImg=this.imgMsg.HeadImg;
this.Success(response.data.message);
} else {
this.Error(response.data.message);
......@@ -151,6 +157,10 @@
this.Success(response.data.message);
this.updateInfo = false;
this.resetMsg();
localStorage.removeItem("scmAccount");
this.$router.push({
path: '/Login'
})
} else {
this.Error(response.data.message);
}
......
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