From aa6cb653d967f48e051d288b0b3a1115b7030cea Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 28 May 2025 12:56:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E6=9D=90=E7=AE=A1=E7=90=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=A3=9F=E6=9D=90=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/canteen/canteenErpCategory.ts         | 56 +++++++++++--------
 src/views/canteen/canteenErpMaterial/form.vue | 24 +++++++-
 .../canteen/canteenErpMaterial/index.vue      |  5 +-
 src/views/wallet/wallet-freeze/index.vue      |  2 +-
 4 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/src/api/canteen/canteenErpCategory.ts b/src/api/canteen/canteenErpCategory.ts
index e24915d..71d8e6c 100644
--- a/src/api/canteen/canteenErpCategory.ts
+++ b/src/api/canteen/canteenErpCategory.ts
@@ -1,41 +1,49 @@
 import request from "/@/utils/request"
 
 export function fetchList(query?: Object) {
-  return request({
-    url: '/canteen/canteenErpCategory/page',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: "/canteen/canteenErpCategory/page",
+		method: "get",
+		params: query,
+	})
 }
 
 export function addObj(obj?: Object) {
-  return request({
-    url: '/canteen/canteenErpCategory',
-    method: 'post',
-    data: obj
-  })
+	return request({
+		url: "/canteen/canteenErpCategory",
+		method: "post",
+		data: obj,
+	})
 }
 
 export function getObj(id?: string) {
-  return request({
-    url: '/canteen/canteenErpCategory/' + id,
-    method: 'get'
-  })
+	return request({
+		url: "/canteen/canteenErpCategory/" + id,
+		method: "get",
+	})
 }
 
 export function delObjs(ids?: Object) {
-  return request({
-    url: '/canteen/canteenErpCategory',
-    method: 'delete',
-    data: ids
-  })
+	return request({
+		url: "/canteen/canteenErpCategory",
+		method: "delete",
+		data: ids,
+	})
 }
 
 export function putObj(obj?: Object) {
-  return request({
-    url: '/canteen/canteenErpCategory',
-    method: 'put',
-    data: obj
-  })
+	return request({
+		url: "/canteen/canteenErpCategory",
+		method: "put",
+		data: obj,
+	})
 }
 
+// 食材分类下拉列表
+export function getSimpleAll(obj?: Object) {
+	return request({
+		url: "/canteen/canteenErpCategory/simpleAll",
+		method: "get",
+		data: obj,
+	})
+}
diff --git a/src/views/canteen/canteenErpMaterial/form.vue b/src/views/canteen/canteenErpMaterial/form.vue
index 98820e9..f2504f3 100644
--- a/src/views/canteen/canteenErpMaterial/form.vue
+++ b/src/views/canteen/canteenErpMaterial/form.vue
@@ -7,7 +7,13 @@
 						<el-input v-model="form.name" placeholder="请输入食材名称" />
 					</el-form-item>
 				</el-col>
-
+				<el-col :span="12" class="mb20">
+					<el-form-item label="食材分类" prop="categoryId">
+						<el-select v-model="form.categoryId" placeholder="请选择食材分类">
+							<el-option v-for="item in canteenErpCategoryOptions" :key="item?.id" :label="item?.name" :value="item?.id" />
+						</el-select>
+					</el-form-item>
+				</el-col>
 				<el-col :span="12" class="mb20">
 					<el-form-item label="食材单位" prop="unit">
 						<el-input v-model="form.unit" placeholder="请输入食材单位" />
@@ -46,11 +52,11 @@
 </template>
 
 <script setup lang="ts" name="CanteenErpMaterialDialog">
-import { useDict } from "/@/hooks/dict"
 import { useMessage } from "/@/hooks/message"
 import { getObj, addObj, putObj } from "/@/api/canteen/canteenErpMaterial"
-import { rule } from "/@/utils/validate"
+import { getSimpleAll } from "/@/api/canteen/canteenErpCategory"
 import { displayPrice, storePrice } from "/@/utils/formatMoney"
+
 const emit = defineEmits(["refresh"])
 
 // 定义变量内容
@@ -63,18 +69,21 @@ const loading = ref(false)
 const form = reactive({
 	id: "",
 	name: "",
+	categoryId: "",
 	unit: "",
 	purchasePrice: "",
 	baseStock: "",
 	inventoryLowerLimit: "",
 	inventoryUpperLimit: "",
 })
+const canteenErpCategoryOptions = ref<any>([])
 
 // 定义校验规则
 const dataRules = ref({
 	name: [{ required: true, message: "食材名称不能为空", trigger: "blur" }],
 	unit: [{ required: true, message: "食材单位不能为空", trigger: "blur" }],
 	purchasePrice: [{ required: true, message: "食材进价不能为空", trigger: "blur" }],
+	categoryId: [{ required: true, message: "食材分类不能为空", trigger: "blur" }],
 })
 
 // 打开弹窗
@@ -130,6 +139,15 @@ const getcanteenErpMaterialData = (id: string) => {
 		})
 }
 
+onMounted(async () => {
+	const res = await getSimpleAll()
+	if (res.code == 0) {
+		canteenErpCategoryOptions.value = res.data
+	} else {
+		canteenErpCategoryOptions.value = []
+	}
+})
+
 // 暴露变量
 defineExpose({
 	openDialog,
diff --git a/src/views/canteen/canteenErpMaterial/index.vue b/src/views/canteen/canteenErpMaterial/index.vue
index 5b8ea6f..031868f 100644
--- a/src/views/canteen/canteenErpMaterial/index.vue
+++ b/src/views/canteen/canteenErpMaterial/index.vue
@@ -43,8 +43,9 @@
 			>
 				<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="unit" label="商品单位" show-overflow-tooltip />
+				<el-table-column prop="name" label="食材名称" show-overflow-tooltip />
+				<el-table-column prop="categoryName" label="食材分类" show-overflow-tooltip />
+				<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>
 				</el-table-column>
diff --git a/src/views/wallet/wallet-freeze/index.vue b/src/views/wallet/wallet-freeze/index.vue
index 9e724fd..fa3672c 100644
--- a/src/views/wallet/wallet-freeze/index.vue
+++ b/src/views/wallet/wallet-freeze/index.vue
@@ -69,7 +69,7 @@
 				<el-table-column prop="createTime" label="创建时间" />
 				<el-table-column label="操作" width="200">
 					<template #default="{ row }">
-						<el-button v-if="row.processStatus == 1 && row.isCheckUser" icon="VideoPlay" text type="primary" @click="deal(row)">
+						<el-button v-if="row.processStatus == '1' && row.isCheckUser" icon="VideoPlay" text type="primary" @click="deal(row)">
 							开始处理
 						</el-button>
 						<el-button