Merge branch 'dev' into dev-yj

src/components/floor-plan/CanvasMenu.jsx

@@ -220,7 +220,7 @@ export default function CanvasMenu(props) {
               <div className="ico-btn-from">
                 <button className="btn-frame gray ico-flx act">
                   <span className="ico ico01"></span>
-                  <span>{getMessage('plan.menu.estimate.roof.alloc')}</span>
+                  <span>{getMessage('plan.menu.estimate.docDown')}</span>
                 </button>
                 <button className="btn-frame gray ico-flx">
                   <span className="ico ico02"></span>

src/components/management/StuffSubHeader.jsx

@@ -7,7 +7,7 @@ import { useMessage } from '@/hooks/useMessage'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { floorPlanObjectState } from '@/store/floorPlanObjectAtom'
 import { useSetRecoilState } from 'recoil'
-
+import { queryStringFormatter } from '@/util/common-utils'
 export default function StuffSubHeader({ type }) {
   const { getMessage } = useMessage()
   const router = useRouter()
@@ -25,8 +25,13 @@ export default function StuffSubHeader({ type }) {
   const moveFloorPlan = () => {
     setFloorPlanObjectNo({ floorPlanObjectNo: objectNo })
 
-    //상단 헤더에서 이동할땐 무조건 첫번째 플랜으로
-    router.push('/floor-plan/estimate/5/1')
+    const param = {
+      pid: '1',
+    }
+    //확인필요
+    const url = `/floor-plan?${queryStringFormatter(param)}`
+    console.log(url)
+    router.push(url)
   }
 
   return (

src/locales/ja.json

@@ -148,6 +148,7 @@
   "modal.roof.alloc.select.parallel": "並列式",
   "modal.roof.alloc.select.stairs": "カスケード",
   "modal.roof.alloc.apply": "選択した屋根材として割り当て",
+  "plan.menu.estimate.docDown": "文書のダウンロード",
   "plan.menu.estimate.save": "保存",
   "plan.menu.estimate.reset": "初期化",
   "plan.menu.estimate.copy": "コピー",
@@ -783,18 +784,18 @@
   "surface.shape.validate.size.4to5": "④길이는 ⑤보다 큰 값을 넣어주세요.",
   "estimate.detail.header.title": "基本情報",
   "estimate.detail.objectNo": "品番",
-  "estimate.detail.estimateNo": "見積書番号",
-  "estimate.detail.createDatetime": "登録日",
+  "estimate.detail.docNo": "見積書番号",
+  "estimate.detail.drawingEstimateCreateDate": "登録日",
   "estimate.detail.lastEditDatetime": "変更日時",
   "estimate.detail.saleStoreId": "一次販売店名",
   "estimate.detail.estimateDate": "見積日",
   "estimate.detail.otherSaleStoreId": "二次販売店名",
   "estimate.detail.receiveUser": "担当者 ",
-  "estimate.detail.title": "案件名",
-  "estimate.detail.remarks": "メモ",
-  "estimate.detail.orderType": "注文分類",
+  "estimate.detail.objectName": "案件名",
+  "estimate.detail.objectRemarks": "メモ",
+  "estimate.detail.estimateType": "注文分類",
   "estimate.detail.roofCns": "屋根材・仕様施工",
-  "estimate.detail.note": "備考",
+  "estimate.detail.remarks": "備考",
   "estimate.detail.nextSubmit": "後日資料提出",
   "estimate.detail.header.fileList1": "ファイル添付",
   "estimate.detail.fileList.btn": "ファイル選択",

src/locales/ko.json

@@ -152,6 +152,7 @@
   "modal.roof.alloc.select.parallel": "병렬식",
   "modal.roof.alloc.select.stairs": "계단식",
   "modal.roof.alloc.apply": "선택한 지붕재로 할당",
+  "plan.menu.estimate.docDown": "문서 다운로드",
   "plan.menu.estimate.save": "저장",
   "plan.menu.estimate.reset": "초기화",
   "plan.menu.estimate.copy": "복사",
@@ -789,18 +790,18 @@
   "surface.shape.validate.size.4to5": "④길이는 ⑤보다 큰 값을 넣어주세요.",
   "estimate.detail.header.title": "기본정보",
   "estimate.detail.objectNo": "물건번호",
-  "estimate.detail.estimateNo": "견적서 번호",
-  "estimate.detail.createDatetime": "등록일",
+  "estimate.detail.docNo": "견적서 번호",
+  "estimate.detail.drawingEstimateCreateDate": "등록일",
   "estimate.detail.lastEditDatetime": "변경일시",
   "estimate.detail.saleStoreId": "1차 판매점명",
   "estimate.detail.estimateDate": "견적일",
   "estimate.detail.otherSaleStoreId": "2차 판매점명",
   "estimate.detail.receiveUser": "담당자",
-  "estimate.detail.title": "안건명",
-  "estimate.detail.remarks": "메모",
-  "estimate.detail.orderType": "주문분류",
+  "estimate.detail.objectName": "안건명",
+  "estimate.detail.objectRemarks": "메모",
+  "estimate.detail.estimateType": "주문분류",
   "estimate.detail.roofCns": "지붕재・사양시공",
-  "estimate.detail.note": "비고",
+  "estimate.detail.remarks": "비고",
   "estimate.detail.nextSubmit": "후일자료제출",
   "estimate.detail.header.fileList1": "파일첨부",
   "estimate.detail.fileList.btn": "파일선택",