From 750b0fd9817230d02f7a862bf32082d36dd4bef2 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 13 May 2025 17:21:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/canteenInventoryRecords/form.vue  | 30 +++++--------------
 .../canteen/canteenInventoryRecords/index.vue |  3 +-
 .../canteenInventoryRecords/select-dialog.vue | 14 ++++-----
 3 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/src/views/canteen/canteenInventoryRecords/form.vue b/src/views/canteen/canteenInventoryRecords/form.vue
index d091d75..333d84f 100644
--- a/src/views/canteen/canteenInventoryRecords/form.vue
+++ b/src/views/canteen/canteenInventoryRecords/form.vue
@@ -22,8 +22,8 @@
 			</el-form>
 
 			<el-row class="my-3">
-				<el-button type="primary" plain @click="clickSelectDialog">商品选择</el-button>
-				<el-button @click="removeSelectedRows" :disabled="state.selectedRowIds.length <= 0"> 删除选中 </el-button>
+				<el-button type="primary" plain @click="clickSelectDialog">食材选择</el-button>
+				<el-button @click="removeSelectedRows" :disabled="state.selectedRowIds.length <= 0">删除选中</el-button>
 				<el-button type="danger" plain @click="clearData">清空数据</el-button>
 			</el-row>
 
@@ -64,7 +64,7 @@
 			>
 				<vxe-column type="checkbox" width="40" fixed="left" />
 				<vxe-column type="seq" width="50" fixed="left" />
-				<vxe-column field="name" title="库存商品" />
+				<vxe-column field="name" title="库存食材" />
 				<vxe-column field="stock" title="库存" />
 				<vxe-column field="unit" title="单位" />
 				<vxe-column field="quantity" title="数量" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
@@ -90,16 +90,6 @@
 						<el-input v-model="row.totalNumber" />
 					</template>
 				</vxe-column>
-				<vxe-column field="taxAmount" title="税前金额" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
-					<template #edit="{ row }">
-						<el-input v-model="row.taxAmount" />
-					</template>
-				</vxe-column>
-				<vxe-column field="taxRate" title="税率(%)" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
-					<template #edit="{ row }">
-						<el-input v-model="row.taxRate" />
-					</template>
-				</vxe-column>
 				<vxe-column field="totalAmount" title="累计总金额">
 					<template #default="{ row }">
 						{{ (Number(row.quantity || 0) * Number(row.realPrice || 0)).toFixed(2) }}
@@ -186,8 +176,6 @@ const validRules = ref<VxeTablePropTypes.EditRules<any>>({
 	quantity: [{ required: true, type: "number", min: 1, message: "必需大于等于0" }],
 	realPrice: [{ required: true, type: "number", min: 1, message: "必填" }],
 	totalNumber: [{ required: true, type: "number", min: 1, message: "必填" }],
-	taxAmount: [{ required: true, type: "number", min: 1, message: "必填" }],
-	taxRate: [{ required: true, type: "number", min: 1, message: "必填" }],
 })
 
 // 初始化数据
@@ -213,19 +201,19 @@ const getInitData = async () => {
 	}
 
 	// loading.value = true
-	// 获取简要商品列表
+	// 获取简要食材列表
 	// const [erpSpuSimpleAll] = await Promise.allSettled([getErpSpuSimpleAll()])
 	// 	.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
 	// 	.finally(() => (loading.value = false))
 	// erpSpuSimpleAll && erpSpuSimpleAll.code === 0 && (state.erpSpuSimpleAll = erpSpuSimpleAll.data)
 }
 
-// 点击商品选择
+// 点击食材选择
 const clickSelectDialog = () => selectDialogRef.value.openDialog()
 
-// 获取被选择的商品行
+// 获取被选择的食材行
 const getSelectedRows = (selectionRows: any) => {
-	console.log("被选择的商品行", selectionRows)
+	console.log("被选择的食材行", selectionRows)
 
 	// 筛选新勾选的项并处理
 	const addedItems = selectionRows
@@ -274,8 +262,6 @@ const tableFormItems = () => {
 			remark: item.remark,
 			orderType: 1,
 			totalNumber: item.totalNumber,
-			taxAmount: item.taxAmount,
-			taxRate: item.taxRate,
 		}
 	})
 }
@@ -299,7 +285,7 @@ const baseFormValidate = async () => {
 // 校验可编辑表格 成功返回 true 失败返回 false
 const itemTableFormValidate = async () => {
 	if (state.itemTableForm.length <= 0) {
-		useMessage().warning("请选择商品")
+		useMessage().warning("请选择食材")
 		return false
 	}
 
diff --git a/src/views/canteen/canteenInventoryRecords/index.vue b/src/views/canteen/canteenInventoryRecords/index.vue
index 40a8cc0..1371dc9 100644
--- a/src/views/canteen/canteenInventoryRecords/index.vue
+++ b/src/views/canteen/canteenInventoryRecords/index.vue
@@ -157,7 +157,8 @@ const create = () => {
 
 // 点击编辑
 const edit = (row: any) => {
-	row.id ? (formState.formId = row.id) : useMessage().warning("清单id不存在")
+	if (!row.id) return useMessage().warning("清单id不存在")
+	formState.formId = row.id
 	formState.showForm = true
 }
 
diff --git a/src/views/canteen/canteenInventoryRecords/select-dialog.vue b/src/views/canteen/canteenInventoryRecords/select-dialog.vue
index 9524514..79711af 100644
--- a/src/views/canteen/canteenInventoryRecords/select-dialog.vue
+++ b/src/views/canteen/canteenInventoryRecords/select-dialog.vue
@@ -1,9 +1,9 @@
 <template>
-	<el-dialog v-model="dialogVisible" title="选择商品" width="80%" :close-on-click-modal="false" draggable @close="dialogVisible = false">
+	<el-dialog v-model="dialogVisible" title="选择食材" width="80%" :close-on-click-modal="false" draggable @close="dialogVisible = false">
 		<el-row>
 			<el-form :model="queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataListAndSelect">
-				<el-form-item label="商品名称" prop="name">
-					<el-input placeholder="请输入商品名称" v-model="queryForm.name" />
+				<el-form-item label="食材名称" prop="name">
+					<el-input placeholder="请输入食材名称" v-model="queryForm.name" />
 				</el-form-item>
 				<el-form-item>
 					<el-button icon="search" type="primary" @click="getDataListAndSelect">查询</el-button>
@@ -22,7 +22,7 @@
 		>
 			<el-table-column type="selection" width="40" fixed="left" align="center" />
 			<el-table-column type="index" label="#" width="50" fixed="left" align="center" />
-			<el-table-column prop="name" label="商品名称" min-width="150px" align="center" show-overflow-tooltip />
+			<el-table-column prop="name" label="食材名称" min-width="150px" align="center" show-overflow-tooltip />
 			<el-table-column prop="unit" label="单位" min-width="100px" align="center" show-overflow-tooltip />
 			<el-table-column prop="stock" label="库存" min-width="80px" align="center" show-overflow-tooltip />
 		</el-table>
@@ -71,7 +71,7 @@ const openDialog = () => {
 	getDataListAndSelect()
 }
 
-// 获取商品数据并且勾选
+// 获取食材数据并且勾选
 const getDataListAndSelect = async () => {
 	loading.value = true
 	try {
@@ -115,12 +115,12 @@ const resetQuery = () => {
 	getDataListAndSelect()
 }
 
-// 点击商品列表表格行
+// 点击食材列表表格行
 const rowClick = (row: any) => {
 	tableRef.value.toggleRowSelection(row)
 }
 
-// 商品选择对话框确认
+// 食材选择对话框确认
 const dialogConfirm = () => {
 	const $table = tableRef.value
 	if ($table) {