From 3cd1201dbb08e710fb0b8a044162ff3a07c32bd5 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Wed, 21 May 2025 17:06:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=9A=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/integrated/meetingRoom/form.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/integrated/meetingRoom/form.vue b/src/views/integrated/meetingRoom/form.vue index fa78d2d..ebe4ab2 100644 --- a/src/views/integrated/meetingRoom/form.vue +++ b/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 }))) From 13888518d91e358b28de89077aa58f145960f2de Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Thu, 22 May 2025 23:22:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=9B=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/canteen/canteenErpMaterial/form.vue | 19 +++++++++++++------ .../canteenInventoryRecords/select-dialog.vue | 1 + 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/views/canteen/canteenErpMaterial/form.vue b/src/views/canteen/canteenErpMaterial/form.vue index 469b4d9..8cd475f 100644 --- a/src/views/canteen/canteenErpMaterial/form.vue +++ b/src/views/canteen/canteenErpMaterial/form.vue @@ -4,16 +4,21 @@ - - + + - - + + + + + + + @@ -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'}], }) // 打开弹窗 diff --git a/src/views/canteen/canteenInventoryRecords/select-dialog.vue b/src/views/canteen/canteenInventoryRecords/select-dialog.vue index f7d4e97..df36a8a 100644 --- a/src/views/canteen/canteenInventoryRecords/select-dialog.vue +++ b/src/views/canteen/canteenInventoryRecords/select-dialog.vue @@ -26,6 +26,7 @@ +