diff options
Diffstat (limited to 'components/bidding/manage')
4 files changed, 108 insertions, 34 deletions
diff --git a/components/bidding/manage/bidding-basic-info-editor.tsx b/components/bidding/manage/bidding-basic-info-editor.tsx index e2d888ff..90923825 100644 --- a/components/bidding/manage/bidding-basic-info-editor.tsx +++ b/components/bidding/manage/bidding-basic-info-editor.tsx @@ -1141,18 +1141,16 @@ export function BiddingBasicInfoEditor({ biddingId, readonly = false }: BiddingB }) }} > - {() => ( - <DropzoneTrigger asChild> - <DropzoneZone className="flex justify-center h-32"> - <div className="flex items-center gap-6"> - <DropzoneUploadIcon /> - <div className="grid gap-0.5"> - <DropzoneTitle>파일을 드래그하여 업로드</DropzoneTitle> - </div> - </div> - </DropzoneZone> - </DropzoneTrigger> - )} + <DropzoneZone> + <DropzoneUploadIcon className="mx-auto h-12 w-12 text-muted-foreground" /> + <DropzoneTitle className="text-lg font-medium"> + 파일을 드래그하거나 클릭하여 업로드 + </DropzoneTitle> + <DropzoneDescription className="text-sm text-muted-foreground"> + PDF, Word, Excel, 이미지 파일 (최대 600MB) + </DropzoneDescription> + </DropzoneZone> + <DropzoneInput /> </Dropzone> @@ -1235,18 +1233,16 @@ export function BiddingBasicInfoEditor({ biddingId, readonly = false }: BiddingB }) }} > - {() => ( - <DropzoneTrigger asChild> - <DropzoneZone className="flex justify-center h-32"> - <div className="flex items-center gap-6"> - <DropzoneUploadIcon /> - <div className="grid gap-0.5"> - <DropzoneTitle>파일을 드래그하여 업로드</DropzoneTitle> - </div> - </div> - </DropzoneZone> - </DropzoneTrigger> - )} + <DropzoneZone> + <DropzoneUploadIcon className="mx-auto h-12 w-12 text-muted-foreground" /> + <DropzoneTitle className="text-lg font-medium"> + 파일을 드래그하거나 클릭하여 업로드 + </DropzoneTitle> + <DropzoneDescription className="text-sm text-muted-foreground"> + 협력업체용 문서나 파일을 업로드 하세요. (최대 600MB) + </DropzoneDescription> + </DropzoneZone> + <DropzoneInput /> </Dropzone> diff --git a/components/bidding/manage/bidding-companies-editor.tsx b/components/bidding/manage/bidding-companies-editor.tsx index da566c82..f6b3a3f0 100644 --- a/components/bidding/manage/bidding-companies-editor.tsx +++ b/components/bidding/manage/bidding-companies-editor.tsx @@ -271,6 +271,12 @@ export function BiddingCompaniesEditor({ biddingId, readonly = false }: BiddingC return } + // 전화번호 형식 검증 (국제 표준) + if (newContact.contactNumber && !newContact.contactNumber.startsWith('+')) { + toast.error('전화번호는 국제 표준 형식(+)으로 시작해야 합니다. (예: +821012345678)') + return + } + try { const result = await createBiddingCompanyContact( biddingId, @@ -703,8 +709,11 @@ export function BiddingCompaniesEditor({ biddingId, readonly = false }: BiddingC id="contactNumber" value={newContact.contactNumber} onChange={(e) => setNewContact(prev => ({ ...prev, contactNumber: e.target.value }))} - placeholder="010-1234-5678" + placeholder="+821012345678" /> + <p className="text-[0.8rem] text-muted-foreground"> + * SMS 발송을 위해 국제 표준 형식으로 입력해주세요. (예: +821012345678) + </p> </div> </div> diff --git a/components/bidding/manage/bidding-items-editor.tsx b/components/bidding/manage/bidding-items-editor.tsx index 208cf040..f61b3960 100644 --- a/components/bidding/manage/bidding-items-editor.tsx +++ b/components/bidding/manage/bidding-items-editor.tsx @@ -227,6 +227,57 @@ export function BiddingItemsEditor({ biddingId, readonly = false }: BiddingItems const userId = session?.user?.id?.toString() || '1' let hasError = false + // 필수값 검증 + for (let i = 0; i < items.length; i++) { + const item = items[i]; + + // 필수값: 자재그룹코드, 자재그룹명 + if (!item.materialGroupNumber || !item.materialGroupInfo) { + toast.error(`${i + 1}번 품목의 자재그룹 정보를 입력해주세요.`); + setIsSubmitting(false); + return; + } + + // 필수값: 수량 또는 중량 + if (quantityWeightMode === 'quantity') { + if (!item.quantity || parseFloat(item.quantity) <= 0) { + toast.error(`${i + 1}번 품목의 수량을 입력해주세요.`); + setIsSubmitting(false); + return; + } + if (!item.quantityUnit) { + toast.error(`${i + 1}번 품목의 수량 단위를 선택해주세요.`); + setIsSubmitting(false); + return; + } + } else { + if (!item.totalWeight || parseFloat(item.totalWeight) <= 0) { + toast.error(`${i + 1}번 품목의 중량을 입력해주세요.`); + setIsSubmitting(false); + return; + } + if (!item.weightUnit) { + toast.error(`${i + 1}번 품목의 중량 단위를 선택해주세요.`); + setIsSubmitting(false); + return; + } + } + + // 필수값: 납품요청일 + if (!item.requestedDeliveryDate) { + toast.error(`${i + 1}번 품목의 납품요청일을 입력해주세요.`); + setIsSubmitting(false); + return; + } + + // 필수값: 내정단가 (사용자 요청) + if (!item.targetUnitPrice || parseFloat(item.targetUnitPrice.replace(/,/g, '')) <= 0) { + toast.error(`${i + 1}번 품목의 내정단가를 입력해주세요.`); + setIsSubmitting(false); + return; + } + } + // 모든 아이템을 upsert 처리 (id가 있으면 update, 없으면 insert) for (const item of items) { const targetAmount = calculateTargetAmount(item) @@ -1111,10 +1162,8 @@ export function BiddingItemsEditor({ biddingId, readonly = false }: BiddingItems if (!open) setSelectedItemForWbs(null) }} selectedCode={item.wbsCode ? { - PROJ_NO: '', WBS_ELMT: item.wbsCode, WBS_ELMT_NM: item.wbsName || '', - WBS_LVL: '' } : undefined} onCodeSelect={(wbsCode) => { updatePRItem(item.id, { @@ -1167,15 +1216,12 @@ export function BiddingItemsEditor({ biddingId, readonly = false }: BiddingItems }} selectedCode={item.costCenterCode ? { KOSTL: item.costCenterCode, - KTEXT: '', - LTEXT: item.costCenterName || '', - DATAB: '', - DATBI: '' + KTEXT: item.costCenterName || '', } : undefined} onCodeSelect={(costCenter) => { updatePRItem(item.id, { costCenterCode: costCenter.KOSTL, - costCenterName: costCenter.LTEXT + costCenterName: costCenter.KTEXT }) setCostCenterDialogOpen(false) setSelectedItemForCostCenter(null) @@ -1223,7 +1269,6 @@ export function BiddingItemsEditor({ biddingId, readonly = false }: BiddingItems }} selectedCode={item.glAccountCode ? { SAKNR: item.glAccountCode, - FIPEX: '', TEXT1: item.glAccountName || '' } : undefined} onCodeSelect={(glAccount) => { diff --git a/components/bidding/manage/bidding-schedule-editor.tsx b/components/bidding/manage/bidding-schedule-editor.tsx index b5f4aaf0..ca4643ff 100644 --- a/components/bidding/manage/bidding-schedule-editor.tsx +++ b/components/bidding/manage/bidding-schedule-editor.tsx @@ -324,11 +324,23 @@ export function BiddingScheduleEditor({ biddingId, readonly = false }: BiddingSc vendors: selectedVendors, message: invitationData.message || '', currentUser: { - id: session.user.id, + id: Number(session.user.id), epId: session.user.epId, email: session.user.email || undefined, }, approvers, + specificationMeeting: schedule.hasSpecificationMeeting ? { + meetingDate: specMeetingInfo.meetingDate, + meetingTime: specMeetingInfo.meetingTime, + location: specMeetingInfo.location, + address: specMeetingInfo.address, + contactPerson: specMeetingInfo.contactPerson, + contactPhone: specMeetingInfo.contactPhone, + contactEmail: specMeetingInfo.contactEmail, + agenda: specMeetingInfo.agenda, + materials: specMeetingInfo.materials, + notes: specMeetingInfo.notes, + } : undefined, }) if (result.status === 'pending_approval') { @@ -428,6 +440,18 @@ export function BiddingScheduleEditor({ biddingId, readonly = false }: BiddingSc biddingId, vendors, message: data.message || '', + specificationMeeting: schedule.hasSpecificationMeeting ? { + meetingDate: specMeetingInfo.meetingDate, + meetingTime: specMeetingInfo.meetingTime, + location: specMeetingInfo.location, + address: specMeetingInfo.address, + contactPerson: specMeetingInfo.contactPerson, + contactPhone: specMeetingInfo.contactPhone, + contactEmail: specMeetingInfo.contactEmail, + agenda: specMeetingInfo.agenda, + materials: specMeetingInfo.materials, + notes: specMeetingInfo.notes, + } : undefined, }) // 결재 준비 완료 - invitationData와 결재 데이터 저장 및 결재 다이얼로그 열기 |