refactor(wms): 优化报表查询逻辑和界面显示

- 将查询参数中的 updateBy 改为 createBy 以匹配实际业务需求
- 移除不再使用的 selectType 参数
- 优化员工信息页面显示,调整离职时间展示
- 提取公共的 fetch 逻辑到单独文件
- 重构报表查询逻辑,使用 Promise.all 并行请求
- 调整钢卷文档页面,增加创建人选择功能
This commit is contained in:
砂糖
2026-03-25 09:04:48 +08:00
parent 45f58a7d3e
commit bb79b02ee4
15 changed files with 164 additions and 236 deletions

View File

@@ -102,8 +102,16 @@
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createByName" width="100" />
<el-table-column label="操作人" align="center" prop="updateBy" width="100" />
<el-table-column label="创建人" align="center" prop="createByName" width="140">
<template slot-scope="scope">
<el-select @change="handleProcessTimeChange(scope.row)" v-model="scope.row.createBy" placeholder="请选择创建人" filterable>
<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userName" />
</el-select>
<!-- <span>{{ scope.row.createByName }}</span> -->
</template>
</el-table-column>
<el-table-column label="完成时间" align="center" prop="completeTime" width="220" :show-overflow-tooltip="true">
<template slot-scope="scope">
@@ -234,6 +242,7 @@ import {
cancelAction,
restorePendingAction,
} from '@/api/wms/pendingAction';
import { listUser } from '@/api/system/user';
import CoilSelector from '@/components/CoilSelector';
import CoilNo from '@/components/KLPService/Renderer/CoilNo.vue';
@@ -288,7 +297,9 @@ export default {
]
},
// 钢卷选择器可见性
coilSelectorVisible: false
coilSelectorVisible: false,
// 用户列表
userList: [],
};
},
computed: {
@@ -321,6 +332,8 @@ export default {
this.getList();
// 设置定时刷新(可选,用于移动端扫码后自动刷新)
this.startAutoRefresh();
// 查询用户列表
this.getUserList();
},
beforeDestroy() {
// 清除定时器
@@ -345,6 +358,12 @@ export default {
this.loading = false;
});
},
/** 查询用户列表 */
getUserList() {
listUser({ pageSize: 9999 }).then(response => {
this.userList = response.rows;
});
},
switchActionStatus(value) {
console.log(value)
if (!value) {

View File

@@ -230,8 +230,8 @@
<el-descriptions-item label="打包状态">{{ selectedSplitItem.packingStatus || '-' }}</el-descriptions-item>
<el-descriptions-item label="包装要求">{{ selectedSplitItem.packagingRequirement || '-'
}}</el-descriptions-item>
<el-descriptions-item label="毛重">{{ selectedSplitItem.grossWeight || '-' }} kg</el-descriptions-item>
<el-descriptions-item label="净重">{{ selectedSplitItem.netWeight || '-' }} kg</el-descriptions-item>
<el-descriptions-item label="毛重">{{ selectedSplitItem.grossWeight || '-' }} t</el-descriptions-item>
<el-descriptions-item label="净重">{{ selectedSplitItem.netWeight || '-' }} t</el-descriptions-item>
<el-descriptions-item label="长度" v-if="selectedSplitItem.length">{{ selectedSplitItem.length }}
m</el-descriptions-item>
<el-descriptions-item label="调制度">{{ selectedSplitItem.temperGrade || '-' }}</el-descriptions-item>