diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/documents/StageList.tsx | 4 | ||||
| -rw-r--r-- | components/vendor-data/sidebar.tsx | 9 | ||||
| -rw-r--r-- | components/vendor-data/vendor-data-container.tsx | 8 |
3 files changed, 19 insertions, 2 deletions
diff --git a/components/documents/StageList.tsx b/components/documents/StageList.tsx index 8d82b741..64510dda 100644 --- a/components/documents/StageList.tsx +++ b/components/documents/StageList.tsx @@ -175,6 +175,8 @@ export default function StageList({ document }: StageListProps) { <TableHead className="w-[100px]">Stage</TableHead> <TableHead className="w-[100px]">Revision</TableHead> <TableHead className="w-[150px]">첨부파일</TableHead> + <TableHead className="w-[150px]">등록자</TableHead> + <TableHead className="w-[150px]">Comment</TableHead> <TableHead className="w-[150px]">생성일</TableHead> <TableHead className="w-[120px]">계획일</TableHead> <TableHead className="w-[120px]">실제일</TableHead> @@ -232,6 +234,8 @@ export default function StageList({ document }: StageListProps) { )} </div> </TableCell> + <TableCell>{ver.uploaderName}</TableCell> + <TableCell>{ver.comment}</TableCell> <TableCell>{formatDate(ver.DocumentSubmitDate) ?? "-"}</TableCell> <TableCell>{ver.planDate ?? "-"}</TableCell> <TableCell>{ver.actualDate ?? "-"}</TableCell> diff --git a/components/vendor-data/sidebar.tsx b/components/vendor-data/sidebar.tsx index 2dff6bc1..3805d216 100644 --- a/components/vendor-data/sidebar.tsx +++ b/components/vendor-data/sidebar.tsx @@ -24,6 +24,8 @@ interface SidebarProps extends React.HTMLAttributes<HTMLDivElement> { isCollapsed: boolean packages: PackageData[] selectedPackageId: number | null + selectedProjectId: number | null + selectedContractId: number | null onSelectPackage: (itemId: number) => void forms: FormInfo[] selectedForm: string | null @@ -37,6 +39,8 @@ export function Sidebar({ isCollapsed, packages, selectedPackageId, + selectedProjectId, + selectedContractId, onSelectPackage, forms, selectedForm, @@ -48,6 +52,7 @@ export function Sidebar({ const rawPathname = usePathname() const pathname = rawPathname ?? "" + /** * --------------------------- * 1) URL에서 현재 패키지 / 폼 코드 추출 @@ -105,7 +110,7 @@ export function Sidebar({ if (mode === "ENG") { // ENG 모드에서는 첫 번째 패키지 ID 또는 현재 URL에서 추출한 ID 사용 - packageId = currentItemId || (packages[0]?.itemId || 0); + packageId = 0; } else { // IM 모드에서는 반드시 선택된 패키지 ID 필요 if (selectedPackageId === null) return; @@ -119,7 +124,7 @@ export function Sidebar({ // 예: /vendor-data/form/[packageId]/[formCode] const baseSegments = segments.slice(0, segments.indexOf("vendor-data") + 1).join("/") // 모드 정보를 쿼리 파라미터로 추가 - router.push(`/${baseSegments}/form/${packageId}/${form.formCode}?mode=${mode}`) + router.push(`/${baseSegments}/form/${packageId}/${form.formCode}/${selectedProjectId}/${selectedContractId}?mode=${mode}`) } return ( diff --git a/components/vendor-data/vendor-data-container.tsx b/components/vendor-data/vendor-data-container.tsx index 77b36abf..fcecae43 100644 --- a/components/vendor-data/vendor-data-container.tsx +++ b/components/vendor-data/vendor-data-container.tsx @@ -274,6 +274,8 @@ export function VendorDataContainer({ isCollapsed={isCollapsed} packages={currentContract?.packages || []} selectedPackageId={selectedPackageId} + selectedProjectId={selectedProjectId} + selectedContractId={selectedContractId} onSelectPackage={handleSelectPackage} forms={formList} selectedForm={ @@ -305,6 +307,8 @@ export function VendorDataContainer({ isCollapsed={isCollapsed} packages={currentContract?.packages || []} selectedPackageId={selectedPackageId} + selectedContractId={selectedContractId} + selectedProjectId={selectedProjectId} onSelectPackage={handleSelectPackage} forms={formList} selectedForm={ @@ -324,6 +328,8 @@ export function VendorDataContainer({ isCollapsed={isCollapsed} packages={currentContract?.packages || []} selectedPackageId={selectedPackageId} + selectedContractId={selectedContractId} + selectedProjectId={selectedProjectId} onSelectPackage={handleSelectPackage} forms={formList} selectedForm={ @@ -368,6 +374,8 @@ export function VendorDataContainer({ isCollapsed={isCollapsed} packages={currentContract?.packages || []} selectedPackageId={selectedPackageId} + selectedProjectId={selectedProjectId} + selectedContractId={selectedContractId} onSelectPackage={handleSelectPackage} forms={formList} selectedForm={ |