diff --git a/src/components/header/Header.jsx b/src/components/header/Header.jsx
index c12d237e..900a39c8 100644
--- a/src/components/header/Header.jsx
+++ b/src/components/header/Header.jsx
@@ -132,7 +132,7 @@ export default function Header(props) {
onMouseLeave={(e) => ToggleonMouse(e, 'remove', 'nav > ul')}
>
{menu.children.length === 0 ? (
-
+
{getMessage(menu.name)}
) : (
@@ -147,7 +147,9 @@ export default function Header(props) {
onMouseEnter={(e) => ToggleonMouse(e, 'add', 'li > ul')}
onMouseLeave={(e) => ToggleonMouse(e, 'remove', 'li > ul')}
>
- {getMessage(m.name)}
+
+ {getMessage(m.name)}
+
)
})}
diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx
index 75cadeae..4e21c0f5 100644
--- a/src/components/management/StuffDetail.jsx
+++ b/src/components/management/StuffDetail.jsx
@@ -79,7 +79,7 @@ export default function StuffDetail() {
const [detailData, setDetailData] = useState({})
useEffect(() => {
- console.log('objectNo::', objectNo)
+ // console.log('objectNo::', objectNo)
if (objectNo) {
console.log('수정화면')
@@ -209,8 +209,11 @@ export default function StuffDetail() {
form.setValue('zipNo', info.zipNo)
}
- //팝업에서 넘어온 설계의뢰 정보
- const setPlanReqInfo = (info) => {}
+ //팝업에서 넘어온 설계의뢰 정보로 바꾸기
+ const setPlanReqInfo = (info) => {
+ console.log('팝업에서 넘어온 설계의뢰 정보::: ', info)
+ // form.setValue('dispCompanyName', info.planReqName)
+ }
//팝업에서 넘어온 바람정보
const setWindSppedInfo = (info) => {
@@ -441,7 +444,7 @@ export default function StuffDetail() {
let testobj = '10'
del({ url: `/api/object/${testobj}` }).then((res) => {
- // console.log('삭제 결과:::', res)
+ console.log('삭제 결과:::', res)
router.push('/management/stuff')
})
}
@@ -819,7 +822,7 @@ export default function StuffDetail() {
- {/* */}
+
|
@@ -871,7 +874,7 @@ export default function StuffDetail() {
-
+
{/*
-
+
{getMessage('stuff.search.btn1')}
diff --git a/src/components/management/popup/FindAddressPop.jsx b/src/components/management/popup/FindAddressPop.jsx
index b3702ded..0c480a52 100644
--- a/src/components/management/popup/FindAddressPop.jsx
+++ b/src/components/management/popup/FindAddressPop.jsx
@@ -79,7 +79,6 @@ export default function FindAddressPop(props) {
}
// 주소적용 클릭
const applyAddress = () => {
- // console.log('주소적용 클릭:::::::::', prefId, address1, address2, address3, zipNo)
if (prefId == null) {
alert(getMessage('stuff.addressPopup.error.message2'))
} else {
diff --git a/src/components/management/popup/PlanRequestPop.jsx b/src/components/management/popup/PlanRequestPop.jsx
index 5a6fb9d8..fe6e2d2a 100644
--- a/src/components/management/popup/PlanRequestPop.jsx
+++ b/src/components/management/popup/PlanRequestPop.jsx
@@ -24,6 +24,8 @@ export default function PlanRequestPop(props) {
const globalLocaleState = useRecoilValue(globalLocaleStore)
+ const [planReqObject, setPlanReqObject] = useState({})
+
const { get, promiseGet } = useAxios(globalLocaleState)
const { getMessage } = useMessage()
@@ -205,6 +207,26 @@ export default function PlanRequestPop(props) {
],
})
+ //설계의뢰 그리드에서 선택한 설계의로 정보
+ const getSelectedRowdata = (data) => {
+ if (isNotEmptyArray(data)) {
+ setPlanReqObject(data[0])
+ } else {
+ setPlanReqObject({})
+ }
+ }
+
+ // 설계의뢰 적용 클릭
+ const applyPlanReq = () => {
+ if (isObjectNotEmpty(planReqObject)) {
+ props.planReqInfo(planReqObject)
+ // 팝업닫기
+ props.setShowDesignRequestButtonValid(false)
+ } else {
+ alert(getMessage('stuff.planReqPopup.error.message1'))
+ }
+ }
+
const tempList = [
{
label: '완료',
@@ -405,7 +427,7 @@ export default function PlanRequestPop(props) {
Plan List
-
+
@@ -415,7 +437,9 @@ export default function PlanRequestPop(props) {
props.setShowDesignRequestButtonValid(false)}>
{getMessage('stuff.planReqPopup.btn3')}
- {getMessage('stuff.planReqPopup.btn4')}
+
+ {getMessage('stuff.planReqPopup.btn4')}
+
diff --git a/src/components/management/popup/PlanRequestPopQGrid.jsx b/src/components/management/popup/PlanRequestPopQGrid.jsx
index b7dca164..e610a138 100644
--- a/src/components/management/popup/PlanRequestPopQGrid.jsx
+++ b/src/components/management/popup/PlanRequestPopQGrid.jsx
@@ -39,8 +39,14 @@ export default function PlanRequestPopQGrid(props) {
[gridData],
)
+ //부모로 선택한 설계의뢰정보 보내기
+ const onSelectionChanged = () => {
+ const selectedData = gridApi.getSelectedRows()
+ props.getSelectedRowdata(selectedData)
+ }
+
return (
-
+
)
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 15cbe762..0545be6e 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -502,6 +502,7 @@
"stuff.planReqPopup.search.period": "期間検索",
"stuff.planReqPopup.search.schDateGbnS": "提出日",
"stuff.planReqPopup.search.schDateGbnR": "受付日",
+ "stuff.planReqPopup.error.message1": "設計依頼を選択してください。",
"stuff.search.title": "物件状況",
"stuff.search.btn1": "物件登録",
"stuff.search.btn2": "照会",
diff --git a/src/locales/ko.json b/src/locales/ko.json
index f3f3deea..d02eed19 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -507,6 +507,7 @@
"stuff.planReqPopup.search.period": "기간검색",
"stuff.planReqPopup.search.schDateGbnS": "제출일",
"stuff.planReqPopup.search.schDateGbnR": "접수일",
+ "stuff.planReqPopup.error.message1": "설계의뢰를 선택해주세요.",
"stuff.search.title": "물건현황",
"stuff.search.btn1": "신규등록",
"stuff.search.btn2": "조회",
|