feat: enhance survey sales API with detailed error handling, improved search parameters, and new registration form component
This commit is contained in:
parent
a227ba7115
commit
d7aca7e214
@ -1,40 +1,62 @@
|
||||
import { NextResponse } from 'next/server'
|
||||
import { prisma } from '@/libs/prisma'
|
||||
|
||||
export async function GET(request: Request, context: { params: { id: string } }) {
|
||||
const { id } = await context.params
|
||||
// @ts-ignore
|
||||
const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.findUnique({
|
||||
where: { ID: Number(id) },
|
||||
include: {
|
||||
DETAIL_INFO: true,
|
||||
},
|
||||
})
|
||||
return NextResponse.json(survey)
|
||||
}
|
||||
|
||||
export async function PUT(request: Request, context: { params: { id: string } }) {
|
||||
const { id } = await context.params
|
||||
const body = await request.json()
|
||||
try {
|
||||
const { id } = await context.params
|
||||
// @ts-ignore
|
||||
const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
|
||||
const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.findUnique({
|
||||
where: { ID: Number(id) },
|
||||
data: {
|
||||
...body,
|
||||
include: {
|
||||
DETAIL_INFO: true,
|
||||
},
|
||||
})
|
||||
return NextResponse.json(survey)
|
||||
} catch (error) {
|
||||
console.error(error)
|
||||
throw error
|
||||
console.error('Error fetching survey:', error)
|
||||
return NextResponse.json({ error: 'Failed to fetch survey' }, { status: 500 })
|
||||
}
|
||||
}
|
||||
|
||||
export async function PUT(request: Request, context: { params: { id: string } }) {
|
||||
try {
|
||||
const { id } = await context.params
|
||||
const body = await request.json()
|
||||
console.log('body:: ', body)
|
||||
|
||||
// DETAIL_INFO를 분리
|
||||
const { DETAIL_INFO, ...basicInfo } = body
|
||||
|
||||
// @ts-ignore
|
||||
const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
|
||||
where: { ID: Number(id) },
|
||||
data: {
|
||||
...basicInfo,
|
||||
UPT_DT: new Date(),
|
||||
DETAIL_INFO: DETAIL_INFO
|
||||
? {
|
||||
upsert: {
|
||||
create: DETAIL_INFO,
|
||||
update: DETAIL_INFO,
|
||||
},
|
||||
}
|
||||
: undefined,
|
||||
},
|
||||
include: {
|
||||
DETAIL_INFO: true,
|
||||
},
|
||||
})
|
||||
return NextResponse.json(survey)
|
||||
} catch (error) {
|
||||
console.error('Error updating survey:', error)
|
||||
return NextResponse.json({ error: 'Failed to update survey' }, { status: 500 })
|
||||
}
|
||||
}
|
||||
|
||||
export async function DELETE(request: Request, context: { params: { id: string } }) {
|
||||
const { id } = await context.params
|
||||
|
||||
try {
|
||||
//@ts-ignore
|
||||
const { id } = await context.params
|
||||
|
||||
await prisma.$transaction(async (tx) => {
|
||||
// @ts-ignore
|
||||
const detailData = await tx.SD_SURVEY_SALES_BASIC_INFO.findUnique({
|
||||
@ -43,69 +65,75 @@ export async function DELETE(request: Request, context: { params: { id: string }
|
||||
DETAIL_INFO: true,
|
||||
},
|
||||
})
|
||||
console.log('detailData:: ', detailData)
|
||||
|
||||
if (detailData?.DETAIL_INFO?.ID) {
|
||||
// @ts-ignore
|
||||
await tx.SD_SURVEY_SALES_DETAIL_INFO.delete({
|
||||
where: { ID: Number(detailData?.DETAIL_INFO?.ID) },
|
||||
where: { ID: Number(detailData.DETAIL_INFO.ID) },
|
||||
})
|
||||
}
|
||||
|
||||
// @ts-ignore
|
||||
await tx.SD_SURVEY_SALES_BASIC_INFO.delete({
|
||||
where: { ID: Number(id) },
|
||||
})
|
||||
})
|
||||
|
||||
return NextResponse.json({ message: 'Survey deleted successfully' })
|
||||
} catch (error) {
|
||||
console.error(error)
|
||||
throw error
|
||||
console.error('Error deleting survey:', error)
|
||||
return NextResponse.json({ error: 'Failed to delete survey' }, { status: 500 })
|
||||
}
|
||||
}
|
||||
|
||||
export async function PATCH(request: Request, context: { params: { id: string } }) {
|
||||
const { id } = await context.params
|
||||
const body = await request.json()
|
||||
try {
|
||||
const { id } = await context.params
|
||||
const body = await request.json()
|
||||
|
||||
if (body.submit) {
|
||||
// @ts-ignore
|
||||
const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
|
||||
where: { ID: Number(id) },
|
||||
data: {
|
||||
SUBMISSION_STATUS: true,
|
||||
SUBMISSION_DATE: new Date(),
|
||||
},
|
||||
})
|
||||
return NextResponse.json({ message: 'Survey confirmed successfully' })
|
||||
} else {
|
||||
// @ts-ignore
|
||||
const hasDetails = await prisma.SD_SURVEY_SALES_DETAIL_INFO.findUnique({
|
||||
where: { BASIC_INFO_ID: Number(id) },
|
||||
})
|
||||
console.log('hasDetails:: ', hasDetails)
|
||||
if (hasDetails) {
|
||||
//@ts-ignore
|
||||
const result = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
|
||||
where: { ID: Number(id) },
|
||||
data: {
|
||||
UPT_DT: new Date(),
|
||||
DETAIL_INFO: {
|
||||
update: body.DETAIL_INFO,
|
||||
},
|
||||
},
|
||||
})
|
||||
return NextResponse.json(result)
|
||||
} else {
|
||||
if (body.submit) {
|
||||
// @ts-ignore
|
||||
const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
|
||||
where: { ID: Number(id) },
|
||||
data: {
|
||||
DETAIL_INFO: {
|
||||
create: body.DETAIL_INFO,
|
||||
},
|
||||
SUBMISSION_STATUS: true,
|
||||
SUBMISSION_DATE: new Date(),
|
||||
},
|
||||
})
|
||||
console.log(survey)
|
||||
return NextResponse.json({ message: 'Survey detail created successfully' })
|
||||
return NextResponse.json({ message: 'Survey confirmed successfully' })
|
||||
} else {
|
||||
// @ts-ignore
|
||||
const hasDetails = await prisma.SD_SURVEY_SALES_DETAIL_INFO.findUnique({
|
||||
where: { BASIC_INFO_ID: Number(id) },
|
||||
})
|
||||
|
||||
if (hasDetails) {
|
||||
//@ts-ignore
|
||||
const result = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
|
||||
where: { ID: Number(id) },
|
||||
data: {
|
||||
UPT_DT: new Date(),
|
||||
DETAIL_INFO: {
|
||||
update: body.DETAIL_INFO,
|
||||
},
|
||||
},
|
||||
})
|
||||
return NextResponse.json(result)
|
||||
} else {
|
||||
// @ts-ignore
|
||||
const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
|
||||
where: { ID: Number(id) },
|
||||
data: {
|
||||
DETAIL_INFO: {
|
||||
create: body.DETAIL_INFO,
|
||||
},
|
||||
},
|
||||
})
|
||||
return NextResponse.json({ message: 'Survey detail created successfully' })
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error updating survey:', error)
|
||||
return NextResponse.json({ error: 'Failed to update survey' }, { status: 500 })
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,16 +1,18 @@
|
||||
import { NextResponse } from 'next/server'
|
||||
import { prisma } from '@/libs/prisma'
|
||||
|
||||
// Types
|
||||
/**
|
||||
* 검색 파라미터
|
||||
*/
|
||||
type SearchParams = {
|
||||
keyword?: string | null
|
||||
searchOption?: string | null
|
||||
isMySurvey?: string | null
|
||||
sort?: string | null
|
||||
keyword?: string | null // 검색어
|
||||
searchOption?: string | null // 검색 옵션 (select 옵션)
|
||||
isMySurvey?: string | null // 내가 작성한 매물
|
||||
sort?: string | null // 정렬 방식
|
||||
offset?: string | null
|
||||
memberRole?: string | null
|
||||
store?: string | null
|
||||
builderNo?: string | null
|
||||
role?: string | null // 회원권한한
|
||||
store?: string | null // 판매점ID
|
||||
builderNo?: string | null // 시공ID
|
||||
}
|
||||
|
||||
type WhereCondition = {
|
||||
@ -19,133 +21,131 @@ type WhereCondition = {
|
||||
[key: string]: any
|
||||
}
|
||||
|
||||
// Constants
|
||||
// 검색 가능한 필드 옵션
|
||||
const SEARCH_OPTIONS = [
|
||||
'BUILDING_NAME',
|
||||
'REPRESENTATIVE',
|
||||
'STORE',
|
||||
'CONSTRUCTION_POINT',
|
||||
'CUSTOMER_NAME',
|
||||
'POST_CODE',
|
||||
'ADDRESS',
|
||||
'ADDRESS_DETAIL',
|
||||
'BUILDING_NAME', // 건물명
|
||||
'REPRESENTATIVE', // 담당자
|
||||
'STORE', // 판매점
|
||||
'CONSTRUCTION_POINT', // 시공점
|
||||
'CUSTOMER_NAME', // 고객명
|
||||
'POST_CODE', // 우편번호
|
||||
'ADDRESS', // 주소
|
||||
'ADDRESS_DETAIL', // 상세주소
|
||||
] as const
|
||||
|
||||
// 페이지당 항목 수
|
||||
const ITEMS_PER_PAGE = 10
|
||||
|
||||
// Helper functions
|
||||
/**
|
||||
* 키워드 검색 조건 생성 함수
|
||||
* @param keyword 검색 키워드
|
||||
* @param searchOption 검색 옵션
|
||||
* @returns 검색 조건 객체
|
||||
*/
|
||||
const createKeywordSearchCondition = (keyword: string, searchOption: string): WhereCondition => {
|
||||
const where: WhereCondition = {}
|
||||
|
||||
if (searchOption === 'all') {
|
||||
// 모든 필드 검색 시 OR 조건 사용
|
||||
where.OR = []
|
||||
|
||||
// ID 검색 조건 추가
|
||||
// ID가 숫자인 경우 ID 검색 조건 추가
|
||||
if (keyword.match(/^\d+$/) || !isNaN(Number(keyword))) {
|
||||
where.OR.push({
|
||||
ID: { equals: Number(keyword) },
|
||||
})
|
||||
}
|
||||
|
||||
// 다른 필드 검색 조건 추가
|
||||
where.OR.push(
|
||||
...SEARCH_OPTIONS.map((field) => ({
|
||||
[field]: { contains: keyword },
|
||||
})),
|
||||
)
|
||||
} else if (SEARCH_OPTIONS.includes(searchOption as any)) {
|
||||
where[searchOption] = { contains: keyword }
|
||||
} else if (SEARCH_OPTIONS.includes(searchOption.toUpperCase() as any)) {
|
||||
// 특정 필드 검색
|
||||
where[searchOption.toUpperCase()] = { contains: keyword }
|
||||
} else if (searchOption === 'id') {
|
||||
where.ID = { equals: Number(keyword) }
|
||||
// ID 검색 (숫자 변환 필요)
|
||||
const number = Number(keyword)
|
||||
if (!isNaN(number)) {
|
||||
where.ID = { equals: number }
|
||||
} else {
|
||||
// 유효하지 않은 ID 검색 시 빈 결과 반환
|
||||
where.ID = { equals: null }
|
||||
}
|
||||
}
|
||||
|
||||
return where
|
||||
}
|
||||
|
||||
/**
|
||||
* 회원 역할별 검색 조건 생성 함수
|
||||
* @param params 검색 파라미터
|
||||
* @returns 검색 조건 객체
|
||||
*/
|
||||
const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
|
||||
const where: WhereCondition = { AND: [] }
|
||||
|
||||
switch (params.memberRole) {
|
||||
// 1차점: 같은 판매점에서 작성된 매물 + 2차점에서 제출받은 매물
|
||||
case 'Admin':
|
||||
switch (params.role) {
|
||||
case 'Admin': // 1차점
|
||||
// 같은 판매점에서 작성된 매물 + 2차점에서 제출받은 매물
|
||||
where.OR = [
|
||||
{
|
||||
AND: [
|
||||
{ STORE: { equals: params.store } },
|
||||
{ SUBMISSION_STATUS: { equals: false } }
|
||||
]
|
||||
AND: [{ STORE: { equals: params.store } }],
|
||||
},
|
||||
{
|
||||
AND: [
|
||||
{ STORE: { endsWith: params.store } },
|
||||
{ SUBMISSION_STATUS: { equals: true } }
|
||||
]
|
||||
}
|
||||
AND: [{ STORE: { startsWith: params.store } }, { SUBMISSION_STATUS: { equals: true } }],
|
||||
},
|
||||
]
|
||||
break
|
||||
|
||||
// 2차점: 같은 판매점에서 작성된 매물 + Builder에게 제출받은 매물
|
||||
case 'Admin_Sub':
|
||||
case 'Admin_Sub': // 2차점
|
||||
where.OR = [
|
||||
{
|
||||
AND: [
|
||||
{ STORE: { equals: params.store } },
|
||||
{ CONSTRUCTION_POINT: { equals: null } },
|
||||
{ SUBMISSION_STATUS: { equals: false } }
|
||||
{
|
||||
OR: [
|
||||
{ CONSTRUCTION_POINT: { equals: null } },
|
||||
{ CONSTRUCTION_POINT: { equals: '' } }
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
AND: [
|
||||
{ STORE: { equals: params.store } },
|
||||
{ CONSTRUCTION_POINT: { not: null } },
|
||||
{ CONSTRUCTION_POINT: { not: '' } },
|
||||
{ SUBMISSION_STATUS: { equals: true } }
|
||||
]
|
||||
}
|
||||
]
|
||||
break
|
||||
|
||||
// 2차점 시공권한: 같은 시공ID에서 작성된 매물
|
||||
case 'Builder':
|
||||
case 'Builder': // 2차점 시공권한
|
||||
case 'Partner': // Partner
|
||||
// 같은 시공ID에서 작성된 매물
|
||||
where.AND?.push({
|
||||
CONSTRUCTION_POINT: { equals: params.builderNo },
|
||||
SUBMISSION_STATUS: { equals: false },
|
||||
})
|
||||
break
|
||||
|
||||
// 시공점: 같은 시공ID에서 작성된 매물
|
||||
case 'Partner':
|
||||
where.AND?.push({
|
||||
CONSTRUCTION_POINT: { equals: params.builderNo },
|
||||
SUBMISSION_STATUS: { equals: false },
|
||||
})
|
||||
break
|
||||
|
||||
// 모든 매물 조회 가능
|
||||
case 'T01':
|
||||
case 'User':
|
||||
// 모든 매물 조회 가능 (추가 조건 없음)
|
||||
break
|
||||
}
|
||||
|
||||
return where
|
||||
}
|
||||
|
||||
// API Routes
|
||||
export async function POST(request: Request) {
|
||||
try {
|
||||
const body = await request.json()
|
||||
// @ts-ignore
|
||||
const res = await prisma.SD_SURVEY_SALES_BASIC_INFO.create({
|
||||
data: body,
|
||||
})
|
||||
return NextResponse.json(res)
|
||||
} catch (error) {
|
||||
console.error('Error creating survey:', error)
|
||||
return NextResponse.json({ error: 'Failed to create survey' }, { status: 500 })
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* GET 핸들러 - 설문 목록 조회
|
||||
*/
|
||||
export async function GET(request: Request) {
|
||||
try {
|
||||
// URL 파라미터 파싱
|
||||
const { searchParams } = new URL(request.url)
|
||||
const params: SearchParams = {
|
||||
keyword: searchParams.get('keyword'),
|
||||
@ -153,59 +153,95 @@ export async function GET(request: Request) {
|
||||
isMySurvey: searchParams.get('isMySurvey'),
|
||||
sort: searchParams.get('sort'),
|
||||
offset: searchParams.get('offset'),
|
||||
memberRole: searchParams.get('memberRole'),
|
||||
role: searchParams.get('role'),
|
||||
store: searchParams.get('store'),
|
||||
builderNo: searchParams.get('builderNo'),
|
||||
}
|
||||
|
||||
// 검색 조건 구성
|
||||
const where: WhereCondition = {}
|
||||
|
||||
// 내가 작성한 매물 조건
|
||||
// 내가 작성한 매물 조건 적용
|
||||
if (params.isMySurvey) {
|
||||
where.REPRESENTATIVE = params.isMySurvey
|
||||
}
|
||||
|
||||
// 키워드 검색 조건
|
||||
// 키워드 검색 조건 적용
|
||||
if (params.keyword && params.searchOption) {
|
||||
Object.assign(where, createKeywordSearchCondition(params.keyword, params.searchOption))
|
||||
}
|
||||
|
||||
// 회원 유형 조건
|
||||
// 회원 유형 조건 적용
|
||||
Object.assign(where, createMemberRoleCondition(params))
|
||||
|
||||
// 데이터 조회
|
||||
// 데이터 조회 또는 카운트
|
||||
if (params.offset) {
|
||||
// @ts-ignore
|
||||
const res = await prisma.SD_SURVEY_SALES_BASIC_INFO.findMany({
|
||||
// 페이지네이션 데이터 조회
|
||||
//@ts-ignore
|
||||
const surveys = await prisma.SD_SURVEY_SALES_BASIC_INFO.findMany({
|
||||
where,
|
||||
orderBy: params.sort === 'created' ? { REG_DT: 'desc' } : { UPT_DT: 'desc' },
|
||||
skip: Number(params.offset),
|
||||
take: ITEMS_PER_PAGE,
|
||||
})
|
||||
return NextResponse.json(res)
|
||||
return NextResponse.json(surveys)
|
||||
} else {
|
||||
// 전체 개수만 조회
|
||||
//@ts-ignore
|
||||
const count = await prisma.SD_SURVEY_SALES_BASIC_INFO.count({ where })
|
||||
return NextResponse.json(count)
|
||||
}
|
||||
|
||||
// 전체 개수 조회
|
||||
// @ts-ignore
|
||||
const count = await prisma.SD_SURVEY_SALES_BASIC_INFO.count({ where })
|
||||
return NextResponse.json(count)
|
||||
} catch (error) {
|
||||
console.error('Error fetching surveys:', error)
|
||||
return NextResponse.json({ error: 'Failed to fetch surveys' }, { status: 500 })
|
||||
console.error(error)
|
||||
return NextResponse.json({ error: 'Fail Read Survey' }, { status: 500 })
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* PUT 핸들러 - 상세 정보 추가
|
||||
*/
|
||||
export async function PUT(request: Request) {
|
||||
try {
|
||||
const body = await request.json()
|
||||
const detailInfo = { ...body.detail_info, BASIC_INFO_ID: body.id }
|
||||
// @ts-ignore
|
||||
const res = await prisma.SD_SURVEY_SALES_DETAIL_INFO.create({
|
||||
|
||||
// 상세 정보 생성을 위한 데이터 구성
|
||||
const detailInfo = {
|
||||
...body.detail_info,
|
||||
BASIC_INFO_ID: body.id,
|
||||
}
|
||||
|
||||
// 상세 정보 생성
|
||||
//@ts-ignore
|
||||
await prisma.SD_SURVEY_SALES_DETAIL_INFO.create({
|
||||
data: detailInfo,
|
||||
})
|
||||
return NextResponse.json({ message: 'Survey sales updated successfully' })
|
||||
|
||||
return NextResponse.json({
|
||||
message: 'Success Update Survey',
|
||||
})
|
||||
} catch (error) {
|
||||
console.error('Error updating survey:', error)
|
||||
return NextResponse.json({ error: 'Failed to update survey' }, { status: 500 })
|
||||
console.error(error)
|
||||
return NextResponse.json({ error: 'Fail Update Survey' }, { status: 500 })
|
||||
}
|
||||
}
|
||||
|
||||
export async function POST(request: Request) {
|
||||
try {
|
||||
const body = await request.json()
|
||||
const { DETAIL_INFO, ...basicInfo } = body
|
||||
// 기본 정보 생성
|
||||
//@ts-ignore
|
||||
const result = await prisma.SD_SURVEY_SALES_BASIC_INFO.create({
|
||||
data: {
|
||||
...basicInfo,
|
||||
DETAIL_INFO: {
|
||||
create: DETAIL_INFO,
|
||||
},
|
||||
},
|
||||
})
|
||||
return NextResponse.json(result)
|
||||
} catch (error) {
|
||||
console.error(error)
|
||||
return NextResponse.json({ error: 'Fail Create Survey' }, { status: 500 })
|
||||
}
|
||||
}
|
||||
|
||||
9
src/app/survey-sale/regist/page.tsx
Normal file
9
src/app/survey-sale/regist/page.tsx
Normal file
@ -0,0 +1,9 @@
|
||||
import RegistForm from '@/components/survey-sale/temp/registForm'
|
||||
|
||||
export default function RegistPage() {
|
||||
return (
|
||||
<>
|
||||
<RegistForm />
|
||||
</>
|
||||
)
|
||||
}
|
||||
@ -28,10 +28,11 @@ export default function ZipCodePopup() {
|
||||
const popupController = usePopupController()
|
||||
|
||||
const handleApply = () => {
|
||||
console.log(addressInfo?.[0])
|
||||
setAddressData({
|
||||
post_code: addressInfo?.[0]?.zipcode || '',
|
||||
address: addressInfo?.[0]?.prefcode || '',
|
||||
address_detail: addressInfo?.[0]?.address1 + ' ' + addressInfo?.[0]?.address2 + ' ' + addressInfo?.[0]?.address3 || '',
|
||||
address: addressInfo?.[0]?.address1 || '',
|
||||
address_detail: addressInfo?.[0]?.address2 + ' ' + addressInfo?.[0]?.address3 || '',
|
||||
})
|
||||
popupController.setZipCodePopup(false)
|
||||
}
|
||||
|
||||
@ -15,7 +15,7 @@ export default function NavTab() {
|
||||
const params = useParams()
|
||||
const detailId = params.id
|
||||
|
||||
const { basicInfoSelected, roofInfoSelected, reset } = useSurveySaleTabState()
|
||||
const { basicInfoSelected, roofInfoSelected, reset, setBasicInfoSelected, setRoofInfoSelected } = useSurveySaleTabState()
|
||||
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
@ -27,26 +27,36 @@ export default function NavTab() {
|
||||
return null
|
||||
}
|
||||
|
||||
const handleBasicInfoClick = () => {
|
||||
if (id) {
|
||||
router.push(`/survey-sale/basic-info?id=${id}`)
|
||||
return
|
||||
const scrollSection = (section: string) => {
|
||||
const sectionElement = document.getElementById(section)
|
||||
if (sectionElement) {
|
||||
sectionElement.scrollIntoView({ behavior: 'smooth' })
|
||||
}
|
||||
}
|
||||
|
||||
const handleBasicInfoClick = () => {
|
||||
// if (id) {
|
||||
// router.push(`/survey-sale/basic-info?id=${id}`)
|
||||
// return
|
||||
// }
|
||||
if (detailId) {
|
||||
router.push(`/survey-sale/${detailId}`)
|
||||
return
|
||||
}
|
||||
scrollSection('basic-form-section')
|
||||
|
||||
setBasicInfoSelected()
|
||||
}
|
||||
|
||||
const handleRoofInfoClick = () => {
|
||||
if (id) {
|
||||
if (isTemp === 'true') {
|
||||
alert('基本情報が一時保存された状態です。')
|
||||
return
|
||||
}
|
||||
router.push(`/survey-sale/roof-info?id=${id}`)
|
||||
return
|
||||
}
|
||||
// if (id) {
|
||||
// if (isTemp === 'true') {
|
||||
// alert('基本情報が一時保存された状態です。')
|
||||
// return
|
||||
// }
|
||||
// router.push(`/survey-sale/roof-info?id=${id}`)
|
||||
// return
|
||||
// }
|
||||
if (detailId) {
|
||||
router.push(`/survey-sale/${detailId}?tab=roof-info`)
|
||||
return
|
||||
@ -55,6 +65,10 @@ export default function NavTab() {
|
||||
alert('基本情報を先に保存してください。')
|
||||
return null
|
||||
}
|
||||
// if (pathname === '/survey-sale/regist') {
|
||||
scrollSection('roof-form-section')
|
||||
// }
|
||||
setRoofInfoSelected()
|
||||
}
|
||||
|
||||
return (
|
||||
|
||||
@ -2,10 +2,8 @@
|
||||
|
||||
import { useServey } from '@/hooks/useSurvey'
|
||||
import { useParams, useSearchParams } from 'next/navigation'
|
||||
import { useEffect } from 'react'
|
||||
import { useState } from 'react'
|
||||
import { useEffect, useState } from 'react'
|
||||
import DetailForm from './DetailForm'
|
||||
import { useSurveySaleTabState } from '@/store/surveySaleTabState'
|
||||
import RoofDetailForm from './RoofDetailForm'
|
||||
|
||||
export default function DataTable() {
|
||||
@ -14,21 +12,21 @@ export default function DataTable() {
|
||||
|
||||
const searchParams = useSearchParams()
|
||||
const tab = searchParams.get('tab')
|
||||
const isTemp = searchParams.get('isTemporary')
|
||||
|
||||
const { surveyDetail, isLoadingSurveyDetail } = useServey(Number(id))
|
||||
const [isTemporary, setIsTemporary] = useState(true)
|
||||
const { setBasicInfoSelected, setRoofInfoSelected } = useSurveySaleTabState()
|
||||
const [isTemporary, setIsTemporary] = useState(isTemp === 'true')
|
||||
|
||||
const { validateSurveyDetail } = useServey(Number(id))
|
||||
|
||||
useEffect(() => {
|
||||
if (surveyDetail?.REPRESENTATIVE && surveyDetail?.STORE && surveyDetail?.CONSTRUCTION_POINT) {
|
||||
setIsTemporary(false)
|
||||
if (surveyDetail?.DETAIL_INFO) {
|
||||
const validate = validateSurveyDetail(surveyDetail.DETAIL_INFO)
|
||||
if (validate.trim() !== '') {
|
||||
setIsTemporary(false)
|
||||
}
|
||||
}
|
||||
if (tab === 'roof-info') {
|
||||
setRoofInfoSelected()
|
||||
} else {
|
||||
setBasicInfoSelected()
|
||||
}
|
||||
}, [surveyDetail, tab, setBasicInfoSelected, setRoofInfoSelected])
|
||||
}, [surveyDetail])
|
||||
|
||||
if (isLoadingSurveyDetail) {
|
||||
return <div>Loading...</div>
|
||||
@ -68,7 +66,7 @@ export default function DataTable() {
|
||||
<>
|
||||
{/* TODO: 제출한 판매점 ID 추가 필요 */}
|
||||
<div>{new Date(surveyDetail.SUBMISSION_DATE).toLocaleString()}</div>
|
||||
<div>販売店 ID...</div>
|
||||
<div>{surveyDetail.STORE}</div>
|
||||
</>
|
||||
) : (
|
||||
'-'
|
||||
|
||||
@ -1,86 +1,119 @@
|
||||
'use client'
|
||||
import { useRouter } from 'next/navigation'
|
||||
import { useRouter, useSearchParams } from 'next/navigation'
|
||||
import { useServey } from '@/hooks/useSurvey'
|
||||
import { useSessionStore } from '@/store/session'
|
||||
import { useEffect, useState } from 'react'
|
||||
import { SurveyBasicInfo } from '@/types/Survey'
|
||||
import { useState } from 'react'
|
||||
|
||||
export default function DetailButton({ isTemporary, surveyId, representative }: { isTemporary: boolean; surveyId: number; representative: string }) {
|
||||
export default function DetailButton({ surveyDetail }: { surveyDetail: SurveyBasicInfo | null }) {
|
||||
const router = useRouter()
|
||||
const { session } = useSessionStore()
|
||||
const { submitSurvey, deleteSurvey } = useServey(surveyId)
|
||||
const [userId, setUserId] = useState('')
|
||||
const { submitSurvey, deleteSurvey } = useServey(surveyDetail?.ID ?? 0)
|
||||
|
||||
useEffect(() => {
|
||||
if (session?.isLoggedIn) {
|
||||
setUserId(session?.userId ?? '')
|
||||
const searchParams = useSearchParams()
|
||||
const isTemp = searchParams.get('isTemporary')
|
||||
const [isTemporary, setIsTemporary] = useState(isTemp === 'true')
|
||||
|
||||
const checkRole = () => {
|
||||
switch (session?.role) {
|
||||
case 'T01':
|
||||
return session?.userNm === surveyDetail?.REPRESENTATIVE ? true : false
|
||||
case 'Admin':
|
||||
return session?.storeNm === surveyDetail?.STORE ? true : false
|
||||
case 'Admin_Sub':
|
||||
return session?.storeNm === surveyDetail?.STORE ? true : false
|
||||
case 'Builder':
|
||||
return session?.builderNo === surveyDetail?.CONSTRUCTION_POINT ? true : false
|
||||
case 'Partner':
|
||||
return session?.builderNo === surveyDetail?.CONSTRUCTION_POINT ? true : false
|
||||
default:
|
||||
return ''
|
||||
}
|
||||
}, [session, setUserId])
|
||||
}
|
||||
|
||||
const handleSubmit = async () => {
|
||||
if (isTemporary) {
|
||||
alert('一時保存されたデータは提出できません。')
|
||||
return
|
||||
}
|
||||
if (userId === representative) {
|
||||
if (confirm('提出しますか？？')) {
|
||||
if (surveyId) {
|
||||
// TODO: 제출 페이지 추가
|
||||
alert('SUBMIT POPUP!!!!!!!!!!!')
|
||||
await submitSurvey()
|
||||
}
|
||||
const result = checkRole()
|
||||
if (result) {
|
||||
if (isTemporary) {
|
||||
alert('一時保存されたデータは提出できません。')
|
||||
return
|
||||
}
|
||||
} else {
|
||||
alert('担当者のみ提出可能です。')
|
||||
window.neoConfirm(
|
||||
'提出しますか？？',
|
||||
async () => {
|
||||
if (surveyDetail?.ID) {
|
||||
// TODO: 제출 페이지 추가
|
||||
alert('SUBMIT POPUP!!!!!!!!!!!')
|
||||
await submitSurvey()
|
||||
}
|
||||
},
|
||||
() => null,
|
||||
)
|
||||
}
|
||||
}
|
||||
const handleUpdate = () => {
|
||||
if (userId === representative) {
|
||||
router.push(`/survey-sale/basic-info?id=${surveyId}&isTemp=${isTemporary}`)
|
||||
const result = checkRole()
|
||||
if (result) {
|
||||
// router.push(`/survey-sale/basic-info?id=${surveyDetail?.ID}&isTemp=${isTemporary}`)
|
||||
router.push(`/survey-sale/regist?id=${surveyDetail?.ID}`)
|
||||
} else {
|
||||
alert('担当者のみ修正可能です。')
|
||||
}
|
||||
}
|
||||
const handleDelete = async () => {
|
||||
if (confirm('削除しますか？')) {
|
||||
if (surveyId) {
|
||||
if (userId === representative) {
|
||||
await deleteSurvey()
|
||||
router.push('/survey-sale')
|
||||
} else {
|
||||
alert('担当者のみ削除可能です。')
|
||||
window.neoConfirm(
|
||||
'削除しますか？',
|
||||
async () => {
|
||||
if (surveyDetail?.ID) {
|
||||
if (session.userNm === surveyDetail?.REPRESENTATIVE) {
|
||||
await deleteSurvey()
|
||||
alert('削除されました。')
|
||||
router.push('/survey-sale')
|
||||
} else {
|
||||
alert('担当者のみ削除可能です。')
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
() => null,
|
||||
)
|
||||
}
|
||||
|
||||
const isSubmitter = session?.storeNm === surveyDetail?.STORE && session?.builderNo === surveyDetail?.CONSTRUCTION_POINT
|
||||
|
||||
return (
|
||||
<div className="btn-flex-wrap">
|
||||
{isTemporary ? (
|
||||
<div className="btn-bx">
|
||||
<button className="btn-frame n-blue icon" onClick={() => router.push('/survey-sale')}>
|
||||
リスト<i className="btn-arr"></i>
|
||||
</button>
|
||||
</div>
|
||||
{isSubmitter && surveyDetail?.SUBMISSION_STATUS ? (
|
||||
<></>
|
||||
) : (
|
||||
<>
|
||||
{isTemporary || surveyDetail?.SUBMISSION_STATUS ? (
|
||||
<></>
|
||||
) : (
|
||||
<>
|
||||
<div className="btn-bx">
|
||||
<button className="btn-frame red icon" onClick={handleSubmit}>
|
||||
提出<i className="btn-arr"></i>
|
||||
</button>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
<div className="btn-bx">
|
||||
<button className="btn-frame n-blue icon" onClick={() => router.push('/survey-sale')}>
|
||||
リスト<i className="btn-arr"></i>
|
||||
<button className="btn-frame n-blue icon" onClick={handleUpdate}>
|
||||
修正<i className="btn-arr"></i>
|
||||
</button>
|
||||
</div>
|
||||
<div className="btn-bx">
|
||||
<button className="btn-frame red icon" onClick={handleSubmit}>
|
||||
提出<i className="btn-arr"></i>
|
||||
<button className="btn-frame n-blue icon" onClick={handleDelete}>
|
||||
削除<i className="btn-arr"></i>
|
||||
</button>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
<div className="btn-bx">
|
||||
<button className="btn-frame n-blue icon" onClick={handleUpdate}>
|
||||
修正<i className="btn-arr"></i>
|
||||
</button>
|
||||
</div>
|
||||
<div className="btn-bx">
|
||||
<button className="btn-frame n-blue icon" onClick={handleDelete}>
|
||||
削除<i className="btn-arr"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
'use client'
|
||||
|
||||
import { useEffect, useState } from 'react'
|
||||
import DetailButton from './DetailButton'
|
||||
import { SurveyBasicInfo } from '@/types/Survey'
|
||||
|
||||
@ -11,14 +10,6 @@ export default function DetailForm({
|
||||
surveyDetail: SurveyBasicInfo | null
|
||||
isLoadingSurveyDetail: boolean
|
||||
}) {
|
||||
const [isTemporary, setIsTemporary] = useState(true)
|
||||
|
||||
useEffect(() => {
|
||||
if (surveyDetail?.REPRESENTATIVE && surveyDetail?.STORE && surveyDetail?.CONSTRUCTION_POINT) {
|
||||
setIsTemporary(false)
|
||||
}
|
||||
}, [surveyDetail])
|
||||
|
||||
if (isLoadingSurveyDetail) {
|
||||
return <div>Loading...</div>
|
||||
}
|
||||
@ -56,7 +47,7 @@ export default function DetailForm({
|
||||
<input type="text" className="input-frame" disabled defaultValue={surveyDetail?.CUSTOMER_NAME ?? ''} />
|
||||
</div>
|
||||
</div>
|
||||
<DetailButton isTemporary={isTemporary} surveyId={Number(surveyDetail?.ID)} representative={surveyDetail?.REPRESENTATIVE ?? ''} />
|
||||
<DetailButton surveyDetail={surveyDetail ?? null} />
|
||||
</div>
|
||||
</>
|
||||
)
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
import { SurveyBasicInfo, SurveyDetailInfo } from '@/types/Survey'
|
||||
import DetailButton from './DetailButton'
|
||||
import { roof_material, supplementary_facilities } from './form/MultiCheckEtc'
|
||||
import { selectBoxOptions } from './form/SelectBoxEtc'
|
||||
import { radioEtcData } from './form/RadioEtc'
|
||||
import { roof_material, supplementary_facilities } from './form/etcProcess/MultiCheckEtc'
|
||||
import { selectBoxOptions } from './form/etcProcess/SelectBoxEtc'
|
||||
import { radioEtcData } from './form/etcProcess/RadioEtc'
|
||||
|
||||
export default function RoofDetailForm({
|
||||
surveyDetail,
|
||||
@ -196,7 +196,10 @@ export default function RoofDetailForm({
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<DetailButton isTemporary={false} surveyId={Number(surveyDetail?.ID)} representative={surveyDetail?.REPRESENTATIVE ?? ''} />
|
||||
<DetailButton
|
||||
isTemporary={false}
|
||||
surveyDetail={surveyDetail}
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
)
|
||||
|
||||
@ -8,7 +8,7 @@ import { useSurveySaleTabState } from '@/store/surveySaleTabState'
|
||||
import { usePopupController } from '@/store/popupController'
|
||||
import { useAddressStore } from '@/store/addressStore'
|
||||
import { useSessionStore } from '@/store/session'
|
||||
import { useUserType } from '@/hooks/useUserType'
|
||||
// import { useUserType } from '@/hooks/useUserType'
|
||||
|
||||
const defaultBasicInfoForm: SurveyBasicRequest = {
|
||||
REPRESENTATIVE: '',
|
||||
@ -37,7 +37,6 @@ export default function BasicForm() {
|
||||
const [basicInfoData, setBasicInfoData] = useState<SurveyBasicRequest>(defaultBasicInfoForm)
|
||||
|
||||
const { addressData } = useAddressStore()
|
||||
const { memberRole, store, builderNo } = useUserType()
|
||||
const { session } = useSessionStore()
|
||||
|
||||
const popupController = usePopupController()
|
||||
@ -59,12 +58,12 @@ export default function BasicForm() {
|
||||
setBasicInfoData((prev) => ({
|
||||
...prev,
|
||||
REPRESENTATIVE: session?.userId ?? '',
|
||||
STORE: store ?? '',
|
||||
CONSTRUCTION_POINT: builderNo ?? '',
|
||||
STORE: session?.storeNm ?? '',
|
||||
CONSTRUCTION_POINT: session?.builderNo ?? '',
|
||||
}))
|
||||
}
|
||||
setBasicInfoSelected()
|
||||
}, [surveyDetail, addressData, session?.isLoggedIn, session?.userNm, store, builderNo])
|
||||
}, [surveyDetail, addressData, session?.isLoggedIn, session?.userId, session?.storeNm, session?.builderNo])
|
||||
|
||||
const focusInput = (input: keyof SurveyBasicRequest) => {
|
||||
const inputElement = document.getElementById(input)
|
||||
@ -88,19 +87,19 @@ export default function BasicForm() {
|
||||
|
||||
const handleSave = async (isTemporary: boolean) => {
|
||||
if (id) {
|
||||
updateSurvey(basicInfoData)
|
||||
// updateSurvey(basicInfoData)
|
||||
alert('保存しました。')
|
||||
router.push(`/survey-sale/${id}?tab=basic-info`)
|
||||
// router.push(`/survey-sale/${id}?tab=basic-info`)
|
||||
}
|
||||
if (isTemporary) {
|
||||
const saveId = await createSurvey(basicInfoData)
|
||||
// const saveId = await createSurvey(basicInfoData)
|
||||
alert('一時保存されました。')
|
||||
router.push(`/survey-sale/${saveId}?tab=basic-info`)
|
||||
// router.push(`/survey-sale/${saveId}?tab=basic-info`)
|
||||
} else {
|
||||
if (validateSurvey(basicInfoData)) {
|
||||
const saveId = await createSurvey(basicInfoData)
|
||||
alert('保存しました。 登録番号: ' + saveId)
|
||||
router.push(`/survey-sale/${saveId}?tab=basic-info`)
|
||||
// const saveId = await createSurvey(basicInfoData)
|
||||
alert('保存しました。')
|
||||
// router.push(`/survey-sale/${saveId}?tab=basic-info`)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -123,7 +122,7 @@ export default function BasicForm() {
|
||||
onChange={(e) => handleChange('REPRESENTATIVE', e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
{(memberRole === 'Builder' || memberRole?.includes('Admin')) && (
|
||||
{(session?.role === 'Builder' || session?.role?.includes('Admin')) && (
|
||||
<>
|
||||
<div className="data-input-form-bx">
|
||||
<div className="data-input-form-tit">販売店</div>
|
||||
@ -131,20 +130,20 @@ export default function BasicForm() {
|
||||
type="text"
|
||||
className="input-frame"
|
||||
id="store"
|
||||
value={store ? store : basicInfoData.STORE ?? ''}
|
||||
value={session?.storeNm ? session?.storeNm : basicInfoData.STORE ?? ''}
|
||||
onChange={(e) => handleChange('STORE', e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
{(memberRole === 'Partner' || memberRole === 'Builder') && (
|
||||
{(session?.role === 'Partner' || session?.role === 'Builder') && (
|
||||
<div className="data-input-form-bx">
|
||||
<div className="data-input-form-tit">施工店</div>
|
||||
<input
|
||||
type="text"
|
||||
className="input-frame"
|
||||
id="construction_point"
|
||||
value={builderNo ? builderNo : basicInfoData.CONSTRUCTION_POINT ?? ''}
|
||||
value={session?.builderNo ? session?.builderNo : basicInfoData.CONSTRUCTION_POINT ?? ''}
|
||||
onChange={(e) => handleChange('CONSTRUCTION_POINT', e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
@ -196,15 +195,13 @@ export default function BasicForm() {
|
||||
<input type="text" className="input-frame" id="POST_CODE" value={basicInfoData.POST_CODE ?? ''} readOnly />
|
||||
</div>
|
||||
<div className="form-bx">
|
||||
<select
|
||||
className="select-form"
|
||||
name="address"
|
||||
id="ADDRESS"
|
||||
value={basicInfoData.ADDRESS ?? ''}
|
||||
onChange={(e) => handleChange('ADDRESS', e.target.value)}
|
||||
>
|
||||
<option value="">東京都</option>
|
||||
</select>
|
||||
<input
|
||||
type="text"
|
||||
className="input-frame"
|
||||
name="address"
|
||||
id="ADDRESS"
|
||||
value={basicInfoData.ADDRESS ?? ''}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div className="form-btn">
|
||||
|
||||
@ -6,9 +6,9 @@ import { useServey } from '@/hooks/useSurvey'
|
||||
import { SurveyDetailRequest } from '@/types/Survey'
|
||||
import { useRouter, useSearchParams } from 'next/navigation'
|
||||
import { useEffect, useState } from 'react'
|
||||
import MultiCheckEtc from './MultiCheckEtc'
|
||||
import SelectBoxEtc from './SelectBoxEtc'
|
||||
import RadioEtc from './RadioEtc'
|
||||
import MultiCheckEtc from './etcProcess/MultiCheckEtc'
|
||||
import SelectBoxEtc from './etcProcess/SelectBoxEtc'
|
||||
import RadioEtc from './etcProcess/RadioEtc'
|
||||
|
||||
const defaultDetailInfoForm: SurveyDetailRequest = {
|
||||
CONTRACT_CAPACITY: null,
|
||||
|
||||
@ -6,7 +6,6 @@ import { useEffect, useState } from 'react'
|
||||
import { useRouter } from 'next/navigation'
|
||||
import SearchForm from './SearchForm'
|
||||
import { useSurveyFilterStore } from '@/store/surveyFilterStore'
|
||||
import { MemberRole } from '@/hooks/useUserType'
|
||||
import { useSessionStore } from '@/store/session'
|
||||
|
||||
export default function ListTable() {
|
||||
@ -16,7 +15,6 @@ export default function ListTable() {
|
||||
|
||||
const [heldSurveyList, setHeldSurveyList] = useState<typeof surveyList>([])
|
||||
const [hasMore, setHasMore] = useState(false)
|
||||
const [memberRole, setMemberRole] = useState<MemberRole>()
|
||||
|
||||
const { session } = useSessionStore()
|
||||
|
||||
@ -32,8 +30,7 @@ export default function ListTable() {
|
||||
}
|
||||
setHasMore(surveyListCount > offset + 10)
|
||||
}
|
||||
setMemberRole(session.role as MemberRole)
|
||||
}, [surveyList, surveyListCount, offset, session])
|
||||
}, [surveyList, surveyListCount, offset, session?.role])
|
||||
|
||||
const handleDetailClick = (id: number) => {
|
||||
router.push(`/survey-sale/${id}`)
|
||||
@ -47,7 +44,7 @@ export default function ListTable() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<SearchForm onItemsInit={handleItemsInit} memberRole={memberRole as MemberRole} />
|
||||
<SearchForm onItemsInit={handleItemsInit} memberRole={session?.role ?? ''} userId={session?.userId ?? ''} />
|
||||
{heldSurveyList.length > 0 ? (
|
||||
<div className="sale-frame">
|
||||
<ul className="sale-list-wrap">
|
||||
|
||||
@ -1,23 +1,22 @@
|
||||
'use client'
|
||||
|
||||
import { SEARCH_OPTIONS, SEARCH_OPTIONS_ENUM, SEARCH_OPTIONS_PARTNERS, useSurveyFilterStore } from '@/store/surveyFilterStore'
|
||||
import { MemberRole } from '@/hooks/useUserType'
|
||||
import { useRouter } from 'next/navigation'
|
||||
import { useState } from 'react'
|
||||
|
||||
export default function SearchForm({ onItemsInit, memberRole }: { onItemsInit: () => void; memberRole: MemberRole }) {
|
||||
export default function SearchForm({ onItemsInit, memberRole, userId }: { onItemsInit: () => void; memberRole: string; userId: string }) {
|
||||
const router = useRouter()
|
||||
const { setSearchOption, setSort, setIsMySurvey, setKeyword, isMySurvey, keyword, searchOption, sort } = useSurveyFilterStore()
|
||||
const [searchKeyword, setSearchKeyword] = useState(keyword)
|
||||
|
||||
const username = 'test'
|
||||
const [option, setOption] = useState(searchOption)
|
||||
|
||||
const handleSearch = () => {
|
||||
if (searchKeyword.trim().length < 2) {
|
||||
if (option !== 'id' && searchKeyword.trim().length < 2) {
|
||||
alert('2文字以上入力してください')
|
||||
return
|
||||
}
|
||||
setKeyword(searchKeyword)
|
||||
setSearchOption(option)
|
||||
onItemsInit()
|
||||
}
|
||||
const searchOptions = memberRole === 'Partner' ? SEARCH_OPTIONS_PARTNERS : SEARCH_OPTIONS
|
||||
@ -25,7 +24,7 @@ export default function SearchForm({ onItemsInit, memberRole }: { onItemsInit: (
|
||||
return (
|
||||
<div className="sale-frame">
|
||||
<div className="sale-form-bx">
|
||||
<button className="btn-frame n-blue icon" onClick={() => router.push('/survey-sale/basic-info')}>
|
||||
<button className="btn-frame n-blue icon" onClick={() => router.push('/survey-sale/regist')}>
|
||||
新規売買登録<i className="btn-arr"></i>
|
||||
</button>
|
||||
</div>
|
||||
@ -34,8 +33,18 @@ export default function SearchForm({ onItemsInit, memberRole }: { onItemsInit: (
|
||||
className="select-form"
|
||||
name="search-option"
|
||||
id="search-option"
|
||||
value={searchOption}
|
||||
onChange={(e) => setSearchOption(e.target.value as SEARCH_OPTIONS_ENUM)}
|
||||
value={option}
|
||||
onChange={(e) => {
|
||||
if (e.target.value === 'all') {
|
||||
setKeyword('')
|
||||
setSearchKeyword('')
|
||||
onItemsInit()
|
||||
setSearchOption('all')
|
||||
setOption('all')
|
||||
} else {
|
||||
setOption(e.target.value as SEARCH_OPTIONS_ENUM)
|
||||
}
|
||||
}}
|
||||
>
|
||||
{searchOptions.map((option) => (
|
||||
<option key={option.id} value={option.id}>
|
||||
@ -51,7 +60,9 @@ export default function SearchForm({ onItemsInit, memberRole }: { onItemsInit: (
|
||||
className="search-frame"
|
||||
value={searchKeyword}
|
||||
placeholder="タイトルを入力してください. (2文字以上)"
|
||||
onChange={(e) => setSearchKeyword(e.target.value)}
|
||||
onChange={(e) => {
|
||||
setSearchKeyword(e.target.value)
|
||||
}}
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === 'Enter') {
|
||||
handleSearch()
|
||||
@ -66,9 +77,9 @@ export default function SearchForm({ onItemsInit, memberRole }: { onItemsInit: (
|
||||
<input
|
||||
type="checkbox"
|
||||
id="ch01"
|
||||
checked={isMySurvey === username}
|
||||
checked={isMySurvey === userId}
|
||||
onChange={() => {
|
||||
setIsMySurvey(isMySurvey === username ? null : username)
|
||||
setIsMySurvey(isMySurvey === userId ? null : userId)
|
||||
onItemsInit()
|
||||
}}
|
||||
/>
|
||||
|
||||
156
src/components/survey-sale/temp/basicRegist.tsx
Normal file
156
src/components/survey-sale/temp/basicRegist.tsx
Normal file
@ -0,0 +1,156 @@
|
||||
'use client'
|
||||
|
||||
import { SurveyBasicRequest, SurveyRegistRequest } from '@/types/Survey'
|
||||
import { useEffect } from 'react'
|
||||
import { usePopupController } from '@/store/popupController'
|
||||
import { useAddressStore } from '@/store/addressStore'
|
||||
import { useSessionStore } from '@/store/session'
|
||||
|
||||
|
||||
export default function BasicRegist({
|
||||
basicInfoData,
|
||||
setBasicInfoData,
|
||||
}: {
|
||||
basicInfoData: SurveyBasicRequest
|
||||
setBasicInfoData: (data: SurveyBasicRequest) => void
|
||||
}) {
|
||||
|
||||
const { addressData } = useAddressStore()
|
||||
const { session } = useSessionStore()
|
||||
|
||||
const popupController = usePopupController()
|
||||
|
||||
useEffect(() => {
|
||||
if (addressData) {
|
||||
setBasicInfoData({
|
||||
...basicInfoData,
|
||||
POST_CODE: addressData.post_code,
|
||||
ADDRESS: addressData.address,
|
||||
ADDRESS_DETAIL: addressData.address_detail,
|
||||
})
|
||||
}
|
||||
}, [addressData])
|
||||
|
||||
const handleChange = (key: keyof SurveyRegistRequest, value: string) => {
|
||||
setBasicInfoData({ ...basicInfoData, [key]: value })
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="sale-frame" id="basic-form-section">
|
||||
<div className="data-form-wrap">
|
||||
<div className="data-input-form-bx">
|
||||
<div className="data-input-form-tit">担当者名</div>
|
||||
<input
|
||||
type="text"
|
||||
className="input-frame"
|
||||
id="representative"
|
||||
value={session?.userNm ? session?.userNm : basicInfoData.REPRESENTATIVE}
|
||||
disabled
|
||||
/>
|
||||
</div>
|
||||
{(session?.role === 'Builder' || session?.role?.includes('Admin')) && (
|
||||
<>
|
||||
<div className="data-input-form-bx">
|
||||
<div className="data-input-form-tit">販売店</div>
|
||||
<input
|
||||
type="text"
|
||||
className="input-frame"
|
||||
id="store"
|
||||
value={session?.storeNm ? session?.storeNm : basicInfoData.STORE ?? ''}
|
||||
disabled
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
{(session?.role === 'Partner' || session?.role === 'Builder') && (
|
||||
<div className="data-input-form-bx">
|
||||
<div className="data-input-form-tit">施工店</div>
|
||||
<input
|
||||
type="text"
|
||||
className="input-frame"
|
||||
id="construction_point"
|
||||
value={session?.builderNo ? session?.builderNo : basicInfoData.CONSTRUCTION_POINT ?? ''}
|
||||
disabled
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="sale-frame">
|
||||
<div className="data-form-wrap">
|
||||
<div className="data-input-form-bx">
|
||||
<div className="data-input-form-tit">現地調査日</div>
|
||||
<div className="date-input">
|
||||
<button className="date-btn">
|
||||
<i className="date-icon"></i>
|
||||
</button>
|
||||
<input
|
||||
type="date"
|
||||
className="date-frame"
|
||||
id="INVESTIGATION_DATE"
|
||||
value={basicInfoData.INVESTIGATION_DATE ?? ''}
|
||||
onChange={(e) => handleChange('INVESTIGATION_DATE', e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div className="data-input-form-bx">
|
||||
<div className="data-input-form-tit">建物名</div>
|
||||
<input
|
||||
type="text"
|
||||
className="input-frame"
|
||||
id="BUILDING_NAME"
|
||||
value={basicInfoData.BUILDING_NAME ?? ''}
|
||||
onChange={(e) => handleChange('BUILDING_NAME', e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div className="data-input-form-bx">
|
||||
<div className="data-input-form-tit">顧客名</div>
|
||||
<input
|
||||
type="text"
|
||||
className="input-frame"
|
||||
id="CUSTOMER_NAME"
|
||||
value={basicInfoData.CUSTOMER_NAME ?? ''}
|
||||
onChange={(e) => handleChange('CUSTOMER_NAME', e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div className="data-input-form-bx">
|
||||
<div className="data-input-form-tit">建物の住所</div>
|
||||
<div className="form-flex">
|
||||
<div className="form-bx">
|
||||
<input type="text" className="input-frame" id="POST_CODE" placeholder="郵便番号" value={basicInfoData.POST_CODE ?? ''} readOnly />
|
||||
</div>
|
||||
<div className="form-bx">
|
||||
<input
|
||||
className="input-frame"
|
||||
name="address"
|
||||
id="ADDRESS"
|
||||
placeholder="都道府県"
|
||||
value={basicInfoData.ADDRESS ?? ''}
|
||||
onChange={(e) => handleChange('ADDRESS', e.target.value)}
|
||||
readOnly
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div className="form-btn">
|
||||
<button className="btn-frame n-blue icon" onClick={() => popupController.setZipCodePopup(true)}>
|
||||
郵便番号<i className="btn-arr"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div className="data-input-form-bx">
|
||||
<div className="data-input-form-tit">市区町村名, 以後の住所</div>
|
||||
<input
|
||||
type="text"
|
||||
className="input-frame"
|
||||
id="ADDRESS_DETAIL"
|
||||
value={basicInfoData.ADDRESS_DETAIL ?? ''}
|
||||
onChange={(e) => handleChange('ADDRESS_DETAIL', e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
)
|
||||
}
|
||||
92
src/components/survey-sale/temp/formButton.tsx
Normal file
92
src/components/survey-sale/temp/formButton.tsx
Normal file
@ -0,0 +1,92 @@
|
||||
'use client'
|
||||
|
||||
import { SurveyBasicRequest, SurveyRegistRequest } from '@/types/Survey'
|
||||
import { SurveyDetailRequest } from '@/types/Survey'
|
||||
import { useRouter } from 'next/navigation'
|
||||
import { useServey } from '@/hooks/useSurvey'
|
||||
|
||||
export default function FormButton({
|
||||
surveyData,
|
||||
idParam,
|
||||
}: {
|
||||
surveyData: { basic: SurveyBasicRequest; roof: SurveyDetailRequest }
|
||||
idParam: string | null
|
||||
}) {
|
||||
const router = useRouter()
|
||||
const { validateSurveyDetail, createSurvey, updateSurvey } = useServey(Number(idParam))
|
||||
|
||||
const saveData = {
|
||||
...surveyData.basic,
|
||||
DETAIL_INFO: surveyData.roof,
|
||||
}
|
||||
|
||||
const focusInput = (input: keyof SurveyRegistRequest) => {
|
||||
const inputElement = document.getElementById(input)
|
||||
if (inputElement) {
|
||||
inputElement.focus()
|
||||
}
|
||||
}
|
||||
|
||||
const handleSave = (isTemporary: boolean) => {
|
||||
const emptyField = validateSurveyDetail(saveData.DETAIL_INFO)
|
||||
if (!isTemporary) {
|
||||
saveProcess(emptyField)
|
||||
} else {
|
||||
temporarySaveProcess()
|
||||
}
|
||||
}
|
||||
const saveProcess = async (emptyField: string) => {
|
||||
if (emptyField.trim() === '') {
|
||||
if (idParam) {
|
||||
// 매물 수정 (저장)
|
||||
updateSurvey(saveData)
|
||||
router.push(`/survey-sale/${idParam}`)
|
||||
} else {
|
||||
// 매물 생성 (저장)
|
||||
const id = await createSurvey(saveData)
|
||||
router.push(`/survey-sale/${id}`)
|
||||
}
|
||||
alert('保存されました。')
|
||||
} else {
|
||||
alert(emptyField + ' 項目が空です。')
|
||||
focusInput(emptyField as keyof SurveyRegistRequest)
|
||||
}
|
||||
}
|
||||
|
||||
const temporarySaveProcess = async () => {
|
||||
if (idParam) {
|
||||
// 매물 수정 (임시저장)
|
||||
updateSurvey(saveData)
|
||||
router.push(`/survey-sale/${idParam}?isTemporary=true`)
|
||||
} else {
|
||||
// 매물 생성 (임시저장)
|
||||
const id = await createSurvey(saveData)
|
||||
router.push(`/survey-sale/${id}?isTemporary=true`)
|
||||
}
|
||||
alert('一時保存されました。')
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="sale-frame">
|
||||
<div className="btn-flex-wrap">
|
||||
<div className="btn-bx">
|
||||
<button className="btn-frame n-blue icon" onClick={() => handleSave(true)}>
|
||||
一時保存<i className="btn-arr"></i>
|
||||
</button>
|
||||
</div>
|
||||
<div className="btn-bx">
|
||||
<button className="btn-frame red icon" onClick={() => handleSave(false)}>
|
||||
保存<i className="btn-arr"></i>
|
||||
</button>
|
||||
</div>
|
||||
<div className="btn-bx">
|
||||
<button className="btn-frame n-blue icon" onClick={() => router.push('/survey-sale')}>
|
||||
リスト<i className="btn-arr"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
)
|
||||
}
|
||||
105
src/components/survey-sale/temp/registForm.tsx
Normal file
105
src/components/survey-sale/temp/registForm.tsx
Normal file
@ -0,0 +1,105 @@
|
||||
'use client'
|
||||
|
||||
import { SurveyBasicRequest, SurveyDetailRequest, SurveyRegistRequest } from '@/types/Survey'
|
||||
import FormButton from './formButton'
|
||||
import { useEffect, useState } from 'react'
|
||||
import BasicRegist from './basicRegist'
|
||||
import RoofRegist from './roofRegist'
|
||||
import { useSessionStore } from '@/store/session'
|
||||
import { useSearchParams } from 'next/navigation'
|
||||
import { useServey } from '@/hooks/useSurvey'
|
||||
|
||||
const roofInfoForm: SurveyDetailRequest = {
|
||||
CONTRACT_CAPACITY: null,
|
||||
RETAIL_COMPANY: null,
|
||||
SUPPLEMENTARY_FACILITIES: null,
|
||||
SUPPLEMENTARY_FACILITIES_ETC: null,
|
||||
INSTALLATION_SYSTEM: null,
|
||||
INSTALLATION_SYSTEM_ETC: null,
|
||||
CONSTRUCTION_YEAR: null,
|
||||
CONSTRUCTION_YEAR_ETC: null,
|
||||
ROOF_MATERIAL: null,
|
||||
ROOF_MATERIAL_ETC: null,
|
||||
ROOF_SHAPE: null,
|
||||
ROOF_SHAPE_ETC: null,
|
||||
ROOF_SLOPE: null,
|
||||
HOUSE_STRUCTURE: '1',
|
||||
HOUSE_STRUCTURE_ETC: null,
|
||||
RAFTER_MATERIAL: '1',
|
||||
RAFTER_MATERIAL_ETC: null,
|
||||
RAFTER_SIZE: null,
|
||||
RAFTER_SIZE_ETC: null,
|
||||
RAFTER_PITCH: null,
|
||||
RAFTER_PITCH_ETC: null,
|
||||
RAFTER_DIRECTION: '1',
|
||||
OPEN_FIELD_PLATE_KIND: null,
|
||||
OPEN_FIELD_PLATE_KIND_ETC: null,
|
||||
OPEN_FIELD_PLATE_THICKNESS: null,
|
||||
LEAK_TRACE: false,
|
||||
WATERPROOF_MATERIAL: null,
|
||||
WATERPROOF_MATERIAL_ETC: null,
|
||||
INSULATION_PRESENCE: '1',
|
||||
INSULATION_PRESENCE_ETC: null,
|
||||
STRUCTURE_ORDER: null,
|
||||
STRUCTURE_ORDER_ETC: null,
|
||||
INSTALLATION_AVAILABILITY: null,
|
||||
INSTALLATION_AVAILABILITY_ETC: null,
|
||||
MEMO: null,
|
||||
}
|
||||
|
||||
const basicInfoForm: SurveyBasicRequest = {
|
||||
REPRESENTATIVE: '',
|
||||
STORE: null,
|
||||
CONSTRUCTION_POINT: null,
|
||||
INVESTIGATION_DATE: new Date().toLocaleDateString('en-CA'),
|
||||
BUILDING_NAME: null,
|
||||
CUSTOMER_NAME: null,
|
||||
POST_CODE: null,
|
||||
ADDRESS: null,
|
||||
ADDRESS_DETAIL: null,
|
||||
SUBMISSION_STATUS: false,
|
||||
SUBMISSION_DATE: null,
|
||||
}
|
||||
|
||||
export default function RegistForm() {
|
||||
const searchParams = useSearchParams()
|
||||
const id = searchParams.get('id')
|
||||
|
||||
const { session } = useSessionStore()
|
||||
const { surveyDetail } = useServey(Number(id))
|
||||
|
||||
const [basicInfoData, setBasicInfoData] = useState<SurveyBasicRequest>(basicInfoForm)
|
||||
const [roofInfoData, setRoofInfoData] = useState<SurveyDetailRequest>(roofInfoForm)
|
||||
|
||||
useEffect(() => {
|
||||
if (session) {
|
||||
setBasicInfoData({
|
||||
...basicInfoForm,
|
||||
REPRESENTATIVE: session.userNm ?? '',
|
||||
STORE: session.role === 'T01' ? '' : session.storeNm ?? '',
|
||||
CONSTRUCTION_POINT: session.builderNo ?? '',
|
||||
})
|
||||
}
|
||||
if (id && surveyDetail) {
|
||||
const { ID, UPT_DT, REG_DT, DETAIL_INFO, ...rest } = surveyDetail
|
||||
setBasicInfoData(rest)
|
||||
if (surveyDetail?.DETAIL_INFO) {
|
||||
const { ID, UPT_DT, REG_DT, BASIC_INFO_ID, ...rest } = surveyDetail.DETAIL_INFO
|
||||
setRoofInfoData(rest)
|
||||
}
|
||||
}
|
||||
}, [session, surveyDetail])
|
||||
|
||||
const surveyData = {
|
||||
basic: basicInfoData,
|
||||
roof: roofInfoData,
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<BasicRegist basicInfoData={basicInfoData} setBasicInfoData={setBasicInfoData} />
|
||||
<RoofRegist roofInfoData={roofInfoData} setRoofInfoData={setRoofInfoData} />
|
||||
<FormButton surveyData={surveyData} idParam={id} />
|
||||
</>
|
||||
)
|
||||
}
|
||||
284
src/components/survey-sale/temp/roofRegist.tsx
Normal file
284
src/components/survey-sale/temp/roofRegist.tsx
Normal file
@ -0,0 +1,284 @@
|
||||
'use client'
|
||||
|
||||
import { useSurveySaleTabState } from '@/store/surveySaleTabState'
|
||||
|
||||
import { SurveyBasicInfo, SurveyDetailRequest } from '@/types/Survey'
|
||||
import { useEffect } from 'react'
|
||||
import MultiCheckEtc from '../detail/form/etcProcess/MultiCheckEtc'
|
||||
import SelectBoxEtc from '../detail/form/etcProcess/SelectBoxEtc'
|
||||
import RadioEtc from '../detail/form/etcProcess/RadioEtc'
|
||||
|
||||
export default function RoofRegist({
|
||||
roofInfoData,
|
||||
setRoofInfoData,
|
||||
}: {
|
||||
roofInfoData: SurveyDetailRequest
|
||||
setRoofInfoData: (data: SurveyDetailRequest) => void
|
||||
}) {
|
||||
const { setRoofInfoSelected } = useSurveySaleTabState()
|
||||
|
||||
useEffect(() => {
|
||||
setRoofInfoSelected()
|
||||
}, [])
|
||||
|
||||
const handleNumberInput = (key: keyof SurveyDetailRequest, value: number | string) => {
|
||||
if (key === 'ROOF_SLOPE' || key === 'OPEN_FIELD_PLATE_THICKNESS') {
|
||||
const stringValue = value.toString()
|
||||
if (stringValue.length > 5) {
|
||||
alert('保存できるサイズを超えました。')
|
||||
return
|
||||
}
|
||||
if (stringValue.includes('.')) {
|
||||
const decimalPlaces = stringValue.split('.')[1].length
|
||||
if (decimalPlaces > 1) {
|
||||
alert('小数点以下1桁までしか許されません。')
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
setRoofInfoData({ ...roofInfoData, [key]: value.toString() })
|
||||
}
|
||||
|
||||
const handleTextInput = (key: keyof SurveyDetailRequest, value: string) => {
|
||||
setRoofInfoData({ ...roofInfoData, [key]: value || null })
|
||||
}
|
||||
|
||||
const handleBooleanInput = (key: keyof SurveyDetailRequest, value: boolean) => {
|
||||
setRoofInfoData({ ...roofInfoData, [key]: value })
|
||||
}
|
||||
|
||||
const handleUnitInput = (value: string) => {
|
||||
const numericValue = roofInfoData.CONTRACT_CAPACITY?.replace(/[^0-9.]/g, '') || ''
|
||||
setRoofInfoData({
|
||||
...roofInfoData,
|
||||
CONTRACT_CAPACITY: numericValue ? `${numericValue} ${value}` : value,
|
||||
})
|
||||
}
|
||||
|
||||
// const handleSave = async () => {
|
||||
// if (id) {
|
||||
// const emptyField = validateSurveyDetail(roofInfoData)
|
||||
// if (emptyField.trim() === '') {
|
||||
// const updatedBasicInfoData = {
|
||||
// DETAIL_INFO: roofInfoData,
|
||||
// }
|
||||
// try {
|
||||
// createSurveyDetail({
|
||||
// surveyId: Number(id),
|
||||
// surveyDetail: updatedBasicInfoData,
|
||||
// })
|
||||
// alert('調査物件を保存しました。')
|
||||
// } catch (error) {
|
||||
// alert(error)
|
||||
// throw new Error('failed to create survey detail: ' + error)
|
||||
// }
|
||||
// router.push(`/survey-sale`)
|
||||
// } else {
|
||||
// alert(emptyField + ' は必須項目です。')
|
||||
// focusOnInput(emptyField)
|
||||
// }
|
||||
// } else {
|
||||
// alert('基本情報を作成した後、屋根情報を作成することができます。')
|
||||
// }
|
||||
// }
|
||||
// const focusOnInput = (field: string) => {
|
||||
// const input = document.getElementById(field)
|
||||
// if (input) {
|
||||
// input.focus()
|
||||
// }
|
||||
// }
|
||||
return (
|
||||
<>
|
||||
<div className="sale-frame" id="roof-form-section">
|
||||
<div className="sale-roof-title">電気関係</div>
|
||||
<div className="data-form-wrap">
|
||||
<div className="data-input-form-bx">
|
||||
{/* 전기계약 용량 - contract_capacity */}
|
||||
<div className="data-input-form-tit">電気契約容量</div>
|
||||
<div className="data-input mb5">
|
||||
<input
|
||||
type="number"
|
||||
inputMode="decimal"
|
||||
className="input-frame"
|
||||
value={roofInfoData.CONTRACT_CAPACITY?.split(' ')[0] ?? ''}
|
||||
onChange={(e) => handleNumberInput('CONTRACT_CAPACITY', e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div className="data-input">
|
||||
<select
|
||||
className="select-form"
|
||||
name="CONTRACT_CAPACITY_UNIT"
|
||||
id="CONTRACT_CAPACITY_UNIT"
|
||||
onChange={(e) => handleUnitInput(e.target.value)}
|
||||
value={roofInfoData.CONTRACT_CAPACITY?.split(' ')[1] ?? ''}
|
||||
>
|
||||
<option value="" hidden>
|
||||
選択してください
|
||||
</option>
|
||||
<option value="kVA">kVA</option>
|
||||
<option value="A">A</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
{/* 전기 소매 회사 - retail_company */}
|
||||
<div className="data-input-form-bx">
|
||||
<div className="data-input-form-tit">電気小売会社</div>
|
||||
<input
|
||||
type="text"
|
||||
className="input-frame"
|
||||
value={roofInfoData.RETAIL_COMPANY ?? ''}
|
||||
onChange={(e) => handleTextInput('RETAIL_COMPANY', e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
{/* 전기 부대 설비 - supplementary_facilities */}
|
||||
<div className="data-input-form-bx">
|
||||
<MultiCheckEtc column={'SUPPLEMENTARY_FACILITIES'} setDetailInfoData={setRoofInfoData} detailInfoData={roofInfoData} />
|
||||
</div>
|
||||
{/* 설치 희망 시스템 - installation_system */}
|
||||
<SelectBoxEtc column={'INSTALLATION_SYSTEM'} setDetailInfoData={setRoofInfoData} detailInfoData={roofInfoData} />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="sale-frame">
|
||||
<div className="sale-roof-title">屋根関係</div>
|
||||
<div className="data-form-wrap">
|
||||
{/* 건축 연수 - construction_year */}
|
||||
<SelectBoxEtc column={'CONSTRUCTION_YEAR'} setDetailInfoData={setRoofInfoData} detailInfoData={roofInfoData} />
|
||||
{/* 지붕재 - roof_material */}
|
||||
<div className="data-input-form-bx">
|
||||
<MultiCheckEtc column={'ROOF_MATERIAL'} setDetailInfoData={setRoofInfoData} detailInfoData={roofInfoData} />
|
||||
</div>
|
||||
{/* 지붕 모양 - roof_shape */}
|
||||
<SelectBoxEtc column={'ROOF_SHAPE'} setDetailInfoData={setRoofInfoData} detailInfoData={roofInfoData} />
|
||||
{/* 지붕 경사도 - roof_slope */}
|
||||
<div className="data-input-form-bx">
|
||||
<div className="data-input-form-tit">屋根の斜面</div>
|
||||
<div className="data-input flex">
|
||||
<input
|
||||
type="number"
|
||||
step={0.1}
|
||||
inputMode="decimal"
|
||||
className="input-frame"
|
||||
value={roofInfoData.ROOF_SLOPE ?? ''}
|
||||
onChange={(e) => handleNumberInput('ROOF_SLOPE', e.target.value)}
|
||||
/>
|
||||
<span>寸</span>
|
||||
</div>
|
||||
</div>
|
||||
{/* 주택 구조 - house_structure */}
|
||||
<RadioEtc column={'HOUSE_STRUCTURE'} setDetailInfoData={setRoofInfoData} detailInfoData={roofInfoData} />
|
||||
{/* 서까래 재질 - rafter_material */}
|
||||
<RadioEtc column={'RAFTER_MATERIAL'} setDetailInfoData={setRoofInfoData} detailInfoData={roofInfoData} />
|
||||
{/* 서까래 크기 - rafter_size */}
|
||||
<SelectBoxEtc column={'RAFTER_SIZE'} setDetailInfoData={setRoofInfoData} detailInfoData={roofInfoData} />
|
||||
{/* 서까래 피치 - rafter_pitch */}
|
||||
<SelectBoxEtc column={'RAFTER_PITCH'} setDetailInfoData={setRoofInfoData} detailInfoData={roofInfoData} />
|
||||
{/* 서까래 방향 - rafter_direction */}
|
||||
<div className="data-input-form-bx">
|
||||
<div className="data-input-form-tit red-f">垂木の方向</div>
|
||||
<div className="data-check-wrap mb0" id="rafter_direction">
|
||||
<div className="radio-form-box">
|
||||
<input
|
||||
type="radio"
|
||||
name="RAFTER_DIRECTION"
|
||||
id="RAFTER_DIRECTION_1"
|
||||
value={1}
|
||||
onChange={(e) => handleNumberInput('RAFTER_DIRECTION', Number(e.target.value))}
|
||||
checked={roofInfoData.RAFTER_DIRECTION === '1'}
|
||||
/>
|
||||
<label htmlFor="RAFTER_DIRECTION_1">垂直垂木</label>
|
||||
</div>
|
||||
<div className="radio-form-box">
|
||||
<input
|
||||
type="radio"
|
||||
name="RAFTER_DIRECTION"
|
||||
id="RAFTER_DIRECTION_2"
|
||||
value={2}
|
||||
onChange={(e) => handleNumberInput('RAFTER_DIRECTION', Number(e.target.value))}
|
||||
checked={roofInfoData.RAFTER_DIRECTION === '2'}
|
||||
/>
|
||||
<label htmlFor="RAFTER_DIRECTION_2">水平垂木</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/* 노지판 종류 - open_field_plate_kind */}
|
||||
<SelectBoxEtc column={'OPEN_FIELD_PLATE_KIND'} setDetailInfoData={setRoofInfoData} detailInfoData={roofInfoData} />
|
||||
{/* 노지판 두께 - open_field_plate_thickness */}
|
||||
<div className="data-input-form-bx">
|
||||
<div className="data-input-form-tit">
|
||||
路地板厚<span>※小幅板を選択した場合, 厚さ. 小幅板間の間隔寸法を記載</span>
|
||||
</div>
|
||||
<div className="data-input flex">
|
||||
<input
|
||||
type="number"
|
||||
step={0.1}
|
||||
inputMode="decimal"
|
||||
className="input-frame"
|
||||
value={roofInfoData.OPEN_FIELD_PLATE_THICKNESS ?? ''}
|
||||
onChange={(e) => handleNumberInput('OPEN_FIELD_PLATE_THICKNESS', e.target.value)}
|
||||
/>
|
||||
<span>mm</span>
|
||||
</div>
|
||||
</div>
|
||||
{/* 누수 흔적 - leak_trace */}
|
||||
<div className="data-input-form-bx">
|
||||
<div className="data-input-form-tit ">水漏れの痕跡</div>
|
||||
<div className="data-check-wrap mb0">
|
||||
<div className="radio-form-box">
|
||||
<input
|
||||
type="radio"
|
||||
name="LEAK_TRACE"
|
||||
id="LEAK_TRACE_1"
|
||||
checked={roofInfoData.LEAK_TRACE === true}
|
||||
onChange={(e) => handleBooleanInput('LEAK_TRACE', true)}
|
||||
/>
|
||||
<label htmlFor="LEAK_TRACE_1">あり</label>
|
||||
</div>
|
||||
<div className="radio-form-box">
|
||||
<input
|
||||
type="radio"
|
||||
name="LEAK_TRACE"
|
||||
id="LEAK_TRACE_2"
|
||||
checked={roofInfoData.LEAK_TRACE === false}
|
||||
onChange={(e) => handleBooleanInput('LEAK_TRACE', false)}
|
||||
/>
|
||||
<label htmlFor="LEAK_TRACE_2">なし</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/* 방수재 종류 - waterproof_material */}
|
||||
<RadioEtc column={'WATERPROOF_MATERIAL'} setDetailInfoData={setRoofInfoData} detailInfoData={roofInfoData} />
|
||||
{/* 단열재 유무 - insulation_presence */}
|
||||
<RadioEtc column={'INSULATION_PRESENCE'} setDetailInfoData={setRoofInfoData} detailInfoData={roofInfoData} />
|
||||
{/* 노지판 종류 - open_field_plate_kind */}
|
||||
<SelectBoxEtc column={'STRUCTURE_ORDER'} setDetailInfoData={setRoofInfoData} detailInfoData={roofInfoData} />
|
||||
{/* 설치 가능 여부 - installation_availability */}
|
||||
<SelectBoxEtc column={'INSTALLATION_AVAILABILITY'} setDetailInfoData={setRoofInfoData} detailInfoData={roofInfoData} />
|
||||
{/* 메모 - memo */}
|
||||
<div className="data-input-form-bx">
|
||||
<div className="data-input-form-tit">メモ</div>
|
||||
<div className="data-input mb5">
|
||||
<select className="select-form" name="" id="">
|
||||
<option value="">確認済み</option>
|
||||
<option value="">確認済み</option>
|
||||
<option value="">確認済み</option>
|
||||
<option value="">確認済み</option>
|
||||
<option value="">確認済み</option>
|
||||
</select>
|
||||
</div>
|
||||
<div className="data-input">
|
||||
<textarea
|
||||
className="textarea-form"
|
||||
name="MEMO"
|
||||
id="MEMO"
|
||||
value={roofInfoData.MEMO ?? ''}
|
||||
onChange={(e) => handleTextInput('MEMO', e.target.value)}
|
||||
placeholder="例: 漏れの兆候があるため、正確な点検が必要です."
|
||||
></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
)
|
||||
}
|
||||
@ -1,8 +1,46 @@
|
||||
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
|
||||
import type { SurveyBasicInfo, SurveyBasicRequest, SurveyDetailInfo, SurveyDetailRequest, SurveyDetailCoverRequest } from '@/types/Survey'
|
||||
import type {
|
||||
SurveyBasicInfo,
|
||||
SurveyDetailInfo,
|
||||
SurveyDetailRequest,
|
||||
SurveyDetailCoverRequest,
|
||||
SurveyRegistRequest,
|
||||
} from '@/types/Survey'
|
||||
import { axiosInstance } from '@/libs/axios'
|
||||
import { useSurveyFilterStore } from '@/store/surveyFilterStore'
|
||||
import { queryStringFormatter } from '@/utils/common-utils'
|
||||
import { useSessionStore } from '@/store/session'
|
||||
|
||||
const requiredFields = [
|
||||
{
|
||||
field: 'INSTALLATION_SYSTEM',
|
||||
name: '設置希望システム',
|
||||
},
|
||||
{
|
||||
field: 'CONSTRUCTION_YEAR',
|
||||
name: '建築年数',
|
||||
},
|
||||
{
|
||||
field: 'RAFTER_SIZE',
|
||||
name: '垂木サイズ',
|
||||
},
|
||||
{
|
||||
field: 'RAFTER_PITCH',
|
||||
name: '垂木傾斜',
|
||||
},
|
||||
{
|
||||
field: 'WATERPROOF_MATERIAL',
|
||||
name: '防水材',
|
||||
},
|
||||
{
|
||||
field: 'INSULATION_PRESENCE',
|
||||
name: '断熱材有無',
|
||||
},
|
||||
{
|
||||
field: 'STRUCTURE_ORDER',
|
||||
name: '屋根構造の順序',
|
||||
},
|
||||
]
|
||||
|
||||
interface ZipCodeResponse {
|
||||
status: number
|
||||
@ -20,7 +58,6 @@ type ZipCode = {
|
||||
kana2: string
|
||||
kana3: string
|
||||
}
|
||||
import { useUserType } from './useUserType'
|
||||
|
||||
export function useServey(id?: number): {
|
||||
surveyList: SurveyBasicInfo[] | []
|
||||
@ -31,9 +68,9 @@ export function useServey(id?: number): {
|
||||
isCreatingSurvey: boolean
|
||||
isUpdatingSurvey: boolean
|
||||
isDeletingSurvey: boolean
|
||||
createSurvey: (survey: SurveyBasicRequest) => Promise<number>
|
||||
createSurvey: (survey: SurveyRegistRequest) => Promise<number>
|
||||
createSurveyDetail: (params: { surveyId: number; surveyDetail: SurveyDetailCoverRequest }) => void
|
||||
updateSurvey: (survey: SurveyBasicRequest) => void
|
||||
updateSurvey: (survey: SurveyRegistRequest) => void
|
||||
deleteSurvey: () => Promise<boolean>
|
||||
submitSurvey: () => void
|
||||
validateSurveyDetail: (surveyDetail: SurveyDetailRequest) => string
|
||||
@ -41,13 +78,22 @@ export function useServey(id?: number): {
|
||||
} {
|
||||
const queryClient = useQueryClient()
|
||||
const { keyword, searchOption, isMySurvey, sort, offset } = useSurveyFilterStore()
|
||||
const { store, builderNo, memberRole } = useUserType()
|
||||
const { session } = useSessionStore()
|
||||
|
||||
const { data: surveyList, isLoading: isLoadingSurveyList } = useQuery({
|
||||
queryKey: ['survey', 'list', keyword, searchOption, isMySurvey, sort, offset, store, builderNo, memberRole],
|
||||
queryKey: ['survey', 'list', keyword, searchOption, isMySurvey, sort, offset, session?.storeNm, session?.builderNo, session?.role],
|
||||
queryFn: async () => {
|
||||
const resp = await axiosInstance(null).get<SurveyBasicInfo[]>('/api/survey-sales', {
|
||||
params: { keyword, searchOption, isMySurvey, sort, offset, store, builderNo, memberRole },
|
||||
params: {
|
||||
keyword,
|
||||
searchOption,
|
||||
isMySurvey,
|
||||
sort,
|
||||
offset,
|
||||
store: session?.storeNm,
|
||||
builderNo: session?.builderNo,
|
||||
role: session?.role,
|
||||
},
|
||||
})
|
||||
return resp.data
|
||||
},
|
||||
@ -65,17 +111,25 @@ export function useServey(id?: number): {
|
||||
})
|
||||
|
||||
const { data: surveyListCount } = useQuery({
|
||||
queryKey: ['survey', 'list', keyword, searchOption, isMySurvey, sort],
|
||||
queryKey: ['survey', 'list', keyword, searchOption, isMySurvey, sort, session?.builderNo, session?.storeNm, session?.role],
|
||||
queryFn: async () => {
|
||||
const resp = await axiosInstance(null).get<number>('/api/survey-sales', {
|
||||
params: { keyword, searchOption, isMySurvey, sort },
|
||||
params: {
|
||||
keyword,
|
||||
searchOption,
|
||||
isMySurvey,
|
||||
sort,
|
||||
builderNo: session?.builderNo,
|
||||
store: session?.storeNm,
|
||||
role: session?.role,
|
||||
},
|
||||
})
|
||||
return resp.data
|
||||
},
|
||||
})
|
||||
|
||||
const { mutateAsync: createSurvey, isPending: isCreatingSurvey } = useMutation({
|
||||
mutationFn: async (survey: SurveyBasicRequest) => {
|
||||
mutationFn: async (survey: SurveyRegistRequest) => {
|
||||
const resp = await axiosInstance(null).post<SurveyBasicInfo>('/api/survey-sales', survey)
|
||||
return resp.data.ID ?? 0
|
||||
},
|
||||
@ -87,10 +141,9 @@ export function useServey(id?: number): {
|
||||
})
|
||||
|
||||
const { mutate: updateSurvey, isPending: isUpdatingSurvey } = useMutation({
|
||||
mutationFn: async (survey: SurveyBasicRequest) => {
|
||||
console.log('updateSurvey:: ', survey)
|
||||
mutationFn: async (survey: SurveyRegistRequest) => {
|
||||
if (id === undefined) throw new Error('id is required')
|
||||
const resp = await axiosInstance(null).put<SurveyBasicInfo>(`/api/survey-sales/${id}`, survey)
|
||||
const resp = await axiosInstance(null).put<SurveyRegistRequest>(`/api/survey-sales/${id}`, survey)
|
||||
return resp.data
|
||||
},
|
||||
onSuccess: () => {
|
||||
@ -137,24 +190,15 @@ export function useServey(id?: number): {
|
||||
})
|
||||
|
||||
const validateSurveyDetail = (surveyDetail: SurveyDetailRequest) => {
|
||||
const requiredFields = [
|
||||
'INSTALLATION_SYSTEM',
|
||||
'CONSTRUCTION_YEAR',
|
||||
'RAFTER_SIZE',
|
||||
'RAFTER_PITCH',
|
||||
'RAFTER_DIRECTION',
|
||||
'WATERPROOF_MATERIAL',
|
||||
'INSULATION_PRESENCE',
|
||||
'STRUCTURE_ORDER',
|
||||
] as const
|
||||
|
||||
const etcFields = ['INSTALLATION_SYSTEM', 'CONSTRUCTION_YEAR', 'RAFTER_SIZE', 'RAFTER_PITCH', 'WATERPROOF_MATERIAL', 'STRUCTURE_ORDER'] as const
|
||||
|
||||
const emptyField = requiredFields.find((field) => {
|
||||
if (etcFields.includes(field as (typeof etcFields)[number])) {
|
||||
return surveyDetail[field as keyof SurveyDetailRequest] === null && surveyDetail[`${field}_ETC` as keyof SurveyDetailRequest] === null
|
||||
if (etcFields.includes(field.field as (typeof etcFields)[number])) {
|
||||
return (
|
||||
surveyDetail[field.field as keyof SurveyDetailRequest] === null && surveyDetail[`${field.field}_ETC` as keyof SurveyDetailRequest] === ''
|
||||
)
|
||||
} else {
|
||||
return surveyDetail[field as keyof SurveyDetailRequest] === null
|
||||
return surveyDetail[field.field as keyof SurveyDetailRequest] === null
|
||||
}
|
||||
})
|
||||
|
||||
@ -163,7 +207,7 @@ export function useServey(id?: number): {
|
||||
return 'CONTRACT_CAPACITY_UNIT'
|
||||
}
|
||||
|
||||
return emptyField || ''
|
||||
return emptyField?.name || ''
|
||||
}
|
||||
|
||||
const getZipCode = async (zipCode: string): Promise<ZipCode[] | null> => {
|
||||
@ -171,7 +215,6 @@ export function useServey(id?: number): {
|
||||
const { data } = await axiosInstance(null).get<ZipCodeResponse>(
|
||||
`https://zipcloud.ibsnet.co.jp/api/search?${queryStringFormatter({ zipcode: zipCode.trim() })}`,
|
||||
)
|
||||
|
||||
return data.results
|
||||
} catch (e) {
|
||||
console.error('Failed to fetch zipcode data:', e)
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
import { useSessionStore } from '@/store/session'
|
||||
import { useEffect, useState } from 'react'
|
||||
|
||||
export type MemberRole = 'T01' | 'Admin' | 'Admin_Sub' | 'Builder' | 'Partner' | 'User'
|
||||
// TO1 - else
|
||||
// Admin - 1차점, Admin_Sub - 2차점, Builder - 2차점 시공사, Partner - 파트너사, User - else
|
||||
|
||||
// 로그인 된 회원 유형에 따라 조사 매물 목록 변경됨
|
||||
export function useUserType() {
|
||||
const { session } = useSessionStore()
|
||||
const [memberRole, setMemberRole] = useState<MemberRole | null>(null)
|
||||
const [store, setStore] = useState<string | null>(null)
|
||||
const [builderNo, setBuilderNo] = useState<string | null>(null)
|
||||
|
||||
useEffect(() => {
|
||||
if (!session?.isLoggedIn) return
|
||||
setMemberRole(session.role as MemberRole)
|
||||
if (session.role === 'T01') {
|
||||
setStore(null)
|
||||
} else {
|
||||
setStore(session.storeId)
|
||||
}
|
||||
setBuilderNo(session.builderNo)
|
||||
}, [session])
|
||||
|
||||
return {
|
||||
memberRole,
|
||||
store,
|
||||
builderNo,
|
||||
}
|
||||
}
|
||||
@ -1,11 +1,5 @@
|
||||
import { create } from 'zustand'
|
||||
|
||||
// export type SEARCH_OPTIONS_ENUM = 'all' | 'id' | 'building_name' | 'representative' | 'store' | 'construction_point'
|
||||
// | 'store_id' | 'construction_id'
|
||||
// export type SEARCH_OPTIONS_PARTNERS_ENUM = 'all' | 'id' | 'building_name' | 'representative'
|
||||
|
||||
// export type SORT_OPTIONS_ENUM = 'created' | 'updated'
|
||||
|
||||
export const SEARCH_OPTIONS = [
|
||||
{
|
||||
id: 'all',
|
||||
|
||||
@ -115,3 +115,18 @@ export type SurveyDetailRequest = {
|
||||
export type SurveyDetailCoverRequest = {
|
||||
DETAIL_INFO: SurveyDetailRequest
|
||||
}
|
||||
|
||||
export type SurveyRegistRequest = {
|
||||
REPRESENTATIVE: string
|
||||
STORE: string | null
|
||||
CONSTRUCTION_POINT: string | null
|
||||
INVESTIGATION_DATE: string | null
|
||||
BUILDING_NAME: string | null
|
||||
CUSTOMER_NAME: string | null
|
||||
POST_CODE: string | null
|
||||
ADDRESS: string | null
|
||||
ADDRESS_DETAIL: string | null
|
||||
SUBMISSION_STATUS: boolean
|
||||
SUBMISSION_DATE: string | null
|
||||
DETAIL_INFO: SurveyDetailRequest | null
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user