feat(合卷操作): 扩展合卷操作类型范围支持200-299

fix(文件上传): 添加docx到默认支持文件类型列表
refactor(员工信息): 统一部门字段命名并修复备注字段
feat(酸轧合卷): 实现酸轧合卷页面功能
feat(员工入职): 新增员工入职页面及功能
style(合卷页面): 优化合卷页面布局和样式

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

@@ -0,0 +1,500 @@
+<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="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">入职</el-button>
+      </el-col>
+      <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="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <!-- 公司内信息 -->
+        <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-select v-model="form.dept" 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-col>
+            <el-col :span="12">
+              <el-form-item label="入职时间" prop="entryTime">
+                <el-date-picker clearable v-model="form.entryTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="请选择入职时间" style="width: 100%;">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="备注" prop="remark">
+                <el-input v-model="form.infoRemark" 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-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-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">
+              <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="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="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 } from "@/api/wms/employeeChange";
+import { listDept } from "@/api/wms/dept";
+
+export default {
+  name: "EmployeeEntry",
+  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: 0,
+        changeTime: undefined,
+        changeReason: undefined,
+        changeHandler: undefined,
+        attachment: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      // 附件
+      attachment: undefined,
+      // 部门列表
+      deptList: [],
+      // 补录对话框相关
+      supplementTitle: "补录员工入职记录",
+      supplementOpen: false,
+      supplementForm: {
+        changeId: undefined,
+        infoId: undefined,
+        changeType: 0,
+        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: 0,
+        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 = "补录员工入职记录";
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          employeeEntry({
+            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(() => {
+            this.buttonLoading = false;
+          });
+        }
+      });
+    },
+    /** 提交补录表单 */
+    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 {
+            addEmployeeChange({
+              changeType: 0,
+              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

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="60px">
       <el-form-item label="部门" prop="deptId">
-        <el-select v-model="queryParams.deptId" placeholder="请选择部门" clearable @keyup.enter.native="handleQuery">
+        <el-select v-model="queryParams.dept" placeholder="请选择部门" clearable @keyup.enter.native="handleQuery">
           <el-option v-for="item in deptList" :value="item.deptName" :label="item.deptName" :key="item.deptId" />
         </el-select>
       </el-form-item>
@@ -105,9 +105,9 @@
           </template>
           <el-row :gutter="20">
             <el-col :span="12">
-              <el-form-item label="部门" prop="deptId">
+              <el-form-item label="部门" prop="dept">
                 <!-- <el-input v-model="form.dept" placeholder="请输入部门" /> -->
-                <el-select v-model="form.deptId" placeholder="请选择部门">
+                <el-select v-model="form.dept" placeholder="请选择部门">
                   <el-option v-for="item in deptList" :value="item.deptName" :label="item.deptName"
                     :key="item.deptId" />
                 </el-select>
@@ -127,7 +127,7 @@
             </el-col>
              <el-col :span="12">
               <el-form-item label="备注" prop="remark">
-                <el-input v-model="form.remark" placeholder="请输入备注" />
+                <el-input v-model="form.infoRemark" placeholder="请输入备注" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -214,7 +214,7 @@
         </el-card>
 
         <!-- 备注和附件 -->
-        <!-- <el-card class="mb-4" shadow="hover">
+        <el-card class="mb-4" shadow="hover">
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="备注" prop="remark">
@@ -227,7 +227,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-card> -->
+        </el-card>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>