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 @@
+
+
+
+
+
+
+ {{ parseTime(row.createTime, "{y}-{m}-{d}") }}
+
+
+
+
+
+
+
+
+
+
+ {{ displayPrice(row.productPrice) }}
+
+
+
+
+ {{ row.count }}份
+
+
+
+
+ {{ displayPrice(row.totalPrice) }}
+
+
+
+
+
+
+
+
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 @@
>
-
+
+
+ {{ parseTime(row.createTime, "{y}-{m}-{d}") }}
+
+
@@ -63,9 +67,22 @@
{{ row.payCount || 0 }}份
+
+
+ {{ displayPrice(row.totalPrice) }}
+
+
+
- 菜品详情
+
+ 菜品详情
+
@@ -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) => {