src/components/pdf/SurveySaleDownloadPdf.tsx

@@ -1,9 +1,22 @@
 'use client'
 
-import { useRef } from 'react'
+import { useEffect, useRef } from 'react'
 import generatePDF, { Margin, Resolution } from 'react-to-pdf'
+import { useParams } from 'next/navigation'
+import { useSurvey } from '@/hooks/useSurvey'
+import { radioEtcData, roofMaterial, selectBoxOptions, supplementaryFacilities } from '../survey-sale/detail/RoofForm'
 
 export default function SurveySaleDownloadPdf() {
+  const params = useParams()
+  const id = params.id
+
+  const { surveyDetail, isLoadingSurveyDetail } = useSurvey(Number(id))
+
+  useEffect(() => {
+    if (isLoadingSurveyDetail) return
+    handleDownPdf()
+  }, [surveyDetail, isLoadingSurveyDetail])
+
   const targetRef = useRef<HTMLDivElement>(null)
   const handleDownPdf = () => {
     const options = {
@@ -33,7 +46,7 @@ export default function SurveySaleDownloadPdf() {
   }
   return (
     <>
-      <button onClick={handleDownPdf}>down</button>
+      {/* <button onClick={handleDownPdf}>down</button> */}
       <div ref={targetRef} style={{ boxSizing: 'border-box' }}>
         <div style={{ margin: '0 auto', padding: 0, maxWidth: '800px', minWidth: '800px' }}>
           <div style={{ padding: '20px 20px 50px', borderBottom: '2px solid #2E3A59' }}>
@@ -46,12 +59,14 @@ export default function SurveySaleDownloadPdf() {
                   現地明登施工店名
                 </p>
                 <p style={{ margin: 0, padding: 0, fontSize: '13px', color: '#FF5656', fontWeight: 400, fontFamily: 'M-Gothic' }}>
-                  Sheet2 No.4Sheet2
+                  {surveyDetail?.store}
                 </p>
               </div>
               <div style={{ float: 'right' }}>
                 <p style={{ margin: 0, padding: 0, fontSize: '13px', color: '#101010', fontWeight: 500, fontFamily: 'M-Gothic' }}>現地阴買日</p>
-                <p style={{ margin: 0, padding: 0, fontSize: '13px', color: '#FF5656', fontWeight: 400, fontFamily: 'M-Gothic' }}>2025.05.09</p>
+                <p style={{ margin: 0, padding: 0, fontSize: '13px', color: '#FF5656', fontWeight: 400, fontFamily: 'M-Gothic' }}>
+                  {surveyDetail?.investigationDate}
+                </p>
               </div>
             </div>
           </div>
@@ -86,7 +101,7 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    Sheet2No.1
+                    {surveyDetail?.customerName}
                   </td>
                 </tr>
                 <tr>
@@ -115,7 +130,7 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    Sheet2No.2
+                    {surveyDetail?.postCode ? `(${surveyDetail?.postCode}) ${surveyDetail?.address} ${surveyDetail?.addressDetail}` : '-'}
                   </td>
                 </tr>
               </tbody>
@@ -153,7 +168,7 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    Sheet2No.1
+                    {surveyDetail?.detailInfo?.contractCapacity}
                   </td>
                   <th
                     style={{
@@ -180,7 +195,7 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    Sheet2No.1
+                    {surveyDetail?.detailInfo?.retailCompany}
                   </td>
                 </tr>
                 <tr>
@@ -210,7 +225,13 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    Sheet2No.7 選式回答表示/自由入力回答表示
+                    {supplementaryFacilities
+                      .filter((facility) => surveyDetail?.detailInfo?.supplementaryFacilities?.includes(facility.id.toString()))
+                      .map((facility) => facility.name)
+                      .join(', ')}
+                    {surveyDetail?.detailInfo?.supplementaryFacilitiesEtc
+                      ? `, (その他) ${surveyDetail?.detailInfo?.supplementaryFacilitiesEtc}`
+                      : '-'}
                   </td>
                 </tr>
                 <tr>
@@ -240,7 +261,11 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    Sheet2No.8 選択式回表示/自由入力回表
+                    {
+                      selectBoxOptions.installationSystem.find((system) => system.id.toString() === surveyDetail?.detailInfo?.installationSystem)
+                        ?.name
+                    }
+                    {surveyDetail?.detailInfo?.installationSystemEtc ? `, (その他) ${surveyDetail?.detailInfo?.installationSystemEtc}` : '-'}
                   </td>
                 </tr>
               </tbody>
@@ -278,7 +303,7 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    No.9
+                    {surveyDetail?.detailInfo?.constructionYear === '1' ? '新築' : `既築 (${surveyDetail?.detailInfo?.constructionYear}年)`}
                   </td>
                   <th
                     style={{
@@ -305,7 +330,11 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    No.10
+                    {roofMaterial
+                      .filter((material) => surveyDetail?.detailInfo?.roofMaterial?.includes(material.id.toString()))
+                      .map((material) => material.name)
+                      .join(', ')}
+                    {surveyDetail?.detailInfo?.roofMaterialEtc ? `, (その他) ${surveyDetail?.detailInfo?.roofMaterialEtc}` : '-'}
                   </td>
                   <th
                     style={{
@@ -332,7 +361,7 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    No.11
+                    {selectBoxOptions.roofShape.find((shape) => shape.id.toString() === surveyDetail?.detailInfo?.roofShape)?.name}
                   </td>
                 </tr>
                 <tr>
@@ -361,7 +390,7 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    No.12
+                    {`${surveyDetail?.detailInfo?.roofSlope} 寸`}
                   </td>
                   <th
                     style={{
@@ -389,7 +418,7 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    No.13
+                    {`${surveyDetail?.detailInfo?.houseStructure ? '木製' : '(その他)'} ${surveyDetail?.detailInfo?.houseStructureEtc}`}
                   </td>
                 </tr>
                 <tr>
@@ -418,7 +447,8 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    No.14
+                    {radioEtcData.rafterMaterial.find((material) => material.id.toString() === surveyDetail?.detailInfo?.rafterMaterial)?.label ??
+                      (surveyDetail?.detailInfo?.rafterMaterialEtc ? `(その他) ${surveyDetail?.detailInfo?.rafterMaterialEtc}` : '-')}
                   </td>
                   <th
                     style={{
@@ -446,7 +476,8 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    No.15
+                    {selectBoxOptions.rafterSize.find((size) => size.id.toString() === surveyDetail?.detailInfo?.rafterSize)?.name ??
+                      (surveyDetail?.detailInfo?.rafterSizeEtc ? `(その他) ${surveyDetail?.detailInfo?.rafterSizeEtc}` : '-')}
                   </td>
                 </tr>
                 <tr>
@@ -463,7 +494,7 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    垂木ビッチ
+                    垂木ピッチ
                   </th>
                   <td
                     style={{
@@ -475,7 +506,8 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    No.16
+                    {selectBoxOptions.rafterPitch.find((pitch) => pitch.id.toString() === surveyDetail?.detailInfo?.rafterPitch)?.name ??
+                      (surveyDetail?.detailInfo?.rafterPitchEtc ? `(その他) ${surveyDetail?.detailInfo?.rafterPitchEtc}` : '-')}
                   </td>
                   <th
                     style={{
@@ -503,7 +535,8 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    No.17
+                    {radioEtcData.rafterDirection.find((direction) => direction.id.toString() === surveyDetail?.detailInfo?.rafterDirection)?.label ??
+                      '-'}
                   </td>
                 </tr>
                 <tr>
@@ -532,7 +565,8 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    No.18
+                    {selectBoxOptions.openFieldPlateKind.find((kind) => kind.id.toString() === surveyDetail?.detailInfo?.openFieldPlateKind)?.name ??
+                      (surveyDetail?.detailInfo?.openFieldPlateKindEtc ? `(その他) ${surveyDetail?.detailInfo?.openFieldPlateKindEtc}` : '-')}
                   </td>
                   <th
                     style={{
@@ -560,7 +594,7 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    No.19
+                    {surveyDetail?.detailInfo?.openFieldPlateThickness ? `${surveyDetail?.detailInfo?.openFieldPlateThickness}mm` : '-'}
                   </td>
                 </tr>
                 <tr>
@@ -590,7 +624,7 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    No.20
+                    {surveyDetail?.detailInfo?.leakTrace ? 'あり' : 'なし'}
                   </td>
                 </tr>
                 <tr>
@@ -620,7 +654,9 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    No.21
+                    {radioEtcData.waterproofMaterial.find((material) => material.id.toString() === surveyDetail?.detailInfo?.waterproofMaterial)
+                      ?.label ??
+                      (surveyDetail?.detailInfo?.waterproofMaterialEtc ? `(その他) ${surveyDetail?.detailInfo?.waterproofMaterialEtc}` : '-')}
                   </td>
                 </tr>
                 <tr>
@@ -650,7 +686,11 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    No.22
+                    {
+                      radioEtcData.insulationPresence.find((presence) => presence.id.toString() === surveyDetail?.detailInfo?.insulationPresence)
+                        ?.label
+                    }
+                    {surveyDetail?.detailInfo?.insulationPresenceEtc ? `(その他) ${surveyDetail?.detailInfo?.insulationPresenceEtc}` : '-'}
                   </td>
                 </tr>
                 <tr>
@@ -680,7 +720,8 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    No.23
+                    {selectBoxOptions.structureOrder.find((order) => order.id.toString() === surveyDetail?.detailInfo?.structureOrder)?.name ??
+                      (surveyDetail?.detailInfo?.structureOrderEtc ? `(その他) ${surveyDetail?.detailInfo?.structureOrderEtc}` : '-')}
                   </td>
                 </tr>
               </tbody>
@@ -718,7 +759,14 @@ export default function SurveySaleDownloadPdf() {
                       boxSizing: 'border-box',
                     }}
                   >
-                    No.23
+                    {
+                      selectBoxOptions.installationAvailability.find(
+                        (availability) => availability.id.toString() === surveyDetail?.detailInfo?.installationAvailability,
+                      )?.name
+                    }
+                    {surveyDetail?.detailInfo?.installationAvailabilityEtc
+                      ? `(その他) ${surveyDetail?.detailInfo?.installationAvailabilityEtc}`
+                      : '-'}
                   </td>
                 </tr>
               </tbody>
@@ -738,7 +786,7 @@ export default function SurveySaleDownloadPdf() {
                 height: '150px',
               }}
             >
-              No.25
+              {surveyDetail?.detailInfo?.memo ?? '-'}
             </div>
           </div>
         </div>

src/components/popup/SurveySaleSubmitPopup.tsx

@@ -1,7 +1,7 @@
 import Image from 'next/image'
 import { usePopupController } from '@/store/popupController'
 import { useParams } from 'next/navigation'
-import { useServey } from '@/hooks/useSurvey'
+import { useSurvey } from '@/hooks/useSurvey'
 import { useEffect, useState } from 'react'
 import { useSessionStore } from '@/store/session'
 import { useCommCode } from '@/hooks/useCommCode'
@@ -61,7 +61,7 @@ export default function SurveySaleSubmitPopup() {
     contents: '',
   })
 
-  const { submitSurvey, isSubmittingSurvey } = useServey(Number(routeId))
+  const { submitSurvey, isSubmittingSurvey } = useSurvey(Number(routeId))
 
   const handleInputChange = (field: keyof SubmitFormData, value: string) => {
     setSubmitData((prev) => ({ ...prev, [field]: value }))

src/components/popup/ZipCodePopup.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { useServey } from '@/hooks/useSurvey'
+import { useSurvey } from '@/hooks/useSurvey'
 import { useAddressStore } from '@/store/addressStore'
 import { usePopupController } from '@/store/popupController'
 import { useState } from 'react'
@@ -19,7 +19,7 @@ type Address = {
 export default function ZipCodePopup() {
   const [searchValue, setSearchValue] = useState('') //search 데이터 유무
   const { setAddressData } = useAddressStore()
-  const { getZipCode } = useServey()
+  const { getZipCode } = useSurvey()
   const [addressInfo, setAddressInfo] = useState<Address[] | null>([])
 
   const popupController = usePopupController()

src/components/survey-sale/detail/ButtonForm.tsx

@@ -4,7 +4,7 @@ import type { Mode, SurveyBasicRequest, SurveyDetailInfo, SurveyDetailRequest }
 import { useSessionStore } from '@/store/session'
 import { useEffect, useState } from 'react'
 import { useParams, useRouter, useSearchParams } from 'next/navigation'
-import { requiredFields, useServey } from '@/hooks/useSurvey'
+import { requiredFields, useSurvey } from '@/hooks/useSurvey'
 import { usePopupController } from '@/store/popupController'
 
 export default function ButtonForm(props: {
@@ -72,8 +72,8 @@ export default function ButtonForm(props: {
   // 저장/임시저장/수정
   const id = Number(routeId) ? Number(routeId) : Number(idParam)
 
-  const { deleteSurvey, updateSurvey, isDeletingSurvey, isUpdatingSurvey } = useServey(Number(id))
-  const { validateSurveyDetail, createSurvey, isCreatingSurvey } = useServey()
+  const { deleteSurvey, updateSurvey, isDeletingSurvey, isUpdatingSurvey } = useSurvey(Number(id))
+  const { validateSurveyDetail, createSurvey, isCreatingSurvey } = useSurvey()
 
   const handleSave = (isTemporary: boolean, isSubmitProcess = false) => {
     const emptyField = validateSurveyDetail(props.data.roof)

src/components/survey-sale/detail/DataTable.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { useServey } from '@/hooks/useSurvey'
+import { useSurvey } from '@/hooks/useSurvey'
 import { useParams } from 'next/navigation'
 import { useEffect } from 'react'
 import DetailForm from './DetailForm'
@@ -16,7 +16,7 @@ export default function DataTable() {
     }
   }, [id])
 
-  const { surveyDetail, isLoadingSurveyDetail } = useServey(Number(id))
+  const { surveyDetail, isLoadingSurveyDetail } = useSurvey(Number(id))
 
   if (isLoadingSurveyDetail) {
     return <div>Loading...</div>
@@ -67,7 +67,7 @@ export default function DataTable() {
             <tr>
               <th>ダウンロード</th>
               <td>
-                <button className="data-down">
+                <button className="data-down" onClick={() => window.open(`/pdf/survey-sale/${id}`, '_blank')}>
                   HWJ現地調査票確認<i className="down-icon"></i>
                 </button>
               </td>

src/components/survey-sale/detail/DetailForm.tsx

@@ -6,7 +6,7 @@ import ButtonForm from './ButtonForm'
 import BasicForm from './BasicForm'
 import RoofForm from './RoofForm'
 import { useParams, useSearchParams } from 'next/navigation'
-import { useServey } from '@/hooks/useSurvey'
+import { useSurvey } from '@/hooks/useSurvey'
 
 const roofInfoForm: SurveyDetailRequest = {
   contractCapacity: null,
@@ -71,7 +71,7 @@ export default function DetailForm() {
   const modeset = Number(routeId) ? 'READ' : idParam ? 'EDIT' : 'CREATE'
   const id = Number(routeId) ? Number(routeId) : Number(idParam)
 
-  const { surveyDetail, validateSurveyDetail } = useServey(Number(id))
+  const { surveyDetail, validateSurveyDetail } = useSurvey(Number(id))
 
   const [mode, setMode] = useState<Mode>(modeset)
   const [basicInfoData, setBasicInfoData] = useState<SurveyBasicRequest>(basicInfoForm)

src/components/survey-sale/detail/RoofForm.tsx

@@ -312,6 +312,7 @@ export default function RoofForm(props: {
               </div>
               <MultiCheck mode={mode} column="supplementaryFacilities" roofInfo={roofInfo as SurveyDetailInfo} setRoofInfo={setRoofInfo} />
             </div>
+            {/* 설치 희망 시스템 */}
             <div className="data-input-form-bx">
               <div className="data-input-form-tit red-f">設置希望システム</div>
               <SelectedBox mode={mode} column="installationSystem" detailInfoData={roofInfo as SurveyDetailInfo} setRoofInfo={setRoofInfo} />

src/components/survey-sale/list/ListTable.tsx

@@ -1,7 +1,7 @@
 'use client'
 
 import LoadMoreButton from '@/components/LoadMoreButton'
-import { useServey } from '@/hooks/useSurvey'
+import { useSurvey } from '@/hooks/useSurvey'
 import { useEffect, useState } from 'react'
 import { useRouter, usePathname } from 'next/navigation'
 import SearchForm from './SearchForm'
@@ -13,7 +13,7 @@ export default function ListTable() {
   const router = useRouter()
   const pathname = usePathname()
 
-  const { surveyList, isLoadingSurveyList } = useServey()
+  const { surveyList, isLoadingSurveyList } = useSurvey()
   const { offset, setOffset } = useSurveyFilterStore()
 
   const { session } = useSessionStore()
@@ -54,7 +54,7 @@ export default function ListTable() {
             {heldSurveyList.map((survey) => (
               <li className="sale-list-item cursor-pointer" key={survey.id} onClick={() => handleDetailClick(survey.id)}>
                 <div className="sale-item-bx">
-                  <div className="sale-item-date-bx">
+                  <div className="sale-item-date-bx"> 
                     <div className="sale-item-num">{survey.srlNo}</div>
                     <div className="sale-item-date">{survey.investigationDate}</div>
                   </div>

src/hooks/useSurvey.ts

@@ -54,7 +54,7 @@ type ZipCode = {
   kana3: string
 }
 
-export function useServey(id?: number): {
+export function useSurvey(id?: number): {
   surveyList: { data: SurveyBasicInfo[]; count: number } | {}
   surveyDetail: SurveyBasicInfo | null
   isLoadingSurveyList: boolean