Skip to content

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

解决冲突

parents 0e81e1b4 4d9f1177
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 209 additions and 718 deletions
index.html
View file @ 2e2419e5
......@@ -7,7 +7,7 @@
<meta http-equiv="Pragma" content="no-cache">
<meta http-equiv="Cache-Control" content="no-cache, must-revalidate, no-store">
<meta http-equiv="Expires" content="0">
<title>资产管理</title>
<title>四川和平国际旅行社SCM管理系统</title>
</head>
<body>
<div id="app"></div>
......
src/components/Home.vue
View file @ 2e2419e5
This diff is collapsed.
src/components/assetsman/HotelInfo.vue
View file @ 2e2419e5
......@@ -113,10 +113,10 @@
<div class="resource-content clearfix">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="140px">
<div class="resource-baseinfo" style="width:500px;margin:30px 0 0 30px;float:left;">
<el-form-item label="ホテル名">
<el-form-item label="ホテル名" prop="SHotelName">
<el-input type="text" v-model="addMsg.SHotelName" maxlength="100" class="w300"></el-input>
</el-form-item>
<el-form-item label="ホテルの住所">
<el-form-item label="ホテルの住所" prop="SHotelAddress">
<el-input type="text" v-model="addMsg.SHotelAddress" maxlength="100" class="w300"></el-input>
</el-form-item>
<el-form-item label="ホテル星">
......@@ -155,12 +155,27 @@
<el-option v-for="item in SHotelService" :key="item.HType" :label="item.HName" :value="item.HName"></el-option>
</el-select>
</el-form-item>
<el-form-item label="早到入住时间">
<el-time-select class='w300' v-model='addMsg.CheckInTime'
:picker-options="{start: '08:00',step: '00:05',end: '22:00'}">
</el-time-select>
</el-form-item>
<el-form-item label="退房时间">
<el-time-select class='w300' v-model='addMsg.CheckOutTime'
:picker-options="{start: '08:00',step: '00:05',end: '22:00'}">
</el-time-select>
</el-form-item>
<el-form-item label="酒店前台服务时间至">
<el-time-select class='w300' v-model='addMsg.ServiceTime'
:picker-options="{start: '08:00',step: '00:05',end: '22:00'}">
</el-time-select>
</el-form-item>
</div>
</el-form>
</div>
<div class="_addUpload_box" style="margin:30px 0 30px 60px;">
<ul class="uploadUl">
<li v-for="(item, index) in addMsg.ImageList" :key="index"><img :src="item" alt="" />
<li v-for="(item, index) in HotelImageArray" :key="index"><img :src="item" alt="" />
<div class="hoverDiv"><img @click="DeleteImg(item, index)" src="../../assets/img/imgdelete.png" alt="" />
</div>
</li>
......@@ -195,12 +210,17 @@
RoomFacilities: '',
ActivityFacilities: '',
SHotelService: '',
CheckInTime:'',
CheckOutTime:'',
ServiceTime:''
},
PublicFacilities:[],//公共设施
RoomFacilities:[],//客房设施
ActivityFacilities:[],//活动设施
SHotelService:[],//酒店设施服务
//图片数组
HotelImageArray:[],
publicService:'',
roomService:'',
activeService:'',
......@@ -210,7 +230,17 @@
SelectDefaultValue: 0,
starslevel:[],
rules:{
//表单必填验证
SHotelName: [{
required: true,
message: 'ホテル名を入力してください',
trigger: "change"
}],
SHotelAddress: [{
required: true,
message: '住所を入力してください',
trigger: "change"
}]
}
//酒店编号
......@@ -223,26 +253,28 @@
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/DMC/";
var path = "/Upload/SCMHotel/";
this.UploadSelfFileT(path, newArr, x => {
var obj = this.$DMCUtils.DMCImageObj();
var str = x.data.FilePath;
var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
obj.Path = str;
obj.ShowPath = imgUrl;
this.HotelImageArray.push(obj);
console.log(x,'xxxxxx');
var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.HotelImageArray.push(imgUrl);
});
},
//删除图片
DeleteImg(item, index) {
this.HotelImageArray.splice(index, 1);
},
submitForm(addMsg) {
//提交创建、修改表单
let that = this;
// that.$refs[addMsg].validate(valid => {
// if (valid) {
that.saveData();
// } else {
// return false;
// }
// });
that.$refs[addMsg].validate(valid => {
if (valid) {
that.saveData();
} else {
return false;
}
});
},
//保存数据
......@@ -251,6 +283,8 @@
this.addMsg.RoomFacilities=this.roomService.toString();
this.addMsg.ActivityFacilities=this.activeService.toString();
this.addMsg.SHotelService=this.hotelService.toString();
this.addMsg.SHotelImgCover = this.HotelImageArray.toString();
this.apipost(
"scm_post_SetSCMHotelService",
this.addMsg,
......
src/components/assetsman/HotelList.vue
View file @ 2e2419e5
......@@ -14,34 +14,13 @@
新たに</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.Name" placeholder="资产名称"></el-input>
<el-input class="w200" size="small" v-model="msg.SHotelName" placeholder="ホテル名"></el-input>
</li>
<li>
<el-input class="w200" size="small" v-model="msg.PropertyNum" placeholder="资产编码"></el-input>
</li>
<li>
<el-input class="w200" size="small" v-model="msg.SerialNumber" placeholder="序列号"></el-input>
</li>
<li>
<el-select size="small" v-model="msg.PropertyStatus" placeholder="资产状态" clearable filterable>
<el-option v-for="item in PropertyStatusList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</li>
<li>
<el-select size="small" filterable clearable v-model="msg.EmployeeId" placeholder="使用人"
:filter-method="getEmployee1">
<el-option v-for="item in EmployeeList1" :key="item.EmployeeId" :label="item.EmName"
:value="item.EmployeeId">
</el-option>
</el-select>
</li>
<li>
<el-select clearable size="small" v-model="msg.SupplierId" placeholder="供应商">
<el-option v-for="item in supplierList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
<el-select size="small" v-model="msg.Status" placeholder="ホテル状態" >
</el-select>
</li>
<li>
......@@ -49,7 +28,7 @@
start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
</li>
</ul> -->
</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="ホテル名">
......@@ -61,25 +40,13 @@
<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="SHotelPolicy" title="酒店政策"></vxe-table-column>
<vxe-table-column field="PublicFacilities" title="公共设施服务"></vxe-table-column>
<vxe-table-column field="RoomFacilities" title="客房设施服务"></vxe-table-column>
<vxe-table-column field="ActivityFacilities" title="活动设施服务"></vxe-table-column>
<vxe-table-column field="SHotelService" title="酒店设施服务"></vxe-table-column>
<vxe-table-column field="SupplierId" title="供应商编号"></vxe-table-column>
<vxe-table-column field="CreateBy" title="创建人"></vxe-table-column>
<vxe-table-column field="Name" title="创建时间">
<template v-slot="{row}">
<span>{{getDate(row.CreateTime)}}</span>
</template>
</vxe-table-column> -->
<vxe-table-column field="UpdateBy" 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>
</vxe-table-column>
<vxe-table-column field="Status" title="ホテル状態"></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" >
......@@ -109,6 +76,8 @@
msg: {
pageIndex: 1,
pageSize: 15,
SHotelName:"",//酒店名称
Status:-1,//酒店状态
},
};
},
......
src/components/global/Login.vue
View file @ 2e2419e5
<template>
<div class="login">
<div class="loginContent">
<p class="f40 bold c11">资产管理系统</p>
<p class="f40 bold c11">SCM管理系统</p>
<div style="margin:60px 0 50px 0">
<p>
<img style="width:16px;height:14px" src="../../assets/img/user.png" alt="">
......
src/components/global/Nav.vue
View file @ 2e2419e5
......@@ -50,16 +50,19 @@
trigger="click">
<ul>
<li style="cursor: pointer;">
<span class="f14"><span style="color:#BEBEBE">Hello</span>，{{zcuserInfo.emName}}</span>
<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>
<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>
<span style="margin-left:6px">退出登录</span>
</li>
</ul>
<span slot="reference" style="display: inline-flex;align-items: center;cursor: pointer;">
<img v-if="zcuserInfo.Icon && zcuserInfo.Icon!='' " :src="zcuserInfo.Icon" :onerror="defaultHeadImg" style="width:44px;height:44px;margin-left:45px;border-radius:50%" alt="">
<img v-if="zcuserInfo.HeadImg && zcuserInfo.HeadImg!='' " :src="zcuserInfo.HeadImg" :onerror="defaultHeadImg" style="width:44px;height:44px;margin-left:45px;border-radius:50%" alt="">
<img v-else src="../../assets/img/defaultperson.png" style="width:44px;height:44px;margin-left:45px;border-radius:50%" alt="">
</span>
</el-popover>
......@@ -140,6 +143,10 @@ export default {
let menu= this.getLocalStorage().UserMenu
this.menuList =menu[0].ChildMenu;
},
//点击弹出框
showUpdateBoard(){
this.$parent.showBoard();
}
},
}
</script>
......
src/components/global/index.vue
View file @ 2e2419e5
<style>
.PHeader{
width:100px;
height:100px;
margin:30px 0 30px 105px;
border:1px solid #d1d1d1;
border-radius:50%;
background-color: #fff;
}
.PHeader img{
width:100%;
height:100%;
border-radius: 50%;
}
</style>
<template>
<div class="App">
<div class="nav">
......@@ -5,16 +20,41 @@
</div>
<div class="appContent">
<div class="routerContent">
<div :style='{"min-height":minHeight+"px"}'>
<router-view/>
</div>
</div>
</div>
<el-dialog
title="修改资料"
:visible.sync="updateInfo"
top="0"
width="350px"
>
<div class="basefix">
<el-upload :http-request="UploadImage" :multiple="false" :show-file-list="false" action>
<div class="PHeader">
<img v-if="imgMsg.HeadImg && imgMsg.HeadImg!='' " :src="imgMsg.HeadImg" :onerror="defaultHeadImg">
<img v-else src="../../assets/img/defaultperson.png">
</div>
</el-upload>
<el-form :model="passWordMsg" :rules="rules" ref="passWordMsg" label-width="70px">
<el-form-item label="旧密码" prop="oldPwd">
<el-input size="small" v-model="passWordMsg.oldPwd" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="新密码" prop="newPwd">
<el-input size="small" v-model="passWordMsg.newPwd" 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')">确定</span>
<span class="addSpan" @click="updateInfo = false,resetMsg()">取消</span>
</div>
</div>
</el-dialog>
</div>
</template>
......@@ -29,13 +69,35 @@ export default {
data(){
return{
minHeight:0,
}
updateInfo:false,
imgMsg:{
Account:'',
HeadImg:''
},
zcuserInfo:{},
passWordMsg:{
Account:'',
oldPwd:'',
newPwd:''
},
rules:{
//表单必填验证
oldPwd: [{
required: true,
message: '古いパスワードを入力してください',
trigger: "change"
}],
newPwd: [{
required: true,
message: '新しいパスワードを入力してください',
trigger: "change"
}]
},
defaultHeadImg:
'this.src="' + require("../../assets/img/defaultperson.png") + '"',
}
},
created(){
this.minHeight=document.body.clientHeight;
if(!this.getLocalStorage()){
this.$router.push({path: 'login'})
......@@ -46,9 +108,62 @@ export default {
if (this.$route.name === 'index') {
this.$router.push({path: 'Home'})
}
this.imgMsg.HeadImg = zcuserInfo.HeadImg;
},
methods:{
showBoard(){
this.updateInfo=true;
},
//上传图片
UploadImage(file) {
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/SCMHotel/";
this.UploadSelfFileT(path, newArr, x => {
var str = x.data.FilePath;
this.imgMsg.HeadImg = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.imgMsg.Account=this.zcuserInfo.Account;
this.apipost("scm_post_UpdateHeadImgService",this.imgMsg,response => {
//修改添加接口
if (response.data.resultCode == 1) {
this.Success(response.data.message);
} else {
this.Error(response.data.message);
}
},null);
});
},
submitForm(addMsg) {
//提交创建、修改表单
let that = this;
that.$refs[addMsg].validate(valid => {
if (valid) {
that.UpdatePwd();
} else {
return false;
}
});
},
//修改密码
UpdatePwd(){
this.passWordMsg.Account=this.zcuserInfo.Account;
this.apipost("scm_post_UpdatePwdService",this.passWordMsg,response => {
//修改添加接口
if (response.data.resultCode == 1) {
this.Success(response.data.message);
this.updateInfo=false;
this.resetMsg();
} else {
this.Error(response.data.message);
}
},null);
},
//重置输入框
resetMsg(){
this.passWordMsg.oldPwd='';
this.passWordMsg.newPwd='';
}
},
}
</script>
......
src/plugins/index.js
View file @ 2e2419e5
......@@ -118,9 +118,11 @@ export default {
this.apiurl = apiurl;
var token = "";
var key = "";
var uid = "0";
if (this.getLocalStorage() != null) {
token = this.getLocalStorage().token;
key = this.getLocalStorage().secretKey;
uid = this.getLocalStorage().Id;
}
var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
......@@ -131,7 +133,8 @@ export default {
"cmd": cmd,
"timestamp": timestamp,
"token": token,
"sign": md5Str
"sign": md5Str,
"uid":uid
}
if (localStorage.g && localStorage.g != 'undefined') {
// postData.groupId = parseInt(JSON.parse(localStorage.g).i)
......
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