feat(员工管理): 新增员工转正、转岗和离职功能

- 添加员工转正API和页面
- 新增员工转岗功能及相关API和页面
- 实现员工离职功能及相关API和页面
- 在员工信息页面添加在职天数显示
- 调整接收报表页面分页大小
- 完善员工入职补录表单

klp-ui/src/api/wms/employeeChange.js

@@ -62,3 +62,14 @@ export function employeeLeave(data) {
     data: data
   })
 }
+
+/**
+ * 员工转正
+ */
+export function employeeRegular(data) {
+  return request({
+    url: '/wms/employeeChange/regular',
+    method: 'post',
+    data: data
+  })
+}

klp-ui/src/api/wms/employeeTransfer.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询员工转岗记录列表
+export function listEmployeeTransfer(query) {
+  return request({
+    url: '/wms/employeeTransfer/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询员工转岗记录详细
+export function getEmployeeTransfer(transferId) {
+  return request({
+    url: '/wms/employeeTransfer/' + transferId,
+    method: 'get'
+  })
+}
+
+// 新增员工转岗记录
+export function addEmployeeTransfer(data) {
+  return request({
+    url: '/wms/employeeTransfer',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改员工转岗记录
+export function updateEmployeeTransfer(data) {
+  return request({
+    url: '/wms/employeeTransfer',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除员工转岗记录
+export function delEmployeeTransfer(transferId) {
+  return request({
+    url: '/wms/employeeTransfer/' + transferId,
+    method: 'delete'
+  })
+}
+
+// 员工转岗
+export function transferEmployee(data) {
+  return request({
+    url: '/wms/employeeTransfer/transfer',
+    method: 'post',
+    data: data
+  })
+}

klp-ui/src/views/wms/hrm/employeeInfo/entry.vue

@@ -212,6 +212,9 @@
     <!-- 员工入职记录补录对话框 -->
     <el-dialog :title="supplementTitle" :visible.sync="supplementOpen" width="500px" append-to-body>
       <el-form ref="supplementForm" :model="supplementForm" :rules="supplementRules" label-width="80px">
+         <el-form-item label="入职员工" prop="infoId">
+          <EmployeeSelector v-model="supplementForm.infoId" keyField="infoId" placeholder="请选择入职员工" />
+        </el-form-item>
         <el-form-item label="入职时间" prop="changeTime">
           <el-date-picker clearable v-model="supplementForm.changeTime" type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择入职时间">
@@ -241,9 +244,13 @@
 <script>
 import { listEmployeeChange, getEmployeeChange, delEmployeeChange, updateEmployeeChange, addEmployeeChange, employeeEntry } from "@/api/wms/employeeChange";
 import { listDept } from "@/api/wms/dept";
+import EmployeeSelector from "@/components/EmployeeSelector";
 
 export default {
   name: "EmployeeEntry",
+  components: {
+    EmployeeSelector
+  },
   data() {
     return {
       // 按钮loading
@@ -458,6 +465,7 @@ export default {
           } else {
             addEmployeeChange({
               changeType: 0,
+              infoId: this.supplementForm.infoId,
               changeTime: this.supplementForm.changeTime,
               changeHandler: this.supplementForm.changeHandler,
               changeReason: this.supplementForm.changeReason,

klp-ui/src/views/wms/hrm/employeeInfo/formal.vue

@@ -0,0 +1,345 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="转正时间" prop="changeTime">
+        <el-date-picker clearable v-model="queryParams.changeTime" type="date" value-format="yyyy-MM-dd"
+          placeholder="请选择转正时间">
+        </el-date-picker>
+      </el-form-item>
+      <!-- <el-form-item label="异动原因" prop="changeReason">
+        <el-input
+          v-model="queryParams.changeReason"
+          placeholder="请输入异动原因"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="负责人" prop="changeHandler">
+        <el-input v-model="queryParams.changeHandler" placeholder="请输入负责人" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-edit" size="mini" @click="handleSupplement">转正</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
+          @click="handleUpdate">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+          @click="handleDelete">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="employeeEntryList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="异动记录主键ID" align="center" prop="changeId" v-if="true"/> -->
+      <el-table-column label="员工姓名" align="center" prop="wmsEmployeeInfo.name" />
+      <el-table-column label="岗位工种" align="center" prop="wmsEmployeeInfo.jobType" />
+      <el-table-column label="转正时间" align="center" prop="changeTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.changeTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="转正原因" align="center" prop="changeReason" />
+      <el-table-column label="负责人" align="center" prop="changeHandler" />
+      <!-- <el-table-column label="附件" align="center" prop="attachment" /> -->
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 员工转正记录对话框 -->
+    <el-dialog :title="supplementTitle" :visible.sync="supplementOpen" width="500px" append-to-body>
+      <el-form ref="supplementForm" :model="supplementForm" :rules="supplementRules" label-width="80px">
+        <el-form-item label="转正员工" prop="infoId">
+          <EmployeeSelector v-model="supplementForm.infoId" keyField="infoId" placeholder="请选择转正员工" />
+        </el-form-item>
+        <el-form-item label="转正时间" prop="changeTime">
+          <el-date-picker clearable v-model="supplementForm.changeTime" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择转正时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="转正原因" prop="changeReason">
+          <el-input v-model="supplementForm.changeReason" placeholder="请输入转正原因" />
+        </el-form-item>
+        <el-form-item label="负责人" prop="changeHandler">
+          <el-input v-model="supplementForm.changeHandler" placeholder="请输入负责人" disabled />
+        </el-form-item>
+        <el-form-item label="附件" prop="attachment">
+          <file-upload v-model="supplementAttachment" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="supplementForm.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitSupplementForm">确 定</el-button>
+        <el-button @click="cancelSupplement">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listEmployeeChange, getEmployeeChange, delEmployeeChange, updateEmployeeChange, employeeRegular } from "@/api/wms/employeeChange";
+import { listDept } from "@/api/wms/dept";
+import EmployeeSelector from "@/components/EmployeeSelector";
+
+export default {
+  name: "employeeRegular",
+  components: {
+    EmployeeSelector
+  },
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 员工转正表格数据
+      employeeEntryList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        infoId: undefined,
+        changeType: 2,
+        changeTime: undefined,
+        changeReason: undefined,
+        changeHandler: undefined,
+        attachment: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      // 附件
+      attachment: undefined,
+      // 部门列表
+      deptList: [],
+      // 补录对话框相关
+      supplementTitle: "补录员工转正记录",
+      supplementOpen: false,
+      supplementForm: {
+        changeId: undefined,
+        infoId: undefined,
+        changeType: 2,
+        changeTime: undefined,
+        changeReason: undefined,
+        changeHandler: undefined,
+        attachment: undefined,
+        remark: undefined
+      },
+      supplementRules: {
+      },
+      supplementAttachment: undefined
+    };
+  },
+  dicts: ['hrm_employee_education'],
+  created() {
+    this.getList();
+    this.getDeptList();
+  },
+  methods: {
+    /** 查询员工转正记录列表 */
+    getList() {
+      this.loading = true;
+      listEmployeeChange(this.queryParams).then(response => {
+        this.employeeEntryList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    getDeptList() {
+      listDept().then(response => {
+        this.deptList = response.data;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 取消补录按钮操作
+    cancelSupplement() {
+      this.supplementOpen = false;
+      this.resetSupplementForm();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        infoId: undefined,
+        serialNumber: undefined,
+        dept: undefined,
+        jobType: undefined,
+        name: undefined,
+        idCard: undefined,
+        age: undefined,
+        gender: undefined,
+        education: undefined,
+        homeAddress: undefined,
+        phone: undefined,
+        entryTime: undefined,
+        emergencyContact: undefined,
+        relationship: undefined,
+        emergencyContactPhone: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined,
+        delFlag: undefined,
+        remark: undefined,
+        infoRemark: undefined
+      };
+      this.attachment = undefined;
+      this.resetForm("form");
+    },
+    // 补录表单重置
+    resetSupplementForm() {
+      this.supplementForm = {
+        changeId: undefined,
+        infoId: undefined,
+        changeType: 2,
+        changeTime: undefined,
+        changeReason: undefined,
+        changeHandler: undefined,
+        attachment: undefined,
+        remark: undefined
+      };
+      this.supplementAttachment = undefined;
+      this.resetForm("supplementForm");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.changeId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.form.changeHandler = this.$store.getters.nickName;
+      this.open = true;
+      this.title = "员工转正";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.resetSupplementForm();
+      const changeId = row.changeId || this.ids
+      getEmployeeChange(changeId).then(response => {
+        this.loading = false;
+        this.supplementForm = response.data;
+        this.supplementAttachment = response.data.attachment;
+        this.supplementOpen = true;
+        this.supplementTitle = "修改员工转正记录";
+      });
+    },
+    /** 补录按钮操作 */
+    handleSupplement() {
+      this.resetSupplementForm();
+      this.supplementForm.changeHandler = this.$store.getters.nickName;
+      this.supplementOpen = true;
+      this.supplementTitle = "补录员工转正记录";
+    },
+    /** 提交补录表单 */
+    submitSupplementForm() {
+      this.$refs["supplementForm"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.supplementForm.changeId != null) {
+            updateEmployeeChange(this.supplementForm).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.supplementOpen = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            employeeRegular({
+              changeType: 2,
+              infoId: this.supplementForm.infoId,
+              changeTime: this.supplementForm.changeTime,
+              changeHandler: this.supplementForm.changeHandler,
+              changeReason: this.supplementForm.changeReason,
+              attachment: this.supplementAttachment,
+              remark: this.supplementForm.remark
+            }).then(response => {
+              this.$modal.msgSuccess("员工转正记录补录成功");
+              this.supplementOpen = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const changeIds = row.changeId || this.ids;
+      this.$modal.confirm('是否确认删除员工转正记录编号为"' + changeIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delEmployeeChange(changeIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/employeeChange/export', {
+        ...this.queryParams
+      }, `employeeChange_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

klp-ui/src/views/wms/hrm/employeeInfo/index.vue

@@ -69,6 +69,13 @@
           <span>{{ parseTime(scope.row.entryTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="在职天数" align="center">
+        <template slot-scope="scope">
+          <el-tag :type="getRegularStatus(scope.row.entryTime, scope.row.isRegular).type">
+            {{ getRegularStatus(scope.row.entryTime, scope.row.isRegular).days }}天
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="紧急联系人" align="center" prop="emergencyContact" />
       <el-table-column label="关系" align="center" prop="relationship" />
       <el-table-column label="紧急联系电话" align="center" prop="emergencyContactPhone" />
@@ -545,6 +552,37 @@ export default {
           });
         }
       });
+    },
+    /** 计算入职天数和转正状态 */
+    getRegularStatus(entryTime, isRegular) {
+      if (!entryTime) return { days: 0, type: '', status: 0 };
+      
+      const entryDate = new Date(entryTime);
+      const now = new Date();
+      const diffTime = now - entryDate;
+      const diffDays = Math.floor(diffTime / (1000 * 60 * 60 * 24));
+      
+      let type = '';
+      let status = isRegular || 0;
+      
+      if (status === 0) {
+        // 未转正
+        if (diffDays < 60) {
+          // 2个月内未转正
+          type = 'warning';
+        } else if (diffDays < 90) {
+          // 3个月内未转正
+          type = 'info';
+        } else if (diffDays >= 90) {
+          // 3个月以上未转正
+          type = 'warning';
+        }
+      } else {
+        // 已转正
+        type = 'success';
+      }
+      
+      return { days: diffDays, type, status };
     }
   }
 };

klp-ui/src/views/wms/hrm/employeeInfo/leave.vue

@@ -0,0 +1,345 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="离职时间" prop="changeTime">
+        <el-date-picker clearable v-model="queryParams.changeTime" type="date" value-format="yyyy-MM-dd"
+          placeholder="请选择离职时间">
+        </el-date-picker>
+      </el-form-item>
+      <!-- <el-form-item label="异动原因" prop="changeReason">
+        <el-input
+          v-model="queryParams.changeReason"
+          placeholder="请输入异动原因"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="负责人" prop="changeHandler">
+        <el-input v-model="queryParams.changeHandler" placeholder="请输入负责人" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-edit" size="mini" @click="handleSupplement">离职</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
+          @click="handleUpdate">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+          @click="handleDelete">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="employeeEntryList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="异动记录主键ID" align="center" prop="changeId" v-if="true"/> -->
+      <el-table-column label="员工姓名" align="center" prop="wmsEmployeeInfo.name" />
+      <el-table-column label="岗位工种" align="center" prop="wmsEmployeeInfo.jobType" />
+      <el-table-column label="离职时间" align="center" prop="changeTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.changeTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="离职原因" align="center" prop="changeReason" />
+      <el-table-column label="负责人" align="center" prop="changeHandler" />
+      <!-- <el-table-column label="附件" align="center" prop="attachment" /> -->
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 员工离职记录对话框 -->
+    <el-dialog :title="supplementTitle" :visible.sync="supplementOpen" width="500px" append-to-body>
+      <el-form ref="supplementForm" :model="supplementForm" :rules="supplementRules" label-width="80px">
+        <el-form-item label="离职员工" prop="infoId">
+          <EmployeeSelector v-model="supplementForm.infoId" keyField="infoId" placeholder="请选择离职员工" />
+        </el-form-item>
+        <el-form-item label="离职时间" prop="changeTime">
+          <el-date-picker clearable v-model="supplementForm.changeTime" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择离职时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="离职原因" prop="changeReason">
+          <el-input v-model="supplementForm.changeReason" placeholder="请输入离职原因" />
+        </el-form-item>
+        <el-form-item label="负责人" prop="changeHandler">
+          <el-input v-model="supplementForm.changeHandler" placeholder="请输入负责人" disabled />
+        </el-form-item>
+        <el-form-item label="附件" prop="attachment">
+          <file-upload v-model="supplementAttachment" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="supplementForm.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitSupplementForm">确 定</el-button>
+        <el-button @click="cancelSupplement">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listEmployeeChange, getEmployeeChange, delEmployeeChange, updateEmployeeChange, addEmployeeChange, employeeEntry, employeeLeave } from "@/api/wms/employeeChange";
+import { listDept } from "@/api/wms/dept";
+import EmployeeSelector from "@/components/EmployeeSelector";
+
+export default {
+  name: "EmployeeLeave",
+  components: {
+    EmployeeSelector
+  },
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 员工离职表格数据
+      employeeEntryList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        infoId: undefined,
+        changeType: 1,
+        changeTime: undefined,
+        changeReason: undefined,
+        changeHandler: undefined,
+        attachment: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      // 附件
+      attachment: undefined,
+      // 部门列表
+      deptList: [],
+      // 补录对话框相关
+      supplementTitle: "补录员工离职记录",
+      supplementOpen: false,
+      supplementForm: {
+        changeId: undefined,
+        infoId: undefined,
+        changeType: 1,
+        changeTime: undefined,
+        changeReason: undefined,
+        changeHandler: undefined,
+        attachment: undefined,
+        remark: undefined
+      },
+      supplementRules: {
+      },
+      supplementAttachment: undefined
+    };
+  },
+  dicts: ['hrm_employee_education'],
+  created() {
+    this.getList();
+    this.getDeptList();
+  },
+  methods: {
+    /** 查询员工离职记录列表 */
+    getList() {
+      this.loading = true;
+      listEmployeeChange(this.queryParams).then(response => {
+        this.employeeEntryList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    getDeptList() {
+      listDept().then(response => {
+        this.deptList = response.data;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 取消补录按钮操作
+    cancelSupplement() {
+      this.supplementOpen = false;
+      this.resetSupplementForm();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        infoId: undefined,
+        serialNumber: undefined,
+        dept: undefined,
+        jobType: undefined,
+        name: undefined,
+        idCard: undefined,
+        age: undefined,
+        gender: undefined,
+        education: undefined,
+        homeAddress: undefined,
+        phone: undefined,
+        entryTime: undefined,
+        emergencyContact: undefined,
+        relationship: undefined,
+        emergencyContactPhone: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined,
+        delFlag: undefined,
+        remark: undefined,
+        infoRemark: undefined
+      };
+      this.attachment = undefined;
+      this.resetForm("form");
+    },
+    // 补录表单重置
+    resetSupplementForm() {
+      this.supplementForm = {
+        changeId: undefined,
+        infoId: undefined,
+        changeType: 1,
+        changeTime: undefined,
+        changeReason: undefined,
+        changeHandler: undefined,
+        attachment: undefined,
+        remark: undefined
+      };
+      this.supplementAttachment = undefined;
+      this.resetForm("supplementForm");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.changeId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.form.changeHandler = this.$store.getters.nickName;
+      this.open = true;
+      this.title = "员工离职";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.resetSupplementForm();
+      const changeId = row.changeId || this.ids
+      getEmployeeChange(changeId).then(response => {
+        this.loading = false;
+        this.supplementForm = response.data;
+        this.supplementAttachment = response.data.attachment;
+        this.supplementOpen = true;
+        this.supplementTitle = "修改员工离职记录";
+      });
+    },
+    /** 补录按钮操作 */
+    handleSupplement() {
+      this.resetSupplementForm();
+      this.supplementForm.changeHandler = this.$store.getters.nickName;
+      this.supplementOpen = true;
+      this.supplementTitle = "补录员工离职记录";
+    },
+    /** 提交补录表单 */
+    submitSupplementForm() {
+      this.$refs["supplementForm"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.supplementForm.changeId != null) {
+            updateEmployeeChange(this.supplementForm).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.supplementOpen = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            employeeLeave({
+              changeType: 1,
+              infoId: this.supplementForm.infoId,
+              changeTime: this.supplementForm.changeTime,
+              changeHandler: this.supplementForm.changeHandler,
+              changeReason: this.supplementForm.changeReason,
+              attachment: this.supplementAttachment,
+              remark: this.supplementForm.remark
+            }).then(response => {
+              this.$modal.msgSuccess("员工离职记录补录成功");
+              this.supplementOpen = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const changeIds = row.changeId || this.ids;
+      this.$modal.confirm('是否确认删除员工离职记录编号为"' + changeIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delEmployeeChange(changeIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/employeeChange/export', {
+        ...this.queryParams
+      }, `employeeChange_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

klp-ui/src/views/wms/hrm/employeeInfo/transfer.vue

@@ -0,0 +1,316 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="转岗员工" prop="infoId">
+        <EmployeeSelector v-model="queryParams.infoId" keyField="infoId" placeholder="请选择转岗员工" />
+      </el-form-item>
+      <el-form-item label="原部门" prop="oldDept">
+        <el-input v-model="queryParams.oldDept" placeholder="请输入原部门" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="新部门" prop="newDept">
+        <el-input v-model="queryParams.newDept" placeholder="请输入新部门" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="转岗经办人" prop="transferHandler">
+        <el-input v-model="queryParams.transferHandler" placeholder="请输入转岗经办人" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
+          @click="handleUpdate">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+          @click="handleDelete">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="employeeTransferList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="转岗员工" align="center" prop="wmsEmployeeInfo.name" />
+      <el-table-column label="原部门" align="center" prop="oldDept" />
+      <el-table-column label="原岗位工种" align="center" prop="oldJobType" />
+      <el-table-column label="新部门" align="center" prop="newDept" />
+      <el-table-column label="新岗位工种" align="center" prop="newJobType" />
+      <el-table-column label="转岗生效时间" align="center" prop="transferTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.transferTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="转岗原因" align="center" prop="transferReason" />
+      <el-table-column label="转岗经办人" align="center" prop="transferHandler" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改员工转岗记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="转岗员工" prop="infoId">
+          <EmployeeSelector v-model="form.infoId" keyField="infoId" placeholder="请选择转岗员工" />
+        </el-form-item>
+        <el-form-item label="新部门" prop="newDept">
+          <el-select v-model="form.newDept" placeholder="请选择新部门">
+            <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptName" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="新岗位工种" prop="newJobType">
+          <el-input v-model="form.newJobType" placeholder="请输入新岗位工种" />
+        </el-form-item>
+        <el-form-item label="转岗时间" prop="transferTime">
+          <el-date-picker clearable v-model="form.transferTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择转岗时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="转岗原因" prop="transferReason">
+          <el-input v-model="form.transferReason" placeholder="请输入转岗原因" />
+        </el-form-item>
+        <el-form-item label="转岗经办人" prop="transferHandler">
+          <el-input v-model="form.transferHandler" placeholder="请输入转岗经办人" />
+        </el-form-item>
+        <el-form-item label="附件" prop="attachment">
+          <file-upload v-model="form.attachment"></file-upload>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listEmployeeTransfer, getEmployeeTransfer, delEmployeeTransfer, updateEmployeeTransfer, transferEmployee } from "@/api/wms/employeeTransfer";
+import EmployeeSelector from "@/components/EmployeeSelector";
+import { listDept } from "@/api/wms/dept";
+
+export default {
+  name: "EmployeeTransfer",
+  components: {
+    EmployeeSelector,
+  },
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 员工转岗记录表格数据
+      employeeTransferList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        infoId: undefined,
+        oldDept: undefined,
+        oldJobType: undefined,
+        newDept: undefined,
+        newJobType: undefined,
+        transferHandler: undefined,
+      },
+      // 部门列表
+      deptList: [],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        transferId: [
+          { required: true, message: "转岗记录主键ID不能为空", trigger: "blur" }
+        ],
+        infoId: [
+          { required: true, message: "关联员工信息表的主键ID不能为空", trigger: "blur" }
+        ],
+        oldDept: [
+          { required: true, message: "原部门不能为空", trigger: "blur" }
+        ],
+        oldJobType: [
+          { required: true, message: "原岗位工种不能为空", trigger: "change" }
+        ],
+        newDept: [
+          { required: true, message: "新部门不能为空", trigger: "blur" }
+        ],
+        newJobType: [
+          { required: true, message: "新岗位工种不能为空", trigger: "change" }
+        ],
+        transferTime: [
+          { required: true, message: "转岗生效时间不能为空", trigger: "blur" }
+        ],
+        // transferReason: [
+        //   { required: true, message: "转岗原因不能为空", trigger: "blur" }
+        // ],
+        transferHandler: [
+          { required: true, message: "转岗经办人不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDeptList();
+  },
+  methods: {
+    /** 查询员工转岗记录列表 */
+    getList() {
+      this.loading = true;
+      listEmployeeTransfer(this.queryParams).then(response => {
+        this.employeeTransferList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 查询部门列表 */
+    getDeptList() {
+      listDept().then(response => {
+        this.deptList = response.data;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        transferId: undefined,
+        infoId: undefined,
+        oldDept: undefined,
+        oldJobType: undefined,
+        newDept: undefined,
+        newJobType: undefined,
+        transferTime: this.parseTime(new Date(), "{y}-{m}-{d} {h}:{i}:{s}"),
+        transferReason: "",
+        transferHandler: this.$store.getters.nickName,
+        approvalStatus: undefined,
+        attachment: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined,
+        delFlag: undefined,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.transferId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加员工转岗记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const transferId = row.transferId || this.ids
+      getEmployeeTransfer(transferId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改员工转岗记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.transferId != null) {
+            updateEmployeeTransfer(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            transferEmployee(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const transferIds = row.transferId || this.ids;
+      this.$modal.confirm('是否确认删除员工转岗记录编号为"' + transferIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delEmployeeTransfer(transferIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('wms/employeeTransfer/export', {
+        ...this.queryParams
+      }, `employeeTransfer_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

klp-ui/src/views/wms/report/receive.vue

@@ -187,7 +187,7 @@ export default {
         // actionStatus: 2,
         warehouseId: this.queryParams.planId,
         actionType: 401,
-        pageSize: 999,
+        pageSize: 9999,
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,
         endTime: this.queryParams.byCreateTimeEnd,