完善角色列表，表单恢复，超管禁止删除禁用等

src/api/system/index.ts

@@ -29,11 +29,13 @@ export default {
   },
   user: {
     getList: (params: object) => get('/system/user/list', params),
+    params: () => get('/system/user/params'),
     detail: (id: number) => get('/system/user/getInfoById', { id }),
     add: (data: object) => post('/system/user/add', data),
     resetPassword: (data: object) => post('/system/user/resetPassword', data),
     del: (id: number) => del('/system/user/delInfoById', { id }),
     edit: (data: object) => put('/system/user/edit', data),
+    setStatus: (id: number, status: number) => put('/system/user/editStatus', { id, status }),
   },
   config: {
     getList: (params: object) => get('/common/config/list', params),

src/api/system/user/index.ts

@@ -1,75 +0,0 @@
-import request from '/@/utils/request';
-
-export function getUserList(query:Object) {
-    return request({
-        url: '/system/user/list',
-        method: 'get',
-        params:query
-    })
-}
-
-export function getDeptTree() {
-    return request({
-        url: '/system/dept/tree',
-        method: 'get'
-    })
-}
-
-export function getParams() {
-    return request({
-        url: '/system/user/params',
-        method: 'get'
-    })
-}
-
-export function getEditUser(id:number) {
-    return request({
-        url: '/system/user/getEdit',
-        method: 'get',
-        params:{id}
-    })
-}
-
-export function addUser(data:object) {
-    return request({
-        url: '/system/user/add',
-        method: 'post',
-        data:data
-    })
-}
-
-
-export function editUser(data:object) {
-    return request({
-        url: '/system/user/edit',
-        method: 'put',
-        data:data
-    })
-}
-
-export function resetUserPwd(userId:number, password:string) {
-    return request({
-        url: '/system/user/resetPwd',
-        method: 'put',
-        data:{userId,password}
-    })
-}
-
-export function changeUserStatus(userId:number, status:number) {
-    return request({
-        url: '/system/user/setStatus',
-        method: 'put',
-        data:{userId,status}
-    })
-}
-
-
-export function deleteUser(ids:number[]) {
-    return request({
-        url: '/system/user/delete',
-        method: 'delete',
-        data:{ids}
-    })
-}
-
-

src/views/system/user/component/editUser.vue

@@ -1,213 +1,190 @@
 <template>
-	<div class="system-edit-user-container">
-		<el-dialog :title="(ruleForm.userId!==0?'修改':'添加')+'用户'" v-model="isShowDialog" width="769px">
-			<el-form ref="formRef" :model="ruleForm" :rules="rules" size="default" label-width="90px">
-				<el-row :gutter="35">
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="ruleForm.userId===0">
-						<el-form-item label="用户名" prop="userName">
-							<el-input v-model="ruleForm.userName" placeholder="请输入账户名称" clearable></el-input>
-						</el-form-item>
-					</el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="ruleForm.userId===0">
-            <el-form-item label="账户密码" prop="password">
-              <el-input v-model="ruleForm.password" placeholder="请输入" type="password" clearable></el-input>
+  <div class="system-edit-user-container">
+    <el-dialog :title="(ruleForm.id?'修改':'添加')+'用户'" v-model="isShowDialog" width="769px">
+      <el-form ref="formRef" :model="ruleForm" :rules="rules" size="default" label-width="90px">
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="!ruleForm.id">
+            <el-form-item label="用户名" prop="userName">
+              <el-input v-model="ruleForm.userName" placeholder="请输入账户名称" clearable></el-input>
             </el-form-item>
           </el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="用户昵称" prop="userNickname">
-							<el-input v-model="ruleForm.userNickname" placeholder="请输入用户昵称" clearable></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="关联角色" prop="roleIds">
-							<el-select v-model="ruleForm.roleIds" placeholder="请选择" clearable class="w100" multiple>
-								<el-option
-                    v-for="role in roleList"
-                    :key="'role-'+role.id"
-                    :label="role.name"
-                    :value="role.id">
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="!ruleForm.id">
+            <el-form-item label="账户密码" prop="userPassword">
+              <el-input v-model="ruleForm.userPassword" placeholder="请输入" type="password" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+            <el-form-item label="用户昵称" prop="userNickname">
+              <el-input v-model="ruleForm.userNickname" placeholder="请输入用户昵称" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+            <el-form-item label="关联角色" prop="roleIds">
+              <el-select v-model="ruleForm.roleIds" placeholder="请选择" clearable class="w100" multiple>
+                <el-option v-for="role in roleList" :key="'role-'+role.id" :label="role.name" :value="role.id">
                 </el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="部门" prop="deptId">
-							<el-cascader
-								:options="deptData"
-								:props="{ checkStrictly: true,emitPath: false, value: 'deptId', label: 'name' }"
-								placeholder="请选择部门"
-								clearable
-								class="w100"
-								v-model="ruleForm.deptId"
-							>
-								<template #default="{ node, data }">
-									<span>{{ data.deptName }}</span>
-									<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
-								</template>
-							</el-cascader>
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="手机号" prop="mobile">
-							<el-input v-model="ruleForm.mobile" placeholder="请输入手机号" clearable></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="邮箱" prop="email">
-							<el-input v-model="ruleForm.email" placeholder="请输入" clearable></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="性别" prop="sex">
-							<el-select v-model="ruleForm.sex" placeholder="请选择" clearable class="w100">
-								<el-option
-                   v-for="gender in genderData"
-                   :key="'gender-'+gender.value"
-                   :label="gender.label"
-                   :value="gender.value"></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="岗位" prop="postIds">
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+            <el-form-item label="部门" prop="deptId">
+              <el-cascader :options="deptData" :props="{ checkStrictly: true,emitPath: false, value: 'deptId', label: 'deptName' }" placeholder="请选择部门" clearable class="w100" v-model="ruleForm.deptId">
+                <template #default="{ node, data }">
+                  <span>{{ data.deptName }}</span>
+                  <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+                </template>
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+            <el-form-item label="手机号" prop="mobile">
+              <el-input v-model="ruleForm.mobile" placeholder="请输入手机号" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+            <el-form-item label="邮箱" prop="userEmail">
+              <el-input v-model="ruleForm.userEmail" placeholder="请输入" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+            <el-form-item label="性别" prop="sex">
+              <el-select v-model="ruleForm.sex" placeholder="请选择" clearable class="w100">
+                <el-option label="保密" :value="0" />
+                <el-option label="男" :value="1" />
+                <el-option label="女" :value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+            <el-form-item label="岗位" prop="postIds">
               <el-select v-model="ruleForm.postIds" placeholder="请选择" clearable class="w100" multiple>
-                <el-option
-                    v-for="post in postList"
-                    :key="'post-'+post.postId"
-                    :label="post.postName"
-                    :value="post.postId">
+                <el-option v-for="post in postList" :key="'post-'+post.postId" :label="post.postName" :value="post.postId">
                 </el-option>
               </el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="用户状态">
-							<el-switch v-model="ruleForm.status" inline-prompt :active-value="1" :inactive-value="0" active-text="启" inactive-text="禁"></el-switch>
-						</el-form-item>
-					</el-col>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+            <el-form-item label="用户状态">
+              <el-switch v-model="ruleForm.status" inline-prompt :active-value="1" :inactive-value="0" active-text="启" inactive-text="禁"></el-switch>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="用户类型">
               <el-radio-group v-model="ruleForm.isAdmin">
-                <el-radio
-                    :label="1"
-                >后台管理员</el-radio>
-                <el-radio
-                    :label="0"
-                >前台用户</el-radio>
+                <el-radio :label="1">后台管理员</el-radio>
+                <el-radio :label="0">前台用户</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
-					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-						<el-form-item label="用户描述">
-							<el-input v-model="ruleForm.remark" type="textarea" placeholder="请输入用户描述" maxlength="150"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-			<template #footer>
-				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ruleForm.userId!==0?'修 改':'添 加'}}</el-button>
-				</span>
-			</template>
-		</el-dialog>
-	</div>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+            <el-form-item label="用户描述">
+              <el-input v-model="ruleForm.remark" type="textarea" placeholder="请输入用户描述" maxlength="150"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="onCancel" size="default">取 消</el-button>
+          <el-button type="primary" @click="onSubmit" size="default">{{ruleForm.id!==0?'修 改':'添 加'}}</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script lang="ts">
-import { reactive, toRefs, onMounted, defineComponent,ref,unref } from 'vue';
-import {getParams, addUser, editUser, getEditUser} from "/@/api/system/user";
-import {ElMessage} from "element-plus";
+import { reactive, toRefs, onMounted, defineComponent, ref, unref } from 'vue';
+import api from '/@/api/system';
+import { ElMessage } from 'element-plus';
+
+interface DialogRow {
+	id?: number;
+	userName: string; // 用户名
+	userNickname: string; // 用户昵称
+	deptId: number; // 部门id
+	mobile: string; // 中国手机不带国家代码，国际手机号格式为：国家代码-手机号
+	roleIds: number[]; // 角色ID数组
+	postIds: number[]; // 岗位ID数组
+	userTypes: 'system' | 'company'; // 系统 system 企业 company
+	birthday?: string; // 用户昵称
+	userPassword?: string; // 登录密码
+	userEmail?: string; // 用户登录邮箱
+	remark?: string; // 备注
+	avatar?: string; // 用户头像
+	address?: string; // 联系地址
+	describe?: string; // 描述信息
+	sex?: 0 | 1 | 2; // 性别;0:保密,1:男,2:女
+	status: -1 | 0 | 1 | 2; // 用户状态;0:禁用,1:正常,2:未验证
+	isAdmin: 0 | 1; // 是否后台管理员 1 是 0 否
+}
 
+const baseForm: DialogRow = {
+	userName: '',
+	userNickname: '',
+	deptId: 0,
+	mobile: '',
+	birthday: '',
+	userPassword: '',
+	userEmail: '',
+	avatar: '',
+	address: '',
+	describe: '',
+	remark: '',
+	sex: 0,
+	isAdmin: 1,
+	status: 1,
+	postIds: [],
+	roleIds: [],
+	userTypes: 'system',
+};
 
 export default defineComponent({
 	name: 'systemEditUser',
-  props:{
-    deptData:{
-      type:Array,
-      default:()=>[]
-    },
-    genderData:{
-      type:Array,
-      default:()=>[]
-    }
-  },
-	setup(prop,{emit}) {
-    const roleList = ref([]);
-    const postList = ref([]);
-    const formRef = ref<HTMLElement | null>(null);
+	props: {
+		deptData: {
+			type: Array,
+			default: () => [],
+		},
+		genderData: {
+			type: Array,
+			default: () => [],
+		},
+	},
+	setup(prop, { emit }) {
+		const roleList = ref([]);
+		const postList = ref([]);
+		const formRef = ref<HTMLElement | null>(null);
 		const state = reactive({
 			isShowDialog: false,
 			ruleForm: {
-        userId: 0,
-        deptId: 0,
-        userName: '',
-        userNickname: '',
-        password: '',
-        mobile:'',
-        email: '',
-        sex: '',
-        status: 1,
-        remark: '',
-        postIds: [],
-        roleIds: [],
-        isAdmin:0,
+				...baseForm,
+			},
+			//表单校验
+			rules: {
+				userName: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
+				userNickname: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
+				deptId: [{ required: true, message: '归属部门不能为空', trigger: 'blur' }],
+				mobile: [{ required: true, message: '手机号不能为空', trigger: 'blur' }],
+				password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
+				userEmail: [
+					{
+						type: 'email',
+						message: "'请输入正确的邮箱地址",
+						trigger: ['blur', 'change'],
+					},
+				],
 			},
-      //表单校验
-      rules: {
-        userName: [
-          { required: true, message: "用户名称不能为空", trigger: "blur" }
-        ],
-        userNickname: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
-        ],
-        deptId: [
-          { required: true, message: "归属部门不能为空", trigger: "blur" }
-        ],
-        password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" }
-        ],
-        email: [
-          {
-            type: "email",
-            message: "'请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
-        mobile: [
-          { required: true, message: "手机号码不能为空", trigger: "blur" },
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
-      }
 		});
 		// 打开弹窗
-		const openDialog = (row?:any) => {
-      resetForm()
-      if(row) {
-        getEditUser(row.id).then((res:any)=>{
-          const user = res.data.user;
-          state.ruleForm = {
-            userId: user.id,
-            deptId: user.deptId,
-            userName: user.userName,
-            userNickname: user.useruserNickname,
-            password: '-',
-            mobile:user.mobile,
-            email: user.userEmail,
-            sex: String(user.sex),
-            status: user.userStatus,
-            remark: user.remark,
-            postIds: res.data.checkedPosts??[],
-            roleIds: res.data.checkedRoleIds??[],
-            isAdmin:user.isAdmin,
-          };
-        })
-      }
-			state.isShowDialog = true;
+		const openDialog = (row?: any) => {
+			resetForm();
+			if (row) {
+				api.user.detail(row.id).then((user: any) => {
+					state.ruleForm = user;
+				});
+			}
+      state.isShowDialog = true;
 		};
 		// 关闭弹窗
 		const closeDialog = () => {
@@ -219,65 +196,53 @@ export default defineComponent({
 		};
 		// 新增
 		const onSubmit = () => {
-      const formWrap = unref(formRef) as any;
-      if (!formWrap) return;
-      formWrap.validate((valid: boolean) => {
-        if (valid) {
-          if(state.ruleForm.userId===0){
-            //添加
-            addUser(state.ruleForm).then(()=>{
-              ElMessage.success('用户添加成功');
-              closeDialog(); // 关闭弹窗
-              emit('getUserList')
-            });
-          }else{
-            //修改
-            editUser(state.ruleForm).then(()=>{
-              ElMessage.success('用户修改成功');
-              closeDialog(); // 关闭弹窗
-              emit('getUserList')
-            });
-          }
-        }
-      });
+			const formWrap = unref(formRef) as any;
+			if (!formWrap) return;
+			formWrap.validate((valid: boolean) => {
+				if (valid) {
+					if (state.ruleForm.id === 0) {
+						//添加
+						api.user.add(state.ruleForm).then(() => {
+							ElMessage.success('用户添加成功');
+							closeDialog(); // 关闭弹窗
+							emit('getUserList');
+						});
+					} else {
+						//修改
+						api.user.edit(state.ruleForm).then(() => {
+							ElMessage.success('用户修改成功');
+							closeDialog(); // 关闭弹窗
+							emit('getUserList');
+						});
+					}
+				}
+			});
 		};
 		// 初始化部门数据
 		const initTableData = () => {
-      //获取角色岗位选项
-      getParams().then((res:any)=>{
-        roleList.value = res.roleList??[];
-        postList.value = res.posts??[];
-      });
+			//获取角色岗位选项
+			// getParams().then((res:any)=>{
+			//   roleList.value = res.roleList??[];
+			//   postList.value = res.posts??[];
+			// });
 		};
 		// 页面加载时
 		onMounted(() => {
 			initTableData();
 		});
-    const resetForm = ()=>{
-      state.ruleForm = {
-        userId: 0,
-        deptId: 0,
-        userName: '',
-        userNickname: '',
-        password: '',
-        mobile:'',
-        email: '',
-        sex: '',
-        status: 1,
-        remark: '',
-        postIds: [],
-        roleIds: [],
-        isAdmin:0,
-      }
-    };
+		const resetForm = () => {
+			state.ruleForm = {
+				...baseForm,
+			};
+		};
 		return {
 			openDialog,
 			closeDialog,
 			onCancel,
 			onSubmit,
-      roleList,
-      postList,
-      formRef,
+			roleList,
+			postList,
+			formRef,
 			...toRefs(state),
 		};
 	},

src/views/system/user/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="system-user-container">
     <el-row :gutter="10">
-      <el-col :span="6">
+      <el-col :span="5">
         <el-card shadow="hover">
           <el-scrollbar>
             <el-input :prefix-icon="search" v-model="filterText" placeholder="请输入部门名称" clearable size="default" style="width: 100%;" />
@@ -9,7 +9,7 @@
           </el-scrollbar>
         </el-card>
       </el-col>
-      <el-col :span="18">
+      <el-col :span="19">
         <el-card shadow="hover">
           <div class="system-user-search mb15">
             <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
@@ -24,6 +24,7 @@
                   <el-option label="全部" :value="-1" />
                   <el-option label="启用" :value="1" />
                   <el-option label="禁用" :value="0" />
+                  <el-option label="未验证" :value="2" />
                 </el-select>
               </el-form-item>
               <el-form-item label="创建时间" prop="dateRange">
@@ -48,17 +49,17 @@
                   </el-icon>
                   新增用户
                 </el-button>
-                <el-button size="default" type="danger" class="ml10" @click="onRowDel(null)">
+                <!-- <el-button size="default" type="danger" class="ml10" @click="onRowDel(null)">
                   <el-icon>
                     <ele-Delete />
                   </el-icon>
                   删除用户
-                </el-button>
+                </el-button> -->
               </el-form-item>
             </el-form>
           </div>
           <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
             <el-table-column type="index" label="序号" width="60" align="center" />
             <el-table-column prop="userName" label="账户名称" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column prop="userNickname" label="用户昵称" min-width="160" show-overflow-tooltip></el-table-column>
@@ -71,7 +72,7 @@
             <el-table-column prop="mobile" label="手机号" width="120" align="center"></el-table-column>
             <el-table-column prop="status" label="用户状态" width="120" align="center">
               <template #default="scope">
-                <el-switch v-model="scope.row.status" inline-prompt :active-value="1" :inactive-value="0" active-text="启" inactive-text="禁" @change="handleStatusChange(scope.row)">
+                <el-switch v-model="scope.row.status" :disabled="scope.row.id===1" inline-prompt :active-value="1" :inactive-value="0" active-text="启" inactive-text="禁" @change="handleStatusChange(scope.row)">
                 </el-switch>
               </template>
             </el-table-column>
@@ -79,7 +80,7 @@
             <el-table-column label="操作" width="150" align="center" fixed="right">
               <template #default="scope">
                 <el-button size="small" text type="warning" @click="onOpenEditUser(scope.row)">修改</el-button>
-                <el-button size="small" text type="danger" @click="onRowDel(scope.row)">删除</el-button>
+                <el-button size="small" text type="danger" @click="onRowDel(scope.row)" v-if="scope.row.id!==1">删除</el-button>
                 <el-button size="small" text type="success" @click="handleResetPwd(scope.row)">重置</el-button>
               </template>
             </el-table-column>
@@ -97,7 +98,6 @@ import { toRefs, reactive, onMounted, ref, defineComponent, watch, getCurrentIns
 import { ElMessageBox, ElMessage, ElTree, FormInstance } from 'element-plus';
 import { Search } from '@element-plus/icons-vue';
 import EditUser from '/@/views/system/user/component/editUser.vue';
-import { resetUserPwd, changeUserStatus, deleteUser } from '/@/api/system/user/index';
 import api from '/@/api/system';
 import useCommon from '/@/hooks/useCommon';
 
@@ -112,6 +112,7 @@ interface TableDataState {
 		param: {
 			pageNum: number;
 			pageSize: number;
+			status: number;
 			deptId: string;
 			userNickname: string;
 			userName: string;
@@ -145,6 +146,7 @@ export default defineComponent({
 				total: 0,
 				loading: false,
 				param: {
+					status: -1,
 					pageNum: 1,
 					pageSize: 10,
 					deptId: '',
@@ -178,24 +180,24 @@ export default defineComponent({
 		// 删除用户
 		const onRowDel = (row: any) => {
 			let msg = '你确定要删除所选用户？';
-			let ids: number[] = [];
-			if (row) {
-				msg = `此操作将永久删除用户：“${row.userName}”，是否继续?`;
-				ids = [row.id];
-			} else {
-				ids = state.ids;
-			}
-			if (ids.length === 0) {
-				ElMessage.error('请选择要删除的数据。');
-				return;
-			}
+			// let ids: number[] = [];
+			// if (row) {
+			msg = `此操作将永久删除用户：“${row.userName}”，是否继续?`;
+			// 	ids = [row.id];
+			// } else {
+			// 	ids = state.ids;
+			// }
+			// if (ids.length === 0) {
+			// 	ElMessage.error('请选择要删除的数据。');
+			// 	return;
+			// }
 			ElMessageBox.confirm(msg, '提示', {
 				confirmButtonText: '确认',
 				cancelButtonText: '取消',
 				type: 'warning',
 			})
 				.then(() => {
-					deleteUser(ids).then(() => {
+					api.user.del(row.id).then(() => {
 						ElMessage.success('删除成功');
 						userList();
 					});
@@ -241,7 +243,7 @@ export default defineComponent({
 						ElMessage.success('密码不能为空');
 						return;
 					}
-					resetUserPwd(row.id, value).then(() => {
+					api.user.resetPassword(row.id, value).then(() => {
 						ElMessage.success('修改成功，新密码是：' + value);
 					});
 				})
@@ -256,7 +258,7 @@ export default defineComponent({
 				type: 'warning',
 			})
 				.then(function () {
-					return changeUserStatus(row.id, row.status);
+					return api.user.setStatus(row.id, row.status);
 				})
 				.then(() => {
 					ElMessage.success(text + '成功');