From 01353924f4f9d70eb8e9fa94d41118484117d975 Mon Sep 17 00:00:00 2001 From: basssy Date: Tue, 21 Jan 2025 08:51:04 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EC=9D=B8=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EC=B5=9C=EA=B7=BC=EB=AC=BC=EA=B1=B4=20=EC=83=81=EC=84=B8=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99=EC=8B=9C=20=EB=A1=9C=EB=94=A9=EB=B0=94=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/main/MainContents.jsx | 4 +- src/components/management/StuffDetail.jsx | 84 ++++++++++++++++--- .../management/StuffSearchCondition.jsx | 18 +++- .../management/popup/FindAddressPop.jsx | 27 +++++- .../management/popup/FindAddressPopQGrid.jsx | 6 ++ .../management/popup/PlanRequestPop.jsx | 9 +- .../management/popup/PlanRequestPopQGrid.jsx | 6 ++ 7 files changed, 131 insertions(+), 23 deletions(-) diff --git a/src/components/main/MainContents.jsx b/src/components/main/MainContents.jsx index 766d7efc..3c9379d8 100644 --- a/src/components/main/MainContents.jsx +++ b/src/components/main/MainContents.jsx @@ -10,7 +10,6 @@ import { useRecoilValue } from 'recoil' import { useRouter } from 'next/navigation' import { globalLocaleStore } from '@/store/localeAtom' import { queryStringFormatter } from '@/util/common-utils' -import MainSkeleton from '../ui/MainSkeleton' import { useMainContentsController } from '@/hooks/main/useMainContentsController' import { QcastContext } from '@/app/QcastProvider' import { useSwal } from '@/hooks/useSwal' @@ -31,7 +30,7 @@ export default function MainContents() { //FAQ const [recentFaqList, setRecentFaqList] = useState([]) - const { qcastState } = useContext(QcastContext) + const { qcastState, setIsGlobalLoading } = useContext(QcastContext) const { fetchObjectList, initObjectList } = useMainContentsController() useEffect(() => { @@ -105,6 +104,7 @@ export default function MainContents() { key={row.objectNo} className="recently-item" onClick={() => { + setIsGlobalLoading(true) if (row.tempFlg === '0') { router.push(`/management/stuff/detail?objectNo=${row.objectNo.toString()}`, { scroll: false }) } else { diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx index 6b57e111..9e2f0d04 100644 --- a/src/components/management/StuffDetail.jsx +++ b/src/components/management/StuffDetail.jsx @@ -1631,11 +1631,21 @@ export default function StuffDetail() { {getMessage('stuff.detail.btn.save')} )} - + {/* - + */} +
@@ -2131,11 +2141,21 @@ export default function StuffDetail() { {getMessage('stuff.detail.btn.save')} )} - + {/* - + */} +
@@ -2150,11 +2170,21 @@ export default function StuffDetail() { {managementState?.tempFlg === '0' ? ( <>
- + {/* - + */} + @@ -2175,11 +2205,21 @@ export default function StuffDetail() { {getMessage('stuff.detail.btn.save')} )} - + {/* - + */} +
)} @@ -2729,11 +2769,21 @@ export default function StuffDetail() { {/* 진짜R 플랜끝 */}
- + {/* - + */} + @@ -2754,11 +2804,21 @@ export default function StuffDetail() { {getMessage('stuff.detail.btn.save')} )} - + {/* - + */} +
)} diff --git a/src/components/management/StuffSearchCondition.jsx b/src/components/management/StuffSearchCondition.jsx index ad265c55..ba16334e 100644 --- a/src/components/management/StuffSearchCondition.jsx +++ b/src/components/management/StuffSearchCondition.jsx @@ -10,7 +10,7 @@ import JA from '@/locales/ja.json' import { stuffSearchState } from '@/store/stuffAtom' import { isEmptyArray } from '@/util/common-utils' import dayjs from 'dayjs' -import Link from 'next/link' +import { useRouter } from 'next/navigation' import SingleDatePicker from '../common/datepicker/SingleDatePicker' import { useMessage } from '@/hooks/useMessage' import { isObjectNotEmpty } from '@/util/common-utils' @@ -20,6 +20,7 @@ import { SessionContext } from '@/app/SessionProvider' import { QcastContext } from '@/app/QcastProvider' export default function StuffSearchCondition() { + const router = useRouter() const { session } = useContext(SessionContext) const setAppMessageState = useSetRecoilState(appMessageStore) const globalLocaleState = useRecoilValue(globalLocaleStore) @@ -822,12 +823,21 @@ export default function StuffSearchCondition() {

{getMessage('stuff.search.title')}

- - {/* */} + {/* - + */} + diff --git a/src/components/management/popup/FindAddressPop.jsx b/src/components/management/popup/FindAddressPop.jsx index 960fd2e3..55770d12 100644 --- a/src/components/management/popup/FindAddressPop.jsx +++ b/src/components/management/popup/FindAddressPop.jsx @@ -56,9 +56,6 @@ export default function FindAddressPop(props) { //우편번호 검색 const searchPostNum = () => { - // //7830060 - // //9302226 - // //0790177 3개짜리 const params = { zipcode: watch('zipNo'), } @@ -122,6 +119,28 @@ export default function FindAddressPop(props) { } } + //그리드 더블클릭 + const getCellDoubleClicked = (event) => { + setAddress1(event.data.address1) + setAddress2(event.data.address2) + setAddress3(event.data.address3) + setPrefId(event.data.prefcode) + setZipNo(event.data.zipcode) + + if (event.data.prefcode == null) { + return alert(getMessage('stuff.addressPopup.error.message2')) + } else { + props.zipInfo({ + zipNo: event.data.zipcode, + address1: event.data.address1, + address2: event.data.address2, + address3: event.data.address3, + prefId: event.data.prefcode, + }) + } + props.setShowAddressButtonValid(false) + } + return (
@@ -146,7 +165,7 @@ export default function FindAddressPop(props) {
- +
diff --git a/src/components/management/popup/FindAddressPopQGrid.jsx b/src/components/management/popup/FindAddressPopQGrid.jsx index 6447dd48..4de93e9c 100644 --- a/src/components/management/popup/FindAddressPopQGrid.jsx +++ b/src/components/management/popup/FindAddressPopQGrid.jsx @@ -48,6 +48,11 @@ export default function FindAddressPopGrid(props) { props.getSelectedRowdata(selectedData) } + //더블클릭 + const onCellDoubleClicked = useCallback((event) => { + props.getCellDoubleClicked(event) + }, []) + return (
${getMessage('stuff.grid.noData')}`} />
diff --git a/src/components/management/popup/PlanRequestPop.jsx b/src/components/management/popup/PlanRequestPop.jsx index 38df870f..033c71de 100644 --- a/src/components/management/popup/PlanRequestPop.jsx +++ b/src/components/management/popup/PlanRequestPop.jsx @@ -243,6 +243,13 @@ export default function PlanRequestPop(props) { } } + // 더블클릭 + const getCellDoubleClicked = (event) => { + setPlanReqObject(event.data) + props.planReqInfo(event.data) + props.setShowDesignRequestButtonValid(false) + } + return (
@@ -409,7 +416,7 @@ export default function PlanRequestPop(props) {
- +
diff --git a/src/components/management/popup/PlanRequestPopQGrid.jsx b/src/components/management/popup/PlanRequestPopQGrid.jsx index 0e5117e3..5f78f7a3 100644 --- a/src/components/management/popup/PlanRequestPopQGrid.jsx +++ b/src/components/management/popup/PlanRequestPopQGrid.jsx @@ -48,6 +48,11 @@ export default function PlanRequestPopQGrid(props) { props.getSelectedRowdata(selectedData) } + // 그리드 더블클릭 + const onCellDoubleClicked = useCallback((event) => { + props.getCellDoubleClicked(event) + }, []) + return (
${getMessage('stuff.grid.noData')}`} />