From edf9d8bc1510131d73f3496abc0e62612e31a936 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 28 May 2025 14:52:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E6=9D=90=E5=88=86=E7=B1=BB=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/canteen/canteenErpMaterial/index.vue | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/views/canteen/canteenErpMaterial/index.vue b/src/views/canteen/canteenErpMaterial/index.vue
index 031868f..d6429b5 100644
--- a/src/views/canteen/canteenErpMaterial/index.vue
+++ b/src/views/canteen/canteenErpMaterial/index.vue
@@ -44,7 +44,11 @@
 				<el-table-column type="selection" width="40" align="center" />
 				<el-table-column type="index" label="#" width="40" />
 				<el-table-column prop="name" label="食材名称" show-overflow-tooltip />
-				<el-table-column prop="categoryName" label="食材分类" show-overflow-tooltip />
+				<el-table-column prop="categoryName" label="食材分类" show-overflow-tooltip>
+					<template #default="{ row }">
+						{{ canteenErpCategoryOptions.find((item: any) => item.id == row.categoryId)?.name }}
+					</template>
+				</el-table-column>
 				<el-table-column prop="unit" label="食材单位" show-overflow-tooltip />
 				<el-table-column prop="purchasePrice" label="进价" show-overflow-tooltip>
 					<template #default="{ row }">{{ displayPrice(row.purchasePrice, "") }}</template>
@@ -83,6 +87,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"
 import { fetchList, delObjs } from "/@/api/canteen/canteenErpMaterial"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { displayPrice } from "/@/utils/formatMoney"
+import { getSimpleAll } from "/@/api/canteen/canteenErpCategory"
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
@@ -100,6 +105,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
 	pageList: fetchList,
 })
+const canteenErpCategoryOptions = ref<any>([])
 
 //  table hook
 const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
@@ -140,4 +146,13 @@ const handleDelete = async (ids: string[]) => {
 		useMessage().error(err.msg)
 	}
 }
+
+onMounted(async () => {
+	const res = await getSimpleAll()
+	if (res.code == 0) {
+		canteenErpCategoryOptions.value = res.data
+	} else {
+		canteenErpCategoryOptions.value = []
+	}
+})
 </script>