feat(wms): 新增员工异动管理功能并优化员工信息界面

refactor(员工信息): 重构员工信息界面，使用下拉选择替代输入框
feat(员工异动): 新增员工入职和离职功能及相关API
fix(合卷): 修复扫码日期格式化问题
style(交付): 统一结算类型为卷重结算

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

@@ -0,0 +1,64 @@
+import request from '@/utils/request'
+
+// 查询员工异动（入职/离职）列表
+export function listEmployeeChange(query) {
+  return request({
+    url: '/wms/employeeChange/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询员工异动（入职/离职）详细
+export function getEmployeeChange(changeId) {
+  return request({
+    url: '/wms/employeeChange/' + changeId,
+    method: 'get'
+  })
+}
+
+// 新增员工异动（入职/离职）
+export function addEmployeeChange(data) {
+  return request({
+    url: '/wms/employeeChange',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改员工异动（入职/离职）
+export function updateEmployeeChange(data) {
+  return request({
+    url: '/wms/employeeChange',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除员工异动（入职/离职）
+export function delEmployeeChange(changeId) {
+  return request({
+    url: '/wms/employeeChange/' + changeId,
+    method: 'delete'
+  })
+}
+
+// 员工入职
+export function employeeEntry(data) {
+  return request({
+    url: '/wms/employeeChange/entry',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 员工离职
+ */
+export function employeeLeave(data) {
+  return request({
+    url: '/wms/employeeChange/leave',
+    method: 'post',
+    data: data
+  })
+}

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

@@ -85,6 +85,10 @@ export function updatePendingAction(data) {
   if (payload.completeTime) {
     payload.completeTime = parseDate(payload.completeTime)
   }
+  if (payload.scanTime) {
+    // 扫码日期格式化为yyyy-MM-dd'T'HH:mm:ss.SSSX
+    payload.scanTime = parseDate(payload.scanTime).replace(' ', 'T') + '.000Z'
+  }
   return request({
     url: '/wms/coilPendingAction',
     method: 'put',

klp-ui/src/views/wms/coil/merge/acid.vue

@@ -0,0 +1,13 @@
+<template>
+  <div>
+    酸轧合卷
+  </div>
+</template>
+
+<script>
+
+</script>
+
+<style>
+  
+</style>

klp-ui/src/views/wms/delivery/components/detailTable.vue

@@ -264,6 +264,7 @@ export default {
         rawMaterialFactory: coil.manufacturer,
         coilNo: coil.currentCoilNo,
         specification: coil.specification,
+        settlementType: '卷重结算',
         material: coil.material,
         quantity: 1,
         weight: coil.netWeight,
@@ -278,7 +279,7 @@ export default {
         productName: undefined,
         edgeType: undefined,
         packaging: undefined,
-        settlementType: undefined,
+        settlementType: '卷重结算',
         rawMaterialFactory: undefined,
         coilNo: undefined,
         specification: undefined,
@@ -358,6 +359,7 @@ export default {
         coilId: coil.coilId,
         productName: coil.itemName,
         edgeType: coil.trimmingRequirement,
+        settlementType: '卷重结算',
         packaging: coil.packagingRequirement,
         rawMaterialFactory: coil.manufacturer,
         coilNo: coil.currentCoilNo,

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

@@ -1,53 +1,32 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="60px">
-      <el-form-item label="部门" prop="dept">
+      <el-form-item label="部门" prop="deptId">
-        <el-input
+        <el-select v-model="queryParams.deptId" placeholder="请选择部门" clearable @keyup.enter.native="handleQuery">
-          v-model="queryParams.dept"
+          <el-option v-for="item in deptList" :value="item.deptName" :label="item.deptName" :key="item.deptId" />
-          placeholder="请输入部门"
+        </el-select>
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="姓名" prop="name">
-        <el-input
+        <el-input v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.name"
-          placeholder="请输入姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="身份证号" prop="idCard">
-        <el-input
+        <el-input v-model="queryParams.idCard" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.idCard"
-          placeholder="请输入身份证号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="年龄" prop="age">
-        <el-input
+        <el-input v-model="queryParams.age" placeholder="请输入年龄" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.age"
-          placeholder="请输入年龄"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="性别" prop="gender">
-        <el-input
+        <el-select v-model="queryParams.gender" placeholder="请选择性别" clearable @change="handleQuery">
-          v-model="queryParams.gender"
+          <el-option label="男" value="男" />
-          placeholder="请输入性别"
+          <el-option label="女" value="女" />
-          clearable
+        </el-select>
-          @keyup.enter.native="handleQuery"
+        <!-- <el-input v-model="queryParams.gender" placeholder="请输入性别" clearable @keyup.enter.native="handleQuery" /> -->
-        />
       </el-form-item>
       <el-form-item label="学历" prop="education">
-        <el-input
+        <el-select v-model="queryParams.education" placeholder="请选择学历" clearable @change="handleQuery">
-          v-model="queryParams.education"
+          <el-option v-for="item in dict.type.hrm_employee_education" :key="item.value" :label="item.label"
-          placeholder="请输入学历"
+            :value="item.value" />
-          clearable
+        </el-select>
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -57,42 +36,18 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">入职</el-button>
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
-          type="success"
+          @click="handleUpdate">修改</el-button>
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
-          type="danger"
+          @click="handleDelete">删除</el-button>
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</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>
@@ -116,95 +71,208 @@
       </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" />
+      <el-table-column label="紧急联系电话" align="center" prop="emergencyContactPhone" />
       <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="在职状态" align="center">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.isLeave === 0 ? 'success' : 'danger'">
+            {{ scope.row.isLeave === 0 ? '在职' : '已离职' }}
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
-            size="mini"
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
-            type="text"
+          <el-button v-if="scope.row.isLeave === 0" size="mini" type="text" icon="el-icon-switch-button"
-            icon="el-icon-edit"
+            @click="handleResignation(scope.row)">离职</el-button>
-            @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
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      v-show="total>0"
+      @pagination="getList" />
-      :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-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="部门" prop="dept">
+        <!-- 公司内信息 -->
-          <el-input v-model="form.dept" placeholder="请输入部门" />
+        <el-card class="mb-4" shadow="never">
+          <template slot="header">
+            <div class="card-header">
+              <span>在职信息</span>
+            </div>
+          </template>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="部门" prop="deptId">
+                <!-- <el-input v-model="form.dept" placeholder="请输入部门" /> -->
+                <el-select v-model="form.deptId" placeholder="请选择部门">
+                  <el-option v-for="item in deptList" :value="item.deptName" :label="item.deptName"
+                    :key="item.deptId" />
+                </el-select>
               </el-form-item>
+            </el-col>
+            <el-col :span="12">
               <el-form-item label="岗位工种" prop="jobType">
                 <el-input v-model="form.jobType" placeholder="请输入岗位工种" />
               </el-form-item>
-        <el-form-item label="姓名" prop="name">
+            </el-col>
-          <el-input v-model="form.name" placeholder="请输入姓名" />
+            <el-col :span="12">
-        </el-form-item>
-        <el-form-item label="身份证号" prop="idCard">
-          <el-input v-model="form.idCard" placeholder="请输入身份证号" />
-        </el-form-item>
-        <el-form-item label="年龄" prop="age">
-          <el-input v-model="form.age" placeholder="请输入年龄" />
-        </el-form-item>
-        <el-form-item label="性别" prop="gender">
-          <el-input v-model="form.gender" placeholder="请输入性别" />
-        </el-form-item>
-        <el-form-item label="学历" prop="education">
-          <el-input v-model="form.education" placeholder="请输入学历" />
-        </el-form-item>
-        <el-form-item label="家庭住址" prop="homeAddress">
-          <el-input v-model="form.homeAddress" placeholder="请输入家庭住址" />
-        </el-form-item>
-        <el-form-item label="联系电话" prop="phone">
-          <el-input v-model="form.phone" placeholder="请输入联系电话" />
-        </el-form-item>
               <el-form-item label="入职时间" prop="entryTime">
-          <el-date-picker clearable
+                <el-date-picker clearable v-model="form.entryTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-            v-model="form.entryTime"
+                  placeholder="请选择入职时间" style="width: 100%;">
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择入职时间">
                 </el-date-picker>
               </el-form-item>
-        <el-form-item label="紧急联系人" prop="emergencyContact">
+            </el-col>
-          <el-input v-model="form.emergencyContact" placeholder="请输入紧急联系人" />
+             <el-col :span="12">
-        </el-form-item>
-        <el-form-item label="关系" prop="relationship">
-          <el-input v-model="form.relationship" placeholder="请输入关系" />
-        </el-form-item>
-        <el-form-item label="紧急联系人电话" prop="emergencyContactPhone">
-          <el-input v-model="form.emergencyContactPhone" placeholder="请输入紧急联系人电话" />
-        </el-form-item>
               <el-form-item label="备注" prop="remark">
                 <el-input v-model="form.remark" placeholder="请输入备注" />
               </el-form-item>
+            </el-col>
+          </el-row>
+        </el-card>
+
+        <!-- 员工个人信息 -->
+        <el-card class="mb-4" shadow="never">
+          <template slot="header">
+            <div class="card-header">
+              <span>员工信息</span>
+            </div>
+          </template>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="姓名" prop="name">
+                <el-input v-model="form.name" placeholder="请输入姓名" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="身份证号" prop="idCard">
+                <el-input v-model="form.idCard" placeholder="请输入身份证号" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="年龄" prop="age">
+                <el-input v-model="form.age" placeholder="请输入年龄" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="性别" prop="gender">
+                <!-- <el-input v-model="form.gender" placeholder="请输入性别" /> -->
+                <el-radio-group v-model="form.gender" size="small" mode="button">
+                  <el-radio label="男">男</el-radio>
+                  <el-radio label="女">女</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="学历" prop="education">
+                <!-- <el-input v-model="form.education" placeholder="请输入学历" /> -->
+                <el-select v-model="form.education" placeholder="请选择学历">
+                  <el-option v-for="item in dict.type.hrm_employee_education" :key="item.value" :label="item.label"
+                    :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系电话" prop="phone">
+                <el-input v-model="form.phone" placeholder="请输入联系电话" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="家庭住址" prop="homeAddress">
+                <el-input v-model="form.homeAddress" placeholder="请输入家庭住址" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-card>
+
+        <!-- 紧急联系信息 -->
+        <el-card class="mb-4" shadow="never">
+          <template slot="header">
+            <div class="card-header">
+              <span>紧急联系信息</span>
+            </div>
+          </template>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="紧急联系人" prop="emergencyContact">
+                <el-input v-model="form.emergencyContact" placeholder="请输入紧急联系人" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="关系" prop="relationship">
+                <el-input v-model="form.relationship" placeholder="请输入关系" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="紧急联系电话" prop="emergencyContactPhone">
+                <el-input v-model="form.emergencyContactPhone" placeholder="请输入紧急联系人电话" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-card>
+
+        <!-- 备注和附件 -->
+        <!-- <el-card class="mb-4" shadow="hover">
+          <el-row :gutter="20">
+            <el-col :span="24">
+              <el-form-item label="备注" prop="remark">
+                <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="!form.infoId">
+              <el-form-item label="附件" prop="attachment">
+                <file-upload v-model="attachment"></file-upload>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-card> -->
       </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>
+
+    <!-- 员工离职对话框 -->
+    <el-dialog :title="resignationTitle" :visible.sync="resignationOpen" width="500px" append-to-body>
+      <el-form ref="resignationForm" :model="resignationForm" :rules="resignationRules" label-width="80px">
+        <el-form-item label="员工姓名" prop="name">
+          <el-input v-model="resignationForm.name" disabled />
+        </el-form-item>
+        <el-form-item label="异动类型" prop="changeType">
+          <el-input v-model="resignationForm.changeType" disabled />
+        </el-form-item>
+        <el-form-item label="离职时间" prop="changeTime">
+          <el-date-picker clearable v-model="resignationForm.changeTime" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择离职时间" />
+        </el-form-item>
+        <el-form-item label="离职原因" prop="changeReason" required>
+          <el-input v-model="resignationForm.changeReason" type="textarea" placeholder="请输入离职原因" />
+        </el-form-item>
+        <el-form-item label="负责人" prop="changeHandler">
+          <el-input v-model="resignationForm.changeHandler" disabled />
+        </el-form-item>
+        <el-form-item label="附件" prop="attachment">
+          <file-upload v-model="resignationAttachment"></file-upload>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="resignationForm.remark" type="textarea" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitResignation">确 定</el-button>
+        <el-button @click="cancelResignation">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listEmployeeInfo, getEmployeeInfo, delEmployeeInfo, addEmployeeInfo, updateEmployeeInfo } from "@/api/wms/employeeInfo";
+import { listEmployeeInfo, getEmployeeInfo, delEmployeeInfo, updateEmployeeInfo } from "@/api/wms/employeeInfo";
+import { listDept } from "@/api/wms/dept";
+import { employeeEntry, employeeLeave } from '@/api/wms/employeeChange'
 
 export default {
   name: "EmployeeInfo",
@@ -246,11 +314,46 @@ export default {
       form: {},
       // 表单校验
       rules: {
+      },
+      // 附件
+      attachment: undefined,
+      // 部门列表
+      deptList: [],
+      // 离职对话框相关
+      resignationTitle: "员工离职",
+      resignationOpen: false,
+      resignationForm: {
+        infoId: undefined,
+        name: undefined,
+        changeType: "离职",
+        changeTime: undefined,
+        changeReason: undefined,
+        changeHandler: undefined,
+        remark: undefined
+      },
+      resignationRules: {
+        changeTime: [
+          {
+            required: true,
+            message: "请选择离职时间",
+            trigger: "change"
           }
+        ],
+        changeReason: [
+          {
+            required: true,
+            message: "请输入离职原因",
+            trigger: "blur"
+          }
+        ]
+      },
+      resignationAttachment: undefined
     };
   },
+  dicts: ['hrm_employee_education'],
   created() {
     this.getList();
+    this.getDeptList();
   },
   methods: {
     /** 查询员工信息列表 */
@@ -262,6 +365,11 @@ export default {
         this.loading = false;
       });
     },
+    getDeptList() {
+      listDept().then(response => {
+        this.deptList = response.data;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -314,7 +422,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加员工信息";
+      this.title = "员工入职";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -342,8 +450,14 @@ export default {
               this.buttonLoading = false;
             });
           } else {
-            addEmployeeInfo(this.form).then(response => {
+            employeeEntry({
-              this.$modal.msgSuccess("新增成功");
+              changeType: 0,
+              changeTime: this.form.entryTime,
+              changeHandler: this.$store.getters.nickName,
+              attachment: this.attachment,
+              ...this.form
+            }).then(response => {
+              this.$modal.msgSuccess("员工入职成功");
               this.open = false;
               this.getList();
             }).finally(() => {
@@ -373,6 +487,64 @@ export default {
       this.download('wms/employeeInfo/export', {
         ...this.queryParams
       }, `employeeInfo_${new Date().getTime()}.xlsx`)
+    },
+    /** 离职按钮操作 */
+    handleResignation(row) {
+      // 获取北京时间（UTC+8）
+      const now = new Date();
+      const formattedDate = this.parseTime(now, '{y}-{m}-{d} {h}:{i}:{s}')
+
+      this.resignationForm = {
+        infoId: row.infoId,
+        name: row.name,
+        changeType: "离职",
+        changeTime: formattedDate,
+        changeReason: undefined,
+        changeHandler: this.$store.getters.nickName,
+        remark: undefined
+      };
+      this.resignationAttachment = undefined;
+      this.resignationOpen = true;
+    },
+    /** 取消离职按钮操作 */
+    cancelResignation() {
+      this.resignationOpen = false;
+      this.resignationForm = {
+        infoId: undefined,
+        name: undefined,
+        changeType: "1",
+        changeTime: undefined,
+        changeReason: undefined,
+        changeHandler: undefined,
+        remark: undefined
+      };
+      this.resignationAttachment = undefined;
+      this.resetForm("resignationForm");
+    },
+    /** 提交离职表单 */
+    submitResignation() {
+      this.$refs["resignationForm"].validate(valid => {
+        if (valid) {
+          this.$modal.confirm('是否确认提交员工离职申请？').then(() => {
+            this.buttonLoading = true;
+            employeeLeave({
+              changeType: 1,
+              changeTime: this.resignationForm.changeTime,
+              changeReason: this.resignationForm.changeReason,
+              changeHandler: this.resignationForm.changeHandler,
+              attachment: this.resignationAttachment,
+              remark: this.resignationForm.remark,
+              infoId: this.resignationForm.infoId
+            }).then(response => {
+              this.$modal.msgSuccess("员工离职成功");
+              this.resignationOpen = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          });
+        }
+      });
     }
   }
 };