From 26876e499e985c57ad0ce679bdc97331888f05a4 Mon Sep 17 00:00:00 2001
From: wangchengming <15110151257@163.com>
Date: Thu, 3 Jul 2025 22:28:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=A8=E5=86=8C=E5=92=8C?=
=?UTF-8?q?=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/system/user.js | 33 ++-
.../qualification/trainApproval/index.vue | 2 +-
src/views/register.vue | 8 +-
src/views/system/userApproval/index.vue | 248 ++++++++----------
4 files changed, 140 insertions(+), 151 deletions(-)
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 27bd387..6ee6041 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -44,19 +44,15 @@ export function delUser(userId) {
})
}
-// 忘记密码重置
-export function resetPwd(userId, password) {
- const data = {
- userId,
- password
- }
+// 查询待审批新用户
+export function checkRegisterUserList(data) {
return request({
- url: '/system/user/resetPwd',
- method: 'put',
- data: data
+ url: '/system/user/checkRegisterUserList',
+ method: 'get',
+ params: data
})
}
-
+
// 用户密码重置
export function resetUserPwd(userId, password) {
const data = {
@@ -155,3 +151,20 @@ export function getUserInfo() {
method: 'get'
})
}
+
+// 查询部门下拉树结构 白名单
+export function customerDeptTreeSelect() {
+ return request({
+ url: '/fe/dept/listTree',
+ method: 'get'
+ })
+}
+// 忘记密码重置 白名单
+export function resetPwd(params) {
+ return request({
+ url: '/fe/resetUserPwd',
+ method: 'put',
+ data: params
+ })
+}
+
\ No newline at end of file
diff --git a/src/views/qualification/trainApproval/index.vue b/src/views/qualification/trainApproval/index.vue
index 8d0b60e..0dad3c3 100644
--- a/src/views/qualification/trainApproval/index.vue
+++ b/src/views/qualification/trainApproval/index.vue
@@ -17,7 +17,7 @@
-
+
{
const enabledDeptOptions = ref(undefined)
// 获取部门数据
const getDeptTree = () => {
- deptTreeSelect().then(res => {
+ customerDeptTreeSelect().then(res => {
+ console.log('部门数据', res.data)
enabledDeptOptions.value = filterDisabledDept(JSON.parse(JSON.stringify(res.data)))
})
}
@@ -182,7 +183,8 @@ const handleRegister = () => {
register(registerForm.value).then(res => {
console.log('注册结果', res)
const username = registerForm.value.username
- ElMessageBox.alert("恭喜你，您的账号 " + username + " 注册成功！", "系统提示", {
+ const escName = registerForm.value.escUserName
+ ElMessageBox.alert("恭喜你，您的账号 " + username + " 注册成功！请耐心等待ESC" + escName + "审核!!!", "系统提示", {
dangerouslyUseHTMLString: true,
type: "success",
}).then(() => {
diff --git a/src/views/system/userApproval/index.vue b/src/views/system/userApproval/index.vue
index d4ab752..1303317 100644
--- a/src/views/system/userApproval/index.vue
+++ b/src/views/system/userApproval/index.vue
@@ -5,25 +5,30 @@
-
-
+
+
-
-
-
-
+
+
+
-
-
+
+
+
+
- 展开
+ 展开
- 折叠
+ 折叠
@@ -35,19 +40,17 @@
-
-
-
-
-
+
+
-
+
{{ scope.$index + 1 }}
@@ -80,8 +83,8 @@
-
+
@@ -89,142 +92,113 @@
import { ref } from 'vue'
import { useRouter } from 'vue-router'
import Breadcrumb from '@/components/Breadcrumb'
+import { deptTreeSelect, listUser, checkRegisterUserList } from "@/api/system/user"
+import { getBusDependencyPage } from "@/api/system/dependency"
+
const router = useRouter()
-const total = ref(16)
+const loading = ref(true)
+const total = ref(0)
+const tableData = ref([])
const unfoldFlag = ref(false)
-const rangeTime = ref([])
+const dateRange = ref([])
const queryParams = ref({
- pageNum: 1,
+ pageIndex: 1,
pageSize: 10,
- userName: undefined,
+ userId: undefined,
+ dependencyId: undefined,
deptId: undefined,
- qualification: undefined
+ startTime: undefined,
+ endTime: undefined
})
-const tableData = [
- {
- localityName: 'XXX属地',
- departmentName: 'XXX部门',
- officeName: 'XXX科室',
- jobNumber: '3523213',
- name: '赵丽娟',
- curQualification: '-',
- objectiveQualification: 'SH',
- status: 0,
- expireTime: '2019-05-03'
- },
- {
- localityName: 'XXX属地',
- departmentName: 'XXX部门',
- officeName: 'XXX科室',
- jobNumber: '3523213',
- name: '赵丽娟',
- curQualification: '-',
- objectiveQualification: 'SH',
- status: 1,
- expireTime: '2019-05-03'
- },
- {
- localityName: 'XXX属地',
- departmentName: 'XXX部门',
- officeName: 'XXX科室',
- jobNumber: '3523213',
- name: '赵丽娟',
- curQualification: '-',
- objectiveQualification: 'SH',
- status: 2,
- expireTime: '2019-05-03'
- },
- {
- localityName: 'XXX属地',
- departmentName: 'XXX部门',
- officeName: 'XXX科室',
- jobNumber: '3523213',
- name: '赵丽娟',
- curQualification: '-',
- objectiveQualification: 'SH',
- status: 0
- },
- {
- localityName: 'XXX属地',
- departmentName: 'XXX部门',
- officeName: 'XXX科室',
- jobNumber: '3523213',
- name: '赵丽娟',
- curQualification: '-',
- objectiveQualification: 'SH',
- status: 0
- },
- {
- localityName: 'XXX属地',
- departmentName: 'XXX部门',
- officeName: 'XXX科室',
- jobNumber: '3523213',
- name: '赵丽娟',
- curQualification: '-',
- objectiveQualification: 'SH',
- status: 0
- },
- {
- localityName: 'XXX属地',
- departmentName: 'XXX部门',
- officeName: 'XXX科室',
- jobNumber: '3523213',
- name: '赵丽娟',
- curQualification: '-',
- objectiveQualification: 'SH',
- status: 0
- },
- {
- localityName: 'XXX属地',
- departmentName: 'XXX部门',
- officeName: 'XXX科室',
- jobNumber: '3523213',
- name: '赵丽娟',
- curQualification: '-',
- objectiveQualification: 'SH',
- status: 0
- },
- {
- localityName: 'XXX属地',
- departmentName: 'XXX部门',
- officeName: 'XXX科室',
- jobNumber: '3523213',
- name: '赵丽娟',
- curQualification: '-',
- objectiveQualification: 'SH',
- status: 0
- },
- {
- localityName: 'XXX属地',
- departmentName: 'XXX部门',
- officeName: 'XXX科室',
- jobNumber: '3523213',
- name: '赵丽娟',
- curQualification: '-',
- objectiveQualification: 'SH',
- status: 0
- },
-]
+
+
+// 初始化
+onMounted(() => {
+ getAllUser();
+ getDeptTree();
+ getBusDependencyData();
+ getcheckRegisterUserPageList();
+});
+// 属地数据
+const busDependencyData = ref([])
+// 获取属地数据
+const getBusDependencyData = () => {
+ getBusDependencyPage({
+ pageIndex: 1,
+ pageSize: 100,
+ }).then(response => {
+ if (response.code == 200) {
+ busDependencyData.value = response.data.list
+ }
+ })
+}
+// 用户数据
+const allUsers = ref([])
+// 获取所有用户
+const getAllUser = () => {
+ listUser({
+ pageNum: 1,
+ pageSize: 5000
+ }).then(res => {
+ allUsers.value = res.rows
+ })
+}
+// 部门数据
+const enabledDeptOptions = ref(undefined)
+// 获取部门数据
+const getDeptTree = () => {
+ deptTreeSelect().then(res => {
+ enabledDeptOptions.value = filterDisabledDept(JSON.parse(JSON.stringify(res.data)))
+ })
+}
+/** 过滤禁用的部门 */
+const filterDisabledDept = (deptList) => {
+ return deptList.filter(dept => {
+ if (dept.disabled) {
+ return false
+ }
+ if (dept.children && dept.children.length) {
+ dept.children = filterDisabledDept(dept.children)
+ }
+ return true
+ })
+}
+const getcheckRegisterUserPageList = () => {
+ loading.value = true
+ console.log('queryParams.value', queryParams.value)
+ checkRegisterUserList(queryParams.value).then(res => {
+ if (res.code == 200) {
+ tableData.value = res.rows
+ total.value = res.total
+ }
+ loading.value = false
+ }).catch(() => {
+ loading.value = false
+ })
+}
+
const handleFlod = () => {
unfoldFlag.value = !unfoldFlag.value
}
/** 搜索按钮操作 */
const handleQuery = () => {
- queryParams.value.pageNum = 1
- getList()
+ queryParams.value.pageIndex = 1
+ getcheckRegisterUserPageList()
}
/** 重置按钮操作 */
const resetQuery = () => {
dateRange.value = []
- proxy.resetForm("queryRef")
+ queryParams.value.userId = undefined
+ queryParams.value.dependencyId = undefined
queryParams.value.deptId = undefined
- proxy.$refs.deptTreeRef.setCurrentKey(null)
+ queryParams.value.startTime = undefined
+ queryParams.value.endTime = undefined
+ proxy.resetForm("queryRef")
+
handleQuery()
}
-const getList = () => {
-}
const handleView = () => {
router.push('/system/userApproval/userApprovalDetail')
}