From 0a7cfe3df0991bd2eb2b3ee6508e5bccd14ea6e6 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 23 May 2025 10:13:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E6=9D=90=E7=AE=A1=E7=90=86=E8=BF=9B?=
 =?UTF-8?q?=E4=BB=B7=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/canteen/canteenErpMaterial/form.vue | 190 +++++++++---------
 .../canteen/canteenErpMaterial/index.vue      | 183 +++++++++--------
 .../canteen/canteenInventoryRecords/form.vue  |   3 +-
 3 files changed, 204 insertions(+), 172 deletions(-)

diff --git a/src/views/canteen/canteenErpMaterial/form.vue b/src/views/canteen/canteenErpMaterial/form.vue
index 8cd475f..98820e9 100644
--- a/src/views/canteen/canteenErpMaterial/form.vue
+++ b/src/views/canteen/canteenErpMaterial/form.vue
@@ -1,131 +1,137 @@
 <template>
-    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
-      :close-on-click-modal="false" draggable>
-      <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
-       <el-row :gutter="24">
-    <el-col :span="12" class="mb20">
-      <el-form-item label="食材名称" prop="name">
-        <el-input v-model="form.name" placeholder="请输入食材名称"/>
-      </el-form-item>
-      </el-col>
+	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+			<el-row :gutter="24">
+				<el-col :span="12" class="mb20">
+					<el-form-item label="食材名称" prop="name">
+						<el-input v-model="form.name" placeholder="请输入食材名称" />
+					</el-form-item>
+				</el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="食材单位" prop="unit">
-        <el-input v-model="form.unit" placeholder="请输入食材单位"/>
-      </el-form-item>
-      </el-col>
-         <el-col :span="24" class="mb20">
-           <el-form-item  label="进价(元)" prop="purchasePrice">
-             <el-input v-model="form.purchasePrice" placeholder="请输入食材进价"/>
-           </el-form-item>
-         </el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="食材单位" prop="unit">
+						<el-input v-model="form.unit" placeholder="请输入食材单位" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="进价(元)" prop="purchasePrice">
+						<el-input v-model="form.purchasePrice" placeholder="请输入食材进价" />
+					</el-form-item>
+				</el-col>
 
-         <el-col :span="12" class="mb20">
-           <el-form-item label="期初库存" prop="baseStock">
-             <el-input v-model="form.baseStock" placeholder="请输入期初库存"/>
-           </el-form-item>
-         </el-col>
-         <el-col :span="12" class="mb20">
-           <el-form-item label="库存下限" prop="inventoryLowerLimit">
-             <el-input v-model="form.inventoryLowerLimit" placeholder="请输入库存下限"/>
-           </el-form-item>
-         </el-col>
-         <el-col :span="12" class="mb20">
-           <el-form-item label="库存上限" prop="inventoryUpperLimit">
-             <el-input v-model="form.inventoryUpperLimit" placeholder="请输入库存上限"/>
-           </el-form-item>
-         </el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="期初库存" prop="baseStock">
+						<el-input v-model="form.baseStock" placeholder="请输入期初库存" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="库存下限" prop="inventoryLowerLimit">
+						<el-input v-model="form.inventoryLowerLimit" placeholder="请输入库存下限" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="库存上限" prop="inventoryUpperLimit">
+						<el-input v-model="form.inventoryUpperLimit" placeholder="请输入库存上限" />
+					</el-form-item>
+				</el-col>
 			</el-row>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="visible = false">取消</el-button>
-          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-        </span>
-      </template>
-    </el-dialog>
+		</el-form>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="visible = false">取消</el-button>
+				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+			</span>
+		</template>
+	</el-dialog>
 </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';
-const emit = defineEmits(['refresh']);
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import { getObj, addObj, putObj } from "/@/api/canteen/canteenErpMaterial"
+import { rule } from "/@/utils/validate"
+import { displayPrice, storePrice } from "/@/utils/formatMoney"
+const emit = defineEmits(["refresh"])
 
 // 定义变量内容
-const dataFormRef = ref();
+const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
 
 // 提交表单数据
 const form = reactive({
-		id:'',
-	  name: '',
-	  unit: '',
-  purchasePrice: '',
-    baseStock: '',
-  inventoryLowerLimit:  '',
-    inventoryUpperLimit:  '',
-});
+	id: "",
+	name: "",
+	unit: "",
+	purchasePrice: "",
+	baseStock: "",
+	inventoryLowerLimit: "",
+	inventoryUpperLimit: "",
+})
 
 // 定义校验规则
 const dataRules = ref({
-        name: [{required: true, message: '食材名称不能为空', trigger: 'blur'}],
-        unit: [{required: true, message: '食材单位不能为空', trigger: 'blur'}],
-  purchasePrice: [{required: true, message: '食材进价不能为空', trigger: 'blur'}],
+	name: [{ required: true, message: "食材名称不能为空", trigger: "blur" }],
+	unit: [{ required: true, message: "食材单位不能为空", trigger: "blur" }],
+	purchasePrice: [{ required: true, message: "食材进价不能为空", trigger: "blur" }],
 })
 
 // 打开弹窗
 const openDialog = (id: string) => {
-  visible.value = true
-  form.id = ''
+	visible.value = true
+	form.id = ""
 
-  // 重置表单数据
+	// 重置表单数据
 	nextTick(() => {
-		dataFormRef.value?.resetFields();
-	});
+		dataFormRef.value?.resetFields()
+	})
 
-  // 获取canteenErpMaterial信息
-  if (id) {
-    form.id = id
-    getcanteenErpMaterialData(id)
-  }
-};
+	// 获取canteenErpMaterial信息
+	if (id) {
+		form.id = id
+		getcanteenErpMaterialData(id)
+	}
+}
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {});
-	if (!valid) return false;
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
+
+	const _pa = {
+		...form,
+		purchasePrice: storePrice(form.purchasePrice),
+	}
 
 	try {
-    loading.value = true;
-		form.id ? await putObj(form) : await addObj(form);
-		useMessage().success(form.id ? '修改成功' : '添加成功');
-		visible.value = false;
-		emit('refresh');
+		loading.value = true
+		form.id ? await putObj(_pa) : await addObj(_pa)
+		useMessage().success(form.id ? "修改成功" : "添加成功")
+		visible.value = false
+		emit("refresh")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	} finally {
-    loading.value = false;
-  }
-};
-
+		loading.value = false
+	}
+}
 
 // 初始化表单数据
 const getcanteenErpMaterialData = (id: string) => {
-  // 获取数据
-  loading.value = true
-  getObj(id).then((res: any) => {
-    Object.assign(form, res.data)
-  }).finally(() => {
-    loading.value = false
-  })
-};
+	// 获取数据
+	loading.value = true
+	getObj(id)
+		.then((res: any) => {
+			Object.assign(form, res.data, { purchasePrice: displayPrice(res.data.purchasePrice, "") })
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
 
 // 暴露变量
 defineExpose({
-  openDialog
-});
+	openDialog,
+})
 </script>
diff --git a/src/views/canteen/canteenErpMaterial/index.vue b/src/views/canteen/canteenErpMaterial/index.vue
index 82e609a..a92c985 100644
--- a/src/views/canteen/canteenErpMaterial/index.vue
+++ b/src/views/canteen/canteenErpMaterial/index.vue
@@ -1,58 +1,90 @@
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-            v-auth="'canteen_canteenErpMaterial_add'">
-            新 增
-          </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary"
-            v-auth="'canteen_canteenErpMaterial_del'" @click="handleDelete(selectObjs)">
-            删除
-          </el-button>
-          <right-toolbar v-model:showSearch="showSearch" :export="'canteen_canteenErpMaterial_export'"
-                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
-            @queryTable="getDataList"></right-toolbar>
-        </div>
-      </el-row>
-      <el-table :data="state.dataList" v-loading="state.loading" border
-        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button
+						icon="folder-add"
+						type="primary"
+						class="ml10"
+						@click="formDialogRef.openDialog()"
+						v-auth="'canteen_canteenErpMaterial_add'"
+					>
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'canteen_canteenErpMaterial_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'canteen_canteenErpMaterial_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
-        @sort-change="sortChangeHandle">
-        <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="baseStock" label="期初库存"  show-overflow-tooltip/>
-        <el-table-column prop="currentStock" label="总库存"  show-overflow-tooltip/>
-        <el-table-column prop="inventoryLowerLimit" label="库存下限"  show-overflow-tooltip/>
-        <el-table-column prop="inventoryUpperLimit" label="库存上限"  show-overflow-tooltip/>
-        <el-table-column label="操作" width="150">
-          <template #default="scope">
-            <el-button icon="edit-pen" text type="primary" v-auth="'canteen_canteenErpMaterial_edit'"
-              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
-            <el-button icon="delete" text type="primary" v-auth="'canteen_canteenErpMaterial_del'" @click="handleDelete([scope.row.id])">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
-    </div>
+				@sort-change="sortChangeHandle"
+			>
+				<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="purchasePrice" label="进价(元)" show-overflow-tooltip>
+					<template #default="{ row }">{{ displayPrice(row.purchasePrice, "") }}</template>
+				</el-table-column>
+				<el-table-column prop="baseStock" label="期初库存" show-overflow-tooltip />
+				<el-table-column prop="currentStock" label="总库存" show-overflow-tooltip />
+				<el-table-column prop="inventoryLowerLimit" label="库存下限" show-overflow-tooltip />
+				<el-table-column prop="inventoryUpperLimit" label="库存上限" show-overflow-tooltip />
+				<el-table-column label="操作" width="150">
+					<template #default="scope">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'canteen_canteenErpMaterial_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+						>
+							编辑
+						</el-button>
+						<el-button icon="delete" text type="primary" v-auth="'canteen_canteenErpMaterial_del'" @click="handleDelete([scope.row.id])">
+							删除
+						</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
 
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
-
-  </div>
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+	</div>
 </template>
 
 <script setup lang="ts" name="systemCanteenErpMaterial">
-import { BasicTableProps, useTable } from "/@/hooks/table";
-import { fetchList, delObjs } from "/@/api/canteen/canteenErpMaterial";
-import { useMessage, useMessageBox } from "/@/hooks/message";
-import { useDict } from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/canteen/canteenErpMaterial"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { displayPrice } from "/@/utils/formatMoney"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
 
 // 定义变量内容
@@ -65,54 +97,47 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {},
-  pageList: fetchList
+	queryForm: {},
+	pageList: fetchList,
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-	tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/canteen/canteenErpMaterial/export', Object.assign(state.queryForm, { ids: selectObjs }), 'canteenErpMaterial.xlsx')
+	downBlobFile("/canteen/canteenErpMaterial/export", Object.assign(state.queryForm, { ids: selectObjs }), "canteenErpMaterial.xlsx")
 }
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-  selectObjs.value = objs.map(({ id }) => id);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm('此操作将永久删除');
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
 
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success('删除成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 </script>
diff --git a/src/views/canteen/canteenInventoryRecords/form.vue b/src/views/canteen/canteenInventoryRecords/form.vue
index 1701ddb..d16209d 100644
--- a/src/views/canteen/canteenInventoryRecords/form.vue
+++ b/src/views/canteen/canteenInventoryRecords/form.vue
@@ -154,7 +154,8 @@ const openDialog = async (id: string) => {
 			.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
 			.finally(() => (loading.value = false))
 		if (res && res.code == 0) {
-			Object.assign(baseForm, res.data, { items: "" })
+			Object.assign(baseForm, res.data)
+			delete baseForm.items
 			state.itemTableForm = res.data.items.map((item: any) => ({
 				...item,
 				purchasePrice: item.unitPrice,