From 270a3737898ff7ae243f803a012cfc90404b9cb1 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Mon, 12 May 2025 17:26:55 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- src/api/hard/hard-total.ts | 15 +++ .../components/product-total-table.vue | 105 ++++++++++++++++++ .../hard/canteen-product-total/index.vue | 29 ++++- 4 files changed, 147 insertions(+), 6 deletions(-) create mode 100644 src/views/hard/canteen-product-total/components/product-total-table.vue diff --git a/.env.development b/.env.development index 6d86353..8ee6e13 100644 --- a/.env.development +++ b/.env.development @@ -11,14 +11,14 @@ ENV = 'development' # VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/ # VITE_ADMIN_PROXY_PATH = http://localhost:9999/ -VITE_ADMIN_PROXY_PATH = http://192.168.101.123:9999/ # 邓-本地 +VITE_ADMIN_PROXY_PATH = http://192.168.101.125:9999/ # 邓-本地 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上 # 图片访问基础地址 # VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api/ # 测试线上 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # VITE_IMAGE_BASE_PATH = http://localhost:9999 -VITE_IMAGE_BASE_PATH = http://192.168.101.123:9999 # 邓-本地 +VITE_IMAGE_BASE_PATH = http://192.168.101.125:9999 # 邓-本地 # VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上 # 代码生成服务地址 diff --git a/src/api/hard/hard-total.ts b/src/api/hard/hard-total.ts index c7c328f..e564982 100644 --- a/src/api/hard/hard-total.ts +++ b/src/api/hard/hard-total.ts @@ -15,6 +15,21 @@ export function canteenProudctTotal(query: any) { }) } +/** + * 食堂统计 + */ +export function canteenProudctQuery(query: any) { + return request({ + url: "/hard/hard-canteen-total-log/proudct-query", + method: "post", + params: { + current: query.current, + size: query.size, + }, + data: query, + }) +} + export function pageListDept(query?: any) { return request({ url: "/hard/hard-total/page-list-dept", 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 new file mode 100644 index 0000000..d025338 --- /dev/null +++ b/src/views/hard/canteen-product-total/components/product-total-table.vue @@ -0,0 +1,105 @@ + + + diff --git a/src/views/hard/canteen-product-total/index.vue b/src/views/hard/canteen-product-total/index.vue index 0982d8b..976e88d 100644 --- a/src/views/hard/canteen-product-total/index.vue +++ b/src/views/hard/canteen-product-total/index.vue @@ -52,7 +52,11 @@ > - + + + + + + + @@ -73,6 +90,7 @@ + @@ -81,11 +99,14 @@ import { BasicTableProps, useTable } from "/@/hooks/table" import * as hardTotalApi from "/@/api/hard/hard-total" import { displayPrice } from "/@/utils/formatMoney" import { useDict } from "/@/hooks/dict" +import { parseTime } from "/@/utils/formatTime" + +const ProductTotalTable = defineAsyncComponent(() => import("./components/product-total-table.vue")) // 搜索变量 const queryRef = ref() const showSearch = ref(true) - +const productTotalTableRef = ref() // 多选变量 const selectObjs = ref([]) as any const multiple = ref(true) @@ -109,7 +130,7 @@ const exportExcel = () => { const getSummaries = (param: any) => { const { columns, data } = param - const totalColumns = ["payCount"] + const totalColumns = ["payCount", "totalPrice"] const totalRow = Array.from({ length: columns.length }) totalRow[0] = "合计" columns.forEach((i: any, index: number) => {