From c59f2b6e9b18b3bc3a18525d0b75e218a8cd0bad Mon Sep 17 00:00:00 2001 From: jhd <1684074631@qq.com> Date: Fri, 15 May 2026 15:39:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A5=96=E9=87=91=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E5=92=8C=E5=85=AC=E8=BE=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- klp-ui/src/api/eqp/auxiliaryConsume.js | 54 ++ klp-ui/src/router/index.js | 12 + klp-ui/src/views/ems/assisted/statistics.vue | 882 +++++++++++++++++++ klp-ui/src/views/wms/bonus/statistics.vue | 667 ++++++++++++++ 4 files changed, 1615 insertions(+) create mode 100644 klp-ui/src/views/ems/assisted/statistics.vue create mode 100644 klp-ui/src/views/wms/bonus/statistics.vue diff --git a/klp-ui/src/api/eqp/auxiliaryConsume.js b/klp-ui/src/api/eqp/auxiliaryConsume.js index 14f76896..3925656f 100644 --- a/klp-ui/src/api/eqp/auxiliaryConsume.js +++ b/klp-ui/src/api/eqp/auxiliaryConsume.js @@ -42,3 +42,57 @@ export function delAuxiliaryConsume(consumeId) { method: 'delete' }) } +/** + * 获取消耗统计汇总 + */ +export function getConsumeStatistics(query) { + return request({ + url: '/eqp/auxiliaryConsume/statistics/list', + method: 'get', + params: query + }) +} + +/** + * 获取消耗趋势数据 + */ +export function getConsumeTrend(query) { + return request({ + url: '/eqp/auxiliaryConsume/statistics/trend', + method: 'get', + params: query + }) +} + +/** + * 按公辅类型统计 + */ +export function getConsumeByType(query) { + return request({ + url: '/eqp/auxiliaryConsume/statistics/groupByType', + method: 'get', + params: query + }) +} + +/** + * 按产线统计 + */ +export function getConsumeByLine(query) { + return request({ + url: '/eqp/auxiliaryConsume/statistics/groupByLine', + method: 'get', + params: query + }) +} + +/** + * 获取消耗明细 + */ +export function getConsumeDetail(query) { + return request({ + url: '/eqp/auxiliaryConsume/statistics/detail', + method: 'get', + params: query + }) +} diff --git a/klp-ui/src/router/index.js b/klp-ui/src/router/index.js index de5f0aba..6643f3d8 100644 --- a/klp-ui/src/router/index.js +++ b/klp-ui/src/router/index.js @@ -152,6 +152,18 @@ export const dynamicRoutes = [ } ] }, + { + path: '/ems/assisted/statistics', + component: Layout, + children: [ + { + path: '', + component: () => import('@/views/ems/assisted/statistics.vue'), + name: 'AuxiliaryStatistics', + meta: { title: '公辅消耗统计', icon: 'chart' } + } + ] + }, { path: '/system/role-auth', component: Layout, diff --git a/klp-ui/src/views/ems/assisted/statistics.vue b/klp-ui/src/views/ems/assisted/statistics.vue new file mode 100644 index 00000000..804c6c86 --- /dev/null +++ b/klp-ui/src/views/ems/assisted/statistics.vue @@ -0,0 +1,882 @@ + + + + + diff --git a/klp-ui/src/views/wms/bonus/statistics.vue b/klp-ui/src/views/wms/bonus/statistics.vue new file mode 100644 index 00000000..e39293e1 --- /dev/null +++ b/klp-ui/src/views/wms/bonus/statistics.vue @@ -0,0 +1,667 @@ + + + + + From 78b2e21da7739c87185b4b8d6dcc5baf36b32dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com> Date: Fri, 15 May 2026 16:36:27 +0800 Subject: [PATCH 2/2] refactor(wms): add component names and fix export time query MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 为多个wms页面组件添加name属性统一命名规范 2. 修复运单页面导出时间参数为空时的拼接报错问题 --- klp-ui/src/views/wms/coil/panels/base.vue | 4 ++-- klp-ui/src/views/wms/coil/ship.vue | 1 + klp-ui/src/views/wms/coil/waybill.vue | 1 + klp-ui/src/views/wms/delivery/bills/index.vue | 1 + klp-ui/src/views/wms/delivery/canuse/index.vue | 1 + klp-ui/src/views/wms/delivery/waybill/index.vue | 2 +- 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index 4d6d52c2..192afa3e 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -1747,8 +1747,8 @@ export default { ...this.queryParams, exportTimeBy: true, selectType: this.querys.materialType === '原料' ? 'raw_material' : 'product', - startTime: this.queryParams.shipmentTime?.[0] + ' 00:00:00', - endTime: this.queryParams.shipmentTime?.[1] + ' 23:59:59', + startTime: this.queryParams.shipmentTime?.[0] && this.queryParams.shipmentTime?.[0] + ' 00:00:00', + endTime: this.queryParams.shipmentTime?.[1] && this.queryParams.shipmentTime?.[1] + ' 23:59:59', } listBoundCoil(query).then(res => { this.materialCoilList = res.rows || []; diff --git a/klp-ui/src/views/wms/coil/ship.vue b/klp-ui/src/views/wms/coil/ship.vue index 94f28ba7..9efb8c00 100644 --- a/klp-ui/src/views/wms/coil/ship.vue +++ b/klp-ui/src/views/wms/coil/ship.vue @@ -6,6 +6,7 @@ import BasePage from './panels/base.vue'; export default { + name: "Exp-Coil", components: { BasePage }, diff --git a/klp-ui/src/views/wms/coil/waybill.vue b/klp-ui/src/views/wms/coil/waybill.vue index 21b3223f..a1c1cfb0 100644 --- a/klp-ui/src/views/wms/coil/waybill.vue +++ b/klp-ui/src/views/wms/coil/waybill.vue @@ -10,6 +10,7 @@ import BasePage from './panels/base.vue'; export default { + name: 'Exp-Bind', components: { BasePage }, diff --git a/klp-ui/src/views/wms/delivery/bills/index.vue b/klp-ui/src/views/wms/delivery/bills/index.vue index 033a4740..e4ab482e 100644 --- a/klp-ui/src/views/wms/delivery/bills/index.vue +++ b/klp-ui/src/views/wms/delivery/bills/index.vue @@ -70,6 +70,7 @@ import { listCoilByIds } from "@/api/wms/coil"; import WayBill from "../components/wayBill.vue"; export default { + name: "Exp-Bills", data() { return { deliveryWaybillList: [], diff --git a/klp-ui/src/views/wms/delivery/canuse/index.vue b/klp-ui/src/views/wms/delivery/canuse/index.vue index 85fad0e0..aa51d105 100644 --- a/klp-ui/src/views/wms/delivery/canuse/index.vue +++ b/klp-ui/src/views/wms/delivery/canuse/index.vue @@ -15,6 +15,7 @@ import BasePage from '@/views/wms/coil/panels/base.vue'; export default { + name: "Exp-Canuse", components: { BasePage }, diff --git a/klp-ui/src/views/wms/delivery/waybill/index.vue b/klp-ui/src/views/wms/delivery/waybill/index.vue index 3859f3e3..22acffa5 100644 --- a/klp-ui/src/views/wms/delivery/waybill/index.vue +++ b/klp-ui/src/views/wms/delivery/waybill/index.vue @@ -248,7 +248,7 @@ import PlanSelector from "../components/planSelector.vue"; import DragResizePanel from "@/components/DragResizePanel"; export default { - name: "DeliveryWaybill", + name: "Exp-Waybill", components: { MemoInput, DeliveryWaybillDetail,