From 0fa67d4d02323411cfbe46cca1f470184068fb5c Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Fri, 17 Jan 2025 15:00:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=93=81=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/canteen/canteenCategory.ts           | 60 ++++++++++----------
 src/components/Select/SelectCtcg.vue         |  9 +--
 src/views/canteen/canteenDailyMenu/form.vue  | 10 ++--
 src/views/canteen/canteenDailyMenu/index.vue | 22 ++++---
 src/views/canteen/canteenSpu/index.vue       |  4 +-
 5 files changed, 54 insertions(+), 51 deletions(-)

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/Select/SelectCtcg.vue b/src/components/Select/SelectCtcg.vue
index 0ee43f8..432296c 100644
--- a/src/components/Select/SelectCtcg.vue
+++ b/src/components/Select/SelectCtcg.vue
@@ -26,7 +26,7 @@
 
 <script setup lang="ts" name="select-merchant">
 import { reactive } from "vue"
-import { fetchList as getCanteenCategory } from "/@/api/canteen/canteenCategory"
+import { getAllSimple as getCanteenCategory } from "/@/api/canteen/canteenCategory"
 
 const selectId = defineModel()
 
@@ -37,10 +37,7 @@ const props = withDefaults(defineProps<Props>(), {
 	placeholder: "请选择",
 })
 
-const queryForm = reactive<any>({
-	current: 1,
-	size: 9999,
-})
+const queryForm = reactive<any>({})
 
 const state = reactive<any>({
 	loading: true,
@@ -65,7 +62,7 @@ async function getOptions() {
 			...queryForm,
 		}
 		const { data } = await getCanteenCategory(_pa)
-		state.options = data.records ?? []
+		state.options = data ?? []
 	} finally {
 		setTimeout(() => (state.loading = false), 500)
 	}
diff --git a/src/views/canteen/canteenDailyMenu/form.vue b/src/views/canteen/canteenDailyMenu/form.vue
index bc0677f..96825e9 100644
--- a/src/views/canteen/canteenDailyMenu/form.vue
+++ b/src/views/canteen/canteenDailyMenu/form.vue
@@ -158,7 +158,7 @@ import { useMessage } from "/@/hooks/message"
 import { rule } from "/@/utils/validate"
 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"
 import { getObj, addObj, putObj, getCanteenDailyMenuList } from "/@/api/canteen/canteenDailyMenu"
 
 const emit = defineEmits(["refresh"])
@@ -339,10 +339,12 @@ const handleClickSelect = async () => {
 	selectObjs.value = [...selectedFood.value]
 
 	await getDataListAndSelect() // 获取菜品数据并且勾选表格行
-	// 获取菜品分类数据
+	// 获取菜品分类
 	try {
-		const res = await getCanteenCategory({ current: 1, size: 999999 })
-		categoryOptions.value = res.data.records
+		const res = await getCanteenCategory()
+		if (res.code === 0) {
+			categoryOptions.value = res.data
+		}
 	} catch (error) {
 		categoryOptions.value = []
 	}
diff --git a/src/views/canteen/canteenDailyMenu/index.vue b/src/views/canteen/canteenDailyMenu/index.vue
index 1983c3a..9454213 100644
--- a/src/views/canteen/canteenDailyMenu/index.vue
+++ b/src/views/canteen/canteenDailyMenu/index.vue
@@ -81,7 +81,7 @@
 <script setup lang="ts" name="systemCanteenDailyMenu">
 import { ElMessageBox } from "element-plus"
 import { delObjs, selectTimeFoodApi, selectWeekInfo } from "/@/api/canteen/canteenDailyMenu"
-import { fetchList } from "/@/api/canteen/canteenCategory"
+import { getAllSimple as getCanteenCategory } from "/@/api/canteen/canteenCategory"
 import { useMessage } from "/@/hooks/message"
 import { pageJoin } from "/@/api/wallet/mch-manage"
 import { displayPrice } from "/@/utils/formatMoney"
@@ -218,16 +218,20 @@ const merchantInit = async () => {
 	}
 }
 
+// 菜品分类
 const canteenCategoryOption = ref<any>([])
-// 获取菜品分类
-const getCanteenCategory = async () => {
-	const res = await fetchList({ current: 1, size: 9999 })
-	if (res.code === 0) {
-		canteenCategoryOption.value = res.data.records
-	}
-}
+
 onMounted(async () => {
-	await getCanteenCategory()
+	try {
+		// 获取菜品分类
+		const res = await getCanteenCategory()
+		if (res.code === 0) {
+			canteenCategoryOption.value = res.data
+		}
+	} catch (error) {
+		canteenCategoryOption.value = []
+	}
+
 	await merchantInit()
 })
 </script>
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<BasicTableProps>({
 onMounted(async () => {
 	try {
 		const res = await getCanteenCategory()
-		categoryOptions.value = res.data.records
+		categoryOptions.value = res.data
 	} catch (error) {
 		categoryOptions.value = []
 	}