From f52585c1ba7114b40a1425ff7eb32f7a31eba52b Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 12 May 2025 17:13:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A3=9F=E5=A0=82=E8=BF=9B=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/canteen/canteenErpMaterial.ts | 8 + src/api/canteen/canteenProductionTemplate.ts | 48 +++ .../canteenProductionTemplateDetail.ts | 41 ++ src/api/canteen/canteenSpu.ts | 8 + src/api/canteen/canteenSupplier.ts | 41 ++ .../canteenProductionTemplate/form.vue | 400 ++++++++++++++++++ .../canteenProductionTemplate/index.vue | 128 ++++++ .../canteenProductionTemplateDetail/form.vue | 125 ++++++ .../canteenProductionTemplateDetail/index.vue | 117 +++++ src/views/canteen/canteenSupplier/form.vue | 197 +++++++++ src/views/canteen/canteenSupplier/index.vue | 143 +++++++ 11 files changed, 1256 insertions(+) create mode 100644 src/api/canteen/canteenProductionTemplate.ts create mode 100644 src/api/canteen/canteenProductionTemplateDetail.ts create mode 100644 src/api/canteen/canteenSupplier.ts create mode 100644 src/views/canteen/canteenProductionTemplate/form.vue create mode 100644 src/views/canteen/canteenProductionTemplate/index.vue create mode 100644 src/views/canteen/canteenProductionTemplateDetail/form.vue create mode 100644 src/views/canteen/canteenProductionTemplateDetail/index.vue create mode 100644 src/views/canteen/canteenSupplier/form.vue create mode 100644 src/views/canteen/canteenSupplier/index.vue diff --git a/src/api/canteen/canteenErpMaterial.ts b/src/api/canteen/canteenErpMaterial.ts index dc70ff9..0fe95e7 100644 --- a/src/api/canteen/canteenErpMaterial.ts +++ b/src/api/canteen/canteenErpMaterial.ts @@ -8,6 +8,14 @@ export function fetchList(query?: Object) { }) } +export function fetchErpMaterialPageList(query?: Object) { + return request({ + url: '/canteen/canteenErpMaterial/erpMaterialPage', + method: 'get', + params: query + }) +} + export function addObj(obj?: Object) { return request({ url: '/canteen/canteenErpMaterial', diff --git a/src/api/canteen/canteenProductionTemplate.ts b/src/api/canteen/canteenProductionTemplate.ts new file mode 100644 index 0000000..294cef6 --- /dev/null +++ b/src/api/canteen/canteenProductionTemplate.ts @@ -0,0 +1,48 @@ +import request from "/@/utils/request" + +export function fetchList(query?: Object) { + return request({ + url: '/canteen/canteenProductionTemplate/page', + method: 'get', + params: query + }) +} + +export function addObj(obj?: Object) { + return request({ + url: '/canteen/canteenProductionTemplate', + method: 'post', + data: obj + }) +} + +export function getObj(id?: string) { + return request({ + url: '/canteen/canteenProductionTemplate/' + id, + method: 'get' + }) +} + +export function delObjs(ids?: Object) { + return request({ + url: '/canteen/canteenProductionTemplate', + method: 'delete', + data: ids + }) +} + +export function putObj(obj?: Object) { + return request({ + url: '/canteen/canteenProductionTemplate', + method: 'put', + data: obj + }) +} + +export function delChildObj(ids?: Object) { + return request({ + url: '/canteen/canteenProductionTemplate/child', + method: 'delete', + data: ids + }) +} diff --git a/src/api/canteen/canteenProductionTemplateDetail.ts b/src/api/canteen/canteenProductionTemplateDetail.ts new file mode 100644 index 0000000..599374d --- /dev/null +++ b/src/api/canteen/canteenProductionTemplateDetail.ts @@ -0,0 +1,41 @@ +import request from "/@/utils/request" + +export function fetchList(query?: Object) { + return request({ + url: '/canteen/canteenProductionTemplateDetail/page', + method: 'get', + params: query + }) +} + +export function addObj(obj?: Object) { + return request({ + url: '/canteen/canteenProductionTemplateDetail', + method: 'post', + data: obj + }) +} + +export function getObj(id?: string) { + return request({ + url: '/canteen/canteenProductionTemplateDetail/' + id, + method: 'get' + }) +} + +export function delObjs(ids?: Object) { + return request({ + url: '/canteen/canteenProductionTemplateDetail', + method: 'delete', + data: ids + }) +} + +export function putObj(obj?: Object) { + return request({ + url: '/canteen/canteenProductionTemplateDetail', + method: 'put', + data: obj + }) +} + diff --git a/src/api/canteen/canteenSpu.ts b/src/api/canteen/canteenSpu.ts index b07ebbf..24403d3 100644 --- a/src/api/canteen/canteenSpu.ts +++ b/src/api/canteen/canteenSpu.ts @@ -8,6 +8,14 @@ export function fetchList(query?: Object) { }) } +export function fetchSimpleList(query?: Object) { + return request({ + url: '/canteen/canteenSpu/getCanteenSpuSimplePage', + method: 'get', + params: query + }) +} + export function addObj(obj?: Object) { return request({ url: '/canteen/canteenSpu', diff --git a/src/api/canteen/canteenSupplier.ts b/src/api/canteen/canteenSupplier.ts new file mode 100644 index 0000000..0834984 --- /dev/null +++ b/src/api/canteen/canteenSupplier.ts @@ -0,0 +1,41 @@ +import request from "/@/utils/request" + +export function fetchList(query?: Object) { + return request({ + url: '/canteen/canteenSupplier/page', + method: 'get', + params: query + }) +} + +export function addObj(obj?: Object) { + return request({ + url: '/canteen/canteenSupplier', + method: 'post', + data: obj + }) +} + +export function getObj(id?: string) { + return request({ + url: '/canteen/canteenSupplier/' + id, + method: 'get' + }) +} + +export function delObjs(ids?: Object) { + return request({ + url: '/canteen/canteenSupplier', + method: 'delete', + data: ids + }) +} + +export function putObj(obj?: Object) { + return request({ + url: '/canteen/canteenSupplier', + method: 'put', + data: obj + }) +} + diff --git a/src/views/canteen/canteenProductionTemplate/form.vue b/src/views/canteen/canteenProductionTemplate/form.vue new file mode 100644 index 0000000..077f05d --- /dev/null +++ b/src/views/canteen/canteenProductionTemplate/form.vue @@ -0,0 +1,400 @@ + + + \ No newline at end of file diff --git a/src/views/canteen/canteenProductionTemplate/index.vue b/src/views/canteen/canteenProductionTemplate/index.vue new file mode 100644 index 0000000..e275292 --- /dev/null +++ b/src/views/canteen/canteenProductionTemplate/index.vue @@ -0,0 +1,128 @@ + + + diff --git a/src/views/canteen/canteenProductionTemplateDetail/form.vue b/src/views/canteen/canteenProductionTemplateDetail/form.vue new file mode 100644 index 0000000..17a37b4 --- /dev/null +++ b/src/views/canteen/canteenProductionTemplateDetail/form.vue @@ -0,0 +1,125 @@ + + + \ No newline at end of file diff --git a/src/views/canteen/canteenProductionTemplateDetail/index.vue b/src/views/canteen/canteenProductionTemplateDetail/index.vue new file mode 100644 index 0000000..2c9b20b --- /dev/null +++ b/src/views/canteen/canteenProductionTemplateDetail/index.vue @@ -0,0 +1,117 @@ + + + \ No newline at end of file diff --git a/src/views/canteen/canteenSupplier/form.vue b/src/views/canteen/canteenSupplier/form.vue new file mode 100644 index 0000000..55e2783 --- /dev/null +++ b/src/views/canteen/canteenSupplier/form.vue @@ -0,0 +1,197 @@ + + + \ No newline at end of file diff --git a/src/views/canteen/canteenSupplier/index.vue b/src/views/canteen/canteenSupplier/index.vue new file mode 100644 index 0000000..e1378cd --- /dev/null +++ b/src/views/canteen/canteenSupplier/index.vue @@ -0,0 +1,143 @@ + + + \ No newline at end of file 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 2/2] =?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) => {