Skip to content

H
haoban-3
Commit e7616f91 by caoyanzhi
Options

Merge branch 'feature/4月-菜单和权限' into dev

parents 7896ea15 8aae90ff
Showing with 23 additions and 114 deletions
src/App.vue
......@@ -30,7 +30,7 @@ router.beforeEach((to, from, next) => {
}
next();
});
window.myRouter = router;
export default {
name: 'App',
data() {
......
src/components/common/gic-select-group.vue
......@@ -21,7 +21,7 @@
},
-->
<template>
<el-popover placement="bottom" style="min-width: 357px" v-model="departmentVisible">
<el-popover v-if="showSelector" placement="bottom" style="min-width: 357px" v-model="departmentVisible">
<div class="select-search">
<el-input placeholder="请输入内容" maxlength="50" v-model="searchSelect" style="width: 100%;" @keyup.native="value => toInput(value, searchSelect)" @clear="clearSearch"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input>
</div>
......@@ -80,6 +80,7 @@ export default {
},
data() {
return {
showSelector: false,
projectName: '', // 当前项目名
enterpriseId: this.brandId,
searchSelect: '', // 搜索字段
......@@ -219,6 +220,8 @@ export default {
getRequest('/haoban-manage3-web/gic-department-list', para)
.then(async res => {
let resData = res.data;
// code为10031时，表示当前不支持分组查询，所以隐藏本组件
this.showSelector = resData.errorCode != 10031;
if (resData.errorCode == 1) {
if (!!resData.result && !!resData.result.length) {
resData.result.forEach(ele => {
......
src/components/layout/aside-menu.vue
......@@ -24,12 +24,14 @@ export default {
},
computed: {
getMenuList() {
return this.menuList.filter(el => {
if (el.hasRight && el.isShow && Array.isArray(el.childList)) {
el.childList = el.childList.filter(item => item.hasRight && item.isShow);
}
return el.hasRight && el.isShow;
});
return this.menuList
.filter(el => {
if (el.hasRight && el.isShow && Array.isArray(el.childList)) {
el.childList = el.childList.filter(item => item.hasRight && item.isShow);
}
return el.hasRight && el.isShow;
})
.filter(el => Array.isArray(el.childList) && el.childList.length > 0);
}
},
methods: {
......
src/views/reviewCenter/reviewed.vue
......@@ -11,11 +11,14 @@
<div class="right-content">
<div class="right-box">
<div class="reviewed-body-head">
<el-input class="w-250" maxlength="50" placeholder="请输入提交人姓名或门店名称" prefix-icon="el-icon-search" v-model="searchValue" clearable @clear="clearSearch" @keyup.native="value => searchEnterFun(value, searchInput)"> </el-input><el-select class="w-130 m-l-10" v-model="filterValue" placeholder="全部状态" @change="getTableList"> <el-option v-for="item in filterOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select
><el-select class="w-168 m-l-10" v-model="filterBrand" placeholder="全部品牌" @change="getTableList">
<el-input class="w-250" maxlength="50" placeholder="请输入提交人姓名或门店名称" prefix-icon="el-icon-search" v-model="searchValue" clearable @clear="clearSearch" @keyup.native="value => searchEnterFun(value, searchInput)"></el-input>
<el-select class="w-130 m-l-10" v-model="filterValue" placeholder="全部状态" @change="getTableList">
<el-option v-for="item in filterOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
<el-select class="w-168 m-l-10" placeholder="全部品牌">
<el-option label="全部品牌" value=""></el-option>
<el-option v-for="item in brandOptions" :key="item.enterpriseId" :label="item.enterpriseName" :value="item.enterpriseId"> </el-option> </el-select
><span class="p-l-10 font-12 color-909399">展示管理员审核记录及门店成员自助增删导购及用户关联记录</span>
</el-select>
<span class="p-l-10 font-12 color-909399">展示管理员审核记录及门店成员自助增删导购及用户关联记录</span>
</div>
<div class="reviewed-body-content">
<el-table ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" style="width: 100%">
......@@ -132,11 +135,8 @@ export default {
name: 'reviewed',
data() {
return {
tableH: window.screen.availHeight - 464 - 126 + 'px',
wxEnterpriseId: sessionStorage.getItem('userInfos') ? JSON.parse(sessionStorage.getItem('userInfos')).wxEnterpriseId : '',
filterValue: '',
filterBrand: '',
brandOptions: [], //品牌
filterOptions: [
// {
// label: '待审核',
......@@ -187,16 +187,6 @@ export default {
currentPage: 1,
pageSize: 20,
total: 0,
// info
applyInfo: {
// photo: '',
// applyName: '测试的',
// sex: 2,
// code: '223344545fffffffffffffff4',
// phone: '13012343333',
// job: '店长',
// store: '测试门店'
},
// store
showStoreDialog: false,
storeChangeData: {},
......@@ -318,29 +308,6 @@ export default {
};
},
/**
* 获取品牌
*/
getBrandData() {
const that = this;
postRequest('/haoban-manage3-web/wx-enterprise-list', {})
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
if (!!resData.result && !!resData.result.length) {
that.brandOptions = resData.result;
}
return;
}
errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
});
},
/**
* 获取列表数据
*/
getTableList(val) {
......@@ -357,7 +324,6 @@ export default {
search: that.searchValue || '', // 搜索字段
pageNum: that.currentPage, // 当前页
pageSize: that.pageSize, // 一页显示个数
enterpriseId: that.filterBrand // 20190918新增品牌
};
getRequest('/haoban-manage3-web/audit/find-page', para)
.then(res => {
......@@ -381,9 +347,7 @@ export default {
},
mounted() {
const that = this;
that.$emit('showTab', 2);
that.getTableList();
that.getBrandData();
},
components: {
storeChange
......
src/views/reviewCenter/unreview.vue
......@@ -12,10 +12,9 @@
<div class="right-box">
<div class="reviewed-body-head flex flex-space-between">
<div>
<el-input class="w-250" maxlength="50" placeholder="请输入提交人姓名或门店名称" prefix-icon="el-icon-search" v-model="searchValue" clearable @clear="clearSearch" @keyup.native="value => searchEnterFun(value, searchInput)"> </el-input><el-select v-model="filterValue" placeholder="全部事项" @change="getTableList" class="w-130 m-l-10"> <el-option v-for="item in filterOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select
><el-select v-model="filterBrand" placeholder="全部品牌" @change="getTableList" class="w-168 m-l-10">
<el-option label="全部品牌" value=""></el-option>
<el-option v-for="item in brandOptions" :key="item.enterpriseId" :label="item.enterpriseName" :value="item.enterpriseId"> </el-option>
<el-input class="w-250" maxlength="50" placeholder="请输入提交人姓名或门店名称" prefix-icon="el-icon-search" v-model="searchValue" clearable @clear="clearSearch" @keyup.native="value => searchEnterFun(value, searchInput)"></el-input>
<el-select v-model="filterValue" placeholder="全部事项" @change="getTableList" class="w-130 m-l-10">
<el-option v-for="item in filterOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</div>
<el-button v-if="$getButtonLimit($buttonCode.multipleResolve)" :limit-code="$buttonCode.multipleResolve" type="primary" @click="approveAll">批量同意</el-button>
......@@ -158,8 +157,6 @@ export default {
wxEnterpriseId: sessionStorage.getItem('userInfos') ? JSON.parse(sessionStorage.getItem('userInfos')).wxEnterpriseId : '',
auditName: sessionStorage.getItem('userInfos') ? JSON.parse(sessionStorage.getItem('userInfos')).staffName : '',
filterValue: '',
filterBrand: '',
brandOptions: [], // 品牌
searchValue: '',
filterOptions: [
{
......@@ -545,59 +542,6 @@ export default {
};
},
/**
* 获取品牌
*/
getBrandData() {
const that = this;
postRequest('/haoban-manage3-web/wx-enterprise-list', {})
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
if (!!resData.result && !!resData.result.length) {
that.brandOptions = resData.result;
}
return;
}
errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
});
},
/**
* 登录 --- api
*/
toLogin() {
const that = this;
return new Promise((resolve, reject) => {
let para = {};
getRequest('/haoban-manage3-web/get-login-info', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
resolve(resData.result.wxEnterpriseId);
return;
}
errMsg.errorMsg(resData);
resolve({
wxEnterpriseId: ''
});
})
.catch(function(error) {
resolve({
wxEnterpriseId: ''
});
that.$message.error({
duration: 1000,
message: error.message
});
});
});
},
/**
* 获取列表数据
*/
getTableList(val) {
......@@ -614,7 +558,6 @@ export default {
search: that.searchValue, // 搜索字段
pageNum: that.currentPage, // 当前页
pageSize: that.pageSize, // 一页显示个数
enterpriseId: that.filterBrand // 20190918新增品牌
};
getRequest('/haoban-manage3-web/audit/find-page', para)
.then(res => {
......@@ -638,10 +581,7 @@ export default {
},
mounted() {
const that = this;
that.$emit('showTab', 1);
// that.wxEnterpriseId = await that.toLogin();
that.getTableList();
that.getBrandData();
},
components: {
storeChange,
......
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