diff --git a/src/components/header/Header.jsx b/src/components/header/Header.jsx
index c12d237e..29cec36b 100644
--- a/src/components/header/Header.jsx
+++ b/src/components/header/Header.jsx
@@ -89,8 +89,8 @@ export default function Header(props) {
name: 'header.menus.management',
url: '',
children: [
- { id: 3, name: 'header.menus.management.stuff', url: '/management/stuff', children: [] },
- { id: 4, name: 'header.menus.management.plan', url: '/floor-plan', children: [] },
+ { id: 3, name: 'header.menus.management.newStuff', url: '/management/stuff/tempdetail', children: [] },
+ { id: 4, name: 'header.menus.management.stuffList', url: '/management/stuff', children: [] },
],
},
{
diff --git a/src/components/management/Stuff.jsx b/src/components/management/Stuff.jsx
index dfd4f94b..5a1bee40 100644
--- a/src/components/management/Stuff.jsx
+++ b/src/components/management/Stuff.jsx
@@ -71,7 +71,7 @@ export default function Stuff() {
// headerCheckboxSelectionCurrentPageOnly: true, //페이징시 현재 페이지만 체크되도록
// checkboxSelection: true,
// showDisabledCheckboxes: true,
- cellStyle: { textAlign: 'center' },
+ cellStyle: { justifyContent: 'center' },
valueFormatter: function (params) {
if (params.value) {
return dayjs(params?.value).format('YYYY.MM.DD HH:mm:ss')
@@ -85,31 +85,32 @@ export default function Stuff() {
minWidth: 230,
headerName: getMessage('stuff.gridHeader.objectNo'),
cellRenderer: function (params) {
+ let objectNo = params.value.substring(0, 1)
if (params.data.objectNo) {
return (
-
-
-
{params.value}
+
+ {params.value.toLocaleString()}
+ {objectNo === 'R' && (
+
+ )}
)
}
},
cellRendererParams: {
- onPress: copyNo,
+ onClick: copyNo,
},
},
{
field: 'planTotCnt',
headerName: getMessage('stuff.gridHeader.planTotCnt'),
- cellStyle: { textAlign: 'right' },
+ cellStyle: { justifyContent: 'center' },
},
{ field: 'objectName', headerName: getMessage('stuff.gridHeader.objectName'), cellStyle: { textAlign: 'left' } },
{
@@ -131,7 +132,7 @@ export default function Stuff() {
return null
}
},
- cellStyle: { textAlign: 'center' },
+ cellStyle: { justifyContent: 'center' },
},
{
field: 'createDatetime',
@@ -143,7 +144,7 @@ export default function Stuff() {
return null
}
},
- cellStyle: { textAlign: 'center' },
+ cellStyle: { justifyContent: 'center' },
},
],
gridCount: 0,
diff --git a/src/components/management/StuffSubHeader.jsx b/src/components/management/StuffSubHeader.jsx
index f1103143..12a51394 100644
--- a/src/components/management/StuffSubHeader.jsx
+++ b/src/components/management/StuffSubHeader.jsx
@@ -25,58 +25,90 @@ export default function StuffSubHeader({ type }) {
const moveFloorPlan = () => {
setFloorPlanObjectNo({ floorPlanObjectNo: objectNo })
- router.push('/floor-plan')
+ //상단 헤더에서 이동할땐 무조건 첫번째 플랜으로
+ router.push('/floor-plan/estimate/5/1')
}
return (
-
-
- {type === 'list' && (
-
-
{getMessage('header.menus.management')}
-
- )}
- {type === 'temp' && (
-
- -
-
- {getMessage('stuff.temp.subTitle')}
+ <>
+
+
+ {type === 'list' && (
+ <>
+
+
{getMessage('header.menus.management')}
-
-
- )}
- {type === 'detail' && (
-
- )}
-
- {type !== 'detail' && (
-
- -
-
-
-
-
- -
- {getMessage('header.menus.management')}
-
- -
- {getMessage('header.menus.management.stuff')}
-
-
- )}
+
+ -
+
+
+
+
+ -
+ {getMessage('header.menus.management')}
+
+ -
+ {getMessage('header.menus.management.stuffList')}
+
+
+ >
+ )}
+ {type === 'temp' && (
+ <>
+
+ -
+
+ {getMessage('stuff.temp.subTitle')}
+
+
+
+
+ -
+
+
+
+
+ -
+ {getMessage('header.menus.management')}
+
+ -
+ {getMessage('header.menus.management.newStuff')}
+
+
+ >
+ )}
+ {type === 'detail' && (
+ <>
+
+
+ -
+
+
+
+
+ -
+ {getMessage('header.menus.management')}
+
+ -
+ {getMessage('header.menus.management.newStuff')}
+
+
+ >
+ )}
+
-
+ >
)
}
diff --git a/src/locales/ja.json b/src/locales/ja.json
index ea75bf6f..a75b6967 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -3,8 +3,8 @@
"welcome": "환영합니다. {0}님",
"header.menus.home": "ホームへv",
"header.menus.management": "物品及び図面管理",
- "header.menus.management.stuff": "新規物件登録",
- "header.menus.management.plan": "モノ/図面管理",
+ "header.menus.management.newStuff": "新規 物件 登録",
+ "header.menus.management.stuffList": "物件の状況",
"header.menus.community": "コミュニティ",
"header.menus.community.notice": "お知らせ",
"header.menus.community.faq": "FAQ",
@@ -606,7 +606,7 @@
"stuff.planReqPopup.search.schDateGbnR": "受付日",
"stuff.planReqPopup.error.message1": "設計依頼を選択してください。",
"stuff.search.title": "物件状況",
- "stuff.search.btn1": "物件登録",
+ "stuff.search.btn1": "新規 物件 登録",
"stuff.search.btn2": "照会",
"stuff.search.btn3": "初期化",
"stuff.search.schObjectNo": "品番",
diff --git a/src/locales/ko.json b/src/locales/ko.json
index 62336c1c..19dedd58 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -3,8 +3,8 @@
"welcome": "환영합니다. {0}님",
"header.menus.home": "Home",
"header.menus.management": "물건 및 도면 관리",
- "header.menus.management.stuff": "신규 물건 등록",
- "header.menus.management.plan": "사물/도면 관리",
+ "header.menus.management.newStuff": "신규 물건 등록",
+ "header.menus.management.stuffList": "물건 현황",
"header.menus.community": "커뮤니티",
"header.menus.community.notice": "공지",
"header.menus.community.faq": "FAQ",
@@ -611,7 +611,7 @@
"stuff.planReqPopup.search.schDateGbnR": "접수일",
"stuff.planReqPopup.error.message1": "설계의뢰를 선택해주세요.",
"stuff.search.title": "물건현황",
- "stuff.search.btn1": "신규등록",
+ "stuff.search.btn1": "신규 물건 등록",
"stuff.search.btn2": "조회",
"stuff.search.btn3": "초기화",
"stuff.search.schObjectNo": "물건번호",