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 @@ /> - - - - +