用户接口调试
This commit is contained in:
闵炳辉
parent
9db5556eca
commit
e6842c5ff7
@ -5,6 +5,7 @@ ENV = 'development'
|
||||
VITE_BASE_PATH = './'
|
||||
|
||||
# 代理配置（开发使用），必须在一行中
|
||||
# VITE_APP_PROXY=[["/api","http://192.168.130.12:8080/api"]]
|
||||
VITE_APP_PROXY=[["/api","http://192.168.109.195:8080/api"]]
|
||||
|
||||
# 开发环境下跨域代理，请输入要跨域的api地址 - 尾部无需带'/'
|
||||
|
||||
@ -127,3 +127,13 @@ export function allPermissionQuery(params: object = {}) {
|
||||
data: params,
|
||||
})
|
||||
}
|
||||
|
||||
// 所有角色查询
|
||||
export function allRoleQuery(params: object = {}) {
|
||||
return createAxios({
|
||||
url: '/api/role/query',
|
||||
method: 'POST',
|
||||
data: params,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@ -457,6 +457,11 @@ const onSubmit = () => {
|
||||
message: res.msg,
|
||||
type: 'success',
|
||||
})
|
||||
const queryData2 = {
|
||||
parentMenuId: fromDataId.value,
|
||||
recursive: false,
|
||||
}
|
||||
queryMenuMethod(queryData2)
|
||||
} else {
|
||||
ElMessage.error({
|
||||
message: res.msg,
|
||||
@ -464,16 +469,7 @@ const onSubmit = () => {
|
||||
})
|
||||
}
|
||||
})
|
||||
debugger
|
||||
|
||||
visible.value = false
|
||||
const queryData2 = {
|
||||
parentMenuId: fromDataId.value,
|
||||
recursive: false,
|
||||
}
|
||||
console.log(queryData2, 'queryData2')
|
||||
|
||||
queryMenuMethod(queryData2)
|
||||
}
|
||||
})
|
||||
}
|
||||
@ -511,6 +507,11 @@ const fromDelete = (data: any) => {
|
||||
type: 'success',
|
||||
})
|
||||
}, 1000)
|
||||
const queryData2 = {
|
||||
parentMenuId: fromDataId.value,
|
||||
recursive: false,
|
||||
}
|
||||
queryMenuMethod(queryData2)
|
||||
} else {
|
||||
ElMessage.error({
|
||||
message: res.msg,
|
||||
@ -580,6 +581,13 @@ const addOnSubmit = () => {
|
||||
message: res.msg,
|
||||
type: 'success',
|
||||
})
|
||||
const queryData = {
|
||||
parentMenuId: fromDataId.value,
|
||||
recursive: false,
|
||||
}
|
||||
console.log(queryData, 666)
|
||||
|
||||
queryMenuMethod(queryData)
|
||||
} else {
|
||||
ElMessage.error({
|
||||
message: res.msg,
|
||||
@ -587,13 +595,7 @@ const addOnSubmit = () => {
|
||||
})
|
||||
}
|
||||
})
|
||||
const queryData = {
|
||||
parentMenuId: fromDataId.value,
|
||||
recursive: true,
|
||||
}
|
||||
console.log(queryData, 666)
|
||||
|
||||
queryMenuMethod(queryData)
|
||||
visibleAdd.value = false
|
||||
}
|
||||
})
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
<el-container>
|
||||
<el-header style="display: flex; justify-content: space-between">
|
||||
<div>
|
||||
<el-input v-model="input2" size="large" style="width: 220px; margin-right: 10px" />
|
||||
<el-input v-model="input2" size="large" placeholder="根据账户中文名查询" style="width: 220px; margin-right: 10px" />
|
||||
<el-button type="primary" size="large" :icon="Search" @click="userFromQuery">查询</el-button>
|
||||
</div>
|
||||
<el-button type="primary" size="large" :icon="CirclePlusFilled" @click="addUserFromData">新增</el-button>
|
||||
@ -42,19 +42,19 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-main>
|
||||
<el-footer>
|
||||
<!-- <el-footer>
|
||||
<div style="display: flex; justify-content: right">
|
||||
<el-pagination
|
||||
v-model:current-page="currentPage4"
|
||||
v-model:page-size="pageSize4"
|
||||
:page-sizes="[100, 200, 300, 400]"
|
||||
:page-sizes="[10, 15]"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
:total="400"
|
||||
@size-change="handleSizeChange"
|
||||
@current-change="handleCurrentChange"
|
||||
/>
|
||||
</div>
|
||||
</el-footer>
|
||||
</el-footer> -->
|
||||
</el-container>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -81,8 +81,13 @@
|
||||
<el-form-item label="职员联系电话:" prop="phone">
|
||||
<el-input v-model="formUserAdd.phone" placeholder="" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="所属机构ID:" prop="orgId">
|
||||
<!-- <el-form-item label="所属机构ID:" prop="orgId">
|
||||
<el-input v-model="formUserAdd.orgId" placeholder="" clearable />
|
||||
</el-form-item> -->
|
||||
<el-form-item label="角色id集合:" prop="roleList">
|
||||
<el-select v-model="formUserAdd.roleList" placeholder="选择菜单权限" multiple style="width: 240px">
|
||||
<el-option v-for="item in allPermissionData" :key="item.index" :label="item.roleName" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
@ -115,8 +120,13 @@
|
||||
<el-form-item label="职员联系电话:" prop="phone">
|
||||
<el-input v-model="formUserUpData.phone" placeholder="" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="所属机构ID:" prop="orgId">
|
||||
<!-- <el-form-item label="所属机构ID:" prop="orgId">
|
||||
<el-input v-model="formUserUpData.orgId" placeholder="" clearable />
|
||||
</el-form-item> -->
|
||||
<el-form-item label="角色id集合:" prop="roleList">
|
||||
<el-select v-model="formUserUpData.roleList" placeholder="选择菜单权限" multiple style="width: 240px">
|
||||
<el-option v-for="item in allPermissionData" :key="item.index" :label="item.roleName" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
@ -142,7 +152,7 @@
|
||||
<script setup lang="ts">
|
||||
import { ref, reactive, onMounted } from 'vue'
|
||||
import { Search, CirclePlusFilled } from '@element-plus/icons-vue'
|
||||
import { userQuery, userUpdate, userDelete, userAdd, userList } from '/@/api/backend'
|
||||
import { userQuery, userUpdate, userDelete, userAdd, userList, allRoleQuery } from '/@/api/backend'
|
||||
import { ElTable, ElMessage } from 'element-plus'
|
||||
import { useAdminInfo } from '/@/stores/adminInfo'
|
||||
import { fa } from 'element-plus/es/locales.mjs'
|
||||
@ -175,6 +185,7 @@ const getTree = () => {
|
||||
|
||||
onMounted(() => {
|
||||
getTree()
|
||||
allPermission()
|
||||
})
|
||||
|
||||
const formQuery = reactive({
|
||||
@ -189,8 +200,6 @@ const handleNodeClick = (data: Tree) => {
|
||||
|
||||
treeId.value = data.id
|
||||
formQuery.orgId = data.id
|
||||
console.log(formQuery, '闵1')
|
||||
|
||||
RyUserQuery(formQuery)
|
||||
}
|
||||
|
||||
@ -234,11 +243,11 @@ const handleSelectionChange = (val: User[]) => {
|
||||
// 用户搜索
|
||||
const formQuery1 = reactive({
|
||||
userName: '',
|
||||
orgId: '',
|
||||
})
|
||||
const userFromQuery = () => {
|
||||
formQuery1.userName = input2.value
|
||||
console.log(formQuery1, '闵2')
|
||||
|
||||
formQuery1.orgId = treeId.value
|
||||
RyUserQuery(formQuery1)
|
||||
}
|
||||
|
||||
@ -251,6 +260,7 @@ interface RuleUser {
|
||||
email: string
|
||||
phone: string
|
||||
orgId: string
|
||||
roleList: number[]
|
||||
}
|
||||
const formUserAdd = reactive({
|
||||
account: '',
|
||||
@ -259,6 +269,7 @@ const formUserAdd = reactive({
|
||||
email: '',
|
||||
phone: '',
|
||||
orgId: '',
|
||||
roleList: [],
|
||||
})
|
||||
|
||||
const addUserFromData = () => {
|
||||
@ -269,6 +280,7 @@ const addUserFromData = () => {
|
||||
formUserAdd.email = ''
|
||||
formUserAdd.phone = ''
|
||||
formUserAdd.orgId = ''
|
||||
formUserAdd.roleList = []
|
||||
}
|
||||
|
||||
const handleCloseParam = (data: any) => {
|
||||
@ -278,19 +290,29 @@ const handleCloseParam = (data: any) => {
|
||||
|
||||
const addOnSubmit = () => {
|
||||
visibleParam.value = false
|
||||
formUserAdd.orgId = treeId.value
|
||||
console.log(formUserAdd, treeId.value, 'formUserAdd')
|
||||
|
||||
userAdd(formUserAdd).then((res) => {
|
||||
if (res.code == 200) {
|
||||
console.log(res, '新增')
|
||||
formQuery.orgId = treeId.value
|
||||
RyUserQuery(formQuery)
|
||||
} else {
|
||||
ElMessage.error({
|
||||
message: res.msg,
|
||||
type: 'error',
|
||||
})
|
||||
}
|
||||
})
|
||||
formQuery1.userName = input2.value
|
||||
RyUserQuery(formQuery1)
|
||||
}
|
||||
|
||||
// 页面修改
|
||||
const visibleParamUpData = ref(false)
|
||||
|
||||
const formUserUpData = reactive({ id: '', account: '', password: '', userName: '', email: '', phone: '', orgId: '' })
|
||||
const formUserUpData = reactive({ id: '', account: '', password: '', userName: '', email: '', phone: '', orgId: '', roleList: '' })
|
||||
const viewUsers = (data: any) => {
|
||||
console.log(data, '页面修改数据')
|
||||
console.log(data.row.roleList, '页面修改数据')
|
||||
visibleParamUpData.value = true
|
||||
formUserUpData.id = data.row.id
|
||||
formUserUpData.account = data.row.account
|
||||
@ -299,12 +321,22 @@ const viewUsers = (data: any) => {
|
||||
formUserUpData.email = data.row.email
|
||||
formUserUpData.phone = data.row.phone
|
||||
formUserUpData.orgId = data.row.orgId
|
||||
// formUserUpData.roleList = data.row.roleList
|
||||
}
|
||||
const upDataOnSubmit = () => {
|
||||
console.log(formUserUpData, 'formUserUpData')
|
||||
console.log(formUserUpData, formUserUpData.roleList, 'formUserUpData')
|
||||
|
||||
userUpdate(formUserUpData).then((res) => {
|
||||
if (res.code == 200) {
|
||||
console.log(res, '修改成功')
|
||||
|
||||
RyUserQuery(formQuery)
|
||||
} else {
|
||||
ElMessage.error({
|
||||
message: res.msg,
|
||||
type: 'error',
|
||||
})
|
||||
}
|
||||
})
|
||||
visibleParamUpData.value = false
|
||||
}
|
||||
@ -350,6 +382,20 @@ const userDeleteDialog1 = () => {
|
||||
RyUserQuery(formQuery)
|
||||
}
|
||||
|
||||
// 用户权限
|
||||
const allPermissionData = ref()
|
||||
// 用户权限
|
||||
const roleName = {
|
||||
roleName: '',
|
||||
}
|
||||
const allPermission = () => {
|
||||
allRoleQuery(roleName).then((res) => {
|
||||
console.log(res.rows, 'resdata')
|
||||
allPermissionData.value = res.rows
|
||||
console.log(allPermissionData.value, '89898989111')
|
||||
})
|
||||
}
|
||||
|
||||
// 分页
|
||||
const currentPage4 = ref(4)
|
||||
const pageSize4 = ref(100)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user