summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorjoonhoekim <26rote@gmail.com>2025-11-27 13:48:44 +0900
committerjoonhoekim <26rote@gmail.com>2025-11-27 13:48:44 +0900
commitb43b1d92ef3d7e57b5df5cd72f75dc3a1c3f1c7a (patch)
tree943e2a52c9e56bdce2fa3a35ef61b795370f47e0 /app
parent79cfa7ea8f21ae227dbb2843ae536fe876ba7c55 (diff)
(김준회) swp 파일 개수 컬럼 삭제 (API에서 주지 않는 데이터), dolce rebuild 에서 상태값 수정, bulk upload MatchBatchFileDwg API 사용해 Edit 으로 보내도록 수정 (Category, status 하드코딩 값 넣어주도록 처리), 상세도면, 파일 추가시 확인 다이얼로그 추가
Diffstat (limited to 'app')
-rw-r--r--app/[lng]/partners/(partners)/dolce-upload-v2/dolce-upload-page-v2.tsx21
-rw-r--r--app/[lng]/partners/(partners)/dolce-upload-v2/page.tsx9
2 files changed, 12 insertions, 18 deletions
diff --git a/app/[lng]/partners/(partners)/dolce-upload-v2/dolce-upload-page-v2.tsx b/app/[lng]/partners/(partners)/dolce-upload-v2/dolce-upload-page-v2.tsx
index f5337c1c..29b41136 100644
--- a/app/[lng]/partners/(partners)/dolce-upload-v2/dolce-upload-page-v2.tsx
+++ b/app/[lng]/partners/(partners)/dolce-upload-v2/dolce-upload-page-v2.tsx
@@ -33,8 +33,8 @@ import { drawingListColumns } from "@/lib/dolce/table/drawing-list-columns";
import { createGttDrawingListColumns, DocumentType } from "@/lib/dolce/table/gtt-drawing-list-columns";
import { createDetailDrawingColumns } from "@/lib/dolce/table/detail-drawing-columns";
import { createFileListColumns } from "@/lib/dolce/table/file-list-columns";
-// V2: MatchBatchFileDwg API를 사용하지 않는 새로운 일괄 업로드 (DetailDwgReceiptMgmtEdit 사용)
-import { B4BulkUploadDialogV2 } from "@/lib/dolce/dialogs/b4-bulk-upload-dialog-v2";
+// V3: Sync 기능 없이 일괄 업로드 (MatchBatchFileDwg / Edit 사용)
+import { B4BulkUploadDialogV3 } from "@/lib/dolce/dialogs/b4-bulk-upload-dialog-v3";
// V1로 되돌리려면: 위 줄을 주석 처리하고 아래 줄의 주석을 해제하세요
// import { B4BulkUploadDialog } from "@/lib/dolce/dialogs/b4-bulk-upload-dialog";
import { AddAndModifyDetailDrawingDialog } from "@/lib/dolce/dialogs/add-and-modify-detail-drawing-dialog";
@@ -520,14 +520,14 @@ export default function DolceUploadPageV2({ searchParams }: DolceUploadPageV2Pro
</Card>
{/* 도면 리스트 테이블 - 항상 렌더링 */}
- <Card className="flex-shrink-0" style={{ minHeight: "500px" }}>
+ <Card className="flex-shrink-0 flex flex-col" style={{ minHeight: "500px" }}>
<CardHeader className="py-3">
<CardTitle className="text-base">
{t("drawingList.title")}
{filteredDrawings.length > 0 && ` ${t("drawingList.count", { count: filteredDrawings.length })}`}
</CardTitle>
</CardHeader>
- <CardContent className="p-0">
+ <CardContent className="p-0 flex-1 min-h-0 flex flex-col">
{!projNo || !vendorInfo ? (
<div className="flex items-center justify-center text-muted-foreground p-8" style={{ minHeight: "400px" }}>
<div className="text-center">
@@ -550,7 +550,8 @@ export default function DolceUploadPageV2({ searchParams }: DolceUploadPageV2Pro
onRowClick={handleDrawingClick}
selectedRow={selectedDrawing || undefined}
getRowId={getDrawingId}
- maxHeight="calc(100vh - 600px)"
+ selectedRow={selectedDrawing || undefined}
+ getRowId={getDrawingId}
minHeight="400px"
defaultPageSize={10}
/>
@@ -612,7 +613,6 @@ export default function DolceUploadPageV2({ searchParams }: DolceUploadPageV2Pro
onRowClick={setSelectedDetail}
selectedRow={selectedDetail || undefined}
getRowId={getDetailDrawingId}
- maxHeight="calc(100vh - 600px)"
minHeight="400px"
defaultPageSize={10}
/>
@@ -658,7 +658,6 @@ export default function DolceUploadPageV2({ searchParams }: DolceUploadPageV2Pro
<DrawingListTableV2
columns={fileColumns}
data={files}
- maxHeight="calc(100vh - 600px)"
minHeight="400px"
defaultPageSize={10}
/>
@@ -667,10 +666,10 @@ export default function DolceUploadPageV2({ searchParams }: DolceUploadPageV2Pro
</Card>
</div>
- {/* B4 일괄 업로드 다이얼로그 (V2) */}
- {/* V2: MatchBatchFileDwg API를 사용하지 않는 새로운 방식 */}
+ {/* B4 일괄 업로드 다이얼로그 (V3) */}
+ {/* V3: Sync 기능 없이 일괄 업로드 (MatchBatchFileDwg / Edit 사용) */}
{vendorInfo && vendorInfo.drawingKind === "B4" && projNo && (
- <B4BulkUploadDialogV2
+ <B4BulkUploadDialogV3
open={bulkUploadDialogOpen}
onOpenChange={setBulkUploadDialogOpen}
projectNo={projNo}
@@ -682,7 +681,7 @@ export default function DolceUploadPageV2({ searchParams }: DolceUploadPageV2Pro
lng={lng}
/>
)}
- {/* V1로 되돌리려면: 위의 B4BulkUploadDialogV2를 B4BulkUploadDialog로 변경하세요 */}
+ {/* V1로 되돌리려면: 위의 B4BulkUploadDialogV3를 B4BulkUploadDialog로 변경하세요 */}
{/* 상세도면 추가 다이얼로그 */}
{vendorInfo && selectedDrawing && (
diff --git a/app/[lng]/partners/(partners)/dolce-upload-v2/page.tsx b/app/[lng]/partners/(partners)/dolce-upload-v2/page.tsx
index 6655606f..9ce7c6c6 100644
--- a/app/[lng]/partners/(partners)/dolce-upload-v2/page.tsx
+++ b/app/[lng]/partners/(partners)/dolce-upload-v2/page.tsx
@@ -53,14 +53,9 @@ export default async function DolceUploadPageWrapper({
<div>
<h2 className="text-2xl font-bold tracking-tight">
{lng === "ko"
- ? "DOLCE 도면 업로드 V2"
- : "DOLCE Drawing Upload V2"}
+ ? "조선 도면 업로드"
+ : "Shipbuilding Drawing Upload"}
</h2>
- <p className="text-muted-foreground">
- {lng === "ko"
- ? "설계문서를 조회하고 업로드할 수 있습니다 (분할 레이아웃)"
- : "View and upload design documents (Split Layout)"}
- </p>
</div>
</div>