@@ -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({
