Merge branch 'dev' into feature/jaeyoung

src/components/estimate/Estimate.jsx

@@ -1128,7 +1128,7 @@ export default function Estimate({ params }) {
                   <input
                     type="checkbox"
                     id="next"
-                    checked={estimateContextState?.fileFlg === '0' ? false : true}
+                    checked={estimateContextState?.fileFlg === '0' || estimateContextState?.fileFlg === null ? false : true}
                     onChange={(e) => {
                       setEstimateContextState({
                         fileFlg: e.target.checked ? '1' : '0',

src/components/main/ChangePasswordPop.jsx

@@ -72,21 +72,25 @@ export default function ChangePasswordPop(props) {
       chgPwd: _password1,
     }
 
-    await patch({ url: '/api/login/v1.0/user/change-password', data: param }).then((res) => {
+    await patch({ url: '/api/login/v1.0/user/change-password', data: param })
-      if (res.result.code === 200) {
+      .then((res) => {
-        if (res.result.resultCode === 'S') {
+        if (res?.result?.code === 200) {
-          alert(getMessage('main.popup.login.success'))
+          if (res?.result?.resultCode === 'S') {
-          setSessionState({ ...sessionState, pwdInitYn: 'Y' })
+            alert(getMessage('main.popup.login.success'))
-          //메인으로 이동
+            //로그인 화면으로 이동해서 다시 로그인해야되서 setSessionState필요없음
-          props.setChagePasswordPopOpen(false)
+            // setSessionState({ ...sessionState, pwdInitYn: 'Y' })
-          router.push('/')
+            props.setChagePasswordPopOpen(false)
+            router.push('/login')
+          } else {
+            alert(res?.result?.resultMsg)
+          }
         } else {
-          alert(res.result.resultMsg)
+          console.log('code not 200 error')
         }
-      } else {
+      })
-        console.log('error')
+      .catch((error) => {
-      }
+        console.log('catch::::::::', error)
-    })
+      })
   }
 
   return (

src/components/management/popup/PlanRequestPop.jsx

@@ -262,6 +262,11 @@ export default function PlanRequestPop(props) {
     }
   }
 
+  const handleBlur = (e) => {
+    let input = e.target
+    input.value = input.value.replace(/[^0-9]/g, '')
+  }
+
   // 엔터 이벤트
   const handleByOnKeyUp = (e) => {
     if (e.key === 'Enter') {
@@ -318,6 +323,7 @@ export default function PlanRequestPop(props) {
                               className="input-light"
                               value={schPlanReqNo}
                               onKeyUp={handleKeyUp}
+                              onBlur={handleBlur}
                               onChange={(e) => {
                                 setSchPlanReqNo(e.target.value)
                               }}

src/hooks/floorPlan/estimate/useEstimateController.js

@@ -148,12 +148,12 @@ export const useEstimateController = (planNo) => {
     let originFileFlg = false
     let fileFlg = true
     let itemFlg = true
-    if (estimateData.charger.trim().length === 0) {
+    if (estimateData?.charger === null || estimateData?.charger?.trim().length === 0) {
       flag = false
       return alert(getMessage('estimate.detail.save.requiredCharger'))
     }
 
-    if (estimateData.objectName.trim().length === 0) {
+    if (estimateData?.objectName === null || estimateData?.objectName?.trim().length === 0) {
       flag = false
       return alert(getMessage('estimate.detail.save.requiredObjectName'))
     }