From 0eccc798c6286aab8b473db63a42518363c8b966 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 26 八月 2025 09:06:32 +0800
Subject: [PATCH] 人力资源页面

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

diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index 02d226f..32946d7 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -724,6 +724,7 @@
         "鏁版嵁锛�"
     )
     .then((res) => {
+      console.log(res);
       if (res) {
         ElMessage.success("姝e湪瀵煎嚭鏁版嵁锛岃绋嶅��...");
         exportData(config.api, config.name);
@@ -742,9 +743,9 @@
 const mergeRows = (type, row) => {
   getDropdownData();
   coalPlanListOptions();
-  if (type === "edit") {
+  if (type === "edit" || type === "view") {
     mergeVisible.value = true;
-  }
+  } 
   operationType.value = type;
   if (type !== "merge") {
     mergeForm.value = { ...row };

--
Gitblit v1.9.3