From 32485efb939725c56ce3d67549e276a06f4ef14a Mon Sep 17 00:00:00 2001
From: basssy <basssy@interplug.co.kr>
Date: Fri, 18 Oct 2024 09:58:29 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AC=BC=EA=B1=B4=EC=A0=95=EB=B3=B4=20&=20?=
 =?UTF-8?q?=EC=84=A4=EA=B3=84=EC=9D=98=EB=A2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/header/Header.jsx              |  6 ++--
 src/components/management/StuffDetail.jsx     | 19 +++++++------
 src/components/management/StuffQGrid.jsx      |  6 ----
 .../management/StuffSearchCondition.jsx       |  2 +-
 .../management/popup/FindAddressPop.jsx       |  1 -
 .../management/popup/PlanRequestPop.jsx       | 28 +++++++++++++++++--
 .../management/popup/PlanRequestPopQGrid.jsx  | 10 +++++--
 src/locales/ja.json                           |  1 +
 src/locales/ko.json                           |  1 +
 9 files changed, 52 insertions(+), 22 deletions(-)

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 ? (
-            <Link key={`${menu.id}`} href={menu.url}>
+            <Link key={`${menu.id}`} href={menu.url} scroll={false}>
               {getMessage(menu.name)}
             </Link>
           ) : (
@@ -147,7 +147,9 @@ export default function Header(props) {
                       onMouseEnter={(e) => ToggleonMouse(e, 'add', 'li > ul')}
                       onMouseLeave={(e) => ToggleonMouse(e, 'remove', 'li > ul')}
                     >
-                      <Link href={m.url}>{getMessage(m.name)}</Link>
+                      <Link href={m.url} scroll={false}>
+                        {getMessage(m.name)}
+                      </Link>
                     </li>
                   )
                 })}
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() {
                       </th>
                       <td>
                         <div className="input-wrap" style={{ width: '500px' }}>
-                          {/* <input type="text" className="input-light" {...form.register('dispCompanyName')} value={form.watch('dispCompanyName')} /> */}
+                          <input type="text" className="input-light" {...form.register('dispCompanyName')} value={form.watch('dispCompanyName')} />
                         </div>
                       </td>
                     </tr>
@@ -871,7 +874,7 @@ export default function StuffDetail() {
                       </th>
                       <td>
                         <div className="flx-box">
-                          <div style={{ width: '567px', marginRight: '5px' }}>
+                          <div className="select-wrap mr5" style={{ width: '567px' }}>
                             {/* <Select
                               options={saleStoreList}
                               value={form.watch('saleStoreId')}
@@ -896,14 +899,14 @@ export default function StuffDetail() {
           {objectNo.substring(0, 1) === 'R' ? (
             <>
               <Link href="/management/stuff">
-                <button type="button" className="btn-origin grey">
+                <button type="button" className="btn-origin grey mr5">
                   R상세:물건목록
                 </button>
               </Link>
               <button type="submit" className="btn-origin navy mr5">
                 R상세:저장
               </button>
-              <button type="submit" className="btn-origin navy mr5" onClick={onDelete}>
+              <button type="submit" className="btn-origin navy" onClick={onDelete}>
                 R상세:물건삭제
               </button>
             </>
diff --git a/src/components/management/StuffQGrid.jsx b/src/components/management/StuffQGrid.jsx
index a2a47c5d..33836e79 100644
--- a/src/components/management/StuffQGrid.jsx
+++ b/src/components/management/StuffQGrid.jsx
@@ -69,12 +69,6 @@ export default function StuffQGrid(props) {
     props.getCellDoubleClicked(event)
   }, [])
 
-  const autoSizeStrategy = useMemo(() => {
-    return {
-      type: 'fitCellContents',
-    }
-  }, [])
-
   // Fetch data & update rowData state
   useEffect(() => {
     gridData ? setRowData(gridData) : ''
diff --git a/src/components/management/StuffSearchCondition.jsx b/src/components/management/StuffSearchCondition.jsx
index e3375258..b33608cf 100644
--- a/src/components/management/StuffSearchCondition.jsx
+++ b/src/components/management/StuffSearchCondition.jsx
@@ -158,7 +158,7 @@ export default function StuffSearchCondition() {
             <h3>{getMessage('stuff.search.title')}</h3>
           </div>
           <div className="left-unit-box">
-            <Link href="/management/stuff/tempdetail">
+            <Link href="/management/stuff/tempdetail" scroll={false}>
               <button type="button" className="btn-origin navy mr5">
                 {getMessage('stuff.search.btn1')}
               </button>
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) {
               </div>
               <div className="design-request-grid">
                 <div className="design-request-grid-tit">Plan List</div>
-                <PlanRequestPopQGrid {...gridProps} />
+                <PlanRequestPopQGrid {...gridProps} getSelectedRowdata={getSelectedRowdata} />
                 <div className="pagination-wrap">
                   <QPagination pageNo={pageNo} pageSize={pageSize} pagePerBlock={10} totalCount={totalCount} handleChangePage={handleChangePage} />
                 </div>
@@ -415,7 +437,9 @@ export default function PlanRequestPop(props) {
               <button className="btn-origin grey mr5" onClick={() => props.setShowDesignRequestButtonValid(false)}>
                 {getMessage('stuff.planReqPopup.btn3')}
               </button>
-              <button className="btn-origin navy ">{getMessage('stuff.planReqPopup.btn4')}</button>
+              <button className="btn-origin navy" onClick={applyPlanReq}>
+                {getMessage('stuff.planReqPopup.btn4')}
+              </button>
             </div>
           </div>
         </div>
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 (
-    <div className="ag-theme-quartz" style={{ height: 500 }}>
+    <div className="ag-theme-quartz" style={{ height: 350 }}>
       <AgGridReact
         onGridReady={onGridReady}
         rowBuffer={rowBuffer}
@@ -49,7 +55,7 @@ export default function PlanRequestPopQGrid(props) {
         defaultColDef={defaultColDef}
         rowSelection={'singleRow'}
         pagination={isPageable}
-        // onSelectionChanged={onSelectionChanged}
+        onSelectionChanged={onSelectionChanged}
       />
     </div>
   )
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": "조회",