qcast3/onsitesurvey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: qcast3:25a061b981602caf4a6caee087d0fd7b575df1b9
Branches Tags
qcast3:main
qcast3:dev
qcast3:feature/submition-target
qcast3:feature/pdf-tracking
qcast3:backup
qcast3:release
..
compare: qcast3:07a6faddbe3a14168892eddb02073f401384bb12
Branches Tags
qcast3:dev
qcast3:feature/submition-target
qcast3:feature/pdf-tracking
qcast3:backup
qcast3:main
qcast3:release

No commits in common. "25a061b981602caf4a6caee087d0fd7b575df1b9" and "07a6faddbe3a14168892eddb02073f401384bb12" have entirely different histories.
25a061b981 ... 07a6faddbe

4 changed files with 7 additions and 12 deletions
Show Stats Expand all files Collapse all files

7
src/app/api/auth/route.ts
View File

@ -128,12 +128,9 @@ export async function POST(request: Request) {
resultForSession.ROLE = 'T01' resultForSession.ROLE = 'T01'
} else if (result.data.data.groupId === '60000') { } else if (result.data.data.groupId === '60000') {
resultForSession.ROLE = 'Admin' resultForSession.ROLE = 'Admin'
} else if (result.data.data.groupId === '70000' && result.data.data.builderNo === null && result.data.data.userAuthCd !== 'B') { } else if (result.data.data.groupId === '70000' && result.data.data.builderNo === null) {
resultForSession.ROLE = 'Admin_Sub' resultForSession.ROLE = 'Admin_Sub'
} else if ( } else if (result.data.data.groupId === '70000' && result.data.data.builderNo !== null) {
(result.data.data.groupId === '70000' && result.data.data.builderNo !== null) ||
(result.data.data.groupId === '70000' && result.data.data.builderNo === null && result.data.data.userAuthCd === 'B')
) {
resultForSession.ROLE = 'Builder' resultForSession.ROLE = 'Builder'
} else { } else {
resultForSession.ROLE = 'User' resultForSession.ROLE = 'User'

7
src/components/survey-sale/detail/BasicForm.tsx
View File

@ -53,7 +53,7 @@ export default function BasicForm({ basicInfo, setBasicInfo, mode, session }: Ba
/> />
</div> </div>
{/* 페이지 모드 별, 권한 별 판매점, 시공점 입력 여부 처리 */} {/* 페이지 모드 별, 권한 별 판매점, 시공점 입력 여부 처리 */}
{mode === 'CREATE' && {mode !== 'READ' &&
(session?.role === 'Builder' ? ( (session?.role === 'Builder' ? (
<> <>
{storeInput(basicInfo, setBasicInfo, mode)} {storeInput(basicInfo, setBasicInfo, mode)}
@ -64,11 +64,10 @@ export default function BasicForm({ basicInfo, setBasicInfo, mode, session }: Ba
) : ( ) : (
<>{storeInput(basicInfo, setBasicInfo, mode)}</> <>{storeInput(basicInfo, setBasicInfo, mode)}</>
))} ))}
{(mode === 'READ' || mode === 'EDIT') && ( {mode === 'READ' && (
<> <>
{basicInfo?.store && storeInput(basicInfo, setBasicInfo, mode)} {basicInfo?.store && storeInput(basicInfo, setBasicInfo, mode)}
{(basicInfo?.constructionPoint || (session?.role === 'Builder' && mode === 'EDIT')) && {basicInfo?.constructionPoint && builderInput(basicInfo, setBasicInfo, mode, session)}
builderInput(basicInfo, setBasicInfo, mode, session)}
</> </>
)} )}
</div> </div>

1
src/components/survey-sale/detail/ButtonForm.tsx
View File

@ -87,7 +87,6 @@ export default function ButtonForm({ mode, setMode, data }: ButtonFormProps) {
case 'Admin_Sub': case 'Admin_Sub':
return session.storeId === basicData.storeId && session.builderId === basicData.constructionPointId return session.storeId === basicData.storeId && session.builderId === basicData.constructionPointId
case 'Builder': case 'Builder':
return session.builderId ? session.builderId === basicData.constructionPointId : session.userId === basicData.representativeId
case 'Partner': case 'Partner':
return session.builderId === basicData.constructionPointId return session.builderId === basicData.constructionPointId
default: default:

4
src/components/survey-sale/detail/DetailForm.tsx
View File

@ -87,7 +87,7 @@ export default function DetailForm() {
store: session?.storeNm ?? null, store: session?.storeNm ?? null,
storeId: session?.storeId ?? null, storeId: session?.storeId ?? null,
constructionPoint: session?.builderNm ?? null, constructionPoint: session?.builderNm ?? null,
constructionPointId: session.role === 'Builder' ? (session.builderId ? session.builderId : '') : session.builderId ?? null, constructionPointId: session?.builderId ?? null,
})) }))
const [roofInfoData, setRoofInfoData] = useState<SurveyDetailRequest>(roofInfoForm) const [roofInfoData, setRoofInfoData] = useState<SurveyDetailRequest>(roofInfoForm)
@ -109,7 +109,7 @@ export default function DetailForm() {
store: session.storeNm ?? null, store: session.storeNm ?? null,
storeId: session.storeId ?? null, storeId: session.storeId ?? null,
constructionPoint: session.builderNm ?? null, constructionPoint: session.builderNm ?? null,
constructionPointId: session.role === 'Builder' ? (session.builderId ? session.builderId : '') : session.builderId ?? null, constructionPointId: session.builderId ?? null,
})) }))
}, [session?.isLoggedIn]) }, [session?.isLoggedIn])