우편번호, 설계의뢰 팝업 더블클릭

src/components/main/MainContents.jsx

@@ -15,6 +15,7 @@ import { QcastContext } from '@/app/QcastProvider'
 import { useSwal } from '@/hooks/useSwal'
 
 import BoardDetailModal from '../community/modal/BoardDetailModal'
+import { handleFileDown } from '@/util/board-utils'
 
 export default function MainContents() {
   const { swalFire } = useSwal()
@@ -22,8 +23,7 @@ export default function MainContents() {
   const { getMessage } = useMessage()
   const router = useRouter()
   const globalLocaleState = useRecoilValue(globalLocaleStore)
-  const { promiseGet } = useAxios(globalLocaleState)
+  const { promiseGet, get } = useAxios(globalLocaleState)
-
   //공지사항
   const [recentNoticeList, setRecentNoticeList] = useState([])
 
@@ -92,6 +92,33 @@ export default function MainContents() {
   const [open, setOpen] = useState(false)
   const [modalNoticeNo, setModalNoticeNo] = useState('')
 
+  // 메인 파일 다운로드
+  const handleDetailFileListDown = async (noticeNo) => {
+    //396, 395테스트
+    const url = `/api/board/detail`
+    const params = new URLSearchParams({
+      noticeNo: noticeNo,
+    })
+
+    const apiUrl = `${url}?${params.toString()}`
+
+    const resultData = await get({ url: apiUrl })
+
+    if (resultData) {
+      if (resultData.result.code === 200) {
+        const boardDetailFileList = resultData.data.listFile
+
+        if (boardDetailFileList && Array.isArray(boardDetailFileList)) {
+          boardDetailFileList.forEach((boardFile) => {
+            handleFileDown(boardFile)
+          })
+        }
+      } else {
+        swalFire({ type: 'alert', text: resultData.result.message, icon: 'error' })
+      }
+    }
+  }
+
   return (
     <div className="main-product-list-wrap">
       <div className="main-product-list">
@@ -114,7 +141,7 @@ export default function MainContents() {
                   >
                     <div className="item-inner">
                       <span className="time">{dayjs(row.lastEditDatetime).format('YYYY.MM.DD HH:mm:ss')}</span>
-                      <span>{row.tempFlg === '0' ? row.objectNo : getMessage('stuff.gridData.tempObjectNo')}</span>
+                      <span className="product">{row.tempFlg === '0' ? row.objectNo : getMessage('stuff.gridData.tempObjectNo')}</span>
                       <span>{row.objectName ? row.objectName : '-'}</span>
                       <span>{row.saleStoreName}</span>
                     </div>
@@ -184,7 +211,13 @@ export default function MainContents() {
         </ProductItem>
         <ProductItem num={4} name={'Data Download'}>
           <div className="data-download-wrap">
-            <button className="data-down" type="button" onClick={() => swalFire({ text: getMessage('main.content.alert.noFile'), type: 'alert' })}>
+            <button
+              className="data-down"
+              type="button"
+              onClick={() => {
+                // handleDetailFileListDown(395)
+              }}
+            >
               <span>{getMessage('main.content.download1')}</span>
             </button>
             <button className="data-down" type="button" onClick={() => swalFire({ text: getMessage('main.content.alert.noFile'), type: 'alert' })}>

src/components/management/Stuff.jsx

@@ -222,7 +222,6 @@ export default function Stuff() {
       if (!params.saleStoreId) {
         params.saleStoreId = session.storeId
       }
-
       async function fetchData() {
         const apiUrl = `/api/object/list?${queryStringFormatter(params)}`
         await get({
@@ -278,6 +277,13 @@ export default function Stuff() {
       if (!stuffSearchParams.saleStoreId) {
         stuffSearchParams.saleStoreId = session.storeId
       }
+      if (stuffSearchParams.schMyDataCheck) {
+        if (session.storeLvl === '1') {
+          //schOtherSelSaleStoreId 초기화 schSelSaleStoreId 에 saleStoreId 담아서 보내기
+          stuffSearchParams.schOtherSelSaleStoreId = ''
+          stuffSearchParams.schSelSaleStoreId = session.storeId
+        }
+      }
 
       async function fetchData() {
         const apiUrl = `/api/object/list?${queryStringFormatter(stuffSearchParams)}`
@@ -312,6 +318,12 @@ export default function Stuff() {
       if (!params.saleStoreId) {
         stuffSearchParams.saleStoreId = session.storeId
       }
+      if (stuffSearchParams.schMyDataCheck) {
+        //schOtherSelSaleStoreId 초기화 schSelSaleStoreId 에 saleStoreId 담아서 보내기
+        stuffSearchParams.schOtherSelSaleStoreId = ''
+        stuffSearchParams.schSelSaleStoreId = session.storeId
+      }
+
       async function fetchData() {
         const apiUrl = `/api/object/list?${queryStringFormatter(stuffSearchParams)}`
         await get({ url: apiUrl }).then((res) => {
@@ -347,6 +359,7 @@ export default function Stuff() {
         code: 'S',
         pageNo: 1,
         pageSize: 100,
+        schMyDataCheck: false,
       }
 
       setStuffSearch({

src/components/management/StuffDetail.jsx

@@ -4,7 +4,6 @@ import { useState, useEffect, useRef, useContext } from 'react'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { Button } from '@nextui-org/react'
 import Select, { components } from 'react-select'
-import Link from 'next/link'
 import { useAxios } from '@/hooks/useAxios'
 import { globalLocaleStore } from '@/store/localeAtom'
 import { isEmptyArray, isNotEmptyArray, isObjectNotEmpty, queryStringFormatter } from '@/util/common-utils'
@@ -289,10 +288,12 @@ export default function StuffDetail() {
               display: 'none',
             }
           }
-          // if (managementState?.createUser === 'T01' && session?.userId !== 'T01') {
+          if (managementState?.createUser === 'T01') {
-          //createUser가 T01인데 로그인사용자가 T01이 아니면 버튼숨기기 적용할지 미정!!!!!!!!
+            if (session.userId !== 'T01') {
-          //buttonStyle = { display: 'none' }
+              // #474
-          // }
+              buttonStyle = { display: 'none' }
+            }
+          }
           return (
             <>
               <div className="grid-cell-btn">
@@ -301,7 +302,6 @@ export default function StuffDetail() {
                   type="button"
                   className="grid-btn"
                   onClick={() => {
-                    //mid:5(견적서), /pid:플랜번호
                     setFloorPlanObjectNo({ floorPlanObjectNo: params.data.objectNo })
                     setIsGlobalLoading(true)
                     setMenuNumber(5)
@@ -1025,6 +1025,8 @@ export default function StuffDetail() {
   const _objectNameOmit = watch('objectNameOmit')
   // saleStoreId: '', //1차 판매점ID
   const _saleStoreId = watch('saleStoreId')
+  // 2차 판매점명
+  const _otherSaleStoreId = watch('otherSaleStoreId')
   // zipNo: '', //우편번호
   const _zipNo = watch('zipNo')
   // prefId: '', //도도부현
@@ -1043,6 +1045,7 @@ export default function StuffDetail() {
   useEffect(() => {
     if (editMode === 'NEW') {
       const formData = form.getValues()
+
       let errors = {}
       if (!formData.receiveUser || formData.receiveUser.trim().length === 0) {
         errors.receiveUser = true
@@ -1057,6 +1060,12 @@ export default function StuffDetail() {
         errors.saleStoreId = true
       }
 
+      if (session?.storeLvl === '2') {
+        if (!formData.otherSaleStoreId) {
+          errors.otherSaleStoreId = true
+        }
+      }
+
       if (!formData.zipNo) {
         errors.zipNo = true
       }
@@ -1099,6 +1108,12 @@ export default function StuffDetail() {
         errors.saleStoreId = true
       }
 
+      if (session?.storeLvl === '2') {
+        if (!formData.otherSaleStoreId) {
+          errors.otherSaleStoreId = true
+        }
+      }
+
       if (!formData.zipNo) {
         errors.zipNo = true
       }
@@ -1130,6 +1145,7 @@ export default function StuffDetail() {
     _objectName,
     _objectNameOmit,
     _saleStoreId,
+    _otherSaleStoreId,
     _zipNo,
     _prefId,
     _address,
@@ -1595,6 +1611,13 @@ export default function StuffDetail() {
 
   // 그리드 더블 클릭 해당플랜의 도면작성 화면으로 이동
   const getCellDoubleClicked = (params) => {
+    //#474정책
+    if (managementState.createUser === 'T01') {
+      if (session.userId !== 'T01') {
+        return false
+      }
+    }
+
     if (params?.column?.colId !== 'estimateDate') {
       if (params?.data?.planNo && params?.data?.objectNo) {
         let objectNo = params?.data?.objectNo
@@ -2462,6 +2485,7 @@ export default function StuffDetail() {
                         <td>
                           <div className="flx-box">
                             <div className="select-wrap mr5" style={{ width: '567px' }}>
+                              상세
                               <Select
                                 id="long-value-select2"
                                 instanceId="long-value-select2"
@@ -2473,16 +2497,18 @@ export default function StuffDetail() {
                                 onChange={onSelectionChange2}
                                 getOptionLabel={(x) => x.saleStoreName}
                                 getOptionValue={(x) => x.saleStoreId}
-                                // isDisabled={
+                                isDisabled={
-                                //   managementState?.tempFlg === '0'
+                                  managementState?.tempFlg === '0'
-                                //     ? true
+                                    ? true
-                                //     : session?.storeLvl === '1' && form.watch('saleStoreId') != ''
+                                    : session?.storeLvl === '1'
-                                //       ? false
+                                      ? otherSaleStoreList.length > 0
-                                //       : false
+                                        ? false
-                                // }
+                                        : true
-                                isDisabled={managementState?.tempFlg === '0' ? true : false}
+                                      : otherSaleStoreList.length === 1
+                                        ? true
+                                        : false
+                                }
                                 isClearable={managementState?.tempFlg === '0' ? false : true}
-                                // isClearable={managementState?.tempFlg === '0' ? false : session?.storeLvl === '1' ? true : true}
                                 value={otherSaleStoreList.filter(function (option) {
                                   return option.saleStoreId === otherSelOptions
                                 })}

src/components/management/StuffSearchCondition.jsx

@@ -343,7 +343,7 @@ export default function StuffSearchCondition() {
       })
     } else {
       if (session?.storeLvl === '2') {
-        if (otherSaleStoreList.length > 1) {
+        if (otherSaleStoreList.length === 1) {
           setOtherSaleStoreId(session.storeId)
           stuffSearch.schOtherSelSaleStoreId = session.storeId
           stuffSearch.schObjectNo = ''
@@ -356,6 +356,24 @@ export default function StuffSearchCondition() {
           stuffSearch.schTempFlg = ''
           stuffSearch.schMyDataCheck = false
 
+          stuffSearch.startRow = 1
+          stuffSearch.endRow = 100
+          stuffSearch.schSortType = 'U'
+          stuffSearch.pageNo = 1
+          stuffSearch.pageSize = 100
+        } else if (otherSaleStoreList.length > 1) {
+          setOtherSaleStoreId('')
+          stuffSearch.schOtherSelSaleStoreId = session.storeId
+          stuffSearch.schObjectNo = ''
+          stuffSearch.schAddress = ''
+          stuffSearch.schObjectName = ''
+          stuffSearch.schSaleStoreName = ''
+          stuffSearch.schReceiveUser = ''
+          stuffSearch.schDispCompanyName = ''
+          stuffSearch.schDateType = 'U'
+          stuffSearch.schTempFlg = ''
+          stuffSearch.schMyDataCheck = false
+
           stuffSearch.startRow = 1
           stuffSearch.endRow = 100
           stuffSearch.schSortType = 'U'
@@ -504,13 +522,23 @@ export default function StuffSearchCondition() {
                 })
               } else {
                 if (stuffSearch.code === 'S') {
-                  setOtherSaleStoreId(session?.storeId)
+                  if (otherList.length === 1) {
-                  setStuffSearch({
+                    setOtherSaleStoreId(session?.storeId)
-                    ...stuffSearch,
+                    setStuffSearch({
-                    code: 'S',
+                      ...stuffSearch,
-                    schSelSaleStoreId: res[0].saleStoreId,
+                      code: 'S',
-                    schOtherSelSaleStoreId: otherList[0].saleStoreId,
+                      schSelSaleStoreId: res[0].saleStoreId,
-                  })
+                      schOtherSelSaleStoreId: otherList[0].saleStoreId,
+                    })
+                  } else {
+                    setOtherSaleStoreId('')
+                    setStuffSearch({
+                      ...stuffSearch,
+                      code: 'S',
+                      schSelSaleStoreId: res[0].saleStoreId,
+                      schOtherSelSaleStoreId: '',
+                    })
+                  }
                 } else {
                   setOtherSaleStoreId(stuffSearch?.schOtherSelSaleStoreId)
                   setStuffSearch({
@@ -561,7 +589,6 @@ export default function StuffSearchCondition() {
       setOtherSaleStoreId('')
       setSchSelSaleStoreId(key.saleStoreId)
       stuffSearch.schSelSaleStoreId = key.saleStoreId
-      //T01아닌 1차점은 본인으로 디폴트셋팅이고 수정할수없어서 여기안옴
       //고른 1차점의 saleStoreId로 2차점 API호출하기
       let url = `/api/object/saleStore/${key.saleStoreId}/list?firstFlg=0&userId=${session?.userId}`
       let otherList
@@ -720,19 +747,61 @@ export default function StuffSearchCondition() {
         setMyDataCheck(stuffSearch.schMyDataCheck)
       }
     } else {
-      setStartDate(stuffSearch?.schFromDt ? stuffSearch.schFromDt : dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'))
+      if (stuffSearch.code === 'DELETE') {
-      setEndDate(stuffSearch?.schToDt ? stuffSearch.schToDt : dayjs(new Date()).format('YYYY-MM-DD'))
+        //1차점인경우
-      setObjectNo(stuffSearch.schObjectNo ? stuffSearch.schObjectNo : objectNo)
+        if (session.storeLvl === '1') {
-      setSaleStoreName(stuffSearch.schSaleStoreName ? stuffSearch.schSaleStoreName : saleStoreName)
+          stuffSearch.schOtherSelSaleStoreId = ''
-      setAddress(stuffSearch.schAddress ? stuffSearch.schAddress : address)
+          setOtherSaleStoreId('')
-      setobjectName(stuffSearch.schObjectName ? stuffSearch.schObjectName : objectName)
+        } else {
-      setDispCompanyName(stuffSearch.schDispCompanyName ? stuffSearch.schDispCompanyName : dispCompanyName)
+          //2차점 본인하나인경우
-      setReceiveUser(stuffSearch.schReceiveUser ? stuffSearch.schReceiveUser : receiveUser)
+          //34있는경우
-      setDateType(stuffSearch.schDateType ? stuffSearch.schDateType : dateType)
+          stuffSearch.schOtherSelSaleStoreId = ''
-      setTempFlg(stuffSearch.schTempFlg ? stuffSearch.schTempFlg : tempFlg)
+          setOtherSaleStoreId('')
-      setMyDataCheck(stuffSearch.schMyDataCheck)
+        }
-      if (session.storeLvl !== '1') {
+
-        stuffSearch.schSelSaleStoreId = ''
+        setObjectNo('')
+        setSaleStoreName('')
+        setAddress('')
+        setobjectName('')
+        setDispCompanyName('')
+        setReceiveUser('')
+        objectNoRef.current.value = ''
+        saleStoreNameRef.current.value = ''
+        addressRef.current.value = ''
+        objectNameRef.current.value = ''
+        dispCompanyNameRef.current.value = ''
+        receiveUserRef.current.value = ''
+        stuffSearch.schObjectNo = ''
+        stuffSearch.schAddress = ''
+        stuffSearch.schObjectName = ''
+        stuffSearch.schSaleStoreName = ''
+        stuffSearch.schReceiveUser = ''
+        stuffSearch.schDispCompanyName = ''
+        stuffSearch.schDateType = 'U'
+        stuffSearch.schTempFlg = ''
+        stuffSearch.schMyDataCheck = false
+        stuffSearch.schFromDt = dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD')
+        stuffSearch.schToDt = dayjs(new Date()).format('YYYY-MM-DD')
+        stuffSearch.startRow = 1
+        stuffSearch.endRow = 100
+        stuffSearch.schSortType = 'U'
+        stuffSearch.pageNo = 1
+        stuffSearch.pageSize = 100
+      } else {
+        setStartDate(stuffSearch?.schFromDt ? stuffSearch.schFromDt : dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'))
+        setEndDate(stuffSearch?.schToDt ? stuffSearch.schToDt : dayjs(new Date()).format('YYYY-MM-DD'))
+        setObjectNo(stuffSearch.schObjectNo ? stuffSearch.schObjectNo : objectNo)
+        setSaleStoreName(stuffSearch.schSaleStoreName ? stuffSearch.schSaleStoreName : saleStoreName)
+        setAddress(stuffSearch.schAddress ? stuffSearch.schAddress : address)
+        setobjectName(stuffSearch.schObjectName ? stuffSearch.schObjectName : objectName)
+        setDispCompanyName(stuffSearch.schDispCompanyName ? stuffSearch.schDispCompanyName : dispCompanyName)
+        setReceiveUser(stuffSearch.schReceiveUser ? stuffSearch.schReceiveUser : receiveUser)
+        setDateType(stuffSearch.schDateType ? stuffSearch.schDateType : dateType)
+        setTempFlg(stuffSearch.schTempFlg ? stuffSearch.schTempFlg : tempFlg)
+        setMyDataCheck(stuffSearch.schMyDataCheck)
+        if (session.storeLvl !== '1') {
+          stuffSearch.schSelSaleStoreId = ''
+        }
       }
     }
 
@@ -802,10 +871,12 @@ export default function StuffSearchCondition() {
       if (e.target.checked) {
         stuffSearch.schMyDataCheck = e.target.value
         setMyDataCheck(true)
-
         if (otherSaleStoreList.length > 1) {
-          stuffSearch.schSelSaleStoreId = otherSaleStoreId
+          stuffSearch.schOtherSelSaleStoreId = session.storeId
-          stuffSearch.schOtherSelSaleStoreId = ''
+          setOtherSaleStoreId(session.storeId)
+        } else {
+          stuffSearch.schSelSaleStoreId = ''
+          stuffSearch.schOtherSelSaleStoreId = session.storeId
         }
       } else {
         setMyDataCheck(false)