修改

src/api/personnel/attendance/employee/index.js

@@ -1,138 +1,18 @@
 import request from '@/utils/request'
-import { praseStrEmpty } from "@/utils/ruoyi";
 
 // 查询用户列表
 export function listUser(query) {
   return request({
-    url: '/system/user/page',
-    // url: '/personnel/employee/page',
+    url: '/personnel/attendance/employee-setting/info-page',
     method: 'get',
     params: query
   })
 }
-
-// 获取用户精简信息列表
-export function listSimpleUsers() {
-  return request({
-    url: '/system/user/list-all-simple',
-    method: 'get'
-  })
-}
-
-// 查询用户详细
-export function getUser(userId) {
-  return request({
-    url: '/system/user/get?id=' + praseStrEmpty(userId),
-    method: 'get'
-  })
-}
-
-// 新增用户
-export function addUser(data) {
-  return request({
-    url: '/system/user/create',
-    method: 'post',
-    data: data
-  })
-}
-
 // 修改用户
 export function updateUser(data) {
   return request({
-    url: '/system/user/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除用户
-export function delUser(userId) {
-  return request({
-    url: '/system/user/delete?id=' + userId,
-    method: 'delete'
-  })
-}
-
-// 导出用户
-export function exportUser(query) {
-  return request({
-    url: '/system/user/export',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
-// 用户密码重置
-export function resetUserPwd(id, password) {
-  const data = {
-    id,
-    password
-  }
-  return request({
-    url: '/system/user/update-password',
+    url: '/personnel/attendance/employee-setting/batch-update',
     method: 'put',
     data: data
   })
-}
-
-// 用户状态修改
-export function changeUserStatus(id, status) {
-  const data = {
-    id,
-    status
-  }
-  return request({
-    url: '/system/user/update-status',
-    method: 'put',
-    data: data
-  })
-}
-
-// 查询用户个人信息
-export function getUserProfile() {
-  return request({
-    url: '/system/user/profile/get',
-    method: 'get'
-  })
-}
-
-// 修改用户个人信息
-export function updateUserProfile(data) {
-  return request({
-    url: '/system/user/profile/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 用户密码重置
-export function updateUserPwd(oldPassword, newPassword) {
-  const data = {
-    oldPassword,
-    newPassword
-  }
-  return request({
-    url: '/system/user/profile/update-password',
-    method: 'put',
-    data: data
-  })
-}
-
-// 用户头像上传
-export function uploadAvatar(data) {
-  return request({
-    url: '/system/user/profile/update-avatar',
-    method: 'put',
-    data: data
-  })
-}
-
-// 下载用户导入模板
-export function importTemplate() {
-  return request({
-    url: '/system/user/get-import-template',
-    method: 'get',
-    responseType: 'blob'
-  })
-}
+}

src/views/personnel/attendance/employee/index.vue

@@ -18,18 +18,18 @@
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
           label-width="68px">
-          <el-form-item label="员工姓名" prop="username">
-            <el-input v-model="queryParams.username" placeholder="请输入员工姓名" clearable style="width: 240px"
+          <el-form-item label="员工姓名" prop="name">
+            <el-input v-model="queryParams.name" placeholder="请输入员工姓名" clearable style="width: 240px"
               @keyup.enter.native="handleQuery" />
           </el-form-item>
-          <el-form-item label="班次" prop="status">
-            <el-select v-model="queryParams.status" placeholder="班次" clearable style="width: 240px">
+          <el-form-item label="班次" prop="schedulingId">
+            <el-select v-model="queryParams.schedulingId" placeholder="班次" clearable style="width: 240px">
               <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="parseInt(dict.value)" :label="dict.label"
                 :value="parseInt(dict.value)" />
             </el-select>
           </el-form-item>
-          <el-form-item label="手机号" prop="mobile">
-            <el-input v-model="queryParams.mobile" placeholder="请输入手机号码" clearable style="width: 240px"
+          <el-form-item label="手机号" prop="phoneNumber">
+            <el-input v-model="queryParams.phoneNumber" placeholder="请输入手机号码" clearable style="width: 240px"
               @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item>
@@ -48,18 +48,13 @@
 
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="用户编号" align="center" key="id" prop="id"/>
-          <el-table-column label="员工姓名" align="center" prop="username"/>
-          <el-table-column label="班次信息" align="center" prop="status">
-            <template v-slot="scope">
-              <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.auditStatus"/>
-            </template>
-          </el-table-column>
+          <el-table-column label="员工Id" align="center" rop="employeeId"/>
+          <el-table-column label="员工姓名" align="center" prop="name"/>
+          <el-table-column label="班次信息" align="center" prop="shiftName"/>
           <el-table-column label="部门" align="center" key="deptName" prop="deptName"/>
-          <el-table-column label="手机号" align="center" prop="mobile"/>
-          <el-table-column label="邮箱" align="center" prop="nickname"/>
+          <el-table-column label="手机号" align="center" prop="phoneNumber"/>
+          <el-table-column label="邮箱" align="center" prop="email"/>
         </el-table>
-
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
           @pagination="getList" />
       </el-col>
@@ -68,8 +63,8 @@
     <!-- 设置排班对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="排班选择" prop="status">
-            <el-select v-model="form.status" placeholder="请选择排班" clearable style="width: 100%;">
+        <el-form-item label="排班选择" prop="schedulingId">
+            <el-select v-model="form.schedulingId" placeholder="请选择排班" clearable style="width: 100%;">
               <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="parseInt(dict.value)" :label="dict.label"
                 :value="parseInt(dict.value)" />
             </el-select>
@@ -85,7 +80,6 @@
 
 <script>
 import {
-  addUser,
   listUser,
   updateUser
 } from "@/api/personnel/attendance/employee/index";
@@ -127,14 +121,14 @@ export default {
       queryParams: {
         pageNo: 1,
         pageSize: 10,
-        username: undefined,
-        mobile: undefined,
-        status: undefined,
+        name: undefined,
+        phoneNumber: undefined,
+        schedulingId: undefined,
         deptId: undefined,
       },
       // 表单校验
       rules: {
-        status: [
+        schedulingId: [
           { required: true, message: "请选择排班", trigger: "blur" }
         ],
       },
@@ -190,7 +184,7 @@ export default {
     reset() {
       this.form = {
         ids: "",
-        status: "",
+        schedulingId: "",
       };
       this.resetForm("form");
     },
@@ -206,7 +200,8 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.form.ids = selection.map(item => item.postId)
+      console.log(selection);
+      this.form.ids = selection.map(item => item.employeeId)
       this.single = selection.length != 1
       this.multiple = !selection.length
     },