diff --git a/src/app/suitable/layout.tsx b/src/app/suitable/layout.tsx index 6141455..e738923 100644 --- a/src/app/suitable/layout.tsx +++ b/src/app/suitable/layout.tsx @@ -17,9 +17,14 @@ export default function layout({ children }: SuitableLayoutProps) {
-
この適合表は参考資料として使用してください.
-
詳細やお問い合わせは1：1お問い合わせをご利用ください.
-
屋根材の選択or屋根材名を直接入力してください.
+
この適合表は参考資料として使用してください
+
検索したい屋根材製品がない場合は、お問い合わせ登録からお問い合わせください
+
+ "屋根材の種類を選択"から種類を選んで候補から選ぶか、製品名が分かる場合は"製品名を入力"から直接入力して表示される候補から選択してください +
+
+ 屋根材の種類を選択し、下部の"全選択"を押してから"選択ダウンロード"を押すと、屋根材適合表のPDFのダウンロードが可能です。 +
{children} diff --git a/src/components/inquiry/Detail.tsx b/src/components/inquiry/Detail.tsx index 0ee483f..f451d80 100644 --- a/src/components/inquiry/Detail.tsx +++ b/src/components/inquiry/Detail.tsx @@ -38,9 +38,7 @@ export default function Detail() { 顧客名 - - {inquiryDetail?.regNm ? inquiryDetail?.regNm : '-'} - + {inquiryDetail?.regNm ? inquiryDetail?.regNm : '-'} 販売店 @@ -93,7 +91,7 @@ export default function Detail() {
diff --git a/src/components/inquiry/RegistForm.tsx b/src/components/inquiry/RegistForm.tsx index 7cf5b9d..e633035 100644 --- a/src/components/inquiry/RegistForm.tsx +++ b/src/components/inquiry/RegistForm.tsx @@ -297,7 +297,7 @@ export default function RegistForm() {
@@ -324,10 +324,10 @@ export default function RegistForm() { router.push('/inquiry/list') }} > - リスト + お問い合わせ一覧
diff --git a/src/components/suitable/Suitable.tsx b/src/components/suitable/Suitable.tsx index e960de8..fa1275a 100644 --- a/src/components/suitable/Suitable.tsx +++ b/src/components/suitable/Suitable.tsx @@ -41,7 +41,7 @@ export default function Suitable() {
- お問い合わせ + お問い合わせください
  • diff --git a/src/components/suitable/SuitableSearch.tsx b/src/components/suitable/SuitableSearch.tsx index 7a62fe2..6d46f70 100644 --- a/src/components/suitable/SuitableSearch.tsx +++ b/src/components/suitable/SuitableSearch.tsx @@ -46,7 +46,7 @@ export default function SuitableSearch() { <>
    handleInputChange(e.target.value)} onKeyDown={(e) => { diff --git a/src/components/survey-sale/detail/RoofForm.tsx b/src/components/survey-sale/detail/RoofForm.tsx index 353de95..6ae1e12 100644 --- a/src/components/survey-sale/detail/RoofForm.tsx +++ b/src/components/survey-sale/detail/RoofForm.tsx @@ -1,8 +1,8 @@ import { useEffect, useState } from 'react' import type { Mode, SurveyDetailInfo, SurveyDetailRequest } from '@/types/Survey' import { useAlertMsg, WARNING_MESSAGE } from '@/hooks/useAlertMsg' -import { radioEtcData, supplementaryFacilities } from '@/types/Survey' import { useSurveyOptionStore } from '@/store/surveyOptionStore' +import { radioEtcData, supplementaryFacilities } from '@/types/Survey' const makeNumArr = (value: string) => { return value @@ -20,6 +20,11 @@ export default function RoofForm(props: { const { showErrorAlert } = useAlertMsg() const [isFlip, setIsFlip] = useState(true) + const { selectBoxOptions, initialized, loading, loadOptions } = useSurveyOptionStore() + useEffect(() => { + if (!initialized && !loading) loadOptions() + }, [initialized, loading]) + const handleNumberInput = (key: keyof SurveyDetailRequest, value: number | string) => { /** 지붕 경사도, 노지판 두께 처리 - 최대 5자리, 소수점 1자리 처리 */ if (key === 'roofSlope' || key === 'openFieldPlateThickness') { @@ -116,7 +121,7 @@ export default function RoofForm(props: {
    {/* 전기 부대 설비 */}
    - 電気袋設備※複数選択可能 + 電気付帯設備※複数選択可能
    @@ -133,9 +138,44 @@ export default function RoofForm(props: {
    {/* 건축 연수 */} -
    建築研修
    +
    築年数
    - + +
    + setRoofInfo({ ...roofInfo, constructionYearEtc: e.target.value })} + /> + 年 +
    @@ -154,7 +194,7 @@ export default function RoofForm(props: {
    {/* 지붕 경사도 */} -
    屋根の斜面
    +
    屋根勾配
    {/* 서까래 피치 */} -
    垂木サイズ
    +
    垂木ピッチ
    @@ -201,7 +241,7 @@ export default function RoofForm(props: {
    {/* 노지판 종류 */} -
    路地板の種類
    +
    野地板の種類
    @@ -228,14 +268,14 @@ export default function RoofForm(props: { )}
    {/* 누수 흔적 */} -
    水漏れの痕跡
    +
    雨漏りの痕跡
    {/* 방수재 종류 */} -
    防水材の種類
    +
    ルーフィングの種類
    @@ -251,7 +291,39 @@ export default function RoofForm(props: {
    {/* 지붕 제품명 설치 가능 여부 확인 */}
    屋根製品名 設置可否確認
    - + +
    + setRoofInfo({ ...roofInfo, installationAvailabilityEtc: e.target.value })} + placeholder="屋根製品名が分かる場合は入力してください" + readOnly={mode === 'READ'} + /> +
    {/* 메모 */} @@ -297,14 +369,10 @@ const SelectedBox = ({ const selectedId = detailInfoData?.[column as keyof SurveyDetailInfo] const etcValue = detailInfoData?.[`${column}Etc` as keyof SurveyDetailInfo] const [isEtcSelected, setIsEtcSelected] = useState(Boolean(etcValue)) - useEffect(() => { if (!initialized && !loading) loadOptions() }, [initialized, loading]) - const isSpecialCase = column === 'constructionYear' || column === 'installationAvailability' - const showEtcOption = !isSpecialCase - /** SelectBox 값 변경 처리 */ const handleSelectChange = (e: React.ChangeEvent) => { const value = e.target.value @@ -327,18 +395,21 @@ const SelectedBox = ({ /** Input box 비활성화 처리 * - 읽기 모드 : 비활성화 - * - 설치 가능 여부 : 기타 입력 창 항상 활성화 - * - 건축 연수 : 新築 신축 (N) 체크 시 비활성화 + * - 기타 선택 해제 시 비활성화 * */ const isInputDisabled = () => { if (mode === 'READ') return true - if (column === 'installationAvailability') return false - if (column === 'constructionYear') { - return detailInfoData.constructionYear === selectBoxOptions.constructionYear[0].code || detailInfoData.constructionYear === null - } return !isEtcSelected && !etcValue } + /** placeholder 설정 처리 */ + const setPlaceholder = (column: string) => { + switch (column) { + default: + return '-' + } + } + return ( <> -
    +
    - {column === 'constructionYear' && 年}
    ) @@ -453,6 +521,13 @@ const RadioSelected = ({ return !etcChecked && !etcValue } + const setPlaceholder = (column: string) => { + switch (column) { + default: + return '-' + } + } + return ( <> {radioEtcData[column as keyof typeof radioEtcData].map((item) => ( @@ -489,7 +564,7 @@ const RadioSelected = ({ id={`${column}Etc`} type="text" className="input-frame" - placeholder="-" + placeholder={setPlaceholder(column)} value={detailInfoData[`${column}Etc` as keyof SurveyDetailInfo]?.toString() ?? ''} onChange={handleEtcInputChange} readOnly={isInputDisabled()} @@ -580,6 +655,13 @@ const MultiCheck = ({ return mode === 'READ' || etcValue === null } + const setPlaceholder = (column: string) => { + switch (column) { + default: + return '-' + } + } + return ( <>
    @@ -604,7 +686,7 @@ const MultiCheck = ({ - 新規売買登録 + 調査物件登録
    diff --git a/src/components/ui/Main.tsx b/src/components/ui/Main.tsx index 2a93bc7..ed9e13c 100644 --- a/src/components/ui/Main.tsx +++ b/src/components/ui/Main.tsx @@ -8,11 +8,11 @@ export default function Main() { <>
    -
    屋根材の照会
    -
    ご使用の屋根材の適合性をご確認いただけます
    +
    屋根材適合の確認
    +
    屋根材製品名で、対応架台の確認が可能です
    @@ -26,7 +26,7 @@ export default function Main() {
    調査物件一覧
    -
    作成物件確認
    +
    作成した調査物件の確認
    @@ -38,7 +38,7 @@ export default function Main() {
    調査物件登録
    -
    新規物件作成
    +
    調査物件の新規登録
    @@ -50,7 +50,7 @@ export default function Main() {
    お問い合わせ一覧
    -
    作成お問い合わせの確認
    +
    作成したお問い合わせの確認
    diff --git a/src/components/ui/common/Header.tsx b/src/components/ui/common/Header.tsx index 4be42c8..e48c8ec 100644 --- a/src/components/ui/common/Header.tsx +++ b/src/components/ui/common/Header.tsx @@ -88,7 +88,7 @@ export default function Header() { }} >
    -
    私は作成した物件
    +
    私が作成した物件
    @@ -100,16 +100,19 @@ export default function Header() { }} >
    -
    私は作成したお問い合わせ
    +
    私が作成した問い合わせ
    -
    { - router.push('/suitable') - setSideNavIsOpen(false) - }}> +
    { + router.push('/suitable') + setSideNavIsOpen(false) + }} + >
    -
    屋根材適合性の確認
    +
    屋根材適合の確認
    @@ -127,29 +130,45 @@ export default function Header() {
  • - +
  • - +
  • - +
    • {session.role !== 'Partner' && (
  • - +
    • )} diff --git a/src/hooks/useSurvey.ts b/src/hooks/useSurvey.ts index 28193d0..5e14604 100644 --- a/src/hooks/useSurvey.ts +++ b/src/hooks/useSurvey.ts @@ -15,7 +15,7 @@ export const requiredFields = [ }, { field: 'constructionYear', - name: '建築年数', + name: '築年数', }, { field: 'rafterSize', @@ -23,15 +23,15 @@ export const requiredFields = [ }, { field: 'rafterPitch', - name: '垂木傾斜', + name: '垂木ピッチ', }, { field: 'waterproofMaterial', - name: '防水材', + name: 'ルーフィングの種類', }, { field: 'insulationPresence', - name: '断熱材有無', + name: '断熱材の有無', }, { field: 'structureOrder', diff --git a/src/hooks/useTitle.ts b/src/hooks/useTitle.ts index 63adc5e..3d818e1 100644 --- a/src/hooks/useTitle.ts +++ b/src/hooks/useTitle.ts @@ -14,13 +14,13 @@ export const useTitle = () => { case '/': return 'Hanasys 現地調査' case '/suitable': - return '屋根材適合性の確認' + return '屋根材適合の確認' case '/survey-sale': return '調査物件一覧' case '/survey-sale/regist': return '調査物件登録' case '/inquiry/list': - return 'お問い合わせ' + return 'お問い合わせ一覧' case '/inquiry/regist': return 'お問い合わせ登録' case '/pw-reset': diff --git a/src/types/Survey.ts b/src/types/Survey.ts index efd2147..6a48a92 100644 --- a/src/types/Survey.ts +++ b/src/types/Survey.ts @@ -345,7 +345,7 @@ export const supplementaryFacilities: { id: number; code: string | null; name: s /** 에코큐트 */ { id: 1, code: null, name: 'エコキュート' }, /** 에네팜 */ - { id: 2, code: null, name: 'エネパーム' }, + { id: 2, code: null, name: 'エネファーム' }, /** 축전지시스템 */ { id: 3, code: null, name: '蓄電池システム' }, /** 태양광발전 */ @@ -382,7 +382,7 @@ export const selectBoxOptions: Record 防水材 > 屋根の基礎 > 垂木', + label: '屋根材>ルーフィング>野地板>垂木', }, ], houseStructure: [ @@ -530,7 +530,7 @@ export const radioEtcData: Record