From 2e6d58585f355624c993843dfd1ee282872ffefd Mon Sep 17 00:00:00 2001
From: 123 <123@qq.com>
Date: Tue, 13 May 2025 17:33:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E4=BA=8B=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E7=94=A8=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/operate/materialSeal/index.ts    |   8 +-
 src/api/operate/materialSeal/types.ts    |   4 +-
 src/api/system/user/types.ts             |   5 +-
 src/views/operate/employee/index.vue     | 682 +++++++++++++++++++++++
 src/views/operate/materialSeal/index.vue |  40 +-
 src/views/system/user/authRole.vue       |   6 +-
 6 files changed, 718 insertions(+), 27 deletions(-)
 create mode 100644 src/views/operate/employee/index.vue

diff --git a/src/api/operate/materialSeal/index.ts b/src/api/operate/materialSeal/index.ts
index 6a8a8ff..fd04032 100644
--- a/src/api/operate/materialSeal/index.ts
+++ b/src/api/operate/materialSeal/index.ts
@@ -65,13 +65,13 @@ export const delMaterialSeal = (id: string | number | Array<string | number>) =>
 /**
  * 公章状态修改
  */
-export const changeSealStatus = (roleId: string | number, status: string) => {
+export const changeSealStatus = (id: string | number, sealStatus: string) => {
   const data = {
-    roleId,
-    status
+    id,
+    sealStatus
   };
   return request({
-    url: '/system/role/changeStatus',
+    url: '/operate/materialSeal/changeStatus',
     method: 'put',
     data: data
   });
diff --git a/src/api/operate/materialSeal/types.ts b/src/api/operate/materialSeal/types.ts
index b451077..ba71892 100644
--- a/src/api/operate/materialSeal/types.ts
+++ b/src/api/operate/materialSeal/types.ts
@@ -7,7 +7,7 @@ export interface MaterialSealVO {
   /**
    * 印章类型
    */
-  sealType: number;
+  sealType: string;
 
   /**
    * 印章名称
@@ -59,7 +59,7 @@ export interface MaterialSealQuery extends PageQuery {
   /**
    * 印章类型
    */
-  sealType?: number;
+  sealType?: string;
 
   /**
    * 印章名称
diff --git a/src/api/system/user/types.ts b/src/api/system/user/types.ts
index cb7fc41..deac845 100644
--- a/src/api/system/user/types.ts
+++ b/src/api/system/user/types.ts
@@ -20,6 +20,7 @@ export interface UserQuery extends PageQuery {
   deptId?: string | number;
   roleId?: string | number;
   userIds?: string;
+  employeeName?: string;
 }
 
 /**
@@ -57,7 +58,7 @@ export interface UserForm {
   userId?: string;
   deptId?: number;
   userName: string;
-  nickName?: string;
+  employeeName?: string;
   password: string;
   phonenumber?: string;
   email?: string;
@@ -66,6 +67,8 @@ export interface UserForm {
   remark?: string;
   postIds: string[];
   roleIds: string[];
+  employeeName?: string;
+
 }
 
 export interface UserInfoVO {
diff --git a/src/views/operate/employee/index.vue b/src/views/operate/employee/index.vue
new file mode 100644
index 0000000..39ab533
--- /dev/null
+++ b/src/views/operate/employee/index.vue
@@ -0,0 +1,682 @@
+<template>
+  <div class="p-2">
+    <el-row :gutter="20">
+      <!-- 部门树 -->
+      <el-col :lg="4" :xs="24" style="">
+        <el-card shadow="hover">
+          <el-input v-model="deptName" placeholder="请输入部门名称" prefix-icon="Search" clearable />
+          <el-tree
+            ref="deptTreeRef"
+            class="mt-2"
+            node-key="id"
+            :data="deptOptions"
+            :props="{ label: 'label', children: 'children' } as any"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            highlight-current
+            default-expand-all
+            @node-click="handleNodeClick"
+          />
+        </el-card>
+      </el-col>
+      <el-col :lg="20" :xs="24">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+          <div v-show="showSearch" class="mb-[10px]">
+            <el-card shadow="hover">
+              <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+                <el-form-item label="员工账号" prop="userName">
+                  <el-input v-model="queryParams.userName" placeholder="请输入用户账号" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+                <el-form-item label="员工姓名" prop="employeeName">
+                  <el-input v-model="queryParams.employeeName" placeholder="请输入员工姓名" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+                <el-form-item label="手机号码" prop="phonenumber">
+                  <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+
+                <el-form-item label="状态" prop="status">
+                  <el-select v-model="queryParams.status" placeholder="用户状态" clearable>
+                    <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="创建时间" style="width: 308px">
+                  <el-date-picker
+                    v-model="dateRange"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                    type="daterange"
+                    range-separator="-"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+                  ></el-date-picker>
+                </el-form-item>
+                <el-form-item>
+                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                </el-form-item>
+              </el-form>
+            </el-card>
+          </div>
+        </transition>
+
+        <el-card shadow="hover">
+          <template #header>
+            <el-row :gutter="10">
+              <el-col :span="1.5">
+                <el-button v-has-permi="['system:user:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button v-has-permi="['system:user:edit']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">
+                  修改
+                </el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button v-has-permi="['system:user:remove']" type="danger" plain :disabled="multiple" icon="Delete" @click="handleDelete()">
+                  删除
+                </el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-dropdown class="mt-[1px]">
+                  <el-button plain type="info">
+                    更多
+                    <el-icon class="el-icon--right"><arrow-down /></el-icon
+                  ></el-button>
+                  <template #dropdown>
+                    <el-dropdown-menu>
+                      <el-dropdown-item icon="Download" @click="importTemplate">下载模板</el-dropdown-item>
+                      <!-- 注意 由于el-dropdown-item标签是延迟加载的 所以v-has-permi自定义标签不生效 需要使用v-if调用方法执行 -->
+                      <el-dropdown-item v-if="checkPermi(['system:user:import'])" icon="Top" @click="handleImport">导入数据</el-dropdown-item>
+                      <el-dropdown-item v-if="checkPermi(['system:user:export'])" icon="Download" @click="handleExport">导出数据</el-dropdown-item>
+                    </el-dropdown-menu>
+                  </template>
+                </el-dropdown>
+              </el-col>
+              <right-toolbar v-model:show-search="showSearch" :columns="columns" :search="true" @query-table="getList"></right-toolbar>
+            </el-row>
+          </template>
+
+          <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="50" align="center" />
+            <el-table-column v-if="columns[0].visible" key="userId" label="员工编号" align="center" prop="userId" />
+            <el-table-column v-if="columns[1].visible" key="userName" label="员工账号" align="center" prop="userName" :show-overflow-tooltip="true" />
+            <el-table-column v-if="columns[2].visible" key="employeeName" label="员工姓名" align="center" prop="employeeName" :show-overflow-tooltip="true" />
+            <el-table-column v-if="columns[3].visible" key="sex" label="性别" align="center" prop="sex" :show-overflow-tooltip="true" >
+              <template #default="scope">
+                   <dict-tag :options="sys_user_sex" :value="scope.row.sex" />
+                </template>   
+            </el-table-column> 
+            <el-table-column v-if="columns[4].visible" key="deptName" label="部门" align="center" prop="deptName" :show-overflow-tooltip="true" width="180"/>
+            <el-table-column v-if="columns[5].visible" key="phonenumber" label="手机号码" align="center" prop="phonenumber" width="120" />
+            <el-table-column v-if="columns[6].visible" key="employeeHireDate" label="入职时间" align="center" prop="employeeHireDate" width="120" />
+            <el-table-column v-if="columns[7].visible" key="employeeStatus" label="用工状态" align="center" prop="sealType" width="100">
+                <template #default="scope">
+                   <dict-tag :options="opr_employee_status" :value="scope.row.employeeStatus" />
+                </template>
+            </el-table-column> 
+            <el-table-column v-if="columns[8].visible" key="status" label="状态" align="center">
+              <template #default="scope">
+                <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="columns[6].visible" key="employeeLeaveDate" label="离职时间" align="center" prop="employeeLeaveDate" width="120" />
+            <el-table-column v-if="columns[9].visible" label="创建时间" align="center" prop="createTime" width="160">
+              <template #default="scope">
+                <span>{{ scope.row.createTime }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width">
+              <template #default="scope">
+                <el-tooltip v-if="scope.row.userId !== 1" content="修改" placement="top">
+                  <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+                </el-tooltip>
+                <el-tooltip v-if="scope.row.userId !== 1" content="删除" placement="top">
+                  <el-button v-hasPermi="['system:user:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+                </el-tooltip>
+
+                <el-tooltip v-if="scope.row.userId !== 1" content="重置密码" placement="top">
+                  <el-button v-hasPermi="['system:user:resetPwd']" link type="primary" icon="Key" @click="handleResetPwd(scope.row)"></el-button>
+                </el-tooltip>
+
+                <el-tooltip v-if="scope.row.userId !== 1" content="分配角色" placement="top">
+                  <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)"></el-button>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <pagination
+            v-show="total > 0"
+            v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize"
+            :total="total"
+            @pagination="getList"
+          />
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <!-- 添加或修改用户配置对话框 -->
+    <el-dialog ref="formDialogRef" v-model="dialog.visible" :title="dialog.title" width="600px" append-to-body @close="closeDialog">
+      <el-form ref="userFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="员工姓名" prop="employeeName">
+              <el-input v-model="form.employeeName" placeholder="请输入员工姓名" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="归属部门" prop="deptId">
+              <el-tree-select
+                v-model="form.deptId"
+                :data="enabledDeptOptions"
+                :props="{ value: 'id', label: 'label', children: 'children' } as any"
+                value-key="id"
+                placeholder="请选择归属部门"
+                check-strictly
+                @change="handleDeptChange"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="手机号码" prop="phonenumber">
+              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="邮箱" prop="email">
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item v-if="form.userId == undefined" label="员工账号" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入员工账号" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="form.userId == undefined" label="员工密码" prop="password">
+              <el-input v-model="form.password" placeholder="请输入员工密码" type="password" maxlength="20" show-password />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="用户性别">
+              <el-select v-model="form.sex" placeholder="请选择">
+                <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.status">
+                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="岗位">
+              <el-select v-model="form.postIds" multiple placeholder="请选择">
+                <el-option
+                  v-for="item in postOptions"
+                  :key="item.postId"
+                  :label="item.postName"
+                  :value="item.postId"
+                  :disabled="item.status == '1'"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="角色" prop="roleIds">
+              <el-select v-model="form.roleIds" filterable multiple placeholder="请选择">
+                <el-option
+                  v-for="item in roleOptions"
+                  :key="item.roleId"
+                  :label="item.roleName"
+                  :value="item.roleId"
+                  :disabled="item.status == '1'"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel()">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 用户导入对话框 -->
+    <el-dialog v-model="upload.open" :title="upload.title" width="400px" append-to-body>
+      <el-upload
+        ref="uploadRef"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <el-icon class="el-icon--upload">
+          <i-ep-upload-filled />
+        </el-icon>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="text-center el-upload__tip">
+            <div class="el-upload__tip"><el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据</div>
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="User" lang="ts">
+import api from '@/api/system/user';
+import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
+import { DeptTreeVO, DeptVO } from '@/api/system/dept/types';
+import { RoleVO } from '@/api/system/role/types';
+import { PostQuery, PostVO } from '@/api/system/post/types';
+import { treeselect } from '@/api/system/dept';
+import { globalHeaders } from '@/utils/request';
+import { to } from 'await-to-js';
+import { optionselect } from '@/api/system/post';
+import { hasPermi } from '@/directive/permission';
+import { checkPermi } from '@/utils/permission';
+
+const router = useRouter();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { sys_normal_disable, sys_user_sex, opr_employee_status } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_sex','opr_employee_status'));
+const userList = ref<UserVO[]>();
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<number | string>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+const deptName = ref('');
+const deptOptions = ref<DeptTreeVO[]>([]);
+const enabledDeptOptions = ref<DeptTreeVO[]>([]);
+const initPassword = ref<string>('');
+const postOptions = ref<PostVO[]>([]);
+const roleOptions = ref<RoleVO[]>([]);
+/*** 用户导入参数 */
+const upload = reactive<ImportOption>({
+  // 是否显示弹出层（用户导入）
+  open: false,
+  // 弹出层标题（用户导入）
+  title: '',
+  // 是否禁用上传
+  isUploading: false,
+  // 是否更新已经存在的用户数据
+  updateSupport: 0,
+  // 设置上传的请求头部
+  headers: globalHeaders(),
+  // 上传的地址
+  url: import.meta.env.VITE_APP_BASE_API + '/system/user/importData'
+});
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `用户编号`, visible: false, children: [] },
+  { key: 1, label: `员工账号`, visible: true, children: [] },
+  { key: 2, label: `员工姓名`, visible: true, children: [] },
+  { key: 3, label: `性别`, visible: true, children: [] },
+  { key: 4, label: `部门`, visible: true, children: [] },
+  { key: 5, label: `手机号码`, visible: true, children: [] },
+  { key: 6, label: `入职时间`, visible: true, children: [] },
+  { key: 7, label: `用工状态`, visible: true, children: [] },
+  { key: 8, label: `状态`, visible: true, children: [] },
+  { key: 9, label: `创建时间`, visible: true, children: [] }
+]);
+
+const deptTreeRef = ref<ElTreeInstance>();
+const queryFormRef = ref<ElFormInstance>();
+const userFormRef = ref<ElFormInstance>();
+const uploadRef = ref<ElUploadInstance>();
+const formDialogRef = ref<ElDialogInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: UserForm = {
+  userId: undefined,
+  deptId: undefined,
+  userName: '',
+  employeeName: undefined,
+  password: '',
+  phonenumber: undefined,
+  email: undefined,
+  sex: undefined,
+  status: '0',
+  remark: '',
+  postIds: [],
+  roleIds: []
+};
+
+const initData: PageData<UserForm, UserQuery> = {
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    userName: '',
+    phonenumber: '',
+    status: '',
+    deptId: '',
+    roleId: ''
+  },
+  rules: {
+    userName: [
+      { required: true, message: '用户账号不能为空', trigger: 'blur' },
+      {
+        min: 2,
+        max: 20,
+        message: '用户账号长度必须介于 2 和 20 之间',
+        trigger: 'blur'
+      }
+    ],
+    employeeName: [{ required: true, message: '员工姓名不能为空', trigger: 'blur' }],
+    password: [
+      { required: true, message: '用户密码不能为空', trigger: 'blur' },
+      {
+        min: 5,
+        max: 20,
+        message: '用户密码长度必须介于 5 和 20 之间',
+        trigger: 'blur'
+      },
+      { pattern: /^[^<>"'|\\]+$/, message: '不能包含非法字符：< > " \' \\ |', trigger: 'blur' }
+    ],
+    email: [
+      {
+        type: 'email',
+        message: '请输入正确的邮箱地址',
+        trigger: ['blur', 'change']
+      }
+    ],
+    phonenumber: [
+      {
+        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        message: '请输入正确的手机号码',
+        trigger: 'blur'
+      }
+    ],
+    roleIds: [{ required: true, message: '用户角色不能为空', trigger: 'blur' }]
+  }
+};
+const data = reactive<PageData<UserForm, UserQuery>>(initData);
+
+const { queryParams, form, rules } = toRefs<PageData<UserForm, UserQuery>>(data);
+
+/** 通过条件过滤节点  */
+const filterNode = (value: string, data: any) => {
+  if (!value) return true;
+  return data.label.indexOf(value) !== -1;
+};
+/** 根据名称筛选部门树 */
+watchEffect(
+  () => {
+    deptTreeRef.value?.filter(deptName.value);
+  },
+  {
+    flush: 'post' // watchEffect会在DOM挂载或者更新之前就会触发，此属性控制在DOM元素更新后运行
+  }
+);
+
+/** 查询用户列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await api.listUser(proxy?.addDateRange(queryParams.value, dateRange.value));
+  loading.value = false;
+  userList.value = res.rows;
+  total.value = res.total;
+};
+
+/** 查询部门下拉树结构 */
+const getDeptTree = async () => {
+  const res = await api.deptTreeSelect();
+  deptOptions.value = res.data;
+  enabledDeptOptions.value = filterDisabledDept(res.data);
+};
+
+/** 过滤禁用的部门 */
+const filterDisabledDept = (deptList: DeptTreeVO[]) => {
+  return deptList.filter((dept) => {
+    if (dept.disabled) {
+      return false;
+    }
+    if (dept.children && dept.children.length) {
+      dept.children = filterDisabledDept(dept.children);
+    }
+    return true;
+  });
+};
+
+/** 节点单击事件 */
+const handleNodeClick = (data: DeptVO) => {
+  queryParams.value.deptId = data.id;
+  handleQuery();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+/** 重置按钮操作 */
+const resetQuery = () => {
+  dateRange.value = ['', ''];
+  queryFormRef.value?.resetFields();
+  queryParams.value.pageNum = 1;
+  queryParams.value.deptId = undefined;
+  deptTreeRef.value?.setCurrentKey(undefined);
+  handleQuery();
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: UserVO) => {
+  const userIds = row?.userId || ids.value;
+  const [err] = await to(proxy?.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？') as any);
+  if (!err) {
+    await api.delUser(userIds);
+    await getList();
+    proxy?.$modal.msgSuccess('删除成功');
+  }
+};
+
+/** 用户状态修改  */
+const handleStatusChange = async (row: UserVO) => {
+  let text = row.status === '0' ? '启用' : '停用';
+  try {
+    await proxy?.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?');
+    await api.changeUserStatus(row.userId, row.status);
+    proxy?.$modal.msgSuccess(text + '成功');
+  } catch (err) {
+    row.status = row.status === '0' ? '1' : '0';
+  }
+};
+/** 跳转角色分配 */
+const handleAuthRole = (row: UserVO) => {
+  const userId = row.userId;
+  router.push('/system/user-auth/role/' + userId);
+};
+
+/** 重置密码按钮操作 */
+const handleResetPwd = async (row: UserVO) => {
+  const [err, res] = await to(
+    ElMessageBox.prompt('请输入"' + row.userName + '"的新密码', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      closeOnClickModal: false,
+      inputPattern: /^.{5,20}$/,
+      inputErrorMessage: '用户密码长度必须介于 5 和 20 之间',
+      inputValidator: (value) => {
+        if (/<|>|"|'|\||\\/.test(value)) {
+          return '不能包含非法字符：< > " \' \\ |';
+        }
+      }
+    })
+  );
+  if (!err && res) {
+    await api.resetUserPwd(row.userId, res.value);
+    proxy?.$modal.msgSuccess('修改成功，新密码是：' + res.value);
+  }
+};
+
+/** 选择条数  */
+const handleSelectionChange = (selection: UserVO[]) => {
+  ids.value = selection.map((item) => item.userId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 导入按钮操作 */
+const handleImport = () => {
+  upload.title = '用户导入';
+  upload.open = true;
+};
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'system/user/export',
+    {
+      ...queryParams.value
+    },
+    `user_${new Date().getTime()}.xlsx`
+  );
+};
+/** 下载模板操作 */
+const importTemplate = () => {
+  proxy?.download('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`);
+};
+
+/**文件上传中处理 */
+const handleFileUploadProgress = () => {
+  upload.isUploading = true;
+};
+/** 文件上传成功处理 */
+const handleFileSuccess = (response: any, file: UploadFile) => {
+  upload.open = false;
+  upload.isUploading = false;
+  uploadRef.value?.handleRemove(file);
+  ElMessageBox.alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + '</div>', '导入结果', {
+    dangerouslyUseHTMLString: true
+  });
+  getList();
+};
+
+/** 提交上传文件 */
+function submitFileForm() {
+  uploadRef.value?.submit();
+}
+
+/** 重置操作表单 */
+const reset = () => {
+  form.value = { ...initFormData };
+  userFormRef.value?.resetFields();
+};
+/** 取消按钮 */
+const cancel = () => {
+  dialog.visible = false;
+  reset();
+};
+
+/** 新增按钮操作 */
+const handleAdd = async () => {
+  reset();
+  const { data } = await api.getUser();
+  dialog.visible = true;
+  dialog.title = '新增用户';
+  postOptions.value = data.posts;
+  roleOptions.value = data.roles;
+  form.value.password = initPassword.value.toString();
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: UserForm) => {
+  reset();
+  const userId = row?.userId || ids.value[0];
+  const { data } = await api.getUser(userId);
+  dialog.visible = true;
+  dialog.title = '修改用户';
+  Object.assign(form.value, data.user);
+  postOptions.value = data.posts;
+  roleOptions.value = data.roles;
+  form.value.postIds = data.postIds;
+  form.value.roleIds = data.roleIds;
+  form.value.password = '';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  userFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      form.value.userId ? await api.updateUser(form.value) : await api.addUser(form.value);
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/**
+ * 关闭用户弹窗
+ */
+const closeDialog = () => {
+  dialog.visible = false;
+  resetForm();
+};
+
+/**
+ * 重置表单
+ */
+const resetForm = () => {
+  userFormRef.value?.resetFields();
+  userFormRef.value?.clearValidate();
+
+  form.value.id = undefined;
+  form.value.status = '1';
+};
+onMounted(() => {
+  getDeptTree(); // 初始化部门数据
+  getList(); // 初始化列表数据
+  proxy?.getConfigKey('sys.user.initPassword').then((response) => {
+    initPassword.value = response.data;
+  });
+});
+
+async function handleDeptChange(value: number | string) {
+  const response = await optionselect(value);
+  postOptions.value = response.data;
+  form.value.postIds = [];
+}
+</script>
diff --git a/src/views/operate/materialSeal/index.vue b/src/views/operate/materialSeal/index.vue
index 385f824..6f8fbaf 100644
--- a/src/views/operate/materialSeal/index.vue
+++ b/src/views/operate/materialSeal/index.vue
@@ -4,14 +4,16 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="印章名称" prop="sealName">
-              <el-input v-model="queryParams.sealName" placeholder="请输入印章名称" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="公章名称" prop="sealName">
+              <el-input v-model="queryParams.sealName" placeholder="请输入公章名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="印章管理员" prop="sealAdminId">
-              <el-input v-model="queryParams.sealAdminId" placeholder="请输入印章管理员" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="公章管理员" prop="sealAdminId">
+              <el-input v-model="queryParams.sealAdminId" placeholder="请输入公章管理员" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="印章类型" prop="sealAdminId">
-              <el-input v-model="queryParams.sealAdminId" placeholder="请输入印章类型" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="公章状态" prop="status">
+              <el-select v-model="queryParams.sealStatus" placeholder="公章状态" clearable>
+                <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -43,12 +45,16 @@
 
       <el-table v-loading="loading" :data="materialSealList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="印章名称" align="center" prop="sealName" />
-        <el-table-column label="印章类型" align="center" prop="sealType" />
-        <el-table-column label="印章管理员" align="center" prop="sealAdminId" />
+        <el-table-column label="公章名称" align="center" prop="sealName" />
+        <el-table-column label="公章类型" align="center" prop="sealType" width="100">
+          <template #default="scope">
+            <dict-tag :options="opr_seal_type" :value="scope.row.sealType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="公章管理员" align="center" prop="sealAdminId" />
         <el-table-column label="状态" align="center" width="100">
           <template #default="scope">
-            <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+              <el-switch v-model="scope.row.sealStatus" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -68,19 +74,19 @@
     <!-- 添加或修改公章管理对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="materialSealFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="印章名称" prop="sealName">
-          <el-input v-model="form.sealName" placeholder="请输入印章名称" />
+        <el-form-item label="公章名称" prop="sealName">
+          <el-input v-model="form.sealName" placeholder="请输入公章名称" />
         </el-form-item>
-        <el-form-item label="印章管理员" prop="sealAdminId">
-          <el-input v-model="form.sealAdminId" placeholder="请输入印章管理员" />
+        <el-form-item label="公章管理员" prop="sealAdminId">
+          <el-input v-model="form.sealAdminId" placeholder="请输入公章管理员" />
         </el-form-item>
-        <el-form-item label="印章类型" prop="sealType">
-              <el-select v-model="queryParams.sealType" placeholder="印章类型" clearable>
+        <el-form-item label="公章类型" prop="sealType">
+              <el-select v-model="form.sealType" placeholder="公章类型" clearable>
                 <el-option v-for="dict in opr_seal_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
         </el-form-item>
         <el-form-item label="启用状态" prop="sealStatus">
-              <el-select v-model="queryParams.sealStatus" placeholder="启用状态" clearable>
+              <el-select v-model="form.sealStatus" placeholder="启用状态" clearable>
                 <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
         </el-form-item>
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index 8cb2d0b..63ed286 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -5,8 +5,8 @@
       <el-form :model="form" :inline="true">
         <el-row :gutter="10">
           <el-col :span="2.5">
-            <el-form-item label="用户姓名" prop="nickName">
-              <el-input v-model="form.nickName" disabled />
+            <el-form-item label="员工姓名" prop="employeeName">
+              <el-input v-model="form.employeeName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="2.5">
@@ -71,7 +71,7 @@ const pageSize = ref(10);
 const roleIds = ref<Array<string | number>>([]);
 const roles = ref<RoleVO[]>([]);
 const form = ref<Partial<UserForm>>({
-  nickName: undefined,
+  employeeName: undefined,
   userName: '',
   userId: undefined
 });