diff --git a/src/api/canteen/canteenCategory.ts b/src/api/canteen/canteenCategory.ts index 9b5f113..7a80003 100644 --- a/src/api/canteen/canteenCategory.ts +++ b/src/api/canteen/canteenCategory.ts @@ -1,48 +1,48 @@ import request from "/@/utils/request" export function fetchList(query?: Object) { - return request({ - url: '/canteen/canteenCategory/page', - method: 'get', - params: query - }) + return request({ + url: "/canteen/canteenCategory/page", + method: "get", + params: query, + }) } export function addObj(obj?: Object) { - return request({ - url: '/canteen/canteenCategory', - method: 'post', - data: obj - }) + return request({ + url: "/canteen/canteenCategory", + method: "post", + data: obj, + }) } export function getObj(id?: string) { - return request({ - url: '/canteen/canteenCategory/' + id, - method: 'get' - }) + return request({ + url: "/canteen/canteenCategory/" + id, + method: "get", + }) } export function delObjs(ids?: Object) { - return request({ - url: '/canteen/canteenCategory', - method: 'delete', - data: ids - }) + return request({ + url: "/canteen/canteenCategory", + method: "delete", + data: ids, + }) } export function putObj(obj?: Object) { - return request({ - url: '/canteen/canteenCategory', - method: 'put', - data: obj - }) + return request({ + url: "/canteen/canteenCategory", + method: "put", + data: obj, + }) } -export function getAllSimple() { - return request({ - url: '/canteen/canteenCategory/getAllSimple', - method: 'get', - }) +export function getAllSimple(query?: any) { + return request({ + url: "/canteen/canteenCategory/getAllSimple", + method: "get", + params: query, + }) } - diff --git a/src/components/DictSelect/index.vue b/src/components/DictSelect/index.vue index 602d897..260e222 100644 --- a/src/components/DictSelect/index.vue +++ b/src/components/DictSelect/index.vue @@ -1,52 +1,66 @@ diff --git a/src/components/Select/SelectCtcg.vue b/src/components/Select/SelectCtcg.vue index 20db09d..432296c 100644 --- a/src/components/Select/SelectCtcg.vue +++ b/src/components/Select/SelectCtcg.vue @@ -25,8 +25,8 @@ \ No newline at end of file + diff --git a/src/components/Select/SelectMch.vue b/src/components/Select/SelectMch.vue index 509095e..0856b43 100644 --- a/src/components/Select/SelectMch.vue +++ b/src/components/Select/SelectMch.vue @@ -25,7 +25,7 @@ \ No newline at end of file + diff --git a/src/components/Select/selectHardGroup.vue b/src/components/Select/selectHardGroup.vue index d41fe71..f6f14a8 100644 --- a/src/components/Select/selectHardGroup.vue +++ b/src/components/Select/selectHardGroup.vue @@ -20,7 +20,7 @@ diff --git a/src/views/canteen/canteenSpu/index.vue b/src/views/canteen/canteenSpu/index.vue index 99dfb0c..a1c926c 100644 --- a/src/views/canteen/canteenSpu/index.vue +++ b/src/views/canteen/canteenSpu/index.vue @@ -127,7 +127,7 @@ import { fetchList, delObjs } from "/@/api/canteen/canteenSpu" import { useMessage, useMessageBox } from "/@/hooks/message" import { useDict } from "/@/hooks/dict" import { displayPrice } from "/@/utils/formatMoney" -import { fetchList as getCanteenCategory } from "/@/api/canteen/canteenCategory" +import { getAllSimple as getCanteenCategory } from "/@/api/canteen/canteenCategory" // 引入组件 const FormDialog = defineAsyncComponent(() => import("./form.vue")) @@ -151,7 +151,7 @@ const state: BasicTableProps = reactive({ onMounted(async () => { try { const res = await getCanteenCategory() - categoryOptions.value = res.data.records + categoryOptions.value = res.data } catch (error) { categoryOptions.value = [] } diff --git a/src/views/home/navMenu/index.vue b/src/views/home/navMenu/index.vue index 6537e14..05b5195 100644 --- a/src/views/home/navMenu/index.vue +++ b/src/views/home/navMenu/index.vue @@ -2,7 +2,10 @@ -
+
@@ -10,7 +13,7 @@
- +