ONAANDALL/frontend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'iipbs/as/dev'

Browse Source
This commit is contained in:
chanii8
2026-09-29 14:29:32 +09:00
parent 657ae77dde 6f20ef7273
commit 7946c08c72
14 changed files with 125 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/as/src/entities/adstdstr/index.ts
+1
View File
@@ -5,6 +5,7 @@ export {
useFindUserGugunCombo,
useFindUserSidoCombo,
} from "./api/queries";
export { useFindUserSidoGugunCombo } from "./lib/use-find-user-sido-gugun-combo";
export type {
CmCdAdstDstrComboResponseDto,
CmCdAdstDstrService,
apps/as/src/entities/adstdstr/lib/use-find-user-sido-gugun-combo.ts
+26
View File
@@ -0,0 +1,26 @@
import { useUserStore } from "@/shared/lib";
import { useFindUserGugunCombo, useFindUserSidoCombo } from "../api/queries";
import type { CmCdAdstDstrComboResponseDto } from "../model/adstdstr-interface";
const EMPTY_ADST_LIST: CmCdAdstDstrComboResponseDto[] = [];
export function useFindUserSidoGugunCombo(sidoComCd: string) {
const userInfo = useUserStore((state) => state.userInfo);
const sidoFilterUserInfo =
userInfo?.dtlInstCd === "ROLE_USER04" || userInfo?.dtlInstCd === "ROLE_USER05"
? userInfo
: undefined;
const { data: userSidoData, isPending: isUserSidoPending } =
useFindUserSidoCombo(sidoFilterUserInfo);
const { data: userGugunData, isPending: isUserGugunPending } =
useFindUserGugunCombo(sidoComCd);
return {
userSidoData: userSidoData ?? EMPTY_ADST_LIST,
userGugunData: userGugunData ?? EMPTY_ADST_LIST,
isUserSidoPending,
isUserGugunPending,
};
}
apps/as/src/entities/elapr/ui/elapr-approval-dialog.tsx
+7 -3
View File
@@ -103,6 +103,8 @@ function ElaprApprovalDialog({
const currentUserPrgrs = findCurrentUserPendingApprovalRequest(cyclDocPrgrsList, currentUserUuid);
const canApprove = Boolean(currentUserPrgrs?.elaprPrgrsId);
const canReject =
currentUserPrgrs?.atrzSeComCd === "ATRZ03" || currentUserPrgrs?.atrzSeComCd === "ATRZ99";
const pickingRow = pickingRowKey ? rows.find((r) => r.rowKey === pickingRowKey) : undefined;
const isBusy = isProcessing || savePrgrsSttsMutation.isPending;
@@ -392,9 +394,11 @@ function ElaprApprovalDialog({
<Button onClick={handleApprove} disabled={isBusy}>
결재
</Button>
<Button color="red" onClick={handleReject} disabled={isBusy}>
반려
</Button>
{canReject && (
<Button color="red" onClick={handleReject} disabled={isBusy}>
반려
</Button>
)}
</div>
)}
</div>
apps/as/src/pages/design-cnstn/ui/design-form-page.tsx
+5 -3
View File
@@ -9,7 +9,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { useQueryClient } from "@tanstack/react-query";
import { getListHref, useAlertStore, useUserStore, withListQs } from "@/shared/lib";
import { RhfDevTool, SectionCollapsibleGroup, SectionCollapsibleToggle } from "@/shared/ui";
import { SectionCollapsibleGroup, SectionCollapsibleToggle } from "@/shared/ui";
import {
designCnstnKeys,
type DesignCnstnMngDetResponseDto,
@@ -26,7 +26,10 @@ import {
} from "@/widgets/pbadms-sprt";
import { Button } from "@common/components";
import { type DesignCnstnRegistFormData, designCnstnRegistSchema } from "../lib/design-cnstn-regist-schema";
import {
type DesignCnstnRegistFormData,
designCnstnRegistSchema,
} from "../lib/design-cnstn-regist-schema";
import {
buildFormPayload,
getCreateDefaultValues,
@@ -217,7 +220,6 @@ function DesignFormPage({ mode, initialData, createDefaults }: DesignFormPagePro
</div>
</SectionCollapsibleGroup>
</form>
<RhfDevTool control={form.control} />
</FormProvider>
);
}
apps/as/src/pages/design-cnstn/ui/design-list-page.tsx
+4 -12
View File
@@ -5,11 +5,7 @@ import { useMemo, useState } from "react";
import type { PaginationState } from "@tanstack/react-table";
import { useSearchParamsState } from "@/shared/lib";
import {
type CmCdAdstDstrComboResponseDto,
useFindGugunCombo,
useFindSidoCombo,
} from "@/entities/adstdstr";
import { useFindUserSidoGugunCombo } from "@/entities/adstdstr";
import { CodeSelect } from "@/entities/code";
import type { DesignCnstnMngSearchDto } from "@/entities/design-cnstn";
import {
@@ -28,7 +24,6 @@ import { DesignList } from "./design-list";
const DEFAULT_PAGE_INDEX = 0;
const DEFAULT_PAGE_SIZE = 10;
const DEFAULT_SORT = "designCnstnDocNo,desc";
const EMPTY_ADST_LIST: CmCdAdstDstrComboResponseDto[] = [];
const ALL_SELECT_VALUE = "__ALL__";
const DEFAULT_PARAMS = {
@@ -47,10 +42,7 @@ function DesignListPage() {
const [sidoComCd, setSidoComCd] = useState(params.sidoComCd);
const [sggComCd, setSggComCd] = useState(params.sggComCd);
const { data: sidoData } = useFindSidoCombo();
const { data: gugunData } = useFindGugunCombo(sidoComCd);
const sidoOptions = sidoData ?? EMPTY_ADST_LIST;
const gugunOptions = gugunData ?? EMPTY_ADST_LIST;
const { userSidoData, userGugunData } = useFindUserSidoGugunCombo(sidoComCd);
const pagination: PaginationState = {
pageIndex: params.page,
@@ -104,7 +96,7 @@ function DesignListPage() {
</SelectTrigger>
<SelectContent>
<SelectItem value={ALL_SELECT_VALUE}>전체</SelectItem>
{sidoOptions.map((option) => (
{userSidoData.map((option) => (
<SelectItem key={option.adstDstrCd} value={option.adstDstrCd}>
{option.adstDstrNm}
</SelectItem>
@@ -126,7 +118,7 @@ function DesignListPage() {
</SelectTrigger>
<SelectContent>
<SelectItem value={ALL_SELECT_VALUE}>전체</SelectItem>
{gugunOptions.map((option) => (
{userGugunData.map((option) => (
<SelectItem key={option.adstDstrCd} value={option.adstDstrCd}>
{option.adstDstrNm}
</SelectItem>
apps/as/src/pages/fnrs-cnsltn/ui/fnrs-form-page.tsx
+2 -3
View File
@@ -9,7 +9,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { useQueryClient } from "@tanstack/react-query";
import { getListHref, useAlertStore, useUserStore, withListQs } from "@/shared/lib";
import { RhfDevTool, SectionCollapsibleGroup, SectionCollapsibleToggle } from "@/shared/ui";
import { SectionCollapsibleGroup, SectionCollapsibleToggle } from "@/shared/ui";
import { useAcntgSeMngTree } from "@/entities/acntg";
import { useEsntlAtchFileMngTree } from "@/entities/esntl";
import {
@@ -303,7 +303,7 @@ function FnrsFormPage({ mode, initialData, createDefaults }: FnrsFormPageProps)
onClick={handleApplyClick}
disabled={isSubmitting}
>
신청완료
신청 완료
</Button>
<Button
color="red"
@@ -350,7 +350,6 @@ function FnrsFormPage({ mode, initialData, createDefaults }: FnrsFormPageProps)
onClose={() => setIsPwrkCnsltnDocMngOpen(false)}
/>
) : null}
<RhfDevTool control={form.control} />
</FormProvider>
);
}
apps/as/src/pages/fnrs-cnsltn/ui/fnrs-list-page.tsx
+4 -12
View File
@@ -5,11 +5,7 @@ import { useMemo, useState } from "react";
import type { PaginationState } from "@tanstack/react-table";
import { useSearchParamsState } from "@/shared/lib";
import {
type CmCdAdstDstrComboResponseDto,
useFindGugunCombo,
useFindSidoCombo,
} from "@/entities/adstdstr";
import { useFindUserSidoGugunCombo } from "@/entities/adstdstr";
import { CodeSelect } from "@/entities/code";
import type { FnrsCnsltnMngSearchDto } from "@/entities/fnrs-cnsltn";
import {
@@ -28,7 +24,6 @@ import { FnrsList } from "./fnrs-list";
const DEFAULT_PAGE_INDEX = 0;
const DEFAULT_PAGE_SIZE = 10;
const DEFAULT_SORT = "fnrsCnsltnDocNo,desc";
const EMPTY_ADST_LIST: CmCdAdstDstrComboResponseDto[] = [];
const ALL_SELECT_VALUE = "__ALL__";
const DEFAULT_PARAMS = {
@@ -47,10 +42,7 @@ function FnrsListPage() {
const [sidoComCd, setSidoComCd] = useState(params.sidoComCd);
const [sggComCd, setSggComCd] = useState(params.sggComCd);
const { data: sidoData } = useFindSidoCombo();
const { data: gugunData } = useFindGugunCombo(sidoComCd);
const sidoOptions = sidoData ?? EMPTY_ADST_LIST;
const gugunOptions = gugunData ?? EMPTY_ADST_LIST;
const { userSidoData, userGugunData } = useFindUserSidoGugunCombo(sidoComCd);
const pagination: PaginationState = {
pageIndex: params.page,
@@ -104,7 +96,7 @@ function FnrsListPage() {
</SelectTrigger>
<SelectContent>
<SelectItem value={ALL_SELECT_VALUE}>전체</SelectItem>
{sidoOptions.map((option) => (
{userSidoData.map((option) => (
<SelectItem key={option.adstDstrCd} value={option.adstDstrCd}>
{option.adstDstrNm}
</SelectItem>
@@ -126,7 +118,7 @@ function FnrsListPage() {
</SelectTrigger>
<SelectContent>
<SelectItem value={ALL_SELECT_VALUE}>전체</SelectItem>
{gugunOptions.map((option) => (
{userGugunData.map((option) => (
<SelectItem key={option.adstDstrCd} value={option.adstDstrCd}>
{option.adstDstrNm}
</SelectItem>
apps/as/src/pages/instl-sncn/ui/instl-form-page.tsx
+17 -11
View File
@@ -9,7 +9,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { useQueryClient } from "@tanstack/react-query";
import { getListHref, useAlertStore, useUserStore, withListQs } from "@/shared/lib";
import { RhfDevTool, SectionCollapsibleGroup, SectionCollapsibleToggle } from "@/shared/ui";
import { SectionCollapsibleGroup, SectionCollapsibleToggle } from "@/shared/ui";
import { useEsntlAtchFileMngTree } from "@/entities/esntl";
import {
instlSncnKeys,
@@ -30,8 +30,15 @@ import {
} from "@/widgets/pbadms-sprt";
import { Button } from "@common/components";
import { buildFormPayload, getCreateDefaultValues, mapDetailToFormData } from "../lib/form-data-mapper";
import { type InstlSncnRegistFormData, instlSncnRegistSchema } from "../lib/instl-sncn-regist-schema";
import {
buildFormPayload,
getCreateDefaultValues,
mapDetailToFormData,
} from "../lib/form-data-mapper";
import {
type InstlSncnRegistFormData,
instlSncnRegistSchema,
} from "../lib/instl-sncn-regist-schema";
import { PROGRESS_STATUS_COLUMNS } from "../model/columns";
import { BasicInfoFormSection } from "./sections/basic-info-form-section";
@@ -94,7 +101,7 @@ function InstlFormPage({ mode, initialData, createDefaults }: InstlFormPageProps
(item) => !item.splmntCn || !item.splmntCn.trim(),
);
if (hasEmptySplmntCn) {
alert("보완요청내용이 있습니다. 보완완료내용을 입력해 주세요.");
alert("보완 요청 내용이 있습니다.\n보완 완료 내용을 입력해 주세요.");
return;
}
@@ -109,12 +116,12 @@ function InstlFormPage({ mode, initialData, createDefaults }: InstlFormPageProps
const result = await submitSupplementForm(data);
if (!result) return;
alert("보완완료 처리되었습니다.");
alert("보완 완료 처리되었습니다.");
await queryClient.invalidateQueries({ queryKey: instlSncnKeys.all });
router.push(withListQs(`/instl-sncn/${docNo}`));
queryClient.invalidateQueries({ queryKey: instlSncnKeys.all });
} catch (error) {
console.error("보완완료 실패:", error);
alert("보완완료 처리 중 오류가 발생했습니다.");
console.error("보완 완료 실패:", error);
alert("보완 완료 처리 중 오류가 발생했습니다.");
} finally {
setIsSubmitting(false);
}
@@ -245,7 +252,7 @@ function InstlFormPage({ mode, initialData, createDefaults }: InstlFormPageProps
onClick={form.handleSubmit(onApply)}
disabled={isSubmitting}
>
신청완료
신청 완료
</Button>
<Button
color="red"
@@ -264,7 +271,7 @@ function InstlFormPage({ mode, initialData, createDefaults }: InstlFormPageProps
onClick={form.handleSubmit(onSplmntCmptn)}
disabled={isSubmitting}
>
보완완료
보완 완료
</Button>
)}
</div>
@@ -272,7 +279,6 @@ function InstlFormPage({ mode, initialData, createDefaults }: InstlFormPageProps
</div>
</SectionCollapsibleGroup>
</form>
<RhfDevTool control={form.control} />
</FormProvider>
);
}
apps/as/src/pages/instl-sncn/ui/instl-list-page.tsx
+13 -11
View File
@@ -5,8 +5,7 @@ import { useMemo, useState } from "react";
import type { PaginationState } from "@tanstack/react-table";
import { useSearchParamsState } from "@/shared/lib";
import type { CmCdAdstDstrComboResponseDto } from "@/entities/adstdstr";
import { useFindGugunCombo, useFindSidoCombo } from "@/entities/adstdstr";
import { useFindUserSidoGugunCombo } from "@/entities/adstdstr";
import { CodeSelect } from "@/entities/code";
import type { InstlSncnMngSearchParams } from "@/entities/instl-sncn";
import {
@@ -25,7 +24,7 @@ import { InstlList } from "./instl-list";
const DEFAULT_PAGE_INDEX = 0;
const DEFAULT_PAGE_SIZE = 10;
const DEFAULT_SORT = "instlSncnDocNo,desc";
const EMPTY_ADST_LIST: CmCdAdstDstrComboResponseDto[] = [];
const ALL_SELECT_VALUE = "__ALL__";
const DEFAULT_PARAMS = {
sidoComCd: "",
@@ -43,10 +42,7 @@ function InstlListPage() {
const [sidoComCd, setSidoComCd] = useState(params.sidoComCd);
const [sggComCd, setSggComCd] = useState(params.sggComCd);
const { data: sidoData } = useFindSidoCombo();
const { data: gugunData } = useFindGugunCombo(sidoComCd);
const sidoOptions = sidoData ?? EMPTY_ADST_LIST;
const gugunOptions = gugunData ?? EMPTY_ADST_LIST;
const { userSidoData, userGugunData } = useFindUserSidoGugunCombo(sidoComCd);
const pagination: PaginationState = {
pageIndex: params.page,
@@ -91,7 +87,7 @@ function InstlListPage() {
<Select
value={sidoComCd}
onValueChange={(value) => {
setSidoComCd(value);
setSidoComCd(value === ALL_SELECT_VALUE ? "" : value);
setSggComCd("");
}}
>
@@ -99,7 +95,8 @@ function InstlListPage() {
<SelectValue placeholder="전체" />
</SelectTrigger>
<SelectContent>
{sidoOptions.map((option) => (
<SelectItem value={ALL_SELECT_VALUE}>전체</SelectItem>
{userSidoData.map((option) => (
<SelectItem key={option.adstDstrCd} value={option.adstDstrCd}>
{option.adstDstrNm}
</SelectItem>
@@ -111,12 +108,17 @@ function InstlListPage() {
<Label htmlFor="sggComCd" className="whitespace-nowrap">
시군구
</Label>
<Select value={sggComCd} onValueChange={setSggComCd} disabled={!sidoComCd}>
<Select
value={sggComCd}
onValueChange={(value) => setSggComCd(value === ALL_SELECT_VALUE ? "" : value)}
disabled={!sidoComCd}
>
<SelectTrigger id="sggComCd" className="w-[12rem]">
<SelectValue placeholder="전체" />
</SelectTrigger>
<SelectContent>
{gugunOptions.map((option) => (
<SelectItem value={ALL_SELECT_VALUE}>전체</SelectItem>
{userGugunData.map((option) => (
<SelectItem key={option.adstDstrCd} value={option.adstDstrCd}>
{option.adstDstrNm}
</SelectItem>
apps/as/src/pages/sewer-bsc-plan/ui/sewer-bsc-plan-apply-dialog.tsx
+19 -28
View File
@@ -4,11 +4,7 @@ import { useEffect, useState } from "react";
import { useUserStore } from "@/shared/lib";
import { Field, FieldLabel, FieldSet } from "@/shared/ui/field";
import {
type CmCdAdstDstrComboResponseDto,
useFindUserGugunCombo,
useFindUserSidoCombo,
} from "@/entities/adstdstr";
import { useFindUserSidoGugunCombo } from "@/entities/adstdstr";
import { useCodeList } from "@/entities/code";
import {
Button,
@@ -48,8 +44,6 @@ interface SewerBscPlanApplyDialogProps {
onConfirm: (selection: SewerBscPlanApplySelection) => void;
}
const EMPTY_ADST_LIST: CmCdAdstDstrComboResponseDto[] = [];
function SewerBscPlanApplyDialog({ open, onOpenChange, onConfirm }: SewerBscPlanApplyDialogProps) {
const userInfo = useUserStore((state) => state.userInfo);
const [sidoComCd, setSidoComCd] = useState("");
@@ -58,19 +52,16 @@ function SewerBscPlanApplyDialog({ open, onOpenChange, onConfirm }: SewerBscPlan
const [taskSeComCd, setTaskSeComCd] = useState("");
const canSidoGugunSelectable = userInfo?.dtlInstCd !== "ROLE_USER05";
const sidoFilterUserInfo =
userInfo?.dtlInstCd === "ROLE_USER04" || userInfo?.dtlInstCd === "ROLE_USER05"
? userInfo
: undefined;
const { data: sidoData, isPending: isSidoPending } = useFindUserSidoCombo(sidoFilterUserInfo);
const { data: gugunData, isPending: isGugunPending } = useFindUserGugunCombo(sidoComCd);
const {
userSidoData,
userGugunData,
isUserSidoPending,
isUserGugunPending,
} = useFindUserSidoGugunCombo(sidoComCd);
const { data: planSeOptions, isPending: isPlanSePending } = useCodeList("SEWERBSCPLANSE");
const { data: taskSeOptions, isPending: isTaskSePending } = useCodeList("SEWER");
const sidoOptions = sidoData ?? EMPTY_ADST_LIST;
const gugunOptions = gugunData ?? EMPTY_ADST_LIST;
const isPending = isSidoPending || isPlanSePending || isTaskSePending;
const isPending = isUserSidoPending || isPlanSePending || isTaskSePending;
useEffect(() => {
if (!open) return;
@@ -83,16 +74,16 @@ function SewerBscPlanApplyDialog({ open, onOpenChange, onConfirm }: SewerBscPlan
}, [open, canSidoGugunSelectable]);
useEffect(() => {
if (canSidoGugunSelectable || sidoOptions.length === 0) return;
const nextSidoComCd = sidoOptions[0].adstDstrCd;
if (canSidoGugunSelectable || userSidoData.length === 0) return;
const nextSidoComCd = userSidoData[0].adstDstrCd;
setSidoComCd((current) => (current === nextSidoComCd ? current : nextSidoComCd));
}, [canSidoGugunSelectable, sidoOptions]);
}, [canSidoGugunSelectable, userSidoData]);
useEffect(() => {
if (canSidoGugunSelectable || !sidoComCd || gugunOptions.length === 0) return;
const nextSggComCd = gugunOptions[0].adstDstrCd;
if (canSidoGugunSelectable || !sidoComCd || userGugunData.length === 0) return;
const nextSggComCd = userGugunData[0].adstDstrCd;
setSggComCd((current) => current || nextSggComCd);
}, [canSidoGugunSelectable, sidoComCd, gugunOptions]);
}, [canSidoGugunSelectable, sidoComCd, userGugunData]);
const canConfirm =
!!sewerBscPlanSeComCd && !!taskSeComCd && (!canSidoGugunSelectable || !!sidoComCd);
@@ -100,8 +91,8 @@ function SewerBscPlanApplyDialog({ open, onOpenChange, onConfirm }: SewerBscPlan
function handleConfirm() {
if (!canConfirm) return;
const sidoOption = sidoOptions.find((option) => option.adstDstrCd === sidoComCd);
const gugunOption = gugunOptions.find((option) => option.adstDstrCd === sggComCd);
const sidoOption = userSidoData.find((option) => option.adstDstrCd === sidoComCd);
const gugunOption = userGugunData.find((option) => option.adstDstrCd === sggComCd);
const planSeOption = planSeOptions?.find((option) => option.lwpoCd === sewerBscPlanSeComCd);
const taskSeOption = taskSeOptions?.find((option) => option.lwpoCd === taskSeComCd);
@@ -149,7 +140,7 @@ function SewerBscPlanApplyDialog({ open, onOpenChange, onConfirm }: SewerBscPlan
<SelectValue placeholder="선택" />
</SelectTrigger>
<SelectContent>
{sidoOptions.map((option) => (
{userSidoData.map((option) => (
<SelectItem key={option.adstDstrCd} value={option.adstDstrCd}>
{option.adstDstrNm}
</SelectItem>
@@ -162,13 +153,13 @@ function SewerBscPlanApplyDialog({ open, onOpenChange, onConfirm }: SewerBscPlan
<Select
value={sggComCd || undefined}
onValueChange={setSggComCd}
disabled={!sidoComCd || isGugunPending}
disabled={!sidoComCd || isUserGugunPending}
>
<SelectTrigger className="w-full">
<SelectValue placeholder="선택" />
</SelectTrigger>
<SelectContent>
{gugunOptions.map((option) => (
{userGugunData.map((option) => (
<SelectItem key={option.adstDstrCd} value={option.adstDstrCd}>
{option.adstDstrNm}
</SelectItem>
apps/as/src/pages/sewer-bsc-plan/ui/sewer-bsc-plan-form-page.tsx
+9 -12
View File
@@ -9,7 +9,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { useQueryClient } from "@tanstack/react-query";
import { getListHref, useAlertStore, useUserStore, withListQs } from "@/shared/lib";
import { RhfDevTool, SectionCollapsibleGroup, SectionCollapsibleToggle } from "@/shared/ui";
import { SectionCollapsibleGroup, SectionCollapsibleToggle } from "@/shared/ui";
import { useAcntgSeMngTree } from "@/entities/acntg";
import { useEsntlAtchFileMngTree } from "@/entities/esntl";
import {
@@ -165,9 +165,7 @@ function SewerBscPlanFormPage({
alert("신청 완료되었습니다.");
router.push(
withListQs(
`/sewer-bsc-plan/${result.sewerBscPlanDocNo}?chgCycl=${result.chgCycl ?? 1}`,
),
withListQs(`/sewer-bsc-plan/${result.sewerBscPlanDocNo}?chgCycl=${result.chgCycl ?? 1}`),
);
queryClient.invalidateQueries({ queryKey: sewerBscPlanKeys.all });
} catch (error) {
@@ -185,7 +183,7 @@ function SewerBscPlanFormPage({
(item) => item.cmptnYn === "N" && (!item.splmntCn || !item.splmntCn.trim()),
);
if (hasEmptySplmntCn) {
alert("보완요청 항목이 있습니다.\n보완완료 내용을 입력해 주세요.");
alert("보완 요청 항목이 있습니다.\n보완 완료 내용을 입력해 주세요.");
return;
}
@@ -203,13 +201,13 @@ function SewerBscPlanFormPage({
const result = await sewerBscPlanService.submitSupplement(docNo, payload);
if (!result) return;
alert("보완완료 처리되었습니다.");
alert("보완 완료 처리되었습니다.");
await queryClient.invalidateQueries({ queryKey: sewerBscPlanKeys.all });
const chgCycl = data.sewerBscPlanDtl.chgCycl ?? initialData?.detDto?.chgCycl ?? 1;
router.push(withListQs(`/sewer-bsc-plan/${docNo}?chgCycl=${chgCycl}`));
queryClient.invalidateQueries({ queryKey: sewerBscPlanKeys.all });
} catch (error) {
console.error("보완완료 실패:", error);
alert("보완완료 처리 중 오류가 발생했습니다.");
console.error("보완 완료 실패:", error);
alert("보완 완료 처리 중 오류가 발생했습니다.");
} finally {
setIsSubmitting(false);
}
@@ -298,7 +296,7 @@ function SewerBscPlanFormPage({
onClick={handleApplyClick}
disabled={isSubmitting}
>
신청완료
신청 완료
</Button>
<Button
color="red"
@@ -317,7 +315,7 @@ function SewerBscPlanFormPage({
onClick={form.handleSubmit(onSplmntCmptn)}
disabled={isSubmitting}
>
보완완료
보완 완료
</Button>
)}
</div>
@@ -325,7 +323,6 @@ function SewerBscPlanFormPage({
</div>
</SectionCollapsibleGroup>
</form>
<RhfDevTool control={form.control} />
</FormProvider>
);
}
apps/as/src/pages/sewer-bsc-plan/ui/sewer-bsc-plan-list-page.tsx
+4 -12
View File
@@ -5,11 +5,7 @@ import { useMemo, useState } from "react";
import type { PaginationState } from "@tanstack/react-table";
import { useSearchParamsState } from "@/shared/lib";
import {
type CmCdAdstDstrComboResponseDto,
useFindGugunCombo,
useFindSidoCombo,
} from "@/entities/adstdstr";
import { useFindUserSidoGugunCombo } from "@/entities/adstdstr";
import { CodeSelect } from "@/entities/code";
import type { SewerBscPlanSearchRequestDto } from "@/entities/sewer-bsc-plan";
import {
@@ -28,7 +24,6 @@ import { SewerBscPlanList } from "./sewer-bsc-plan-list";
const DEFAULT_PAGE_INDEX = 0;
const DEFAULT_PAGE_SIZE = 10;
const DEFAULT_SORT = "sewerBscPlanDocNo,desc";
const EMPTY_ADST_LIST: CmCdAdstDstrComboResponseDto[] = [];
const ALL_SELECT_VALUE = "__ALL__";
const DEFAULT_PARAMS = {
@@ -49,10 +44,7 @@ function SewerBscPlanListPage() {
const [sidoComCd, setSidoComCd] = useState(params.sidoComCd);
const [sggComCd, setSggComCd] = useState(params.sggComCd);
const { data: sidoData } = useFindSidoCombo();
const { data: gugunData } = useFindGugunCombo(sidoComCd);
const sidoOptions = sidoData ?? EMPTY_ADST_LIST;
const gugunOptions = gugunData ?? EMPTY_ADST_LIST;
const { userSidoData, userGugunData } = useFindUserSidoGugunCombo(sidoComCd);
const pagination: PaginationState = {
pageIndex: params.page,
@@ -108,7 +100,7 @@ function SewerBscPlanListPage() {
</SelectTrigger>
<SelectContent>
<SelectItem value={ALL_SELECT_VALUE}>전체</SelectItem>
{sidoOptions.map((option) => (
{userSidoData.map((option) => (
<SelectItem key={option.adstDstrCd} value={option.adstDstrCd}>
{option.adstDstrNm}
</SelectItem>
@@ -130,7 +122,7 @@ function SewerBscPlanListPage() {
</SelectTrigger>
<SelectContent>
<SelectItem value={ALL_SELECT_VALUE}>전체</SelectItem>
{gugunOptions.map((option) => (
{userGugunData.map((option) => (
<SelectItem key={option.adstDstrCd} value={option.adstDstrCd}>
{option.adstDstrNm}
</SelectItem>
apps/as/src/widgets/pbadms-sprt/ui/attachments-form-section.tsx
+1 -1
View File
@@ -377,7 +377,7 @@ function AttachmentsFormSection({
return (
<SectionCollapsible title="첨부파일">
<div className="space-y-6">
{essentialFiles.length === 0 && (
{essentialFiles.length > 0 && (
<div className="px-2">
<h3 className="mb-4 text-xl font-semibold">필수 첨부파일</h3>
<Table variant="secondary" className="table-fixed">
apps/as/src/widgets/pbadms-sprt/ui/pbadms-task-apply-dialog.tsx
+13 -22
View File
@@ -4,11 +4,7 @@ import { useEffect, useState } from "react";
import { useUserStore } from "@/shared/lib";
import { Field, FieldGroup, FieldLabel, FieldSet } from "@/shared/ui/field";
import {
type CmCdAdstDstrComboResponseDto,
useFindUserGugunCombo,
useFindUserSidoCombo,
} from "@/entities/adstdstr";
import { useFindUserSidoGugunCombo } from "@/entities/adstdstr";
import { useCodeList } from "@/entities/code";
import {
Button,
@@ -46,8 +42,6 @@ interface PbadmsTaskApplyDialogProps {
codeUpCd?: string;
}
const EMPTY_ADST_LIST: CmCdAdstDstrComboResponseDto[] = [];
function PbadmsTaskApplyDialog({
open,
onOpenChange,
@@ -60,18 +54,15 @@ function PbadmsTaskApplyDialog({
const [sggComCd, setSggComCd] = useState("");
const [selectedCodes, setSelectedCodes] = useState<string[]>([]);
const sidoFilterUserInfo =
userInfo?.dtlInstCd === "ROLE_USER04" || userInfo?.dtlInstCd === "ROLE_USER05"
? userInfo
: undefined;
const { data: sidoData, isPending: isSidoPending } = useFindUserSidoCombo(sidoFilterUserInfo);
const { data: gugunData, isPending: isGugunPending } = useFindUserGugunCombo(sidoComCd);
const {
userSidoData,
userGugunData,
isUserSidoPending,
isUserGugunPending,
} = useFindUserSidoGugunCombo(sidoComCd);
const { data: taskOptions, isPending: isTaskSePending } = useCodeList(codeUpCd);
const sidoOptions = sidoData ?? EMPTY_ADST_LIST;
const gugunOptions = gugunData ?? EMPTY_ADST_LIST;
const isPending = isSidoPending || isTaskSePending;
const isPending = isUserSidoPending || isTaskSePending;
const canSidoGugunSelectable = userInfo?.dtlInstCd !== "ROLE_USER05";
const canConfirm = selectedCodes.length > 0 && (!canSidoGugunSelectable || !!sidoComCd);
@@ -93,8 +84,8 @@ function PbadmsTaskApplyDialog({
function handleConfirm() {
if (!canConfirm) return;
const sidoOption = sidoOptions.find((option) => option.adstDstrCd === sidoComCd);
const gugunOption = gugunOptions.find((option) => option.adstDstrCd === sggComCd);
const sidoOption = userSidoData.find((option) => option.adstDstrCd === sidoComCd);
const gugunOption = userGugunData.find((option) => option.adstDstrCd === sggComCd);
onConfirm({
admdstCd: sggComCd || sidoComCd,
@@ -137,7 +128,7 @@ function PbadmsTaskApplyDialog({
<SelectValue placeholder="선택" />
</SelectTrigger>
<SelectContent>
{sidoOptions.map((option) => (
{userSidoData.map((option) => (
<SelectItem key={option.adstDstrCd} value={option.adstDstrCd}>
{option.adstDstrNm}
</SelectItem>
@@ -150,13 +141,13 @@ function PbadmsTaskApplyDialog({
<Select
value={sggComCd || undefined}
onValueChange={setSggComCd}
disabled={!sidoComCd || isGugunPending}
disabled={!sidoComCd || isUserGugunPending}
>
<SelectTrigger className="w-full">
<SelectValue placeholder="선택" />
</SelectTrigger>
<SelectContent>
{gugunOptions.map((option) => (
{userGugunData.map((option) => (
<SelectItem key={option.adstDstrCd} value={option.adstDstrCd}>
{option.adstDstrNm}
</SelectItem>