From d3da84f65eda7ae186f7dfe0c54ae11bcf49daba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Mon, 9 Mar 2026 10:34:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E8=83=BD=E5=8A=9B=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E5=8F=8A=E8=B0=83=E6=95=B4=E5=88=86=E9=A1=B5=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复产线能力查询时lineId参数传递错误的问题，增加参数校验 调整分页组件默认的pageSizes选项，增加10的选项 修改物料线圈查询状态参数为0 优化线圈吞吐记录展示方式，改为行点击触发 移除用餐记录中不必要的部门字典依赖 --- .../components/HomeModules/StatisticGroup.vue | 2 +- klp-ui/src/components/Pagination/index.vue | 2 +- klp-ui/src/views/aps/lineCapability/index.vue | 11 ++++-- klp-ui/src/views/wms/coil/panels/base.vue | 18 ++++++---- klp-ui/src/views/wms/hrm/records/meal.vue | 35 +++++++++++++------ 5 files changed, 47 insertions(+), 21 deletions(-) diff --git a/klp-ui/src/components/HomeModules/StatisticGroup.vue b/klp-ui/src/components/HomeModules/StatisticGroup.vue index a2f75f9e..74a9ff9a 100644 --- a/klp-ui/src/components/HomeModules/StatisticGroup.vue +++ b/klp-ui/src/components/HomeModules/StatisticGroup.vue @@ -100,7 +100,7 @@ export default { // 顺序请求：前一个请求完成后，再执行下一个 const productRes = await listProduct({ pageSize: 10, pageNum: 1 }); const rawMaterialRes = await listRawMaterial({ pageSize: 10, pageNum: 1 }); - const materialCoilRes = await listMaterialCoil({ pageSize: 10, pageNum: 1, dataType: 1, status: 1 }); + const materialCoilRes = await listMaterialCoil({ pageSize: 10, pageNum: 1, dataType: 1, status: 0 }); const equipmentRes = await listEquipmentManagement({ pageSize: 1, pageNum: 1, status: 'in_service' }); const orderRes = await listOrder({ pageSize: 1, pageNum: 1 }); const customerRes = await listCustomer({ pageSize: 1, pageNum: 1 }); diff --git a/klp-ui/src/components/Pagination/index.vue b/klp-ui/src/components/Pagination/index.vue index 1997a10e..64c8f8d1 100644 --- a/klp-ui/src/components/Pagination/index.vue +++ b/klp-ui/src/components/Pagination/index.vue @@ -37,7 +37,7 @@ export default { pageSizes: { type: Array, default() { - return [15, 20, 30, 50] + return [10, 15, 20, 30, 50] } }, // 移动端页码按钮的数量端默认值5 diff --git a/klp-ui/src/views/aps/lineCapability/index.vue b/klp-ui/src/views/aps/lineCapability/index.vue index 23687c43..be584bbd 100644 --- a/klp-ui/src/views/aps/lineCapability/index.vue +++ b/klp-ui/src/views/aps/lineCapability/index.vue @@ -236,7 +236,8 @@ export default { }, onLineRowClick(row) { this.queryParams.lineId = row.lineId - this.handleQuery() + console.log(row); + // this.handleQuery() }, getList() { this.loading = true @@ -264,8 +265,14 @@ export default { this.open = true return } + console.log(row); + const lineId = row.lineId ?? this.queryParams.lineId + if (!lineId) { + this.$modal.msgError('请选择产线') + return + } this.loading = true - getLineCapability(row.capabilityId).then(res => { + getLineCapability(lineId).then(res => { const d = res.data || {} this.form = { ...this.form, diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index bb2eaa5a..3beb627a 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -77,7 +77,7 @@ + :floatLayerConfig="floatLayerConfig" @row-click="handleRowClick"> @@ -721,6 +721,12 @@ export default { this.getUserList(); }, methods: { + // 处理行点击事件 + handleRowClick(row) { + this.currentCoilId = row.coilId; + this.logOpen = true; + }, + // 获取用户列表 getUserList() { listUser({ pageNum: 1, pageSize: 1000 }).then(res => { this.userList = res.rows || []; diff --git a/klp-ui/src/views/wms/hrm/records/meal.vue b/klp-ui/src/views/wms/hrm/records/meal.vue index fd82e323..92e07cdd 100644 --- a/klp-ui/src/views/wms/hrm/records/meal.vue +++ b/klp-ui/src/views/wms/hrm/records/meal.vue @@ -31,7 +31,6 @@ /> - - - - +