Skip to content

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

新增显示

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