Merge branch 'dev' into dev-yj

src/components/management/Stuff.jsx

@@ -50,12 +50,11 @@ export default function Stuff() {
   }
 
   //물건번호 복사버튼 옆에 영역
-  const onDoubleClick = (e) => {
-    let objectNo = e.target.innerText
-    if (objectNo.substring(0, 1) === 'R') {
-      router.push(`${pathname}/detail?objectNo=${objectNo.toString()}`, { scroll: false })
+  const onDoubleClick = (data) => {
+    if (data.tempFlg === '0') {
+      router.push(`${pathname}/detail?objectNo=${data.objectNo.toString()}`, { scroll: false })
     } else {
-      router.push(`${pathname}/tempdetail?objectNo=${objectNo.toString()}`, { scroll: false })
+      router.push(`${pathname}/tempdetail?objectNo=${data.objectNo.toString()}`, { scroll: false })
     }
   }
 
@@ -85,20 +84,21 @@ 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 (
-              <div className="copy-ico-wrap" onDoubleClick={onDoubleClick}>
-                {params.value.toLocaleString()}
-                {objectNo === 'R' && (
-                  <button
-                    type="button"
-                    className="copy_ico"
-                    onClick={() => {
-                      copyNo(params.value)
-                    }}
-                  ></button>
-                )}
+              <div className="copy-ico-wrap" onDoubleClick={() => onDoubleClick(params.data)}>
+                {(params.data.tempFlg === '0' && (
+                  <>
+                    {params.value.toLocaleString()}
+                    <button
+                      type="button"
+                      className="copy_ico"
+                      onClick={() => {
+                        copyNo(params.value)
+                      }}
+                    ></button>
+                  </>
+                )) || <>{getMessage('stuff.gridData.tempObjectNo')}</>}
               </div>
             )
           }
@@ -157,7 +157,7 @@ export default function Stuff() {
     } else {
       //T 면 임시 R은 진짜
       if (event.data.objectNo) {
-        if (event.data.objectNo.substring(0, 1) === 'R') {
+        if (event.data.tempFlg === '0') {
           router.push(`${pathname}/detail?objectNo=${event.data.objectNo.toString()}`, { scroll: false })
         } else {
           router.push(`${pathname}/tempdetail?objectNo=${event.data.objectNo.toString()}`, { scroll: false })

src/locales/ja.json

@@ -514,6 +514,7 @@
   "stuff.gridHeader.receiveUser": "担当者",
   "stuff.gridHeader.specificationConfirmDate": "仕様確認日",
   "stuff.gridHeader.createDatetime": "登録日",
+  "stuff.gridData.tempObjectNo": "一時保存物",
   "stuff.message.periodError": "最大1年間閲覧可能.",
   "stuff.addressPopup.title": "郵便番号",
   "stuff.addressPopup.placeholder": "郵便番号の7桁を入力してください。",

src/locales/ko.json

@@ -519,6 +519,7 @@
   "stuff.gridHeader.receiveUser": "담당자",
   "stuff.gridHeader.specificationConfirmDate": "사양확인일",
   "stuff.gridHeader.createDatetime": "등록일",
+  "stuff.gridData.tempObjectNo": "임시저장물건",
   "stuff.message.periodError": "최대1년 조회 가능합니다.",
   "stuff.addressPopup.title": "우편번호",
   "stuff.addressPopup.placeholder": "우편번호의 7자리를 입력하세요.",