Commit cdd5cc59 authored by Your Name's avatar Your Name

权限问题优化

parent fc41d7e6
import api from './index' // import api from './index'
import { axios } from '@/utils/request' import { axios } from '@/utils/request'
import loginToken from './token' import loginToken from './token'
import homeUrl from './homeURL' import homeUrl from './homeURL'
......
...@@ -11,69 +11,69 @@ const api = { ...@@ -11,69 +11,69 @@ const api = {
export default api export default api
// export function getUserList(parameter) { export function getUserList(parameter) {
// return axios({ return axios({
// url: api.user, url: api.user,
// method: 'get', method: 'get',
// params: parameter params: parameter
// }) })
// } }
// export function getRoleList(parameter) { export function getRoleList(parameter) {
// return axios({ return axios({
// url: api.role, url: api.role,
// method: 'get', method: 'get',
// params: parameter params: parameter
// }) })
// } }
// export function getServiceList(parameter) { export function getServiceList(parameter) {
// console.log(parameter); console.log(parameter);
// let newparameter = { let newparameter = {
// 'page': parameter.page-1, 'page': parameter.page-1,
// 'pageSize': parameter.pageSize, 'pageSize': parameter.pageSize,
// } }
// return axios({ return axios({
// url: "http://localhost/dengxueyun/newshopBack/backend/web/v1/shopuser/user-complains/user-complain", url: "http://localhost/dengxueyun/newshopBack/backend/web/v1/shopuser/user-complains/user-complain",
// method: 'get', method: 'get',
// headers: { headers: {
// 'Authorization': 'Bearer Be6w4YzLSJxLnFNWFKbbJmpl9yAknSKN' 'Authorization': 'Bearer Be6w4YzLSJxLnFNWFKbbJmpl9yAknSKN'
// }, },
// params: newparameter params: newparameter
// }) })
// } }
// export function getPermissions(parameter) { export function getPermissions(parameter) {
// console.log(parameter); console.log(parameter);
// let newparameter = { let newparameter = {
// 'page': parameter.page-1, 'page': parameter.page-1,
// 'pageSize': parameter.pageSize, 'pageSize': parameter.pageSize,
// } }
// return axios({ return axios({
// url: "http://localhost/dengxueyun/newshopBack/backend/web/v1/shopuser/shop-users/employee-list", url: "http://localhost/dengxueyun/newshopBack/backend/web/v1/shopuser/shop-users/employee-list",
// method: 'get', method: 'get',
// headers: { headers: {
// 'Authorization': 'Bearer Be6w4YzLSJxLnFNWFKbbJmpl9yAknSKN' 'Authorization': 'Bearer Be6w4YzLSJxLnFNWFKbbJmpl9yAknSKN'
// }, },
// params: newparameter params: newparameter
// }) })
// } }
// export function getOrgTree(parameter) { export function getOrgTree(parameter) {
// console.log(parameter); console.log(parameter);
// let newparameter = { let newparameter = {
// 'page': parameter.page-1, 'page': parameter.page-1,
// 'pageSize': parameter.pageSize, 'pageSize': parameter.pageSize,
// } }
// return axios({ return axios({
// url: "http://localhost/dengxueyun/newshopBack/backend/web/v1/shopuser/user-departments/department", url: "http://localhost/dengxueyun/newshopBack/backend/web/v1/shopuser/user-departments/department",
// method: 'get', method: 'get',
// headers: { headers: {
// 'Authorization': 'Bearer Be6w4YzLSJxLnFNWFKbbJmpl9yAknSKN' 'Authorization': 'Bearer Be6w4YzLSJxLnFNWFKbbJmpl9yAknSKN'
// }, },
// params: newparameter params: newparameter
// }) })
// } }
// id == 0 add post // id == 0 add post
// id != 0 update put // id != 0 update put
......
<template> <template>
<div> <div>
<a-card style="margin-bottom:10px"> <a-card style="margin-bottom:10px">
<a-form layout="inline"> <a-form :form="newform" layout="inline">
<a-row :gutter="16" type="flex" justify="start"> <a-row :gutter="16" type="flex" justify="start">
<a-col :span="6"> <a-col :span="6">
<a-form-item label="名称:"> <a-form-item label="名称:">
<a-input type="text"> </a-input> <a-input type="text" v-model="queryParam.TITLE"> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
...@@ -18,26 +18,12 @@ ...@@ -18,26 +18,12 @@
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item> <a-form-item>
<a-button type="primary"> <a-icon type="search"></a-icon>搜索 </a-button> <a-button type="primary" icon="search" @click="$refs.table.refresh(true)">查询</a-button>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
<!-- <a-card hoverable> -->
<!-- <a-spin tip="加载中,请稍候..." :spinning="loading"> -->
<!-- <a-button-group>
<a-button
type="primary"
:disabled="tableSelected.type && tableSelected.type === 'B'"
@click="addMenuClick"
v-perm:menu:add
>
<a-icon type="plus" />新增
</a-button>
<a-button type="primary" @click="editMenuClick" v-perm:menu:edit> <a-icon type="edit" />修改 </a-button>
<a-button type="danger" @click="deleteMenuClick" v-perm:menu:remove> <a-icon type="delete" />删除 </a-button>
</a-button-group> -->
<s-table <s-table
style="margin-top:10px" style="margin-top:10px"
ref="table" ref="table"
...@@ -154,7 +140,9 @@ export default { ...@@ -154,7 +140,9 @@ export default {
wrapperCol: { wrapperCol: {
xs: { span: 17 } xs: { span: 17 }
}, },
form: this.$form.createForm(this), // 查询参数
queryParam: {},
newform: this.$form.createForm(this),
// rowSelection: { // rowSelection: {
// type: 'radio', // type: 'radio',
// selectedRowKeys: [] // selectedRowKeys: []
...@@ -262,20 +250,16 @@ export default { ...@@ -262,20 +250,16 @@ export default {
pagination:false, pagination:false,
// 加载数据方法 必须为 Promise 对象 // 加载数据方法 必须为 Promise 对象
loadData: parameter => { loadData: parameter => {
console.log('shujujiazai') return getMenuList().then(res => {
return getMenuList(Object.assign(parameter, this.queryParam)).then(res => { // res.pageSize = res._meta.perPage
console.log('1212121') // res.page = res._meta.currentPage
// res.pageSize = res._meta.perPage // res.totalPage = res._meta.pageCount
// res.page = res._meta.currentPage // res.totalCount = res._meta.totalCount
// res.totalPage = res._meta.pageCount console.log(res)
// res.totalCount = res._meta.totalCount this.listData = res
res.data=this.listData
console.log(res) return res
this.listData = res })
console.log(this.listData)
res.data=this.listData
return res
})
}, },
selectedRowKeys: [], selectedRowKeys: [],
selectedRows: [], selectedRows: [],
...@@ -293,6 +277,19 @@ export default { ...@@ -293,6 +277,19 @@ export default {
} }
}, },
methods: { methods: {
// secondLoad(){
loadData:parameter => {
return getMenuList(Object.assign(parameter, this.queryParam)).then(res => {
// res.pageSize = res._meta.perPage
// res.page = res._meta.currentPage
// res.totalPage = res._meta.pageCount
// res.totalCount = res._meta.totalCount
this.listData = res
res.data=this.listData
return res
})
// }
},
// regetTreeData () { // regetTreeData () {
// if (this.modalTreeData.length <= 0) { // if (this.modalTreeData.length <= 0) {
// getMenuList({}).then(res => { // getMenuList({}).then(res => {
......
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