From f6d51038692c42e15d2f0302b7f0b1f396fa3771 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Thu, 30 Oct 2025 17:33:00 +0800
Subject: [PATCH 1/4] =?UTF-8?q?1.0.23=20=E7=B3=BB=E7=BB=9F=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=8C=89=E9=92=AE=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue | 40 ++++++++++++++++----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index dbea43e..da302c2 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -6,20 +6,20 @@
 
     <div class="right-menu flex align-center">
       <template v-if="appStore.device !== 'mobile'">
-        <el-select
-          v-if="userId === 1 && tenantEnabled"
-          v-model="companyName"
-          class="min-w-244px"
-          clearable
-          filterable
-          reserve-keyword
-          :placeholder="proxy.$t('navbar.selectTenant')"
-          @change="dynamicTenantEvent"
-          @clear="dynamicClearEvent"
-        >
-          <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
-          <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
-        </el-select>
+<!--        <el-select-->
+<!--          v-if="userId === 1 && tenantEnabled"-->
+<!--          v-model="companyName"-->
+<!--          class="min-w-244px"-->
+<!--          clearable-->
+<!--          filterable-->
+<!--          reserve-keyword-->
+<!--          :placeholder="proxy.$t('navbar.selectTenant')"-->
+<!--          @change="dynamicTenantEvent"-->
+<!--          @clear="dynamicClearEvent"-->
+<!--        >-->
+<!--          <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>-->
+<!--          <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>-->
+<!--        </el-select>-->
 
         <search-menu ref="searchMenuRef" />
         <el-tooltip content="搜索" effect="dark" placement="bottom">
@@ -42,9 +42,9 @@
             </el-popover>
           </div>
         </el-tooltip>
-        <el-tooltip content="Github" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
+<!--        <el-tooltip content="Github" effect="dark" placement="bottom">-->
+<!--          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />-->
+<!--        </el-tooltip>-->
 
         <el-tooltip :content="proxy.$t('navbar.document')" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
@@ -54,9 +54,9 @@
           <screenfull id="screenfull" class="right-menu-item hover-effect" />
         </el-tooltip>
 
-        <el-tooltip :content="proxy.$t('navbar.language')" effect="dark" placement="bottom">
-          <lang-select id="lang-select" class="right-menu-item hover-effect" />
-        </el-tooltip>
+<!--        <el-tooltip :content="proxy.$t('navbar.language')" effect="dark" placement="bottom">-->
+<!--          <lang-select id="lang-select" class="right-menu-item hover-effect" />-->
+<!--        </el-tooltip>-->
 
         <el-tooltip :content="proxy.$t('navbar.layoutSize')" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />

From 8d5ae3fe418d5d287253da040da5adb20b0748b6 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Thu, 30 Oct 2025 17:49:05 +0800
Subject: [PATCH 2/4] =?UTF-8?q?1.0.24=20=E5=90=88=E5=90=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/OAEnum.ts                    | 11 +++++++++++
 src/views/oa/erp/contractInfo/edit.vue | 27 +++++++++++++++++---------
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/enums/OAEnum.ts b/src/enums/OAEnum.ts
index 9973dc6..94e82c7 100644
--- a/src/enums/OAEnum.ts
+++ b/src/enums/OAEnum.ts
@@ -44,3 +44,14 @@ export enum ProjectCategoryEnum {
 }
 
 
+/**
+ * 流程定义编码枚举
+ */
+export enum FlowCodeEnum {
+  /**
+   * 合同编号规则
+   */
+  CONTRACT_CODE = 'OAC',
+
+
+}
diff --git a/src/views/oa/erp/contractInfo/edit.vue b/src/views/oa/erp/contractInfo/edit.vue
index c87db1a..7bbc982 100644
--- a/src/views/oa/erp/contractInfo/edit.vue
+++ b/src/views/oa/erp/contractInfo/edit.vue
@@ -15,7 +15,7 @@
         :pageType="routeParams.type"
         :mode="false"
       />
-      <el-form ref="contractInfoFormRef" :model="form" :disabled="routeParams.type === 'view'" :rules="rules" label-width="120px">
+      <el-form ref="contractInfoFormRef" :model="form" :loading="buttonLoading" :disabled="routeParams.type === 'view' || routeParams.type === 'approval'" :rules="rules" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="有无合同" prop="contractFlag">
@@ -61,7 +61,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="部门" prop="contractDeptId">
-              <el-select v-model="form.contractDeptId" placeholder="请选择部门">
+              <el-select v-model="form.contractDeptId" disabled>
                 <el-option v-for="item in deptInfoList" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
               </el-select>
             </el-form-item>
@@ -167,10 +167,10 @@
 
       <!-- 合同物料表格 -->
       <div style="margin-bottom: 16px">
-        <el-button type="primary" icon="Plus" v-if="routeParams.type !== 'view'" @click="handleAddMaterial">新增物料 </el-button>
+        <el-button type="primary" icon="Plus" v-if="routeParams.type !== 'view' && routeParams.type != 'approval'" @click="handleAddMaterial">新增物料 </el-button>
       </div>
 
-      <el-table :data="contractMaterialList" border v-loading="materialLoading">
+      <el-table :data="contractMaterialList" v-loading="buttonLoading" border>
         <el-table-column label="产品名称" align="center" prop="productName" min-width="120" />
         <el-table-column label="规格描述" align="center" prop="specificationDescription" min-width="120" />
         <el-table-column label="物料编号" align="center" prop="materialCode" width="120" />
@@ -203,7 +203,7 @@
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" min-width="100" />
-        <el-table-column label="操作" align="center" fixed="right" width="150" v-if="routeParams.type !== 'view'">
+        <el-table-column label="操作" align="center" fixed="right" width="150" v-if="routeParams.type !== 'view' && routeParams.type != 'approval'">
           <template #default="scope">
             <el-button link type="primary" icon="Edit" @click="handleEditMaterial(scope.row)">编辑</el-button>
             <el-button link type="danger" icon="Delete" @click="handleDeleteMaterial(scope.row)">删除</el-button>
@@ -366,7 +366,6 @@
 <script setup name="ContractInfoEdit" lang="ts">
 import { addContractInfo, contractSubmitAndFlowStart, getContractInfo, updateContractInfo } from '@/api/oa/erp/contractInfo';
 import { ContractInfoForm } from '@/api/oa/erp/contractInfo/types';
-import { getErpContractMaterialList } from '@/api/oa/erp/contractMaterial';
 import { ContractMaterialVO, ContractMaterialForm } from '@/api/oa/erp/contractMaterial/types';
 import { getBaseUnitInfoList } from '@/api/oa/base/unitInfo';
 import { getRuleGenerateCode } from '@/api/system/codeRule';
@@ -380,7 +379,8 @@ import { ref } from 'vue';
 import { allListDept, listDept } from '@/api/system/dept';
 import { getCrmCustomerInfoList } from '@/api/oa/crm/customerInfo';
 import { getBasePrintTemplateList } from '@/api/oa/base/printTemplate';
-import { CodeRuleEnum } from '@/enums/OAEnum';
+import { CodeRuleEnum, FlowCodeEnum } from '@/enums/OAEnum';
+import { getInfo } from '@/api/login';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
@@ -424,7 +424,6 @@ const ossFileModel = ref<string | string[] | undefined>(undefined);
 const isCodeGenerated = ref(false);
 
 // 合同物料相关
-const materialLoading = ref(false);
 const materialFormRef = ref<ElFormInstance>();
 
 // 合同物料列表计算属性
@@ -609,7 +608,7 @@ const submitForm = (status: string, mode: boolean) => {
         // 设置后端发起和不等于草稿状态 直接走流程发起
         if (status != 'draft') {
           // 后端发起流程模式
-          form.value.flowCode = 'OAC';
+          form.value.flowCode = FlowCodeEnum.CONTRACT_CODE;
           // 流程变量
           form.value.variables = {
             contractName: form.value.contractName,
@@ -845,6 +844,16 @@ onMounted(async () => {
         isCodeGenerated.value = false;
       }
     } else {
+      // 新增模式：获取登录用户部门ID并自动赋值
+      try {
+        const userInfoRes = await getInfo();
+        if (userInfoRes.data?.user?.deptId && !form.value.contractDeptId) {
+          form.value.contractDeptId = userInfoRes.data.user.deptId;
+        }
+      } catch (error) {
+        console.error('获取用户信息失败:', error);
+      }
+
       // 新增模式：如果已有合同编号，禁用生成按钮
       if (form.value.contractCode) {
         isCodeGenerated.value = true;

From b9acf626f10c7f0817bd61ac1ccfdfce6ae2186b Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 3 Nov 2025 16:08:19 +0800
Subject: [PATCH 3/4] =?UTF-8?q?1.0.25=20=E7=94=A8=E6=88=B7=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E5=90=8D=E7=A7=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UserSelect/index.vue        |  8 +++---
 src/views/system/role/authUser.vue         |  8 +++---
 src/views/system/role/selectUser.vue       |  8 +++---
 src/views/system/user/authRole.vue         |  2 +-
 src/views/system/user/index.vue            | 30 +++++++++++-----------
 src/views/system/user/profile/userInfo.vue |  4 +--
 6 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/components/UserSelect/index.vue b/src/components/UserSelect/index.vue
index c940b69..d5602fa 100644
--- a/src/components/UserSelect/index.vue
+++ b/src/components/UserSelect/index.vue
@@ -25,8 +25,8 @@
             <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 label="用户账号" prop="userName">
+                    <el-input v-model="queryParams.userName" 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" />
@@ -61,8 +61,8 @@
             >
               <vxe-column type="checkbox" width="50" align="center" />
               <vxe-column key="userId" title="用户编号" align="center" field="userId" />
-              <vxe-column key="userName" title="用户名称" align="center" field="userName" />
-              <vxe-column key="nickName" title="用户昵称" align="center" field="nickName" />
+              <vxe-column key="userName" title="用户账号" align="center" field="userName" />
+              <vxe-column key="nickName" title="用户姓名" align="center" field="nickName" />
               <vxe-column key="deptName" title="部门" align="center" field="deptName" />
               <vxe-column key="phonenumber" title="手机号码" align="center" field="phonenumber" width="120" />
               <vxe-column key="status" title="状态" align="center">
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 7c7fbeb..a7d7ab2 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -3,8 +3,8 @@
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="search">
         <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 label="用户账号" prop="userName">
+            <el-input v-model="queryParams.userName" 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" />
@@ -35,8 +35,8 @@
       </template>
       <el-table v-loading="loading" border :data="userList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
-        <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+        <el-table-column label="用户账号" prop="userName" :show-overflow-tooltip="true" />
+        <el-table-column label="用户姓名" prop="nickName" :show-overflow-tooltip="true" />
         <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
         <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
         <el-table-column label="状态" align="center" prop="status">
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index cf36fb0..689feb0 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -2,8 +2,8 @@
   <el-row>
     <el-dialog v-model="visible" title="选择用户" width="800px" top="5vh" append-to-body>
       <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 label="用户账号" prop="userName">
+          <el-input v-model="queryParams.userName" 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" />
@@ -16,8 +16,8 @@
       <el-row>
         <el-table ref="tableRef" border :data="userList" height="260px" @row-click="clickRow" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55"></el-table-column>
-          <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+          <el-table-column label="用户账号" prop="userName" :show-overflow-tooltip="true" />
+          <el-table-column label="用户姓名" prop="nickName" :show-overflow-tooltip="true" />
           <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
           <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
           <el-table-column label="状态" align="center" prop="status">
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index d322942..e809e70 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -5,7 +5,7 @@
       <el-form :model="form" :inline="true">
         <el-row :gutter="10">
           <el-col :span="2.5">
-            <el-form-item label="用户昵称" prop="nickName">
+            <el-form-item label="用户姓名" prop="nickName">
               <el-input v-model="form.nickName" disabled />
             </el-form-item>
           </el-col>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index da8c5bc..595cc1d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -24,11 +24,11 @@
           <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 label="用户账号" prop="userName">
+                  <el-input v-model="queryParams.userName" placeholder="请输入用户账号" clearable @keyup.enter="handleQuery" />
                 </el-form-item>
-                <el-form-item label="用户昵称" prop="nickName">
-                  <el-input v-model="queryParams.nickName" placeholder="请输入用户昵称" clearable @keyup.enter="handleQuery" />
+                <el-form-item label="用户姓名" prop="nickName">
+                  <el-input v-model="queryParams.nickName" 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" />
@@ -98,8 +98,8 @@
           <el-table v-loading="loading" border :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="nickName" label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true" />
+            <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="nickName" label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
             <el-table-column v-if="columns[3].visible" key="deptName" label="部门" align="center" prop="deptName" :show-overflow-tooltip="true" />
             <el-table-column v-if="columns[4].visible" key="phonenumber" label="手机号码" align="center" prop="phonenumber" width="120" />
             <el-table-column v-if="columns[5].visible" key="status" label="状态" align="center">
@@ -150,8 +150,8 @@
       <el-form ref="userFormRef" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="用户昵称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+            <el-form-item label="用户姓名" prop="nickName">
+              <el-input v-model="form.nickName" placeholder="请输入用户姓名" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="form.userId == null || form.userId != useUserStore().userId">
@@ -182,8 +182,8 @@
         </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 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">
@@ -335,8 +335,8 @@ const upload = reactive<ImportOption>({
 // 列显隐信息
 const columns = ref<FieldOption[]>([
   { key: 0, label: `用户编号`, visible: false, children: [] },
-  { key: 1, label: `用户名称`, visible: true, children: [] },
-  { key: 2, label: `用户昵称`, visible: true, 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: [] },
@@ -382,15 +382,15 @@ const initData: PageData<UserForm, UserQuery> = {
   },
   rules: {
     userName: [
-      { required: true, message: '用户名称不能为空', trigger: 'blur' },
+      { required: true, message: '用户账号不能为空', trigger: 'blur' },
       {
         min: 2,
         max: 20,
-        message: '用户名称长度必须介于 2 和 20 之间',
+        message: '用户账号长度必须介于 2 和 20 之间',
         trigger: 'blur'
       }
     ],
-    nickName: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
+    nickName: [{ required: true, message: '用户姓名不能为空', trigger: 'blur' }],
     password: [
       { required: true, message: '用户密码不能为空', trigger: 'blur' },
       {
diff --git a/src/views/system/user/profile/userInfo.vue b/src/views/system/user/profile/userInfo.vue
index 2a5d1a0..8066a4c 100644
--- a/src/views/system/user/profile/userInfo.vue
+++ b/src/views/system/user/profile/userInfo.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form ref="userRef" :model="userForm" :rules="rules" label-width="80px">
-    <el-form-item label="用户昵称" prop="nickName">
+    <el-form-item label="用户姓名" prop="nickName">
       <el-input v-model="userForm.nickName" maxlength="30" />
     </el-form-item>
     <el-form-item label="手机号码" prop="phonenumber">
@@ -33,7 +33,7 @@ const userForm = computed(() => props.user);
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const userRef = ref<ElFormInstance>();
 const rule: ElFormRules = {
-  nickName: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
+  nickName: [{ required: true, message: '用户姓名不能为空', trigger: 'blur' }],
   email: [
     { required: true, message: '邮箱地址不能为空', trigger: 'blur' },
     {

From 834ed22f5ba54b59f412c942dffa16ed8ffd4f29 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 3 Nov 2025 16:55:45 +0800
Subject: [PATCH 4/4] =?UTF-8?q?1.0.26=20=E7=94=A8=E6=88=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=9B=9E=E6=98=BE=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/index.vue |  2 +-
 src/views/system/user/index.vue | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 6339df9..baadca6 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -108,7 +108,7 @@
           <el-col :span="12">
             <el-form-item label="负责人" prop="leader">
               <el-select v-model="form.leader" placeholder="请选择负责人">
-                <el-option v-for="item in deptUserList" :key="item.userId" :label="item.userName" :value="item.userId" />
+                <el-option v-for="item in deptUserList" :key="item.userId" :label="item.nickName" :value="item.userId" />
               </el-select>
             </el-form-item>
           </el-col>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 595cc1d..a7ed722 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -102,13 +102,17 @@
             <el-table-column v-if="columns[2].visible" key="nickName" label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
             <el-table-column v-if="columns[3].visible" key="deptName" label="部门" align="center" prop="deptName" :show-overflow-tooltip="true" />
             <el-table-column v-if="columns[4].visible" key="phonenumber" label="手机号码" align="center" prop="phonenumber" width="120" />
-            <el-table-column v-if="columns[5].visible" key="status" label="状态" align="center">
+            <el-table-column v-if="columns[5].visible" key="roles" label="角色" align="center" prop="roles" :show-overflow-tooltip="true">
+              <template #default="scope">
+                <span>{{ scope.row.roles?.map((role: any) => role.roleName).join(', ') || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="columns[6].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" label="创建时间" align="center" prop="createTime" width="160">
+            <el-table-column v-if="columns[7].visible" label="创建时间" align="center" prop="createTime" width="160">
               <template #default="scope">
                 <span>{{ scope.row.createTime }}</span>
               </template>
@@ -339,8 +343,9 @@ const columns = ref<FieldOption[]>([
   { 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: 5, label: `角色`, visible: true, children: [] },
+  { key: 6, label: `状态`, visible: true, children: [] },
+  { key: 7, label: `创建时间`, visible: true, children: [] }
 ]);
 
 const deptTreeRef = ref<ElTreeInstance>();