Merge branch 'production' of https://git.2fi-solutions.com/jason/FPSMS-frontend into production

src/components/DoSearch/DoSearch.tsx

@@ -576,9 +576,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"),
@@ -594,31 +592,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,
@@ -694,7 +689,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({

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.",

src/i18n/zh/do.json

@@ -61,6 +61,8 @@
   "processing": "處理中",
   "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": "沒有找到記錄",