diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/[lng]/evcp/(evcp)/contact-possible-items/page.tsx | 56 | ||||
| -rw-r--r-- | app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/items/page.tsx | 48 | ||||
| -rw-r--r-- | app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/layout.tsx | 162 | ||||
| -rw-r--r-- | app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/page.tsx | 108 | ||||
| -rw-r--r-- | app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/possible-items/page.tsx | 54 | ||||
| -rw-r--r-- | app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/rfq-history/page.tsx | 41 | ||||
| -rw-r--r-- | app/[lng]/partners/tech-signup/page.tsx (renamed from app/[lng]/auth/tech-signup/page.tsx) | 0 | ||||
| -rw-r--r-- | app/[lng]/sales/(sales)/tech-vendors/[id]/info/layout.tsx | 162 | ||||
| -rw-r--r-- | app/[lng]/sales/(sales)/tech-vendors/[id]/info/page.tsx | 108 | ||||
| -rw-r--r-- | app/[lng]/sales/(sales)/tech-vendors/[id]/info/possible-items/page.tsx | 54 | ||||
| -rw-r--r-- | app/[lng]/sales/(sales)/tech-vendors/[id]/info/rfq-history/page.tsx | 41 | ||||
| -rw-r--r-- | app/api/tech-sales-rfqs/[rfqId]/vendors/[vendorId]/comments/route.ts | 32 |
12 files changed, 483 insertions, 383 deletions
diff --git a/app/[lng]/evcp/(evcp)/contact-possible-items/page.tsx b/app/[lng]/evcp/(evcp)/contact-possible-items/page.tsx new file mode 100644 index 00000000..9fda681e --- /dev/null +++ b/app/[lng]/evcp/(evcp)/contact-possible-items/page.tsx @@ -0,0 +1,56 @@ +import { Suspense } from "react"
+import { SearchParams } from "@/types/table"
+import { Shell } from "@/components/shell"
+import { ContactPossibleItemsTable } from "@/lib/contact-possible-items/table/contact-possible-items-table"
+import { getContactPossibleItems } from "@/lib/contact-possible-items/service"
+import { searchParamsCache } from "@/lib/contact-possible-items/validations"
+import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton"
+
+
+interface ContactPossibleItemsPageProps {
+ searchParams: Promise<SearchParams>
+}
+
+export default async function ContactPossibleItemsPage({
+ searchParams,
+}: ContactPossibleItemsPageProps) {
+ const resolvedSearchParams = await searchParams
+ const search = searchParamsCache.parse(resolvedSearchParams)
+
+ const contactPossibleItemsPromise = getContactPossibleItems(search)
+
+ return (
+ <Shell className="gap-2">
+ <div className="flex items-center justify-between space-y-2">
+ <div className="flex items-center justify-between space-y-2">
+ <div>
+ <h2 className="text-2xl font-bold tracking-tight">
+ 담당자별 아이템 관리
+ </h2>
+ <p className="text-muted-foreground">
+ 기술영업 담당자별 가능 아이템을 관리합니다.
+ </p>
+ </div>
+ </div>
+ </div>
+
+
+ <Suspense
+ fallback={
+ <DataTableSkeleton
+ columnCount={12}
+ searchableColumnCount={2}
+ filterableColumnCount={3}
+ cellWidths={["10rem", "10rem", "12rem", "8rem", "8rem"]}
+ shrinkZero
+ />
+ }
+ >
+ <ContactPossibleItemsTable
+ contactPossibleItemsPromise={contactPossibleItemsPromise}
+ />
+ </Suspense>
+
+ </Shell>
+ )
+}
\ No newline at end of file diff --git a/app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/items/page.tsx b/app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/items/page.tsx deleted file mode 100644 index 69c36576..00000000 --- a/app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/items/page.tsx +++ /dev/null @@ -1,48 +0,0 @@ -// import { Separator } from "@/components/ui/separator" -// import { getTechVendorById, getVendorItemsByType } from "@/lib/tech-vendors/service" -// import { type SearchParams } from "@/types/table" -// import { TechVendorItemsTable } from "@/lib/tech-vendors/items-table/item-table" - -// interface IndexPageProps { -// // Next.js 13 App Router에서 기본으로 주어지는 객체들 -// params: { -// lng: string -// id: string -// } -// searchParams: Promise<SearchParams> -// } - -// export default async function TechVendorItemsPage(props: IndexPageProps) { -// const resolvedParams = await props.params -// const id = resolvedParams.id - -// const idAsNumber = Number(id) - -// // 벤더 정보 가져오기 (벤더 타입 필요) -// const vendorInfo = await getTechVendorById(idAsNumber) -// const vendorType = vendorInfo.data?.techVendorType || "조선" - -// const promises = getVendorItemsByType(idAsNumber, vendorType) - -// // 4) 렌더링 -// return ( -// <div className="space-y-6"> -// <div> -// <h3 className="text-lg font-medium"> -// 공급품목 -// </h3> -// <p className="text-sm text-muted-foreground"> -// 기술영업 벤더의 공급 가능한 품목을 확인하세요. -// </p> -// </div> -// <Separator /> -// <div> -// <TechVendorItemsTable -// promises={promises} -// vendorId={idAsNumber} -// vendorType={vendorType} -// /> -// </div> -// </div> -// ) -// }
\ No newline at end of file diff --git a/app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/layout.tsx b/app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/layout.tsx index adeb915c..291cd630 100644 --- a/app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/layout.tsx +++ b/app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/layout.tsx @@ -1,82 +1,82 @@ -import { Metadata } from "next" - -import { Separator } from "@/components/ui/separator" -import { SidebarNav } from "@/components/layout/sidebar-nav" -import { findTechVendorById } from "@/lib/tech-vendors/service" -import { TechVendor } from "@/db/schema/techVendors" -import { Button } from "@/components/ui/button" -import { ArrowLeft } from "lucide-react" -import Link from "next/link" -export const metadata: Metadata = { - title: "Tech Vendor Detail", -} - -export default async function SettingsLayout({ - children, - params, -}: { - children: React.ReactNode - params: { lng: string , id: string} -}) { - - // 1) URL 파라미터에서 id 추출, Number로 변환 - const resolvedParams = await params - const lng = resolvedParams.lng - const id = resolvedParams.id - - const idAsNumber = Number(id) - // 2) DB에서 해당 협력업체 정보 조회 - const vendor: TechVendor | null = await findTechVendorById(idAsNumber) - - // 3) 사이드바 메뉴 - const sidebarNavItems = [ - { - title: "연락처", - href: `/${lng}/evcp/tech-vendors/${id}/info`, - }, - { - title: "RFQ 히스토리", - href: `/${lng}/evcp/tech-vendors/${id}/info/rfq-history`, - }, - // { - // title: "자재 리스트", - // href: `/${lng}/evcp/tech-vendors/${id}/info/items`, - // }, - ] - - return ( - <> - <div className="container py-6"> - <section className="overflow-hidden rounded-[0.5rem] border bg-background shadow"> - <div className="hidden space-y-6 p-10 pb-16 md:block"> - {/* RFQ 목록으로 돌아가는 링크 추가 */} - <div className="flex items-center justify-end mb-4"> - <Link href={`/${lng}/evcp/tech-vendors`} passHref> - <Button variant="ghost" className="flex items-center text-primary hover:text-primary/80 transition-colors p-0 h-auto"> - <ArrowLeft className="mr-1 h-4 w-4" /> - <span>기술영업 벤더 목록으로 돌아가기</span> - </Button> - </Link> - </div> - <div className="space-y-0.5"> - {/* 4) 협력업체 정보가 있으면 코드 + 이름 + "상세 정보" 표기 */} - <h2 className="text-2xl font-bold tracking-tight"> - {vendor - ? `${vendor.vendorCode ?? ""} - ${vendor.vendorName} 상세 정보` - : "Loading Vendor..."} - </h2> - <p className="text-muted-foreground">기술영업 벤더 관련 상세사항을 확인하세요.</p> - </div> - <Separator className="my-6" /> - <div className="flex flex-col space-y-8 lg:flex-row lg:space-x-12 lg:space-y-0"> - <aside className="-mx-4 lg:w-1/5"> - <SidebarNav items={sidebarNavItems} /> - </aside> - <div className="flex-1">{children}</div> - </div> - </div> - </section> - </div> - </> - ) +import { Metadata } from "next"
+
+import { Separator } from "@/components/ui/separator"
+import { SidebarNav } from "@/components/layout/sidebar-nav"
+import { findTechVendorById } from "@/lib/tech-vendors/service"
+import { TechVendor } from "@/db/schema/techVendors"
+import { Button } from "@/components/ui/button"
+import { ArrowLeft } from "lucide-react"
+import Link from "next/link"
+export const metadata: Metadata = {
+ title: "Tech Vendor Detail",
+}
+
+export default async function SettingsLayout({
+ children,
+ params,
+}: {
+ children: React.ReactNode
+ params: { lng: string , id: string}
+}) {
+
+ // 1) URL 파라미터에서 id 추출, Number로 변환
+ const resolvedParams = await params
+ const lng = resolvedParams.lng
+ const id = resolvedParams.id
+
+ const idAsNumber = Number(id)
+ // 2) DB에서 해당 협력업체 정보 조회
+ const vendor: TechVendor | null = await findTechVendorById(idAsNumber)
+
+ // 3) 사이드바 메뉴
+ const sidebarNavItems = [
+ {
+ title: "연락처",
+ href: `/${lng}/evcp/tech-vendors/${id}/info`,
+ },
+ {
+ title: "RFQ 히스토리",
+ href: `/${lng}/evcp/tech-vendors/${id}/info/rfq-history`,
+ },
+ {
+ title: "자재 리스트",
+ href: `/${lng}/evcp/tech-vendors/${id}/info/possible-items`,
+ },
+ ]
+
+ return (
+ <>
+ <div className="container py-6">
+ <section className="overflow-hidden rounded-[0.5rem] border bg-background shadow">
+ <div className="hidden space-y-6 p-10 pb-16 md:block">
+ {/* RFQ 목록으로 돌아가는 링크 추가 */}
+ <div className="flex items-center justify-end mb-4">
+ <Link href={`/${lng}/evcp/tech-vendors`} passHref>
+ <Button variant="ghost" className="flex items-center text-primary hover:text-primary/80 transition-colors p-0 h-auto">
+ <ArrowLeft className="mr-1 h-4 w-4" />
+ <span>기술영업 벤더 목록으로 돌아가기</span>
+ </Button>
+ </Link>
+ </div>
+ <div className="space-y-0.5">
+ {/* 4) 협력업체 정보가 있으면 코드 + 이름 + "상세 정보" 표기 */}
+ <h2 className="text-2xl font-bold tracking-tight">
+ {vendor
+ ? `${vendor.vendorCode ?? ""} - ${vendor.vendorName} 상세 정보`
+ : "Loading Vendor..."}
+ </h2>
+ <p className="text-muted-foreground">기술영업 벤더 관련 상세사항을 확인하세요.</p>
+ </div>
+ <Separator className="my-6" />
+ <div className="flex flex-col space-y-8 lg:flex-row lg:space-x-12 lg:space-y-0">
+ <aside className="-mx-4 lg:w-1/5">
+ <SidebarNav items={sidebarNavItems} />
+ </aside>
+ <div className="flex-1">{children}</div>
+ </div>
+ </div>
+ </section>
+ </div>
+ </>
+ )
}
\ No newline at end of file diff --git a/app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/page.tsx b/app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/page.tsx index a57d6df7..9969a801 100644 --- a/app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/page.tsx +++ b/app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/page.tsx @@ -1,55 +1,55 @@ -import { Separator } from "@/components/ui/separator" -import { getTechVendorContacts } from "@/lib/tech-vendors/service" -import { type SearchParams } from "@/types/table" -import { getValidFilters } from "@/lib/data-table" -import { searchParamsContactCache } from "@/lib/tech-vendors/validations" -import { TechVendorContactsTable } from "@/lib/tech-vendors/contacts-table/contact-table" - -interface IndexPageProps { - // Next.js 13 App Router에서 기본으로 주어지는 객체들 - params: { - lng: string - id: string - } - searchParams: Promise<SearchParams> -} - -export default async function SettingsAccountPage(props: IndexPageProps) { - const resolvedParams = await props.params - const id = resolvedParams.id - - const idAsNumber = Number(id) - - // 2) SearchParams 파싱 (Zod) - // - "filters", "page", "perPage", "sort" 등 contact 전용 컬럼 - const searchParams = await props.searchParams - const search = searchParamsContactCache.parse(searchParams) - const validFilters = getValidFilters(search.filters) - - - - const promises = Promise.all([ - getTechVendorContacts({ - ...search, - filters: validFilters, - }, - idAsNumber) - ]) - // 4) 렌더링 - return ( - <div className="space-y-6"> - <div> - <h3 className="text-lg font-medium"> - Contacts - </h3> - <p className="text-sm text-muted-foreground"> - 업무별 담당자 정보를 확인하세요. - </p> - </div> - <Separator /> - <div> - <TechVendorContactsTable promises={promises} vendorId={idAsNumber}/> - </div> - </div> - ) +import { Separator } from "@/components/ui/separator"
+import { getTechVendorContacts } from "@/lib/tech-vendors/service"
+import { type SearchParams } from "@/types/table"
+import { getValidFilters } from "@/lib/data-table"
+import { searchParamsContactCache } from "@/lib/tech-vendors/validations"
+import { TechVendorContactsTable } from "@/lib/tech-vendors/contacts-table/contact-table"
+
+interface IndexPageProps {
+ // Next.js 13 App Router에서 기본으로 주어지는 객체들
+ params: {
+ lng: string
+ id: string
+ }
+ searchParams: Promise<SearchParams>
+}
+
+export default async function SettingsAccountPage(props: IndexPageProps) {
+ const resolvedParams = await props.params
+ const id = resolvedParams.id
+
+ const idAsNumber = Number(id)
+
+ // 2) SearchParams 파싱 (Zod)
+ // - "filters", "page", "perPage", "sort" 등 contact 전용 컬럼
+ const searchParams = await props.searchParams
+ const search = searchParamsContactCache.parse(searchParams)
+ const validFilters = getValidFilters(search.filters)
+
+
+
+ const promises = Promise.all([
+ getTechVendorContacts({
+ ...search,
+ filters: validFilters,
+ },
+ idAsNumber)
+ ])
+ // 4) 렌더링
+ return (
+ <div className="space-y-6">
+ <div>
+ <h3 className="text-lg font-medium">
+ Contacts
+ </h3>
+ <p className="text-sm text-muted-foreground">
+ 업무별 담당자 정보를 확인하세요.
+ </p>
+ </div>
+ <Separator />
+ <div>
+ <TechVendorContactsTable promises={promises} vendorId={idAsNumber}/>
+ </div>
+ </div>
+ )
}
\ No newline at end of file diff --git a/app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/possible-items/page.tsx b/app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/possible-items/page.tsx new file mode 100644 index 00000000..642c6e32 --- /dev/null +++ b/app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/possible-items/page.tsx @@ -0,0 +1,54 @@ +import { Separator } from "@/components/ui/separator"
+import { getTechVendorPossibleItems } from "@/lib/tech-vendors/service"
+import { type SearchParams } from "@/types/table"
+import { getValidFilters } from "@/lib/data-table"
+import { searchParamsPossibleItemsCache } from "@/lib/tech-vendors/validations"
+import { TechVendorPossibleItemsTable } from "@/lib/tech-vendors/possible-items/possible-items-table"
+
+interface IndexPageProps {
+ // Next.js 13 App Router에서 기본으로 주어지는 객체들
+ params: Promise<{
+ lng: string
+ id: string
+ }>
+ searchParams: Promise<SearchParams>
+}
+
+export default async function TechVendorPossibleItemsPage(props: IndexPageProps) {
+ const resolvedParams = await props.params
+ const id = resolvedParams.id
+
+ const idAsNumber = Number(id)
+ console.log(idAsNumber)
+
+ // 2) SearchParams 파싱 (Zod)
+ // - "filters", "page", "perPage", "sort" 등 possible items 전용 컬럼
+ const searchParams = await props.searchParams
+ const search = searchParamsPossibleItemsCache.parse(searchParams)
+ const validFilters = getValidFilters(search.filters)
+
+ const promises = Promise.all([
+ getTechVendorPossibleItems({
+ ...search,
+ filters: validFilters,
+ }, idAsNumber)
+ ])
+
+ // 4) 렌더링
+ return (
+ <div className="space-y-6">
+ <div>
+ <h3 className="text-lg font-medium">
+ 공급가능 아이템 목록
+ </h3>
+ <p className="text-sm text-muted-foreground">
+ 해당 벤더가 공급 가능한 아이템 목록을 확인할 수 있습니다.
+ </p>
+ </div>
+ <Separator />
+ <div>
+ <TechVendorPossibleItemsTable promises={promises} vendorId={idAsNumber} />
+ </div>
+ </div>
+ )
+}
\ No newline at end of file diff --git a/app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/rfq-history/page.tsx b/app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/rfq-history/page.tsx index a23a988e..9122d524 100644 --- a/app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/rfq-history/page.tsx +++ b/app/[lng]/evcp/(evcp)/tech-vendors/[id]/info/rfq-history/page.tsx @@ -1,11 +1,9 @@ -import { Suspense } from "react"
-import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton"
-import { Shell } from "@/components/shell"
import { type SearchParams } from "@/types/table"
import { getValidFilters } from "@/lib/data-table"
import { TechVendorRfqHistoryTable } from "@/lib/tech-vendors/rfq-history-table/tech-vendor-rfq-history-table"
import { getTechVendorRfqHistory } from "@/lib/tech-vendors/service"
import { searchParamsRfqHistoryCache } from "@/lib/tech-vendors/validations"
+import { Separator } from "@/components/ui/separator"
interface IndexPageProps {
// Next.js 13 App Router에서 기본으로 주어지는 객체들
@@ -39,27 +37,20 @@ export default async function SettingsAccountPage(props: IndexPageProps) { ])
return (
- <Shell className="gap-2">
- <div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
- <div>
- <h1 className="text-2xl font-bold tracking-tight">RFQ 히스토리</h1>
- <p className="text-muted-foreground">벤더가 참여한 기술영업 RFQ 목록입니다.</p>
- </div>
- </div>
-
- <Suspense
- fallback={
- <DataTableSkeleton
- columnCount={8}
- searchableColumnCount={1}
- filterableColumnCount={2}
- cellWidths={["10rem", "20rem", "10rem", "15rem", "10rem", "10rem", "10rem", "8rem"]}
- shrinkZero
- />
- }
- >
- <TechVendorRfqHistoryTable promises={promises} />
- </Suspense>
- </Shell>
+ <div className="space-y-6">
+ <div>
+ <h3 className="text-lg font-medium">
+ RFQ 히스토리
+ </h3>
+ <p className="text-sm text-muted-foreground">
+ 벤더가 참여한 기술영업 RFQ 목록입니다.
+ </p>
+ </div>
+ <Separator />
+ <div>
+ <TechVendorRfqHistoryTable promises={promises} />
+ </div>
+ </div>
+
)
}
\ No newline at end of file diff --git a/app/[lng]/auth/tech-signup/page.tsx b/app/[lng]/partners/tech-signup/page.tsx index d5b019ed..d5b019ed 100644 --- a/app/[lng]/auth/tech-signup/page.tsx +++ b/app/[lng]/partners/tech-signup/page.tsx diff --git a/app/[lng]/sales/(sales)/tech-vendors/[id]/info/layout.tsx b/app/[lng]/sales/(sales)/tech-vendors/[id]/info/layout.tsx index b8df24d1..291cd630 100644 --- a/app/[lng]/sales/(sales)/tech-vendors/[id]/info/layout.tsx +++ b/app/[lng]/sales/(sales)/tech-vendors/[id]/info/layout.tsx @@ -1,82 +1,82 @@ -import { Metadata } from "next" - -import { Separator } from "@/components/ui/separator" -import { SidebarNav } from "@/components/layout/sidebar-nav" -import { findTechVendorById } from "@/lib/tech-vendors/service" -import { TechVendor } from "@/db/schema/techVendors" -import { Button } from "@/components/ui/button" -import { ArrowLeft } from "lucide-react" -import Link from "next/link" -export const metadata: Metadata = { - title: "Tech Vendor Detail", -} - -export default async function SettingsLayout({ - children, - params, -}: { - children: React.ReactNode - params: { lng: string , id: string} -}) { - - // 1) URL 파라미터에서 id 추출, Number로 변환 - const resolvedParams = await params - const lng = resolvedParams.lng - const id = resolvedParams.id - - const idAsNumber = Number(id) - // 2) DB에서 해당 협력업체 정보 조회 - const vendor: TechVendor | null = await findTechVendorById(idAsNumber) - - // 3) 사이드바 메뉴 - const sidebarNavItems = [ - { - title: "연락처", - href: `/${lng}/sales/tech-vendors/${id}/info`, - }, - { - title: "RFQ 히스토리", - href: `/${lng}/sales/tech-vendors/${id}/info/rfq-history`, - }, - // { - // title: "자재 리스트", - // href: `/${lng}/evcp/tech-vendors/${id}/info/items`, - // }, - ] - - return ( - <> - <div className="container py-6"> - <section className="overflow-hidden rounded-[0.5rem] border bg-background shadow"> - <div className="hidden space-y-6 p-10 pb-16 md:block"> - {/* RFQ 목록으로 돌아가는 링크 추가 */} - <div className="flex items-center justify-end mb-4"> - <Link href={`/${lng}/evcp/tech-vendors`} passHref> - <Button variant="ghost" className="flex items-center text-primary hover:text-primary/80 transition-colors p-0 h-auto"> - <ArrowLeft className="mr-1 h-4 w-4" /> - <span>기술영업 벤더 목록으로 돌아가기</span> - </Button> - </Link> - </div> - <div className="space-y-0.5"> - {/* 4) 협력업체 정보가 있으면 코드 + 이름 + "상세 정보" 표기 */} - <h2 className="text-2xl font-bold tracking-tight"> - {vendor - ? `${vendor.vendorCode ?? ""} - ${vendor.vendorName} 상세 정보` - : "Loading Vendor..."} - </h2> - <p className="text-muted-foreground">기술영업 벤더 관련 상세사항을 확인하세요.</p> - </div> - <Separator className="my-6" /> - <div className="flex flex-col space-y-8 lg:flex-row lg:space-x-12 lg:space-y-0"> - <aside className="-mx-4 lg:w-1/5"> - <SidebarNav items={sidebarNavItems} /> - </aside> - <div className="flex-1">{children}</div> - </div> - </div> - </section> - </div> - </> - ) +import { Metadata } from "next"
+
+import { Separator } from "@/components/ui/separator"
+import { SidebarNav } from "@/components/layout/sidebar-nav"
+import { findTechVendorById } from "@/lib/tech-vendors/service"
+import { TechVendor } from "@/db/schema/techVendors"
+import { Button } from "@/components/ui/button"
+import { ArrowLeft } from "lucide-react"
+import Link from "next/link"
+export const metadata: Metadata = {
+ title: "Tech Vendor Detail",
+}
+
+export default async function SettingsLayout({
+ children,
+ params,
+}: {
+ children: React.ReactNode
+ params: { lng: string , id: string}
+}) {
+
+ // 1) URL 파라미터에서 id 추출, Number로 변환
+ const resolvedParams = await params
+ const lng = resolvedParams.lng
+ const id = resolvedParams.id
+
+ const idAsNumber = Number(id)
+ // 2) DB에서 해당 협력업체 정보 조회
+ const vendor: TechVendor | null = await findTechVendorById(idAsNumber)
+
+ // 3) 사이드바 메뉴
+ const sidebarNavItems = [
+ {
+ title: "연락처",
+ href: `/${lng}/evcp/tech-vendors/${id}/info`,
+ },
+ {
+ title: "RFQ 히스토리",
+ href: `/${lng}/evcp/tech-vendors/${id}/info/rfq-history`,
+ },
+ {
+ title: "자재 리스트",
+ href: `/${lng}/evcp/tech-vendors/${id}/info/possible-items`,
+ },
+ ]
+
+ return (
+ <>
+ <div className="container py-6">
+ <section className="overflow-hidden rounded-[0.5rem] border bg-background shadow">
+ <div className="hidden space-y-6 p-10 pb-16 md:block">
+ {/* RFQ 목록으로 돌아가는 링크 추가 */}
+ <div className="flex items-center justify-end mb-4">
+ <Link href={`/${lng}/evcp/tech-vendors`} passHref>
+ <Button variant="ghost" className="flex items-center text-primary hover:text-primary/80 transition-colors p-0 h-auto">
+ <ArrowLeft className="mr-1 h-4 w-4" />
+ <span>기술영업 벤더 목록으로 돌아가기</span>
+ </Button>
+ </Link>
+ </div>
+ <div className="space-y-0.5">
+ {/* 4) 협력업체 정보가 있으면 코드 + 이름 + "상세 정보" 표기 */}
+ <h2 className="text-2xl font-bold tracking-tight">
+ {vendor
+ ? `${vendor.vendorCode ?? ""} - ${vendor.vendorName} 상세 정보`
+ : "Loading Vendor..."}
+ </h2>
+ <p className="text-muted-foreground">기술영업 벤더 관련 상세사항을 확인하세요.</p>
+ </div>
+ <Separator className="my-6" />
+ <div className="flex flex-col space-y-8 lg:flex-row lg:space-x-12 lg:space-y-0">
+ <aside className="-mx-4 lg:w-1/5">
+ <SidebarNav items={sidebarNavItems} />
+ </aside>
+ <div className="flex-1">{children}</div>
+ </div>
+ </div>
+ </section>
+ </div>
+ </>
+ )
}
\ No newline at end of file diff --git a/app/[lng]/sales/(sales)/tech-vendors/[id]/info/page.tsx b/app/[lng]/sales/(sales)/tech-vendors/[id]/info/page.tsx index a57d6df7..9969a801 100644 --- a/app/[lng]/sales/(sales)/tech-vendors/[id]/info/page.tsx +++ b/app/[lng]/sales/(sales)/tech-vendors/[id]/info/page.tsx @@ -1,55 +1,55 @@ -import { Separator } from "@/components/ui/separator" -import { getTechVendorContacts } from "@/lib/tech-vendors/service" -import { type SearchParams } from "@/types/table" -import { getValidFilters } from "@/lib/data-table" -import { searchParamsContactCache } from "@/lib/tech-vendors/validations" -import { TechVendorContactsTable } from "@/lib/tech-vendors/contacts-table/contact-table" - -interface IndexPageProps { - // Next.js 13 App Router에서 기본으로 주어지는 객체들 - params: { - lng: string - id: string - } - searchParams: Promise<SearchParams> -} - -export default async function SettingsAccountPage(props: IndexPageProps) { - const resolvedParams = await props.params - const id = resolvedParams.id - - const idAsNumber = Number(id) - - // 2) SearchParams 파싱 (Zod) - // - "filters", "page", "perPage", "sort" 등 contact 전용 컬럼 - const searchParams = await props.searchParams - const search = searchParamsContactCache.parse(searchParams) - const validFilters = getValidFilters(search.filters) - - - - const promises = Promise.all([ - getTechVendorContacts({ - ...search, - filters: validFilters, - }, - idAsNumber) - ]) - // 4) 렌더링 - return ( - <div className="space-y-6"> - <div> - <h3 className="text-lg font-medium"> - Contacts - </h3> - <p className="text-sm text-muted-foreground"> - 업무별 담당자 정보를 확인하세요. - </p> - </div> - <Separator /> - <div> - <TechVendorContactsTable promises={promises} vendorId={idAsNumber}/> - </div> - </div> - ) +import { Separator } from "@/components/ui/separator"
+import { getTechVendorContacts } from "@/lib/tech-vendors/service"
+import { type SearchParams } from "@/types/table"
+import { getValidFilters } from "@/lib/data-table"
+import { searchParamsContactCache } from "@/lib/tech-vendors/validations"
+import { TechVendorContactsTable } from "@/lib/tech-vendors/contacts-table/contact-table"
+
+interface IndexPageProps {
+ // Next.js 13 App Router에서 기본으로 주어지는 객체들
+ params: {
+ lng: string
+ id: string
+ }
+ searchParams: Promise<SearchParams>
+}
+
+export default async function SettingsAccountPage(props: IndexPageProps) {
+ const resolvedParams = await props.params
+ const id = resolvedParams.id
+
+ const idAsNumber = Number(id)
+
+ // 2) SearchParams 파싱 (Zod)
+ // - "filters", "page", "perPage", "sort" 등 contact 전용 컬럼
+ const searchParams = await props.searchParams
+ const search = searchParamsContactCache.parse(searchParams)
+ const validFilters = getValidFilters(search.filters)
+
+
+
+ const promises = Promise.all([
+ getTechVendorContacts({
+ ...search,
+ filters: validFilters,
+ },
+ idAsNumber)
+ ])
+ // 4) 렌더링
+ return (
+ <div className="space-y-6">
+ <div>
+ <h3 className="text-lg font-medium">
+ Contacts
+ </h3>
+ <p className="text-sm text-muted-foreground">
+ 업무별 담당자 정보를 확인하세요.
+ </p>
+ </div>
+ <Separator />
+ <div>
+ <TechVendorContactsTable promises={promises} vendorId={idAsNumber}/>
+ </div>
+ </div>
+ )
}
\ No newline at end of file diff --git a/app/[lng]/sales/(sales)/tech-vendors/[id]/info/possible-items/page.tsx b/app/[lng]/sales/(sales)/tech-vendors/[id]/info/possible-items/page.tsx new file mode 100644 index 00000000..642c6e32 --- /dev/null +++ b/app/[lng]/sales/(sales)/tech-vendors/[id]/info/possible-items/page.tsx @@ -0,0 +1,54 @@ +import { Separator } from "@/components/ui/separator"
+import { getTechVendorPossibleItems } from "@/lib/tech-vendors/service"
+import { type SearchParams } from "@/types/table"
+import { getValidFilters } from "@/lib/data-table"
+import { searchParamsPossibleItemsCache } from "@/lib/tech-vendors/validations"
+import { TechVendorPossibleItemsTable } from "@/lib/tech-vendors/possible-items/possible-items-table"
+
+interface IndexPageProps {
+ // Next.js 13 App Router에서 기본으로 주어지는 객체들
+ params: Promise<{
+ lng: string
+ id: string
+ }>
+ searchParams: Promise<SearchParams>
+}
+
+export default async function TechVendorPossibleItemsPage(props: IndexPageProps) {
+ const resolvedParams = await props.params
+ const id = resolvedParams.id
+
+ const idAsNumber = Number(id)
+ console.log(idAsNumber)
+
+ // 2) SearchParams 파싱 (Zod)
+ // - "filters", "page", "perPage", "sort" 등 possible items 전용 컬럼
+ const searchParams = await props.searchParams
+ const search = searchParamsPossibleItemsCache.parse(searchParams)
+ const validFilters = getValidFilters(search.filters)
+
+ const promises = Promise.all([
+ getTechVendorPossibleItems({
+ ...search,
+ filters: validFilters,
+ }, idAsNumber)
+ ])
+
+ // 4) 렌더링
+ return (
+ <div className="space-y-6">
+ <div>
+ <h3 className="text-lg font-medium">
+ 공급가능 아이템 목록
+ </h3>
+ <p className="text-sm text-muted-foreground">
+ 해당 벤더가 공급 가능한 아이템 목록을 확인할 수 있습니다.
+ </p>
+ </div>
+ <Separator />
+ <div>
+ <TechVendorPossibleItemsTable promises={promises} vendorId={idAsNumber} />
+ </div>
+ </div>
+ )
+}
\ No newline at end of file diff --git a/app/[lng]/sales/(sales)/tech-vendors/[id]/info/rfq-history/page.tsx b/app/[lng]/sales/(sales)/tech-vendors/[id]/info/rfq-history/page.tsx index a23a988e..9122d524 100644 --- a/app/[lng]/sales/(sales)/tech-vendors/[id]/info/rfq-history/page.tsx +++ b/app/[lng]/sales/(sales)/tech-vendors/[id]/info/rfq-history/page.tsx @@ -1,11 +1,9 @@ -import { Suspense } from "react"
-import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton"
-import { Shell } from "@/components/shell"
import { type SearchParams } from "@/types/table"
import { getValidFilters } from "@/lib/data-table"
import { TechVendorRfqHistoryTable } from "@/lib/tech-vendors/rfq-history-table/tech-vendor-rfq-history-table"
import { getTechVendorRfqHistory } from "@/lib/tech-vendors/service"
import { searchParamsRfqHistoryCache } from "@/lib/tech-vendors/validations"
+import { Separator } from "@/components/ui/separator"
interface IndexPageProps {
// Next.js 13 App Router에서 기본으로 주어지는 객체들
@@ -39,27 +37,20 @@ export default async function SettingsAccountPage(props: IndexPageProps) { ])
return (
- <Shell className="gap-2">
- <div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
- <div>
- <h1 className="text-2xl font-bold tracking-tight">RFQ 히스토리</h1>
- <p className="text-muted-foreground">벤더가 참여한 기술영업 RFQ 목록입니다.</p>
- </div>
- </div>
-
- <Suspense
- fallback={
- <DataTableSkeleton
- columnCount={8}
- searchableColumnCount={1}
- filterableColumnCount={2}
- cellWidths={["10rem", "20rem", "10rem", "15rem", "10rem", "10rem", "10rem", "8rem"]}
- shrinkZero
- />
- }
- >
- <TechVendorRfqHistoryTable promises={promises} />
- </Suspense>
- </Shell>
+ <div className="space-y-6">
+ <div>
+ <h3 className="text-lg font-medium">
+ RFQ 히스토리
+ </h3>
+ <p className="text-sm text-muted-foreground">
+ 벤더가 참여한 기술영업 RFQ 목록입니다.
+ </p>
+ </div>
+ <Separator />
+ <div>
+ <TechVendorRfqHistoryTable promises={promises} />
+ </div>
+ </div>
+
)
}
\ No newline at end of file diff --git a/app/api/tech-sales-rfqs/[rfqId]/vendors/[vendorId]/comments/route.ts b/app/api/tech-sales-rfqs/[rfqId]/vendors/[vendorId]/comments/route.ts index e6bf2b93..ac17766f 100644 --- a/app/api/tech-sales-rfqs/[rfqId]/vendors/[vendorId]/comments/route.ts +++ b/app/api/tech-sales-rfqs/[rfqId]/vendors/[vendorId]/comments/route.ts @@ -8,10 +8,7 @@ import { techSalesRfqComments, techSalesRfqCommentAttachments, users } from "@/d import { revalidateTag } from "next/cache" import { eq, and } from "drizzle-orm" -// 파일 저장을 위한 유틸리티 -import { writeFile, mkdir } from 'fs/promises' -import { join } from 'path' -import crypto from 'crypto' +// 파일 저장을 위한 유틸리티는 이제 saveFile 함수를 사용 /** * 코멘트 조회 API 엔드포인트 @@ -74,6 +71,7 @@ export async function GET( .select({ id: techSalesRfqCommentAttachments.id, fileName: techSalesRfqCommentAttachments.fileName, + originalFileName: techSalesRfqCommentAttachments.originalFileName, fileSize: techSalesRfqCommentAttachments.fileSize, fileType: techSalesRfqCommentAttachments.fileType, filePath: techSalesRfqCommentAttachments.filePath, @@ -185,18 +183,20 @@ export async function POST( if (files.length > 0) { console.log("첨부파일 처리 시작:", files.length); - // 디렉토리 생성 - const uploadDir = join(process.cwd(), "public", `tech-sales-rfq-${rfqId}`, `vendor-${vendorId}`, `comment-${comment.id}`) - await mkdir(uploadDir, { recursive: true }) + // saveFile 함수 import + const { saveFile } = await import('@/lib/file-stroage') // 각 파일 저장 for (const file of files) { - const buffer = Buffer.from(await file.arrayBuffer()) - const filename = `${Date.now()}-${crypto.randomBytes(8).toString("hex")}-${file.name.replace(/[^a-zA-Z0-9.-]/g, "_")}` - const filePath = join(uploadDir, filename) - - // 파일 쓰기 - await writeFile(filePath, buffer) + const saveResult = await saveFile({ + file, + directory: `tech-sales-rfq-${rfqId}/vendor-${vendorId}/comment-${comment.id}`, + originalName: file.name + }) + + if (!saveResult.success) { + throw new Error(saveResult.error || '파일 저장에 실패했습니다.') + } // DB에 첨부파일 정보 저장 const [attachment] = await db @@ -204,10 +204,11 @@ export async function POST( .values({ rfqId, commentId: comment.id, - fileName: file.name, + fileName: saveResult.fileName!, // 해시된 파일명 (저장용) + originalFileName: saveResult.originalName!, // 원본 파일명 (표시용) fileSize: file.size, fileType: file.type, - filePath: `/tech-sales-rfq-${rfqId}/vendor-${vendorId}/comment-${comment.id}/${filename}`, + filePath: saveResult.publicPath!, isVendorUpload: isVendorComment, uploadedBy: parseInt(session.user.id), vendorId, @@ -218,6 +219,7 @@ export async function POST( attachments.push({ id: attachment.id, fileName: attachment.fileName, + originalFileName: attachment.originalFileName, fileSize: attachment.fileSize, fileType: attachment.fileType, filePath: attachment.filePath, |