From 6a9d1d79399c445f818120703783e4bdf28ca121 Mon Sep 17 00:00:00 2001
From: zhang_12370 <z2864490065@outlook.com>
Date: 星期四, 26 六月 2025 11:36:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/zd-before into dev

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

diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index 2dfca16..8b73507 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -455,7 +455,8 @@
 }
 // 鍚堝苟搴撳瓨鏁版嵁鏂规硶
 const mergeRows = (type,row) => {
-  coalFieldListOption();
+  getDropdownData()
+  coalPlanListOptions()
   mergeVisible.value = true;
   operationType.value = type;
   if (type === 'edit') {

--
Gitblit v1.9.3