Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

src/views/canteen/canteenErpMaterial/form.vue

@@ -4,16 +4,21 @@
       <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 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 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">
@@ -59,6 +64,7 @@ const form = reactive({
 		id:'',
 	  name: '',
 	  unit: '',
+  purchasePrice: '',
     baseStock: '',
   inventoryLowerLimit:  '',
     inventoryUpperLimit:  '',
@@ -66,8 +72,9 @@ const form = reactive({
 
 // 定义校验规则
 const dataRules = ref({
-        name: [{required: true, message: '商品名称不能为空', trigger: 'blur'}],
-        unit: [{required: true, message: '商品单位不能为空', trigger: 'blur'}],
+        name: [{required: true, message: '食材名称不能为空', trigger: 'blur'}],
+        unit: [{required: true, message: '食材单位不能为空', trigger: 'blur'}],
+  purchasePrice: [{required: true, message: '食材进价不能为空', trigger: 'blur'}],
 })
 
 // 打开弹窗

src/views/canteen/canteenInventoryRecords/select-dialog.vue

@@ -26,7 +26,7 @@
 			<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-column prop="purchasePrice" label="原进价" min-width="80px" align="center" show-overflow-tooltip>
+			<el-table-column prop="purchasePrice" label="食材价格(元)" min-width="80px" align="center" show-overflow-tooltip>
 				<template #default="{ row }">{{ displayPrice(row.purchasePrice) }}</template>
 			</el-table-column>
 		</el-table>

src/views/integrated/meetingRoom/form.vue

@@ -155,7 +155,7 @@ const loading = ref(false)
 const activeTab = ref('basic')
 
 interface Equipment {
-  id: string;
+  equipId: string;
   equipmentName: string;
   quantity: number;
 }
@@ -258,12 +258,12 @@ const handleCurrentChange = (val: number) => {
 const handleEquipmentConfirm = () => {
   // 过滤掉已经存在的设备
   const newEquipment = selectedEquipment.value.filter(selected => 
-    !equipmentList.value.some(existing => existing.id === selected.id)
+    !equipmentList.value.some(existing => existing.equipId === selected.id)
   )
   
   // 添加新选择的设备
   equipmentList.value.push(...newEquipment.map(item => ({
-    id: item.id,
+    equipId: item.id,
     equipmentName: item.name,
     quantity: 1
   })))