From 0e24d8588ee984f38f1e4aa91a0e99b87f5730c6 Mon Sep 17 00:00:00 2001
From: "CANCERYS\\kw093" <kw093a011@gmail.com>
Date: Thu, 11 Jun 2026 19:52:39 +0800
Subject: [PATCH] so merge button

---
 src/components/DoSearch/DoSearch.tsx | 30 +++++++++++-----------------
 src/i18n/en/do.json                  |  2 ++
 src/i18n/zh/do.json                  |  2 ++
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/components/DoSearch/DoSearch.tsx b/src/components/DoSearch/DoSearch.tsx
index 86bbefa..b9d24a2 100644
--- a/src/components/DoSearch/DoSearch.tsx
+++ b/src/components/DoSearch/DoSearch.tsx
@@ -573,9 +573,7 @@ const DoSearch: React.FC<Props> = ({ filterArgs, searchQuery, onDeliveryOrderSea
       }
   
       const showMergeExtraOption = isWorkbench && activeTab === "ETRA";
-      const mergeCheckboxDefault = false;
 
-      // 显示确认对话框
       const result = await Swal.fire({
         icon: "question",
         title: t("Batch Release"),
@@ -591,31 +589,28 @@ const DoSearch: React.FC<Props> = ({ filterArgs, searchQuery, onDeliveryOrderSea
             </p>
             ${
               showMergeExtraOption
-                ? `<label style="display:flex;align-items:flex-start;gap:8px;margin-top:16px;font-size:0.95em;cursor:pointer;">
-                    <input type="checkbox" id="mergeExtraIntoLaneTicket" ${mergeCheckboxDefault ? "checked" : ""} style="margin-top:3px;" />
-                    <span>${t("Merge extra orders into lane batch ticket")}</span>
-                  </label>`
+                ? `<p style="font-size:0.95em;color:#666;margin-top:16px;">${t("Merge extra orders into lane batch ticket")}</p>`
                 : ""
             }
           </div>
         `,
         showCancelButton: true,
-        confirmButtonText: t("Confirm"),
+        showDenyButton: showMergeExtraOption,
+        confirmButtonText: showMergeExtraOption ? t("Confirm merge release") : t("Confirm"),
+        denyButtonText: t("Confirm release without merge"),
         cancelButtonText: t("Cancel"),
         confirmButtonColor: "#8dba00",
+        denyButtonColor: "#6366f1",
         cancelButtonColor: "#F04438",
-        preConfirm: () => {
-          if (!showMergeExtraOption) return { mergeExtraIntoLaneTicket: true };
-          const el = document.getElementById("mergeExtraIntoLaneTicket") as HTMLInputElement | null;
-          return { mergeExtraIntoLaneTicket: el?.checked ?? mergeCheckboxDefault };
-        },
       });
-    
-      if (result.isConfirmed) {
-        try {
+
+      if (result.isDismissed) return;
+      if (!result.isConfirmed && !result.isDenied) return;
+
+      const mergeExtraIntoLaneTicket = showMergeExtraOption ? result.isConfirmed : true;
+
+      try {
           let startRes ;
-          const mergeExtraIntoLaneTicket =
-            (result.value as { mergeExtraIntoLaneTicket?: boolean } | undefined)?.mergeExtraIntoLaneTicket ?? true;
           if(isWorkbench){
             startRes = await startWorkbenchBatchReleaseAsyncV2({
               ids: idsToRelease,
@@ -691,7 +686,6 @@ const DoSearch: React.FC<Props> = ({ filterArgs, searchQuery, onDeliveryOrderSea
           confirmButtonText: t("OK")
         });
       }
-    }
     } catch (error) {
       console.error("Error fetching all matching records:", error);
       await Swal.fire({
diff --git a/src/i18n/en/do.json b/src/i18n/en/do.json
index c4f361d..4e26e1a 100644
--- a/src/i18n/en/do.json
+++ b/src/i18n/en/do.json
@@ -32,6 +32,8 @@
   "Estimated Arrival To": "Estimated Arrival To",
   "Etra": "Etra",
   "Merge extra orders into lane batch ticket": "Merge into lane merge ticket (isExtrabatch, TI-M- prefix)",
+  "Confirm merge release": "Confirm merge release",
+  "Confirm release without merge": "Confirm release without merge",
   "Expiry Date": "Expiry Date",
   "Failed to assign pick orders. Please try again later.": "Failed to assign pick orders. Please try again later.",
   "Failed to release pick orders. Please try again later.": "Failed to release pick orders. Please try again later.",
diff --git a/src/i18n/zh/do.json b/src/i18n/zh/do.json
index dadf828..eba0589 100644
--- a/src/i18n/zh/do.json
+++ b/src/i18n/zh/do.json
@@ -12,6 +12,8 @@
   "Status": "來貨狀態",
   "Etra": "加單",
   "Merge extra orders into lane batch ticket": "合併同車線送貨訂單（TI-M- 合併票）",
+  "Confirm merge release": "確認合併放單",
+  "Confirm release without merge": "確認不放合併放單",
   "Loading": "正在加載...",
   "No delivery orders selected for batch release. Uncheck orders you want to exclude, or search again to reset selection.": "沒有選擇送貨訂單進行批量放單。取消勾選您想排除的訂單，或重新搜索以重置選擇。",
   "No Records": "沒有找到記錄",