From f2bd781efc7b0c8f6b5cfc0150d7f38aefcfe732 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 15 Jan 2026 14:11:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=A3=9F=E5=A0=82=E8=8F=9C=E5=93=81?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E7=BB=9F=E8=AE=A1(=E6=8C=89=E6=9C=88?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/hard/hard-total.ts | 17 +- src/views/act/act-cancel/index.vue | 55 ++-- .../components/product-total-table-by-day.vue | 180 +++++++++++++ .../product-total-table-by-month.vue | 180 +++++++++++++ .../components/product-total-table.vue | 3 +- .../hard/canteen-product-total/index.vue | 252 ++++++------------ 6 files changed, 478 insertions(+), 209 deletions(-) create mode 100644 src/views/hard/canteen-product-total/components/product-total-table-by-day.vue create mode 100644 src/views/hard/canteen-product-total/components/product-total-table-by-month.vue diff --git a/src/api/hard/hard-total.ts b/src/api/hard/hard-total.ts index d220d72..bca7dd9 100644 --- a/src/api/hard/hard-total.ts +++ b/src/api/hard/hard-total.ts @@ -27,7 +27,7 @@ export function productTotalByDept(query: any) { } /** - * 食堂统计 + * 食堂统计(按天) */ export function canteenProudctTotal(query: any) { return request({ @@ -41,6 +41,21 @@ export function canteenProudctTotal(query: any) { }) } +/** + * 食堂统计(按月) + */ +export function canteenProudctTotalByMonth(query: any) { + return request({ + url: "/hard/hard-canteen-total-log/proudct-total-by-month", + method: "post", + params: { + current: query.current, + size: query.size, + }, + data: query, + }) +} + /** * 食堂统计 */ diff --git a/src/views/act/act-cancel/index.vue b/src/views/act/act-cancel/index.vue index 2d296bd..e4073e5 100644 --- a/src/views/act/act-cancel/index.vue +++ b/src/views/act/act-cancel/index.vue @@ -24,38 +24,22 @@
- + 新 增 - + 删除 - +
- + @@ -68,14 +52,8 @@ @@ -95,14 +73,17 @@ - + diff --git a/src/views/hard/canteen-product-total/components/product-total-table-by-day.vue b/src/views/hard/canteen-product-total/components/product-total-table-by-day.vue new file mode 100644 index 0000000..7e1e311 --- /dev/null +++ b/src/views/hard/canteen-product-total/components/product-total-table-by-day.vue @@ -0,0 +1,180 @@ + + + \ No newline at end of file diff --git a/src/views/hard/canteen-product-total/components/product-total-table-by-month.vue b/src/views/hard/canteen-product-total/components/product-total-table-by-month.vue new file mode 100644 index 0000000..1fa673b --- /dev/null +++ b/src/views/hard/canteen-product-total/components/product-total-table-by-month.vue @@ -0,0 +1,180 @@ + + + \ No newline at end of file diff --git a/src/views/hard/canteen-product-total/components/product-total-table.vue b/src/views/hard/canteen-product-total/components/product-total-table.vue index 0ca8a7b..65443ce 100644 --- a/src/views/hard/canteen-product-total/components/product-total-table.vue +++ b/src/views/hard/canteen-product-total/components/product-total-table.vue @@ -83,10 +83,11 @@ const selectionChangHandle = (objs: { id: string }[]) => { multiple.value = !objs.length } -const openDialog = (createTimeStr: any, hourType: any) => { +const openDialog = (createTimeStr: any, hourType: any, createTimeType: any) => { visible.value = true state.queryForm.createTimeStr = createTimeStr state.queryForm.hourType = hourType + state.queryForm.createTimeType = createTimeType ?? "" getDataList() } diff --git a/src/views/hard/canteen-product-total/index.vue b/src/views/hard/canteen-product-total/index.vue index 657bec2..44d4281 100644 --- a/src/views/hard/canteen-product-total/index.vue +++ b/src/views/hard/canteen-product-total/index.vue @@ -5,7 +5,7 @@ @getSelectNode="handleGetSelectNode" switch-inactive-text="包含" switch-active-text="不包含" :defaultTreeWidth="20" :nodeClickable="false"> - +