职工管理修改

ruoyi-ui/src/views/kaohe/employee/index.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="登录用户Id" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入登录用户Id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="登录用户Id" prop="userId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.userId"-->
+<!--          placeholder="请输入登录用户Id"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="部门名称" prop="deptName">
         <el-input
           v-model="queryParams.deptName"
@@ -110,7 +110,7 @@
     <el-table v-loading="loading" :data="employeeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" fixed/>
       <el-table-column label="主键" align="center" prop="id" fixed/>
-      <el-table-column label="登录用户Id" align="center" prop="userId" :show-overflow-tooltip="true" min-width="120"/>
+<!--      <el-table-column label="登录用户Id" align="center" prop="userId" :show-overflow-tooltip="true" min-width="120"/>-->
       <el-table-column label="所属部门" align="center" prop="deptId" :show-overflow-tooltip="true" min-width="120"/>
       <el-table-column label="部门名称" align="center" prop="deptName" :show-overflow-tooltip="true" min-width="120"/>
       <el-table-column label="职工姓名" align="center" prop="empName" :show-overflow-tooltip="true" min-width="120"/>
@@ -449,7 +449,7 @@ export default {
     /** 下载模板操作 */
     importTemplate() {
       this.download('kaohe/employee/importTemplate', {
-      }, `user_template_${new Date().getTime()}.xlsx`)
+      }, `职工模板_${new Date().getTime()}.xlsx`)
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {

ruoyi-ui/src/views/system/dept/index.vue

@@ -56,6 +56,7 @@
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
+      <el-table-column prop="deptId" label="部门ID" width="150"></el-table-column>
       <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
       <el-table-column prop="status" label="状态" width="100">

ruoyi-ui/src/views/system/user/index.vue

@@ -534,7 +534,7 @@ export default {
     /** 下载模板操作 */
     importTemplate() {
       this.download('system/user/importTemplate', {
-      }, `user_template_${new Date().getTime()}.xlsx`)
+      }, `用户模板_${new Date().getTime()}.xlsx`)
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {