From d2322bf61924523b1b27c784a1fa6adcb7884307 Mon Sep 17 00:00:00 2001 From: keyy1315 Date: Thu, 10 Jul 2025 14:45:55 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=EC=83=81=EC=84=B8=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EA=B8=B0=EB=B3=B8=EC=A0=95=EB=B3=B4=20=EA=B6=8C?= =?UTF-8?q?=ED=95=9C=20=EB=B3=84=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Builder (2차 시공권한) 계정만 판매점, 시공점 컴포넌트 활성화 - Partners 계정은 시공점 컴포넌트만 활성화 - 이외의 계정은 판매점 컴포넌트만 활성화 --- src/components/survey-sale/detail/BasicForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/survey-sale/detail/BasicForm.tsx b/src/components/survey-sale/detail/BasicForm.tsx index fe2b432..5491a76 100644 --- a/src/components/survey-sale/detail/BasicForm.tsx +++ b/src/components/survey-sale/detail/BasicForm.tsx @@ -53,7 +53,7 @@ export default function BasicForm({ basicInfo, setBasicInfo, mode, session }: Ba /> {/* 페이지 모드 별, 권한 별 판매점, 시공점 입력 여부 처리 */} - {mode === 'READ' || session?.role === 'Builder' ? ( + {session?.role === 'Builder'? ( <> {storeInput(basicInfo, setBasicInfo, mode)} {builderInput(basicInfo, setBasicInfo, mode)} From bdd035c20ebe2baf803d3943432497bda7e5f0ad Mon Sep 17 00:00:00 2001 From: keyy1315 Date: Thu, 10 Jul 2025 14:47:35 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=EC=88=98=EC=A0=95=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EB=B0=8F=20=EB=AC=B8=EA=B5=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 수정화면에서 リスト(리스트) 에서 戻る (뒤로) 버튼 문구 수정 - 버튼 클릭 시 목록 화면이 아닌 상세화면으로 이동하도록 수정 --- .../survey-sale/detail/ButtonForm.tsx | 38 ++++++++++++++----- src/hooks/useAlertMsg.ts | 3 ++ 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/src/components/survey-sale/detail/ButtonForm.tsx b/src/components/survey-sale/detail/ButtonForm.tsx index e07166b..1640d7a 100644 --- a/src/components/survey-sale/detail/ButtonForm.tsx +++ b/src/components/survey-sale/detail/ButtonForm.tsx @@ -215,7 +215,7 @@ export default function ButtonForm({ mode, setMode, data }: ButtonFormProps) { return (
- +
) @@ -230,10 +230,14 @@ export default function ButtonForm({ mode, setMode, data }: ButtonFormProps) { {mode === 'READ' && (
- - {(permissions.isWriter || permissions.isSubmiter || (permissions.isReceiver && isSubmit)) && } + + {(permissions.isWriter || permissions.isSubmiter || (permissions.isReceiver && isSubmit)) && ( + + )} {(permissions.isWriter || (permissions.isReceiver && isSubmit)) && } - {!isSubmit && permissions.isSubmiter && !data.basic.srlNo?.includes('一時保存') && } + {!isSubmit && permissions.isSubmiter && !data.basic.srlNo?.includes('一時保存') && ( + + )}
)} @@ -242,11 +246,14 @@ export default function ButtonForm({ mode, setMode, data }: ButtonFormProps) { {/* 작성자 - 임시저장, 저장, 제출(미제출인 매물) 버튼 표시 */} {/* 제출권한자 - 임시저장, 저장, 제출(미제출인 매물) 버튼 표시 */} {/* 제출수신자 - 임시저장, 저장 버튼 표시 */} + {/* 수정화면에서는 리스트 버튼 클릭 시 READ 모드로 이동 */} {(mode === 'CREATE' || mode === 'EDIT') && (
- - {(data.basic.srlNo?.includes('一時保存') || mode === 'CREATE') && handleSave(true)} disabled={buttonDisabled} />} + + {(data.basic.srlNo?.includes('一時保存') || mode === 'CREATE') && ( + handleSave(true)} disabled={buttonDisabled} /> + )} handleSave(false)} disabled={buttonDisabled} />
@@ -256,12 +263,25 @@ export default function ButtonForm({ mode, setMode, data }: ButtonFormProps) { } /** Button Components */ -const ListButton = () => { +const ListButton = ({ mode, setMode }: { mode: Mode; setMode: (mode: Mode) => void }) => { const router = useRouter() + const { showConfirm } = useAlertMsg() return (
-
) diff --git a/src/hooks/useAlertMsg.ts b/src/hooks/useAlertMsg.ts index a1281b1..17429bb 100644 --- a/src/hooks/useAlertMsg.ts +++ b/src/hooks/useAlertMsg.ts @@ -39,6 +39,9 @@ export const CONFIRM_MESSAGE = { /** 문의 저장 확인 메세지 - "문의를 등록 하시겠습니까? 한화재팬 담당자에게 문의 메일이 발송됩니다." */ SAVE_INQUIRY_CONFIRM: 'お問い合わせを登録しますか? Hanwha Japanの担当者にお問い合わせメールが送信されます。', + + /** 작성 / 수정 취소 확인 메세지 - "변경 내용이 저장되지 않았습니다. 돌아가도 되겠습니까?" */ + EDIT_CANCEL_CONFIRM: '変更内容が保存されていません。戻ってもよろしいですか?', } export const WARNING_MESSAGE = {