From a549643e699ae6d7a7279c3cb5fbe2973fdcd9b2 Mon Sep 17 00:00:00 2001 From: keyy1315 Date: Wed, 2 Jul 2025 10:40:17 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20T01=20=EC=A0=9C=EC=B6=9C=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/popup/SurveySaleSubmitPopup.tsx | 2 +- src/components/survey-sale/detail/ButtonForm.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/popup/SurveySaleSubmitPopup.tsx b/src/components/popup/SurveySaleSubmitPopup.tsx index eba8bb1..89df985 100644 --- a/src/components/popup/SurveySaleSubmitPopup.tsx +++ b/src/components/popup/SurveySaleSubmitPopup.tsx @@ -101,7 +101,7 @@ export default function SurveySaleSubmitPopup() { const FORM_FIELDS: FormField[] = [ { id: 'sender', name: '発送者', required: true }, { id: 'saleBase', name: '提出地点選択', required: session?.role === 'Admin' }, - { id: 'targetNm', name: '提出販売店', required: session?.role !== 'Admin' }, + { id: 'targetNm', name: '提出販売店', required: session?.role !== 'Admin' && session?.role !== 'T01' }, { id: 'receiver', name: '受信者', required: true }, { id: 'reference', name: '参考', required: false }, { id: 'title', name: 'タイトル', required: true }, diff --git a/src/components/survey-sale/detail/ButtonForm.tsx b/src/components/survey-sale/detail/ButtonForm.tsx index 479a85d..535aa03 100644 --- a/src/components/survey-sale/detail/ButtonForm.tsx +++ b/src/components/survey-sale/detail/ButtonForm.tsx @@ -72,7 +72,7 @@ export default function ButtonForm({ mode, setMode, data }: ButtonFormProps) { const isReceiver = session?.storeId === basicData.submissionTargetId || session?.storeNm === basicData.submissionTargetNm || - (session?.role === 'T01' && basicData.submissionTargetNm === ADMIN_SUBMIT_TARGET_NM) + (session?.role === 'T01' && basicData.submissionStatus && basicData.submissionTargetId === null && basicData.submissionTargetNm !== null) return { isSubmiter, isWriter, isReceiver } } @@ -258,7 +258,7 @@ export default function ButtonForm({ mode, setMode, data }: ButtonFormProps) { handleSave(true, false)} /> handleSave(false, false)} /> - {session?.role === 'T01' || isSubmit ? null : } + {!isSubmit && permissions.isSubmiter && } )}