奖金看板和公辅看板优化

This commit is contained in:
jhd
2026-05-15 17:45:54 +08:00
parent 44f5e64016
commit 8ce4df0847
2 changed files with 76 additions and 32 deletions

View File

@@ -73,8 +73,7 @@
</el-select>
</el-form-item>
<el-form-item label="公辅类型">
<el-select v-model="filterForm.typeId" placeholder="请选择公辅类型" clearable>
<el-option label="全部" value="" />
<el-select v-model="filterForm.typeIds" placeholder="请选择公辅类型" clearable multiple>
<el-option v-for="item in auxiliaryTypes" :key="item.typeId" :label="item.typeName" :value="item.typeId" />
</el-select>
</el-form-item>
@@ -236,7 +235,7 @@ export default {
startDate: "",
endDate: "",
lineName: "",
typeId: ""
typeIds: []
},
// 分页参数
pageParams: {
@@ -388,9 +387,7 @@ export default {
if (this.filterForm.lineName) {
params.lineName = this.filterForm.lineName;
}
if (this.filterForm.typeId) {
params.typeId = this.filterForm.typeId;
}
// 公辅类型筛选不在请求中传递,由前端过滤
if (needPage) {
params.pageNum = this.pageParams.pageNum;
params.pageSize = this.pageParams.pageSize;
@@ -402,7 +399,15 @@ export default {
const params = this.getQueryParams();
params.pageSize = 9999; // 获取全部数据
const res = await listAuxiliaryConsume(params);
this.rawData = res.rows || [];
// 前端过滤公辅类型(支持多选)
let filteredData = res.rows || [];
if (this.filterForm.typeIds && this.filterForm.typeIds.length > 0) {
const selectedTypeIds = new Set(this.filterForm.typeIds);
filteredData = filteredData.filter(item => selectedTypeIds.has(item.typeId));
}
this.rawData = filteredData;
// 同时更新分页数据
const pageParams = this.getQueryParams(true);