물건현황 수정화면

src/components/management/StuffDetail.jsx

@@ -427,7 +427,6 @@ export default function StuffDetail() {
         //도도부현 / 주소
         setPrefValue(detailData.prefId)
         form.setValue('prefId', detailData.prefId)
-        //prefName ???
         form.setValue('address', detailData.address)
         //발전시뮬
         form.setValue('areaId', detailData.areaId)
@@ -439,7 +438,7 @@ export default function StuffDetail() {
         //한랭지대책시행 coldRegionFlg 1이면 true
         form.setValue('coldRegionFlg', detailData.coldRegionFlg === '1' ? true : false)
 
-        //면조도구분surfaceType
+        //면조도구분 surfaceType null로 내려오면 셋팅 안하고 저장할때 필수값 체크하도록
         // form.setValue('surfaceType', 'Ⅱ')
         // form.setValue('surfaceType', 'III・IV')
         form.setValue('surfaceType', detailData.surfaceType)
@@ -447,8 +446,12 @@ export default function StuffDetail() {
         form.setValue('saltAreaFlg', detailData.saltAreaFlg === '1' ? true : false)
         //설치높이
         form.setValue('installHeight', detailData.installHeight)
-        //계약조건
-        form.setValue('conType', detailData.conType)
+        //계약조건 null로 내려오면 0으로 디폴트셋팅
+        if (detailData.conType === null) {
+          form.setValue('conType', '0')
+        } else {
+          form.setValue('conType', detailData.conType)
+        }
         //메모
         form.setValue('remarks', detailData.remarks)
       })
@@ -888,53 +891,70 @@ export default function StuffDetail() {
 
     let errors = {}
     let fieldNm
+    //담당자
     if (!formData.receiveUser || formData.receiveUser.trim().length === 0) {
       fieldNm = getMessage('stuff.detail.receiveUser')
       errors = fieldNm
     }
+    //물건명
     if (!formData.objectName || formData.objectName.trim().length === 0) {
       fieldNm = getMessage('stuff.detail.objectStatusId')
       errors = fieldNm
     }
+    //경칭
     if (!formData.objectNameOmit) {
       fieldNm = getMessage('stuff.detail.objectNameOmit')
       errors = fieldNm
     }
+    //1차판매점명
     if (!formData.saleStoreId) {
       fieldNm = getMessage('stuff.detail.saleStoreId')
       errors = fieldNm
     }
-
+    //우편번호
     if (!formData.zipNo) {
       fieldNm = getMessage('stuff.detail.zipNo')
       errors = fieldNm
     }
-
+    //주소
+    if (!formData.address) {
+      fieldNm = getMessage('stuff.detail.address')
+      errors = fieldNm
+    }
+    //도도부현
     if (!formData.prefId || formData.prefId === '0') {
       fieldNm = getMessage('stuff.detail.prefId')
       errors = fieldNm
     }
-
+    //발전시뮬레이션지역
     if (!formData.areaId) {
       fieldNm = getMessage('stuff.detail.areaId')
       errors = fieldNm
     }
-
+    //기준풍속
     if (!formData.standardWindSpeedId) {
       fieldNm = getMessage('stuff.detail.standardWindSpeedId')
       errors = fieldNm
     }
-
+    //수직적설량
     if (!formData.verticalSnowCover) {
       fieldNm = getMessage('stuff.detail.verticalSnowCover')
       errors = fieldNm
     }
 
+    //면조도구분
+    if (!formData.surfaceType) {
+      fieldNm = getMessage('stuff.detail.surfaceType')
+      errors = fieldNm
+    }
+    //설치높이
     if (!formData.installHeight) {
       fieldNm = getMessage('stuff.detail.installHeight')
       errors = fieldNm
     }
 
+    //계약조건
+
     if (Object.keys(errors).length > 0) {
       return alert(getMessage('stuff.detail.save.valierror3', [errors]))
     }

src/components/management/StuffHeader.jsx

@@ -6,6 +6,7 @@ import { useRouter, useSearchParams } from 'next/navigation'
 import { globalLocaleStore } from '@/store/localeAtom'
 import { useRecoilValue } from 'recoil'
 import { useMessage } from '@/hooks/useMessage'
+import dayjs from 'dayjs'
 
 export default function StuffHeader() {
   const { getMessage } = useMessage()
@@ -57,11 +58,15 @@ export default function StuffHeader() {
       </div>
       <div className="sub-table-box">
         <div className="info-title">{getMessage('stuff.detail.header.lastEditDatetime')}</div>
-        <div className="info-inner">{headerData.lastEditDatetime}</div>
+        <div className="info-inner">
+          {dayjs(headerData.lastEditDatetime).format('YYYY.MM.DD HH:mm:ss')} ({headerData.lastEditUserName})
+        </div>
       </div>
       <div className="sub-table-box">
         <div className="info-title">{getMessage('stuff.detail.header.createDatetime')}</div>
-        <div className="info-inner">{headerData.createDatetime}</div>
+        <div className="info-inner">
+          {dayjs(headerData.createDatetime).format('YYYY.MM.DD')} ({headerData.createUserName})
+        </div>
       </div>
     </div>
   )

src/locales/ja.json

@@ -486,6 +486,7 @@
   "stuff.detail.saleStoreId": "一次販売店名/ID",
   "stuff.detail.otherSaleStoreId": "二次販売店名/ID",
   "stuff.detail.zipNo": "郵便番号 ",
+  "stuff.detail.address": "住所 ",
   "stuff.detail.btn.addressPop": "住所検索",
   "stuff.detail.btn.addressPop.guide": "※ 郵便番号7桁を入力した後、アドレス検索ボタンをクリックしてください",
   "stuff.detail.prefId": "都道府県 / 住所 ",

src/locales/ko.json

@@ -491,6 +491,7 @@
   "stuff.detail.saleStoreId": "1차 판매점명 / ID",
   "stuff.detail.otherSaleStoreId": "2차 판매점명 / ID",
   "stuff.detail.zipNo": "우편번호",
+  "stuff.detail.address": "주소",
   "stuff.detail.btn.addressPop": "주소검색",
   "stuff.detail.btn.addressPop.guide": "※ 주소검색 버튼을 클릭한 후, 도도부현 정보를 선택해주십시오.",
   "stuff.detail.prefId": "도도부현 / 주소",