From 6476418b5d6754abfac6048fc881f8a2e07b6b09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=B5=E7=82=B3=E8=BE=89?= <972108913@qq.com>
Date: Fri, 28 Jun 2024 14:38:12 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../backend/auth/menuManagement/index.vue | 140 +++----------
.../backend/auth/userManagement/index.vue | 189 ++++++++++++------
ui/dasadmin/types/global.d.ts | 1 +
3 files changed, 159 insertions(+), 171 deletions(-)
diff --git a/ui/dasadmin/src/views/backend/auth/menuManagement/index.vue b/ui/dasadmin/src/views/backend/auth/menuManagement/index.vue
index d7c21bbf..91c32662 100644
--- a/ui/dasadmin/src/views/backend/auth/menuManagement/index.vue
+++ b/ui/dasadmin/src/views/backend/auth/menuManagement/index.vue
@@ -94,8 +94,8 @@
-
-
+
+
@@ -106,32 +106,6 @@
-
-
-
-
-
+
+
@@ -182,37 +156,13 @@
-
-
确定是否删除?
@@ -284,15 +234,6 @@ const loadNode = (node: Node, resolve: (data: Tree[]) => void) => {
console.log(err)
})
}
-// 菜单搜索查询
-const input2 = ref('')
-const queryListData = {
- menuName: '',
-}
-const clickQuery = () => {
- queryListData.menuName = input2.value
- queryMenuMethod(queryListData)
-}
// 菜单查询
const input1 = ref('')
const switchValue = ref(true)
@@ -320,6 +261,21 @@ const handleNodeClick = (data: Tree) => {
queryMenuMethod(queryData)
}
+
+// 菜单搜索查询
+const input2 = ref('')
+const queryListData = {
+ menuName: '',
+ parentMenuId: '',
+}
+const clickQuery = () => {
+ queryListData.menuName = input2.value
+ queryListData.parentMenuId = fromDataId.value
+ console.log(queryListData, 'queryListDataqueryListData')
+
+ queryMenuMethod(queryListData)
+}
+
// 查询接口
const queryMenuMethod = (data: any) => {
menusQuery(data).then((res) => {
@@ -365,10 +321,6 @@ const handleCloseAdd = () => {
visibleAdd.value = false
}
-const handleCloseParam = (done: () => void) => {
- visibleParam.value = false
-}
-
interface RuleForm {
menuName: string | undefined
menuOrder: number
@@ -496,8 +448,18 @@ interface fromDelete {
const fromDelete = (data: any) => {
dialogVisibleDelete.value = true
fromDeleteData.id = data.row.id
+}
+
+// 删除提示弹框
+const dialogVisibleDelete = ref(false)
+
+const handleCloseDelete = (done: () => void) => {
+ dialogVisibleDelete.value = false
+}
+const dialogVisibleDelete1 = (done: () => void) => {
+ dialogVisibleDelete.value = false
menuDelete(fromDeleteData).then((res) => {
- console.log(res, data, '删除')
+ console.log(res, '删除')
if (res.code == 200) {
setTimeout(() => {
ElMessage({
@@ -520,18 +482,6 @@ const fromDelete = (data: any) => {
})
}
-// 删除提示弹框
-const dialogVisibleDelete = ref(false)
-
-const handleCloseDelete = (done: () => void) => {
- ElMessageBox.confirm('确定是否删除?')
- .then(() => {
- done()
- })
- .catch(() => {
- // catch error
- })
-}
// 菜单新增
const visibleAdd = ref(false)
@@ -569,10 +519,11 @@ const fromAdd = () => {
formInlineAdd.updatedTime = 12345
}
const addOnSubmit = () => {
- formInlineAdd.parentMenuId = fromDataId.value
console.log(formInlineAdd, 'formInlineAdd')
formRef.value.validate((valid: any) => {
if (valid) {
+ alert(1)
+ formInlineAdd.parentMenuId = fromDataId.value
menuAdd(formInlineAdd).then((res: any) => {
console.log(res, '增加')
if (res.code == 200) {
@@ -601,31 +552,6 @@ const addOnSubmit = () => {
})
}
-// 显示
-const visibleParam = ref(false)
-const clickParam = () => {
- visibleParam.value = true
-}
-
-//
-const ParamTableData = reactive([
- {
- name: '页面名称',
- },
- {
- name: '页面路径',
- },
-])
-
-const visibleParam1 = () => {
- formActionRef.value.validate((valid: any) => {
- if (valid) {
- visibleParam.value = false
- } else {
- visibleParam.value = true
- }
- })
-}
// 分页
const currentPage4 = ref(4)
const pageSize4 = ref(100)
diff --git a/ui/dasadmin/src/views/backend/auth/userManagement/index.vue b/ui/dasadmin/src/views/backend/auth/userManagement/index.vue
index c2bb75ba..2e758798 100644
--- a/ui/dasadmin/src/views/backend/auth/userManagement/index.vue
+++ b/ui/dasadmin/src/views/backend/auth/userManagement/index.vue
@@ -4,7 +4,15 @@
-
+
@@ -42,34 +50,37 @@
-
+
-
+
@@ -78,15 +89,15 @@
-
+
-
+
-
+
@@ -100,15 +111,18 @@
-
+
@@ -117,15 +131,15 @@
-
+
-
+
-
+
@@ -153,10 +167,10 @@
import { ref, reactive, onMounted } from 'vue'
import { Search, CirclePlusFilled } from '@element-plus/icons-vue'
import { userQuery, userUpdate, userDelete, userAdd, userList, allRoleQuery } from '/@/api/backend'
-import { ElTable, ElMessage } from 'element-plus'
+import { ElTable, ElMessage, FormRules } from 'element-plus'
import { useAdminInfo } from '/@/stores/adminInfo'
-import { fa } from 'element-plus/es/locales.mjs'
-import { values } from 'lodash-es'
+import type Node from 'element-plus/es/components/tree/src/model/node'
+
const adminInfo = useAdminInfo()
const input1 = ref('')
const input2 = ref('')
@@ -203,6 +217,27 @@ const handleNodeClick = (data: Tree) => {
RyUserQuery(formQuery)
}
+const loadNode = (node: Node, resolve: (data: Tree[]) => void) => {
+ if (node.level === 0) {
+ return resolve([])
+ }
+
+ const treeQuery = reactive({
+ parentOrgId: node.data.id,
+ recursive: false,
+ })
+
+ userList(treeQuery)
+ .then((res) => {
+ console.log(res, '树')
+ // userData.value = res.data
+ return resolve(res.data)
+ })
+ .catch((err) => {
+ console.log(err)
+ })
+}
+
const defaultProps = {
children: 'children',
label: 'name',
@@ -216,8 +251,9 @@ const tableData = ref()
const RyUserQuery = (data: any) => {
userQuery(data).then((res) => {
if (res.code == 200) {
- console.log(res.rows, 'res111')
+ console.log(res, 'res111')
tableData.value = res.rows
+ paginationTotal.value = res.total
} else {
ElMessage.error({
message: res.msg,
@@ -248,6 +284,8 @@ const formQuery1 = reactive({
const userFromQuery = () => {
formQuery1.userName = input2.value
formQuery1.orgId = treeId.value
+ console.log(formQuery1, 'formQuery1formQuery1formQuery1')
+
RyUserQuery(formQuery1)
}
@@ -271,7 +309,22 @@ const formUserAdd = reactive({
orgId: '',
roleList: [],
})
-
+const rules = reactive>({
+ account: [
+ {
+ required: true,
+ message: '用户名不能为空',
+ trigger: 'blur',
+ },
+ ],
+ password: [
+ {
+ required: true,
+ message: '用户密码不能为空',
+ trigger: 'blur',
+ },
+ ],
+})
const addUserFromData = () => {
visibleParam.value = true
formUserAdd.account = ''
@@ -287,21 +340,25 @@ const handleCloseParam = (data: any) => {
visibleParam.value = false
console.log(data)
}
-
+const formRef = ref()
const addOnSubmit = () => {
- visibleParam.value = false
- formUserAdd.orgId = treeId.value
- console.log(formUserAdd, treeId.value, 'formUserAdd')
+ formRef.value.validate((valid: any) => {
+ if (valid) {
+ 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',
+ 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',
+ })
+ }
})
}
})
@@ -310,9 +367,9 @@ const addOnSubmit = () => {
// 页面修改
const visibleParamUpData = ref(false)
-const formUserUpData = reactive({ id: '', account: '', password: '', userName: '', email: '', phone: '', orgId: '', roleList: '' })
+const formUserUpData = reactive({ id: '', account: '', password: '', userName: '', email: '', phone: '', orgId: '', roleList: [] })
const viewUsers = (data: any) => {
- console.log(data.row.roleList, '页面修改数据')
+ console.log(data, '页面修改数据')
visibleParamUpData.value = true
formUserUpData.id = data.row.id
formUserUpData.account = data.row.account
@@ -321,24 +378,28 @@ const viewUsers = (data: any) => {
formUserUpData.email = data.row.email
formUserUpData.phone = data.row.phone
formUserUpData.orgId = data.row.orgId
- // formUserUpData.roleList = data.row.roleList
+ formUserUpData.roleList = data.row.roleList
}
const upDataOnSubmit = () => {
- console.log(formUserUpData, formUserUpData.roleList, 'formUserUpData')
+ formRef.value.validate((valid: any) => {
+ if (valid) {
+ console.log(formUserUpData, formUserUpData.roleList, 'formUserUpData')
- userUpdate(formUserUpData).then((res) => {
- if (res.code == 200) {
- console.log(res, '修改成功')
+ userUpdate(formUserUpData).then((res) => {
+ if (res.code == 200) {
+ console.log(res, '修改成功')
- RyUserQuery(formQuery)
- } else {
- ElMessage.error({
- message: res.msg,
- type: 'error',
+ RyUserQuery(formQuery)
+ } else {
+ ElMessage.error({
+ message: res.msg,
+ type: 'error',
+ })
+ }
})
+ visibleParamUpData.value = false
}
})
- visibleParamUpData.value = false
}
const handleCloseParamUp = () => {
@@ -352,21 +413,6 @@ const userListDelete = reactive({
const userFromDelete = (data: any) => {
userDeleteDialog.value = true
userListDelete.id = data.row.id
- userDelete(userListDelete).then((res) => {
- if (res.code == 200) {
- setTimeout(() => {
- ElMessage({
- message: res.msg,
- type: 'success',
- })
- }, 1000)
- } else {
- ElMessage.error({
- message: res.msg,
- type: 'error',
- })
- }
- })
}
const userDeleteDialog = ref(false)
@@ -377,9 +423,24 @@ const handleCloseDelete = () => {
const userDeleteDialog1 = () => {
userDeleteDialog.value = false
- formQuery.orgId = treeId.value
- console.log(formQuery, 'formQuery')
- RyUserQuery(formQuery)
+ userDelete(userListDelete).then((res) => {
+ if (res.code == 200) {
+ setTimeout(() => {
+ ElMessage({
+ message: res.msg,
+ type: 'success',
+ })
+ }, 1000)
+ formQuery.orgId = treeId.value
+ console.log(formQuery, 'formQuery')
+ RyUserQuery(formQuery)
+ } else {
+ ElMessage.error({
+ message: res.msg,
+ type: 'error',
+ })
+ }
+ })
}
// 用户权限
@@ -397,9 +458,9 @@ const allPermission = () => {
}
// 分页
-const currentPage4 = ref(4)
-const pageSize4 = ref(100)
-
+const currentPage4 = ref(0)
+const pageSize4 = ref(10)
+const paginationTotal = ref(0)
const handleSizeChange = (val: number) => {
console.log(`${val} items per page`)
}
diff --git a/ui/dasadmin/types/global.d.ts b/ui/dasadmin/types/global.d.ts
index cfa07364..92b47897 100644
--- a/ui/dasadmin/types/global.d.ts
+++ b/ui/dasadmin/types/global.d.ts
@@ -19,6 +19,7 @@ interface TableDefaultData {
}
interface ApiResponse {
+ total: number
code: number
data: T
msg: string