Skip to content

S
SuperMan
Commit b9e0a126 authored by 黄奎's avatar 黄奎
Browse files
Options

新增显示

parent 45bd848a
Hide whitespace changes
Inline Side-by-side
Showing with 285 additions and 251 deletions
src/components/Restaurant/restaurantList.vue
View file @ b9e0a126
...@@ -321,7 +321,8 @@ ...@@ -321,7 +321,8 @@
<li> <li>
<button class="hollowFixedBtn" type="button" <button class="hollowFixedBtn" type="button"
@click="resetPageIndex(),selectResource()">{{$t('pub.searchBtn')}}</button> @click="resetPageIndex(),selectResource()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" type="button" <!--v-if="IsEditDmcSource==1"-->
<button class="normalBtn" type="button"
@click="$router.push('restaurantInfoManage')">{{$t('pub.addBtn')}}</button> @click="$router.push('restaurantInfoManage')">{{$t('pub.addBtn')}}</button>
</li> </li>
</ul> </ul>
...@@ -341,7 +342,8 @@ ...@@ -341,7 +342,8 @@
</div> </div>
<div class="starSu"> <div class="starSu">
<div class="star"> <div class="star">
<span class="foodList" v-for="(items,index) in item.FoodTagArr" :key="index">{{items}}</span> <span class="foodList">{{item.DiningTypeName}}</span>
<!-- <span class="foodList" v-for="(items,index) in item.FoodTagArr" :key="index">{{items}}</span> -->
</div> </div>
<span v-if="item.Star==8" class="sushe">{{$t('restaurant.res_homeFacility')}}</span> <span v-if="item.Star==8" class="sushe">{{$t('restaurant.res_homeFacility')}}</span>
<span v-if="item.Star==9" class="sushe">{{$t('restaurant.res_SpringHotel')}}</span> <span v-if="item.Star==9" class="sushe">{{$t('restaurant.res_SpringHotel')}}</span>
...@@ -382,7 +384,8 @@ ...@@ -382,7 +384,8 @@
{{item.UpdateTimeStr}} {{item.UpdateTimeStr}}
</div> </div>
<div class="btnList"> <div class="btnList">
<button @click="goSubInfo('restaurantInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button> <!--v-if="IsEditDmcSource==1"-->
<button @click="goSubInfo('restaurantInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
<button v-if="IsHotelPriceStock==1" @click="goUrl('RestaurantPackage',item.ID)" <button v-if="IsHotelPriceStock==1" @click="goUrl('RestaurantPackage',item.ID)"
class="hotelBtn">{{$t('restaurant.res_package')}}</button> class="hotelBtn">{{$t('restaurant.res_package')}}</button>
</div> </div>
...@@ -397,16 +400,13 @@ ...@@ -397,16 +400,13 @@
export default { export default {
data() { data() {
return { return {
IsHotelPriceStock: 0, //1-有获取餐厅与报价添加修改权限
total: 0, total: 0,
currentPage: 1, currentPage: 1,
countryList: "", countryList: "",
provinceList: "", provinceList: "",
cityList: "", cityList: "",
district: "", district: "",
Ids: [],
tableData: "", tableData: "",
deleteID: "",
EmployeeList: [], //员工列表 EmployeeList: [], //员工列表
DiningTypeList: [], DiningTypeList: [],
DiningPriceTypeList: [], DiningPriceTypeList: [],
...@@ -420,7 +420,6 @@ ...@@ -420,7 +420,6 @@
label: this.$t('system.table_delete') label: this.$t('system.table_delete')
} }
], ],
isDeleteNote: true,
loading: true, loading: true,
defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"', defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"',
msg: { msg: {
...@@ -439,7 +438,9 @@ ...@@ -439,7 +438,9 @@
currentPage: 1, currentPage: 1,
ID: 0, ID: 0,
UpdateBy: 0, //操作人 UpdateBy: 0, //操作人
} },
IsHotelPriceStock: 0, //1-有获取餐厅与报价添加修改权限
IsEditDmcSource: 0, //是否有新增修改权限
}; };
}, },
methods: { methods: {
...@@ -592,15 +593,21 @@ ...@@ -592,15 +593,21 @@
}, },
//获取酒店修改与报价添加修改权限 //获取酒店修改与报价添加修改权限
GetHotelPirceStockAuth() { GetHotelPirceStockAuth() {
this.apipost( let isStock = "IsHotelPriceStock";
"hotel_post_GetHotelPriceStockAuthService", {}, let editDmcSource = "F_EditDmcSource";
res => { this.apipost('userauth_get_CheckUserAuthNewService', '', res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.IsHotelPriceStock = res.data.data; var tempData = res.data.data;
if (tempData && tempData.length > 0) {
if (tempData.includes(isStock)) {
this.IsHotelPriceStock = 1;
}
if (tempData.includes(editDmcSource)) {
this.IsEditDmcSource = 1;
}
} }
}, }
err => {} });
);
}, },
//根据当前员工所在部门获取该部门及子部门员工信息 //根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() { getEmployeeList() {
......
src/components/platformModule/systemVersion.vue
View file @ b9e0a126
<style> <style>
.versionList { .versionList {
padding: 20px; padding: 20px;
} }
.versionList li {
float: left; .versionList li {
margin: 0 30px 30px 0; float: left;
color: #fff; margin: 0 30px 30px 0;
min-width: 250px; color: #fff;
padding: 0 24px; min-width: 250px;
height: 329px; padding: 0 24px;
background: #1BC594; height: 329px;
border-radius: 4px; background: #1BC594;
position: relative; border-radius: 4px;
} position: relative;
.versionListLayer{ }
position: absolute;
z-index: 50; .versionListLayer {
width: 260px; position: absolute;
height: 329px; z-index: 50;
left: 0; width: 260px;
top: 0; height: 329px;
border-radius: 4px; left: 0;
background: rgba(0,0,0,.6); top: 0;
} border-radius: 4px;
.versionList li p.title { background: rgba(0, 0, 0, .6);
text-align: center; }
font-size: 14px;
line-height: 60px; .versionList li p.title {
border-bottom: 1px solid #06B381; text-align: center;
} font-size: 14px;
line-height: 60px;
.versionList li pre { border-bottom: 1px solid #06B381;
text-align: center; }
height: 200px;
line-height: 28px; .versionList li pre {
padding: 10px 0; text-align: center;
} height: 200px;
line-height: 28px;
.versionList li p.btm { padding: 10px 0;
text-align: center; }
}
.versionList li p.btm {
.versionList li.addli { text-align: center;
background: #F0EFEF; }
color: #666;
text-align: center; .versionList li.addli {
line-height: 300px; background: #F0EFEF;
font-size: 20px; color: #666;
cursor: pointer; text-align: center;
} line-height: 300px;
font-size: 20px;
.versionList li.addli:hover { cursor: pointer;
background: #fff; }
}
.versionList li.addli:hover {
.versionBtn { background: #fff;
display: inline-block; }
cursor: pointer;
width: 66px; .versionBtn {
height: 30px; display: inline-block;
border: none; cursor: pointer;
background: #30CFA1; width: 66px;
border-radius: 15px; height: 30px;
color: #fff; border: none;
} background: #30CFA1;
border-radius: 15px;
.versionBtn:hover { color: #fff;
background: #fff; }
color: #333;
} .versionBtn:hover {
background: #fff;
.addVersion { color: #333;
width: 800px; }
}
.insideDialog{ .addVersion {
width: 300px; width: 800px;
} }
.remarkVersion {
width: 350px; .insideDialog {
height: 60px; width: 300px;
border: 1px solid #dcdfe6; }
border-radius: 8px;
line-height: 18px; .remarkVersion {
padding: 10px 22px; width: 350px;
} height: 60px;
.ql-editor{height: 200px!important;} border: 1px solid #dcdfe6;
border-radius: 8px;
line-height: 18px;
padding: 10px 22px;
}
.ql-editor {
height: 200px !important;
}
</style> </style>
<template> <template>
<div class="flexOne"> <div class="flexOne">
<div class="versionList"> <div class="versionList">
<ul> <ul>
<li v-for="(item,index) in dataList"> <template v-for="(item,index) in dataList">
<div v-if='item.Status==1' class="versionListLayer"> <li :key="`vl_`+index">
<div @click="outerVisible = true;dialogTitle='修改系统版本',updateDate(item.Id)" style="width: 90px; height: 30px;margin: 260px 0 0 85px; cursor: pointer; text-align: center; line-height: 30px;font-size: 14px; border-radius: 15px; border: 1px solid #fff;"> <div v-if='item.Status==1' class="versionListLayer">
<i class="iconfont icon-img_bianji_small" style="font-size: 14px;"></i> <div @click="outerVisible = true;dialogTitle='修改系统版本',updateDate(item.Id)"
编辑 style="width: 90px; height: 30px;margin: 260px 0 0 85px; cursor: pointer; text-align: center; line-height: 30px;font-size: 14px; border-radius: 15px; border: 1px solid #fff;">
</div> <i class="iconfont icon-img_bianji_small" style="font-size: 14px;"></i>
</div> 编辑
<p class="title">{{item.VersionsName}}({{item.EmployeeNum=='0'?'不限':item.EmployeeNum}})</p> </div>
<pre v-html="item.Description"></pre> </div>
<!--<pre >{{item.Description}} <p class="title">{{item.VersionsName}}({{item.EmployeeNum=='0'?'不限':item.EmployeeNum}})</p>
</pre>--> <pre v-html="item.Description"></pre>
<p class="btm"> <p class="btm">
<input class="versionBtn" @click="outerVisible = true;dialogTitle='修改系统版本',updateDate(item.Id)" type="button" value="修改" /> <input class="versionBtn" @click="outerVisible = true;dialogTitle='修改系统版本',updateDate(item.Id)"
<input class="versionBtn" @click="goUrl('versionspermissionList',item.Id)" type="button" value="ERP菜单" /> type="button" value="修改" />
<input class="versionBtn" @click="goUrlApp('appversionsPermissionList',item.Id)" type="button" value="APP菜单" /> <input class="versionBtn" @click="goUrl('versionspermissionList',item.Id)" type="button" value="ERP菜单" />
</p> <input class="versionBtn" @click="goUrlApp('appversionsPermissionList',item.Id)" type="button"
</li> value="APP菜单" />
<li class="addli" @click="outerVisible = true;dialogTitle='添加系统版本',clearMessage()"> </p>
<i class="iconfont icon-plus" style="font-size: 80px;color:#E1E1E1"></i> </li>
</li> </template>
</ul> <li class="addli" @click="outerVisible = true;dialogTitle='添加系统版本',clearMessage()">
</div> <i class="iconfont icon-plus" style="font-size: 80px;color:#E1E1E1"></i>
</li>
<el-dialog custom-class='addVersion' :title="dialogTitle" :visible.sync="outerVisible" center> </ul>
<el-form :model="form"> </div>
<table class="layerTable">
<tr> <el-dialog custom-class='addVersion' :title="dialogTitle" :visible.sync="outerVisible" center>
<td><span>版本名称：</span></td> <el-form :model="form">
<td><input maxlength="14" class="layerText" v-model="addMsg.VersionsName" type="text"></td> <table class="layerTable">
</tr> <tr>
<tr> <td><span>版本名称：</span></td>
<td><span class="fl">版本描述：</span></td> <td><el-input maxlength="14" class="w150" v-model="addMsg.VersionsName" type="text" /></td>
<td> </tr>
<quill-editor v-model="addMsg.Description"> <tr>
</quill-editor> <td><span class="fl">版本描述：</span></td>
</td> <td>
</tr> <quill-editor v-model="addMsg.Description">
<tr> </quill-editor>
<td><span>账户数量：</span></td> </td>
<td><input @keyup.native="checkInteger(addMsg,'EmployeeNum')" class="layerText" v-model="addMsg.EmployeeNum" type="text"></td> </tr>
</tr> <tr>
<tr> <td><span>账户数量：</span></td>
<td><span>是否开启：</span></td> <td><el-input @keyup.native="checkInteger(addMsg,'EmployeeNum')" class="w150" v-model="addMsg.EmployeeNum"
<td> type="text" /></td>
<el-switch v-model="addMsg.Status" active-value="0" inactive-value="1"></el-switch> </tr>
</td> <tr>
</tr> <td><span>是否开启：</span></td>
</table> <td>
</el-form> <el-switch v-model="addMsg.Status" active-value="0" inactive-value="1"></el-switch>
<div slot="footer" class="dialog-footer"> </td>
<button class="hollowFixedBtn" @click="outerVisible = false,getList()">取消</button> &nbsp; </tr>
<button class="normalBtn" type="primary" @click="innerVisible=true,addData()">保存</button> </table>
</div> </el-form>
</el-dialog> <div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false,getList()">取消</button> &nbsp;
</div> <button class="normalBtn" type="primary" @click="innerVisible=true,addData()">保存</button>
</div>
</el-dialog>
</div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
dialogTitle: '', dialogTitle: '',
insideDialogTxt: '保存成功！', insideDialogTxt: '保存成功！',
outerVisible: false, outerVisible: false,
innerVisible: false, innerVisible: false,
isRight:true, isRight: true,
dataList: {}, dataList: {},
form: {}, form: {},
msg: { msg: {
pageIndex:1, pageIndex: 1,
pageSize:99, pageSize: 99,
"Status": -1, "Status": -1,
"VersionsName": '', "VersionsName": '',
}, },
addMsg: { addMsg: {
EmployeeNum:'', EmployeeNum: '',
id:'', id: '',
Status:'0', Status: '0',
VersionsName: '', VersionsName: '',
Description: '' Description: ''
} }
} }
}, },
mounted() { mounted() {
this.getList(); this.getList();
}, },
methods: { methods: {
getList() { getList() {
this.apipost("admin_get_SysVersionsGetPageList", this.msg, res => { this.apipost("admin_get_SysVersionsGetPageList", this.msg, res => {
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
}else{ } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
}, err => {}) }, err => {})
}, },
addData() { addData() {
if(this.addMsg.EmployeeNum==''){ if (this.addMsg.EmployeeNum == '') {
this.$message.warning('请输入账户数量') this.$message.warning('请输入账户数量')
return return
} }
if(this.addMsg.VersionsName==''){ if (this.addMsg.VersionsName == '') {
this.$message.warning('请输入版本名称') this.$message.warning('请输入版本名称')
return return
} }
this.apipost("admin_post_SysVersionsSet", this.addMsg, res => { this.apipost("admin_post_SysVersionsSet", this.addMsg, res => {
if(res.data.resultCode==1) if (res.data.resultCode == 1) {
{ this.$message.success(res.data.message)
this.$message.success(res.data.message) this.outerVisible = false;
this.outerVisible=false; this.getList()
this.getList() } else {
}else{ this.$message.error(res.data.message)
this.$message.error(res.data.message)
}
} }, err => {})
}, err => {}) },
}, updateDate(id) {
updateDate(id){ this.addMsg.id = id;
this.addMsg.id=id; this.apipost('admin_get_SysVersionsGet', {
this.apipost('admin_get_SysVersionsGet',{VersionsId:id},res=>{ VersionsId: id
if(res.data.resultCode==1) }, res => {
{ if (res.data.resultCode == 1) {
this.addMsg.Status=res.data.data.Status.toString() this.addMsg.Status = res.data.data.Status.toString()
this.addMsg.VersionsName=res.data.data.VersionsName; this.addMsg.VersionsName = res.data.data.VersionsName;
this.addMsg.Description=res.data.data.Description; this.addMsg.Description = res.data.data.Description;
this.addMsg.EmployeeNum=res.data.data.EmployeeNum this.addMsg.EmployeeNum = res.data.data.EmployeeNum
}else{} } else {}
},err=>{}) }, err => {})
}, },
clearMessage() { clearMessage() {
this.addMsg = { this.addMsg = {
Status: 0, Status: 0,
VersionsName: '', VersionsName: '',
Description: '' Description: ''
} }
}, },
goUrl (path,id) { goUrl(path, id) {
this.$router.push({ name: path,query:{"id":id,blank:'y',tab:'ERP菜单'} }) this.$router.push({
}, name: path,
goUrlApp(path,id) { query: {
this.$router.push({ name: path,query:{"id":id,blank:'y',tab:'APP菜单'} }) "id": id,
} blank: 'y',
tab: 'ERP菜单'
}
})
}, },
} goUrlApp(path, id) {
this.$router.push({
name: path,
query: {
"id": id,
blank: 'y',
tab: 'APP菜单'
}
})
}
},
}
</script>： </script>：
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