refactor(wms): 优化报表查询逻辑和界面显示
- 将查询参数中的 updateBy 改为 createBy 以匹配实际业务需求 - 移除不再使用的 selectType 参数 - 优化员工信息页面显示,调整离职时间展示 - 提取公共的 fetch 逻辑到单独文件 - 重构报表查询逻辑,使用 Promise.all 并行请求 - 调整钢卷文档页面,增加创建人选择功能
This commit is contained in:
@@ -85,7 +85,7 @@
|
||||
<el-table-column label="年龄" align="center" prop="age" />
|
||||
<el-table-column label="性别" align="center" prop="gender" />
|
||||
<el-table-column label="学历" align="center" prop="education" />
|
||||
<el-table-column label="家庭住址" align="center" prop="homeAddress" />
|
||||
<!-- <el-table-column label="家庭住址" align="center" prop="homeAddress" /> -->
|
||||
<el-table-column label="联系电话" align="center" prop="phone" />
|
||||
<el-table-column label="入职时间" align="center" prop="entryTime" width="180">
|
||||
<template slot-scope="scope">
|
||||
@@ -94,8 +94,8 @@
|
||||
</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 :type="getRegularStatus(scope.row.entryTime, scope.row.isRegular, scope.row.isLeave).type">
|
||||
{{ getRegularStatus(scope.row.entryTime, scope.row.isRegular, scope.row.isLeave).days }}天
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -106,7 +106,7 @@
|
||||
<el-table-column label="在职状态" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-tag :type="scope.row.isLeave === 0 ? 'success' : 'danger'">
|
||||
{{ scope.row.isLeave === 0 ? '在职' : '已离职' }}
|
||||
{{ scope.row.isLeave == 0 ? '在职' : parseTime(scope.row.leaveTime, '{y}-{m}-{d}') }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -154,6 +154,13 @@
|
||||
placeholder="请选择入职时间" style="width: 100%;">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12" v-if="form.isLeave == 1">
|
||||
<el-form-item label="离职时间" prop="leaveTime">
|
||||
<el-date-picker clearable v-model="form.leaveTime" 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">
|
||||
@@ -593,7 +600,7 @@ export default {
|
||||
});
|
||||
},
|
||||
/** 计算入职天数和转正状态 */
|
||||
getRegularStatus(entryTime, isRegular) {
|
||||
getRegularStatus(entryTime, isRegular, isLeave) {
|
||||
if (!entryTime) return { days: 0, type: '', status: 0 };
|
||||
|
||||
const entryDate = new Date(entryTime);
|
||||
@@ -603,6 +610,12 @@ export default {
|
||||
|
||||
let type = '';
|
||||
let status = isRegular || 0;
|
||||
|
||||
// 如果是已离职的,使用primary
|
||||
if (isLeave === 1) {
|
||||
type = 'primary';
|
||||
return { days: diffDays, type, status };
|
||||
}
|
||||
|
||||
if (status === 0) {
|
||||
// 未转正
|
||||
|
||||
Reference in New Issue
Block a user