@@ -206,7 +215,6 @@ export default function Estimate({ params }) {
defaultValue={state?.charger}
onChange={(e) => {
//담당자 charger
- // console.log('담당자:::::', e.target.value)
setState({ charger: e.target.value })
}}
/>
@@ -227,7 +235,6 @@ export default function Estimate({ params }) {
defaultValue={state?.objectName}
onChange={(e) => {
//안건명 objectName
- // console.log('안건명::::', e.target.value)
setState({ objectName: e.target.value })
}}
/>
@@ -244,7 +251,6 @@ export default function Estimate({ params }) {
if (isObjectNotEmpty(e)) {
setState({ objectNameOmit: e.clCodeNm })
} else {
- // console.log('XXX')
setState({ objectNameOmit: '' })
}
}}
@@ -342,7 +348,6 @@ export default function Estimate({ params }) {
defaultValue={state?.remarks}
onChange={(e) => {
//비고
- // console.log('비고:::::', e.target.value)
setState({ remarks: e.target.value })
}}
/>
diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx
index 9a455216..61cdc1df 100644
--- a/src/components/management/StuffDetail.jsx
+++ b/src/components/management/StuffDetail.jsx
@@ -11,7 +11,6 @@ import { isEmptyArray, isNotEmptyArray, isObjectNotEmpty } from '@/util/common-u
import { useMessage } from '@/hooks/useMessage'
import { useForm } from 'react-hook-form'
import { useRecoilValue, useSetRecoilState } from 'recoil'
-import { sessionStore } from '@/store/commonAtom'
import { SessionContext } from '@/app/SessionProvider'
import FindAddressPop from './popup/FindAddressPop'
import PlanRequestPop from './popup/PlanRequestPop'
@@ -28,7 +27,6 @@ export default function StuffDetail() {
const [selOptions, setSelOptions] = useState('') //선택한 1차점
const [otherSelOptions, setOtherSelOptions] = useState('') //선택한 1차점외
- const sessionState = useRecoilValue(sessionStore)
const { session } = useContext(SessionContext)
const router = useRouter()
@@ -320,12 +318,11 @@ export default function StuffDetail() {
let firstList
let otherList
let favList
- // if (sessionState?.storeId === 'T01') {
if (session?.storeId === 'T01') {
url = `/api/object/saleStore/${session?.storeId}/firstList?userId=${session?.userId}`
} else {
if (session.storeLvl === '1') {
- url = `/api/object/saleStore/${session?.storeId}/list?firstFlg=1&userId=${sessionState?.userId}`
+ url = `/api/object/saleStore/${session?.storeId}/list?firstFlg=1&userId=${session?.userId}`
} else {
url = `/api/object/saleStore/${session?.storeId}/list?firstFlg=1&userId=${session?.userId}`
}
@@ -400,7 +397,6 @@ export default function StuffDetail() {
}
})
}
- // }, [objectNo, sessionState])
}, [objectNo, session])
useEffect(() => {
@@ -1279,9 +1275,7 @@ export default function StuffDetail() {
//1차점 or 2차점 안고르고 임시저장하면
if (params.saleStoreId == '') {
- // params.saleStoreId = sessionState.storeId
params.saleStoreId = session.storeId
- // params.saleStoreLevel = sessionState.storeLvl
params.saleStoreLevel = session.storeLvl
}
@@ -1445,7 +1439,6 @@ export default function StuffDetail() {
- {/* {sessionState?.storeId === 'T01' && ( */}
{session?.storeId === 'T01' && (
<>
@@ -1479,7 +1472,6 @@ export default function StuffDetail() {
>
)}
- {/* {sessionState?.storeId !== 'T01' && sessionState?.storeLvl === '1' && ( */}
{session?.storeId !== 'T01' && session?.storeLvl === '1' && (
<>
@@ -1511,7 +1503,6 @@ export default function StuffDetail() {
>
)}
- {/* {sessionState?.storeId !== 'T01' && sessionState?.storeLvl !== '1' && ( */}
{session?.storeId !== 'T01' && session?.storeLvl !== '1' && (
<>
diff --git a/src/hooks/floorPlan/estimate/useEstimateController.js b/src/hooks/floorPlan/estimate/useEstimateController.js
index 87fa15ca..2b92a14a 100644
--- a/src/hooks/floorPlan/estimate/useEstimateController.js
+++ b/src/hooks/floorPlan/estimate/useEstimateController.js
@@ -1,9 +1,11 @@
import { useAxios } from '@/hooks/useAxios'
-import { useEffect, useReducer, useState } from 'react'
+import { useContext, useEffect, useReducer, useState } from 'react'
import { useRecoilState, useRecoilValue } from 'recoil'
import { globalLocaleStore } from '@/store/localeAtom'
import { estimateState, floorPlanObjectState } from '@/store/floorPlanObjectAtom'
import { isObjectNotEmpty } from '@/util/common-utils'
+import { SessionContext } from '@/app/SessionProvider'
+
const reducer = (prevState, nextState) => {
return { ...prevState, ...nextState }
}
@@ -41,6 +43,7 @@ const defaultEstimateData = {
unit: '',
},
],
+ fileList: [],
}
// Helper functions
@@ -51,14 +54,14 @@ const updateItemInList = (itemList, itemId, updates) => {
}
export const useEstimateController = (planNo) => {
+ const { session } = useContext(SessionContext)
const globalLocaleState = useRecoilValue(globalLocaleStore)
const objectRecoil = useRecoilValue(floorPlanObjectState)
const [estimateData, setEstimateData] = useRecoilState(estimateState)
- const { get, post } = useAxios(globalLocaleState)
+ const { get, post, promisePost } = useAxios(globalLocaleState)
const [isLoading, setIsLoading] = useState(false)
- const { promisePost } = useAxios()
const [state, setState] = useReducer(reducer, defaultEstimateData)
useEffect(() => {
@@ -123,12 +126,32 @@ export const useEstimateController = (planNo) => {
}
useEffect(() => {
- setEstimateData({ ...state })
+ setEstimateData({ ...state, userId: session.userId })
+ //sapSalesStoreCd 추가예정 필수값
+ // setEstimateData({ ...state, userId: session.userId, sapSalesStoreCd : session.sapSalesStoreCd })
}, [state])
//견적서 저장
const handleEstimateSubmit = async () => {
console.log('::담긴 estimateData:::', estimateData)
+ //1. 첨부파일 저장
+ const formData = new FormData()
+ formData.append('file', estimateData.fileList)
+ formData.append('objectNo', estimateData.objectNo)
+ formData.append('planNo', estimateData.planNo)
+ formData.append('category', '10')
+ formData.append('userId', estimateData.userId)
+ for (const value of formData.values()) {
+ console.log('formData::', value)
+ }
+
+ await promisePost({ url: '/api/file/fileUpload', data: formData }).then((res) => {
+ console.log('파일저장::::::::::', res)
+ })
+
+ //2. 상세데이터 저장
+
+ console.log('상세저장시작!!')
return
try {
const result = await promisePost({
|