견적서 화면 상단 메뉴이동 관련 수정

src/components/floor-plan/CanvasMenu.jsx

@@ -203,7 +203,11 @@ export default function CanvasMenu(props) {
       setCurrentMenu(menu.title)
     }
 
-    if (pathname !== '/floor-plan') router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`)
+    if (pathname !== '/floor-plan') {
+      if (menu.index !== 0) {
+        router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`)
+      }
+    }
   }
 
   const changeSelectedRoofMaterial = (e) => {

src/components/management/StuffDetail.jsx

@@ -304,6 +304,7 @@ export default function StuffDetail() {
                     //mid:5(견적서), /pid:플랜번호
                     setFloorPlanObjectNo({ floorPlanObjectNo: params.data.objectNo })
                     setIsGlobalLoading(true)
+                    setMenuNumber(5)
                     router.push(`/floor-plan/estimate/5?pid=${params.data.planNo}&objectNo=${params.data.objectNo}`)
                   }}
                 >

src/components/management/StuffSubHeader.jsx

@@ -40,8 +40,8 @@ export default function StuffSubHeader({ type }) {
     if (isObjectNotEmpty(managementState)) {
       if (managementState.createUser === 'T01') {
         if (session.userId !== 'T01') {
-          //도면 작성은 이동 할 수 있도록 변경 #457
-          // setButtonStyle('none')
+          //도면 작성은 이동 할 수 있도록 변경 #457 다시 못하도록 변경#474
+          setButtonStyle('none')
         }
       }
     }

src/components/management/popup/PlanRequestPop.jsx

@@ -8,19 +8,12 @@ import SingleDatePicker from '@/components/common/datepicker/SingleDatePicker'
 import dayjs from 'dayjs'
 import PlanRequestPopQGrid from './PlanRequestPopQGrid'
 import { isObjectNotEmpty, queryStringFormatter } from '@/util/common-utils'
-import { useCommonCode } from '@/hooks/common/useCommonCode'
-import Select from 'react-select'
 import QPagination from '@/components/common/pagination/QPagination'
 export default function PlanRequestPop(props) {
   const [pageNo, setPageNo] = useState(1) //현재 페이지 번호
   const [pageSize, setPageSize] = useState(20) //페이지 당 게시물 개수
   const [totalCount, setTotalCount] = useState(0) //총 갯수
 
-  //공통코드
-  const { commonCode, findCommonCode } = useCommonCode()
-
-  // const [planStatCdList, setPlanStatCdList] = useState([])
-
   const globalLocaleState = useRecoilValue(globalLocaleStore)
 
   const [planReqObject, setPlanReqObject] = useState({})
@@ -71,16 +64,6 @@ export default function PlanRequestPop(props) {
     }
   }
 
-  // 상태 검색조건 변경
-  const onSelectionChange = (key) => {
-    if (isObjectNotEmpty(key)) {
-      setSchPlanStatCd(key.clCode)
-    } else {
-      //X누름
-      setSchPlanStatCd('')
-    }
-  }
-
   // 조회
   const onSubmit = (page, type) => {
     const params = {
@@ -194,7 +177,8 @@ export default function PlanRequestPop(props) {
       {
         field: 'title',
         headerName: getMessage('stuff.planReqPopup.gridHeader.title'),
-        minWidth: 150,
+        minWidth: 250,
+        cellStyle: { textAlign: 'left' },
       },
       {
         field: 'address1',
@@ -234,13 +218,6 @@ export default function PlanRequestPop(props) {
     }
   }
 
-  // useEffect(() => {
-  //   const code1 = findCommonCode(115800) //상태
-  //   if (code1 != null) {
-  //     setPlanStatCdList(code1)
-  //   }
-  // }, [commonCode])
-
   useEffect(() => {
     onSubmit(pageNo, 'S')
   }, [])
@@ -431,9 +408,11 @@ export default function PlanRequestPop(props) {
                     </select>
                   </div>
                 </div>
-                <PlanRequestPopQGrid {...gridProps} getSelectedRowdata={getSelectedRowdata} />
-                <div className="pagination-wrap">
-                  <QPagination pageNo={pageNo} pageSize={pageSize} pagePerBlock={10} totalCount={totalCount} handleChangePage={handleChangePage} />
+                <div className="q-grid">
+                  <PlanRequestPopQGrid {...gridProps} getSelectedRowdata={getSelectedRowdata} />
+                  <div className="pagination-wrap">
+                    <QPagination pageNo={pageNo} pageSize={pageSize} pagePerBlock={10} totalCount={totalCount} handleChangePage={handleChangePage} />
+                  </div>
                 </div>
               </div>
             </div>

src/components/management/popup/PlanRequestPopQGrid.jsx

@@ -22,8 +22,8 @@ export default function PlanRequestPopQGrid(props) {
       flex: 1,
       minWidth: 100,
       sortable: false,
-      suppressMovable: false,
-      resizable: false,
+      suppressMovable: true,
+      resizable: true,
       suppressSizeToFit: false,
     }
   }, [])
@@ -58,6 +58,7 @@ export default function PlanRequestPopQGrid(props) {
         defaultColDef={defaultColDef}
         pagination={isPageable}
         onSelectionChanged={onSelectionChanged}
+        autoSizeAllColumns={true}
         overlayNoRowsTemplate={`<span className="ag-overlay-loading-center">${getMessage('stuff.grid.noData')}</span>`}
       />
     </div>

src/hooks/floorPlan/estimate/useEstimateController.js

@@ -80,6 +80,7 @@ export const useEstimateController = (planNo) => {
 
               res.data.pkgAsp = roundedNumber.toString()
             }
+
             setEstimateContextState(res.data)
           }
         }