From 23006c64e0d7478ff2e8c723f2bfda3781b65b09 Mon Sep 17 00:00:00 2001
From: zhang_12370 <z2864490065@outlook.com>
Date: 星期五, 18 七月 2025 11:59:20 +0800
Subject: [PATCH] 1、优化配煤计算器 2、优化正是库存数据渲染问题

---
 src/views/warehouseManagement/index.vue |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index 12bfcdc..b7bd8a4 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -483,7 +483,9 @@
 const mergeRows = (type,row) => {
   getDropdownData()
   coalPlanListOptions()
-  mergeVisible.value = true;
+  if (type === 'edit') {
+    mergeVisible.value = true;
+  }
   operationType.value = type;
   if (type !== 'merge') {
     mergeForm.value = {...row}
@@ -492,6 +494,7 @@
       proxy.$modal.msgWarning('璇疯嚦灏戦�夋嫨涓ゆ潯鏁版嵁')
       return
     }
+    mergeVisible.value = true;
     filteredList.value.forEach(item => {
       mergeForm.value[item.fields] = ''
     })

--
Gitblit v1.9.3