From e13c9080e668e7190c3ad9762e4fd8a1a6ef203c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Mon, 22 Jan 2024 15:20:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AE=A1=E6=A0=B8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user-boot/user.ts             |  10 ++
 src/components/table/index.vue        |  12 ++-
 src/layouts/admin/index.vue           |  21 +++-
 src/styles/vxeTable.scss              |  12 ++-
 src/views/auth/audit/index.vue        | 136 ++++++++++++++++++++++++++
 src/views/auth/userList/popupEdit.vue | 136 +++++++++++++-------------
 src/views/auth/userList/popupPwd.vue  |  42 ++++----
 7 files changed, 273 insertions(+), 96 deletions(-)
 create mode 100644 src/views/auth/audit/index.vue

diff --git a/src/api/user-boot/user.ts b/src/api/user-boot/user.ts
index c652926..fad01e6 100644
--- a/src/api/user-boot/user.ts
+++ b/src/api/user-boot/user.ts
@@ -106,3 +106,13 @@ export async function updatePassword(params: any) {
         }
     })
 }
+
+
+
+export function checkUser(data:any) {
+    return request({
+        url: '/user-boot/user/check',
+        method: 'put',
+        data: data
+    })
+}
\ No newline at end of file
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index efa537f..e84c4c4 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -6,6 +6,8 @@
             :data="tableStore.table.data"
             v-loading="tableStore.table.loading"
             v-bind="Object.assign({}, defaultAttribute, $attrs)"
+            @checkbox-all="selectChangeEvent"
+            @checkbox-change="selectChangeEvent"
         >
             <!-- Column 组件内部是 el-table-column -->
             <template v-if="isGroup">
@@ -91,7 +93,7 @@
 <script setup lang="ts">
 import { ref, nextTick, inject, computed, onMounted } from 'vue'
 import type { ElTable } from 'element-plus'
-import { VxeTableInstance } from 'vxe-table'
+import { VxeTableEvents, VxeTableInstance } from 'vxe-table'
 import FieldRender from '@/components/table/fieldRender/index.vue'
 import Column from '@/components/table/column/index.vue'
 import { useConfig } from '@/stores/config'
@@ -134,8 +136,12 @@ const pageSizes = computed(() => {
 /*
  * 记录选择的项
  */
-const onSelectionChange = (selection: any) => {
-    // tableStore.onTableAction('selection-change', selection)
+const selectChangeEvent: VxeTableEvents.CheckboxChange<any> = ({ checked }) => {
+    const $table = tableRef.value
+    if ($table) {
+        const records = $table.getCheckboxRecords()
+        tableStore.onTableAction('selection-change', records)
+    }
 }
 
 const getRef = () => {
diff --git a/src/layouts/admin/index.vue b/src/layouts/admin/index.vue
index 43fa434..680c6de 100644
--- a/src/layouts/admin/index.vue
+++ b/src/layouts/admin/index.vue
@@ -1,8 +1,8 @@
 <template>
-    <component :is="config.layout.layoutMode"></component>
+    <component :is='config.layout.layoutMode'></component>
 </template>
 
-<script setup lang="ts">
+<script setup lang='ts'>
 import { reactive } from 'vue'
 import { useConfig } from '@/stores/config'
 import { useNavTabs } from '@/stores/navTabs'
@@ -73,6 +73,21 @@ const init = async () => {
                 keepalive: 0,
                 extend: 'none',
                 children: [
+                    {
+                        id: 3,
+                        pid: 2,
+                        type: 'menu',
+                        title: '审核管理',
+                        name: 'auth/audit',
+                        path: 'auth/audit',
+                        icon: 'el-icon-Avatar',
+                        menu_type: 'tab',
+                        url: '',
+                        component: '/src/views/auth/audit/index.vue',
+                        keepalive: 'auth/audit',
+                        extend: 'none',
+                        children: []
+                    },
                     {
                         id: 3,
                         pid: 2,
@@ -135,7 +150,7 @@ const init = async () => {
             })
         }
         handlerMenu(res.data)
-        handleAdminRoute([...res.data,...arr])
+        handleAdminRoute([...res.data, ...arr])
         // 预跳转到上次路径
         if (route.params.to) {
             const lastRoute = JSON.parse(route.params.to as string)
diff --git a/src/styles/vxeTable.scss b/src/styles/vxeTable.scss
index 80886fa..33da066 100644
--- a/src/styles/vxeTable.scss
+++ b/src/styles/vxeTable.scss
@@ -20,7 +20,15 @@
 // }
 
 .vxe-header--row {
-    background: var(--el-color-primary);
-    color: var(--el-color-white);
+  background: var(--el-color-primary);
+  color: var(--el-color-white);
+}
+
+.is--checked.vxe-checkbox, .is--checked.vxe-checkbox .vxe-checkbox--icon, .is--checked.vxe-custom--checkbox-option, .is--checked.vxe-custom--checkbox-option .vxe-checkbox--icon, .is--checked.vxe-export--panel-column-option, .is--checked.vxe-export--panel-column-option .vxe-checkbox--icon, .is--checked.vxe-table--filter-option, .is--checked.vxe-table--filter-option .vxe-checkbox--icon, .is--indeterminate.vxe-checkbox, .is--indeterminate.vxe-checkbox .vxe-checkbox--icon, .is--indeterminate.vxe-custom--checkbox-option, .is--indeterminate.vxe-custom--checkbox-option .vxe-checkbox--icon, .is--indeterminate.vxe-export--panel-column-option, .is--indeterminate.vxe-export--panel-column-option .vxe-checkbox--icon, .is--indeterminate.vxe-table--filter-option, .is--indeterminate.vxe-table--filter-option .vxe-checkbox--icon, .vxe-table--render-default .is--checked.vxe-cell--checkbox, .vxe-table--render-default .is--checked.vxe-cell--checkbox .vxe-checkbox--icon, .vxe-table--render-default .is--indeterminate.vxe-cell--checkbox, .vxe-table--render-default .is--indeterminate.vxe-cell--checkbox .vxe-checkbox--icon {
+  color: var(--el-color-primary-light-8);
+}
+
+.vxe-checkbox:not(.is--disabled):hover .vxe-checkbox--icon, .vxe-custom--checkbox-option:not(.is--disabled):hover .vxe-checkbox--icon, .vxe-export--panel-column-option:not(.is--disabled):hover .vxe-checkbox--icon, .vxe-table--filter-option:not(.is--disabled):hover .vxe-checkbox--icon, .vxe-table--render-default .vxe-cell--checkbox:not(.is--disabled):hover .vxe-checkbox--icon {
+  color: var(--el-color-primary-light-8);
 }
 
diff --git a/src/views/auth/audit/index.vue b/src/views/auth/audit/index.vue
new file mode 100644
index 0000000..cb268f1
--- /dev/null
+++ b/src/views/auth/audit/index.vue
@@ -0,0 +1,136 @@
+<template>
+    <div class="default-main">
+        <div class="custom-table-header">
+            <div style="flex: 1; font-weight: 700">待审核用户</div>
+            <el-button :icon="Check" type="primary" @click="addRole" class="ml10">审核通过</el-button>
+        </div>
+        <Table ref="tableRef" @checkbox-all="" @checkbox-change="" />
+    </div>
+</template>
+<script setup lang="ts">
+import { Check } from '@element-plus/icons-vue'
+import { ref, onMounted, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import { ElMessage } from 'element-plus'
+import { checkUser } from '@/api/user-boot/user'
+
+defineOptions({
+    name: 'auth/audit'
+})
+const tableStore = new TableStore({
+    showPage: false,
+    method: 'POST',
+    url: '/user-boot/user/checkUserList',
+    column: [
+        { width: '60', type: 'checkbox' },
+        { title: '名称', field: 'name' },
+        { title: '登录名', field: 'loginName' },
+        { title: '角色', field: 'roleName' },
+        { title: '部门', field: 'deptId' },
+        { title: '电话', field: 'phoneShow' },
+        { title: '注册时间', field: 'registerTime' },
+        { title: '类型', field: 'casualUserName' },
+        { title: '状态', field: 'stateName' },
+        {
+            title: '操作',
+            width: '130',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '审核通过',
+                    type: 'primary',
+                    icon: 'el-icon-Check',
+                    render: 'tipButton',
+                    click: row => {
+                        checkUser([row.id]).then(res => {
+                            tableStore.index()
+                            ElMessage.success('操作成功')
+                        })
+                    }
+                },
+                {
+                    name: 'del',
+                    title: '审核不通过',
+                    type: 'danger',
+                    icon: 'el-icon-Close',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定不通过该角色吗？'
+                    },
+                    click: row => {
+                        ElMessage.warning('功能尚未实现')
+                    }
+                }
+            ]
+        }
+    ],
+    loadCallback: () => {
+        tableStore.table.data.forEach((item: any) => {
+            item.deptId = item.deptId || '/'
+            item.phoneShow = item.phone || '/'
+            item.roleName = item.role.length ? item.role : '/'
+            switch (item.casualUser) {
+                case 0:
+                    item.casualUserName = '临时用户'
+                    break
+                case 1:
+                    item.casualUserName = '长期用户'
+                    break
+                default:
+                    item.casualUserName = '/'
+                    break
+            }
+            switch (item.state) {
+                case 0:
+                    item.stateName = '注销'
+                    break
+                case 1:
+                    item.stateName = '正常'
+                    break
+                case 2:
+                    item.stateName = '锁定'
+                    break
+                case 3:
+                    item.stateName = '待审核'
+                    break
+                case 4:
+                    item.stateName = '休眠'
+                    break
+                case 5:
+                    item.stateName = '密码过期'
+                    break
+                default:
+                    item.stateName = '/'
+                    break
+            }
+        })
+    }
+})
+tableStore.table.params.casualUser = 0
+tableStore.table.params.searchState = 0
+tableStore.table.params.searchValue = ''
+tableStore.table.params.searchBeginTime = ''
+tableStore.table.params.searchEndTime = ''
+tableStore.table.params.sortBy = ''
+tableStore.table.params.orderBy = ''
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+
+const addRole = () => {
+    if (!tableStore.table.selection.length) {
+        ElMessage.warning('请选择用户')
+        return
+    }
+    checkUser(tableStore.table.selection.map((item: any) => item.id)).then(res => {
+        tableStore.index()
+        ElMessage.success('操作成功')
+    })
+}
+</script>
diff --git a/src/views/auth/userList/popupEdit.vue b/src/views/auth/userList/popupEdit.vue
index 852d8fc..41f4650 100644
--- a/src/views/auth/userList/popupEdit.vue
+++ b/src/views/auth/userList/popupEdit.vue
@@ -1,96 +1,96 @@
 <template>
-    <el-dialog class='cn-operate-dialog' v-model='dialogVisible' :title='title'>
+    <el-dialog class="cn-operate-dialog" v-model="dialogVisible" :title="title">
         <el-scrollbar>
-            <el-form :inline='true' :model='form' label-width='120px' :rules='rules'>
-                <el-form-item label='用户名' prop='name'>
-                    <el-input v-model='form.name' placeholder='请输入昵称' />
+            <el-form :inline="true" :model="form" label-width="120px" :rules="rules">
+                <el-form-item label="用户名" prop="name">
+                    <el-input v-model="form.name" placeholder="请输入昵称" />
                 </el-form-item>
-                <el-form-item label='登录名' prop='loginName'>
-                    <el-input v-model='form.loginName' placeholder='请输入登录名' />
+                <el-form-item label="登录名" prop="loginName">
+                    <el-input v-model="form.loginName" placeholder="请输入登录名" />
                 </el-form-item>
-                <el-form-item label='默认密码' prop='password' v-if="title === '新增用户'">
-                    <el-input v-model='form.password' placeholder='请输入密码' disabled />
+                <el-form-item label="默认密码" prop="password" v-if="title === '新增用户'">
+                    <el-input v-model="form.password" placeholder="请输入密码" disabled />
                 </el-form-item>
-                <el-form-item label='权限类型' prop='type'>
+                <el-form-item label="权限类型" prop="type">
                     <el-select
-                        style='width: 100%'
-                        v-model='form.type'
-                        @change='changeValue'
+                        style="width: 100%"
+                        v-model="form.type"
+                        @change="changeValue"
                         disabled
-                        placeholder='请选择权限类型'
+                        placeholder="请选择权限类型"
                     >
                         <el-option
-                            v-for='(item, index) in UserTypeOption'
-                            :label='item.label'
-                            :value='item.value'
-                            :key='index'
+                            v-for="(item, index) in UserTypeOption"
+                            :label="item.label"
+                            :value="item.value"
+                            :key="index"
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label='用户类型' prop='casualUser'>
-                    <el-select style='width: 100%' v-model='form.casualUser' placeholder='请选择权限类型'>
+                <el-form-item label="用户类型" prop="casualUser">
+                    <el-select style="width: 100%" v-model="form.casualUser" placeholder="请选择权限类型">
                         <el-option
-                            v-for='(item, index) in TypeOptions'
-                            :label='item.label'
-                            :value='item.value'
-                            :key='index'
+                            v-for="(item, index) in TypeOptions"
+                            :label="item.label"
+                            :value="item.value"
+                            :key="index"
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label='所属部门' prop='deptId'>
-                    <Area style='width: 100%' v-model='form.deptId' />
+                <el-form-item label="所属部门" prop="deptId">
+                    <Area style="width: 100%" v-model="form.deptId" />
                 </el-form-item>
-                <el-form-item label='角色' prop='role'>
-                    <el-select style='width: 100%' v-model='form.role' placeholder='请选择角色' multiple collapse-tags>
+                <el-form-item label="角色" prop="role">
+                    <el-select style="width: 100%" v-model="form.role" placeholder="请选择角色" multiple collapse-tags>
                         <el-option
-                            v-for='(item, index) in roleOptions'
-                            :label='item.label'
-                            :value='item.value'
-                            :key='index'
+                            v-for="(item, index) in roleOptions"
+                            :label="item.label"
+                            :value="item.value"
+                            :key="index"
                         ></el-option>
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label='手机号' prop='phone'>
-                    <el-input v-model='form.phone' placeholder='请输入手机号' />
+                <el-form-item label="手机号" prop="phone">
+                    <el-input v-model="form.phone" placeholder="请输入手机号" />
                 </el-form-item>
-                <el-form-item label='邮箱' prop='email'>
-                    <el-input v-model='form.email' placeholder='请输入描述' />
+                <el-form-item label="邮箱" prop="email">
+                    <el-input v-model="form.email" placeholder="请输入描述" />
                 </el-form-item>
-                <el-form-item label='起始IP' prop='limitIpStart'>
-                    <el-input v-model='form.limitIpStart' placeholder='请输入描述' />
+                <el-form-item label="起始IP" prop="limitIpStart">
+                    <el-input v-model="form.limitIpStart" placeholder="请输入描述" />
                 </el-form-item>
-                <el-form-item label='结束IP' prop='limitIpEnd'>
-                    <el-input v-model='form.limitIpEnd' placeholder='请输入描述' />
+                <el-form-item label="结束IP" prop="limitIpEnd">
+                    <el-input v-model="form.limitIpEnd" placeholder="请输入描述" />
                 </el-form-item>
-                <el-form-item label='时间段' prop='limitTime'>
-                    <el-slider v-model='form.limitTime' range show-stops :max='24' />
+                <el-form-item label="时间段" prop="limitTime">
+                    <el-slider v-model="form.limitTime" range show-stops :max="24" />
                 </el-form-item>
-                <el-form-item label='短信通知' prop='smsNotice'>
-                    <el-radio-group v-model='form.smsNotice'>
-                        <el-radio-button :label='0'>是</el-radio-button>
-                        <el-radio-button :label='1'>否</el-radio-button>
+                <el-form-item label="短信通知" prop="smsNotice">
+                    <el-radio-group v-model="form.smsNotice">
+                        <el-radio-button :label="0">是</el-radio-button>
+                        <el-radio-button :label="1">否</el-radio-button>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label='邮件通知' prop='emailNotice'>
-                    <el-radio-group v-model='form.emailNotice'>
-                        <el-radio-button :label='0'>是</el-radio-button>
-                        <el-radio-button :label='1'>否</el-radio-button>
+                <el-form-item label="邮件通知" prop="emailNotice">
+                    <el-radio-group v-model="form.emailNotice">
+                        <el-radio-button :label="0">是</el-radio-button>
+                        <el-radio-button :label="1">否</el-radio-button>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label='用户ID'>
-                    <div style='display: flex; width: 100%'>
-                        <el-radio-group v-model='useId'>
-                            <el-radio-button :label='1'>是</el-radio-button>
-                            <el-radio-button :label='0'>否</el-radio-button>
+                <el-form-item label="用户ID">
+                    <div style="display: flex; width: 100%">
+                        <el-radio-group v-model="useId">
+                            <el-radio-button :label="1">是</el-radio-button>
+                            <el-radio-button :label="0">否</el-radio-button>
                         </el-radio-group>
                         <el-input
                             :disabled="title !== '新增用户'"
-                            v-model='form.id'
-                            placeholder='请输入用户id'
-                            v-if='useId'
-                            style='flex: 1'
-                            class='ml10'
+                            v-model="form.id"
+                            placeholder="请输入用户id"
+                            v-if="useId"
+                            style="flex: 1"
+                            class="ml10"
                         ></el-input>
                     </div>
                 </el-form-item>
@@ -98,23 +98,24 @@
         </el-scrollbar>
 
         <template #footer>
-            <span class='dialog-footer'>
-                <el-button @click='dialogVisible = false'>取消</el-button>
-                <el-button type='primary' @click='submit'>确认</el-button>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
             </span>
         </template>
     </el-dialog>
 </template>
-<script lang='ts' setup>
+<script lang="ts" setup>
 import { ref, inject } from 'vue'
 import { reactive } from 'vue'
 import TableStore from '@/utils/tableStore'
-import { ElMessage } from 'element-plus'
+import { ElMessage, FormItemRule } from 'element-plus'
 import { roleList } from '@/api/user-boot/role'
 import { add, edit } from '@/api/user-boot/user'
 import { useAdminInfo } from '@/stores/adminInfo'
 import Area from '@/components/form/area/index.vue'
 import { de } from 'element-plus/es/locale'
+import { Arrayable } from 'element-plus/es/utils'
 
 const adminInfo = useAdminInfo()
 const tableStore = inject('tableStore') as TableStore
@@ -137,7 +138,7 @@ const form = reactive({
     emailNotice: 0,
     type: 0
 })
-const rules = {
+const rules:Partial<Record<string, Arrayable<FormItemRule>>> = {
     name: [{ required: true, message: '用户名不能为空', trigger: 'blur' }],
     role: [{ required: true, message: '角色不能为空', trigger: 'blur' }],
     password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
@@ -149,7 +150,7 @@ const rules = {
         { required: false, message: '邮箱不能为空', trigger: 'blur' },
         {
             type: 'email',
-            message: '\'请输入正确的邮箱地址',
+            message: "'请输入正确的邮箱地址",
             trigger: ['blur', 'change']
         }
     ],
@@ -264,7 +265,6 @@ const submit = async () => {
     dialogVisible.value = false
 }
 
-const changeValue = () => {
-}
+const changeValue = () => {}
 defineExpose({ open })
 </script>
diff --git a/src/views/auth/userList/popupPwd.vue b/src/views/auth/userList/popupPwd.vue
index cc56614..977caeb 100644
--- a/src/views/auth/userList/popupPwd.vue
+++ b/src/views/auth/userList/popupPwd.vue
@@ -1,28 +1,28 @@
 <template>
-    <el-dialog class='cn-operate-dialog' v-model='dialogVisible' title='修改密码'>
+    <el-dialog class="cn-operate-dialog" v-model="dialogVisible" title="修改密码">
         <el-scrollbar>
-            <el-form :inline='false' :model='form' label-width='120px' :rules='rules' ref='formRef'>
-                <el-form-item label='校验密码' prop='password'>
-                    <el-input v-model='form.password' type='password' placeholder='请输入校验密码' show-password />
+            <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
+                <el-form-item label="校验密码" prop="password">
+                    <el-input v-model="form.password" type="password" placeholder="请输入校验密码" show-password />
                 </el-form-item>
-                <el-form-item label='新密码' prop='newPwd'>
-                    <el-input v-model='form.newPwd' type='password' placeholder='请输入新密码' show-password />
+                <el-form-item label="新密码" prop="newPwd">
+                    <el-input v-model="form.newPwd" type="password" placeholder="请输入新密码" show-password />
                 </el-form-item>
-                <el-form-item label='确认密码' prop='confirmPwd'>
-                    <el-input v-model='form.confirmPwd' type='password' placeholder='请输入确认密码' show-password />
+                <el-form-item label="确认密码" prop="confirmPwd">
+                    <el-input v-model="form.confirmPwd" type="password" placeholder="请输入确认密码" show-password />
                 </el-form-item>
             </el-form>
         </el-scrollbar>
 
         <template #footer>
-            <span class='dialog-footer'>
-                <el-button @click='dialogVisible = false'>取消</el-button>
-                <el-button type='primary' @click='submit'>确认</el-button>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
             </span>
         </template>
     </el-dialog>
 </template>
-<script lang='ts' setup>
+<script lang="ts" setup>
 import { ref, inject } from 'vue'
 import { reactive } from 'vue'
 import TableStore from '@/utils/tableStore'
@@ -52,13 +52,16 @@ const rules = {
                 if (value === '') {
                     callback(new Error('请输入旧密码'))
                 } else {
-                    passwordConfirm(value).then(res => {
-                        callback()
-                    }).catch(() => {
-                        callback(new Error('旧密码不正确'))
-                    })
+                    passwordConfirm(value)
+                        .then(res => {
+                            callback()
+                        })
+                        .catch(() => {
+                            callback(new Error('旧密码不正确'))
+                        })
                 }
-            }, trigger: 'blur'
+            },
+            trigger: 'blur'
         }
     ],
     newPwd: [
@@ -104,7 +107,7 @@ const open = (id: string) => {
     dialogVisible.value = true
 }
 const submit = async () => {
-    formRef.value.validate((valid) => {
+    formRef.value.validate((valid:boolean) => {
         if (valid) {
             updatePassword({
                 id: form.id,
@@ -115,7 +118,6 @@ const submit = async () => {
             })
         }
     })
-
 }
 
 defineExpose({ open })