물건 목록 검색조건 추가

src/components/management/Stuff.jsx

@@ -219,7 +219,6 @@ export default function Stuff() {
         pageSize: stuffSearchParams?.pageSize ? stuffSearchParams.pageSize : 100,
       }
 
-      // console.log('코드S PA::::::', params)
       async function fetchData() {
         const apiUrl = `/api/object/list?${queryStringFormatter(params)}`
         await get({
@@ -272,7 +271,6 @@ export default function Stuff() {
       stuffSearchParams.schSortType = defaultSortType
       stuffSearchParams.pageNo = stuffSearchParams.pageNo
 
-      // console.log('코드E PA:::::::::::', stuffSearchParams)
       async function fetchData() {
         const apiUrl = `/api/object/list?saleStoreId=${session?.storeId}&${queryStringFormatter(stuffSearchParams)}`
         await get({ url: apiUrl }).then((res) => {
@@ -303,7 +301,6 @@ export default function Stuff() {
       stuffSearchParams.schSortType = defaultSortType
       setPageNo(1)
 
-      // console.log('코드FINISH PA::::::::::::::::', stuffSearchParams)
       async function fetchData() {
         const apiUrl = `/api/object/list?saleStoreId=${session?.storeId}&${queryStringFormatter(stuffSearchParams)}`
         await get({ url: apiUrl }).then((res) => {

src/components/management/StuffSearchCondition.jsx

@@ -61,6 +61,8 @@ export default function StuffSearchCondition() {
   const [receiveUser, setReceiveUser] = useState('') //담당자
   const [dateType, setDateType] = useState('U') //갱신일(U)/등록일(R)
   const [tempFlg, setTempFlg] = useState('') //임시저장여부
+  //내물건보기 체크박스
+  const [myDataCheck, setMyDataCheck] = useState(false)
 
   const [schSelSaleStoreList, setSchSelSaleStoreList] = useState([]) //판매대리점 자동완성 SELECT 전체
   const [favoriteStoreList, setFavoriteStoreList] = useState([]) //즐겨찾기한 판매점목록
@@ -84,7 +86,6 @@ export default function StuffSearchCondition() {
     }
 
     setIsGlobalLoading(true)
-
     if (stuffSearch.code === 'S') {
       if (stuffSearch.pageNo !== 1) {
         setStuffSearch({
@@ -98,6 +99,7 @@ export default function StuffSearchCondition() {
           schReceiveUser: receiveUser ? receiveUser.trim() : '',
           schDateType: dateType,
           schTempFlg: tempFlg, //임시저장물건
+          schMyDataCheck: myDataCheck,
           schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
           schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
           code: 'E',
@@ -108,19 +110,19 @@ export default function StuffSearchCondition() {
           pageSize: stuffSearch?.pageSize,
         })
       } else {
-        if (session.saleStoreId !== 'T01') {
+        if (session.storeId !== 'T01') {
           setStuffSearch({
             schObjectNo: objectNo ? objectNo.trim() : stuffSearch.schObjectNo.trim(),
             schSaleStoreName: saleStoreName ? saleStoreName.trim() : '',
             schAddress: address ? address.trim() : '',
             schObjectName: objectName ? objectName.trim() : '',
             schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '',
-            // schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : '',
             schSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? '' : stuffSearch.schSelSaleStoreId,
             schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '',
             schReceiveUser: receiveUser ? receiveUser.trim() : '',
             schDateType: dateType,
             schTempFlg: tempFlg, //임시저장물건
+            schMyDataCheck: myDataCheck,
             schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
             schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
             code: 'E',
@@ -138,11 +140,11 @@ export default function StuffSearchCondition() {
             schObjectName: objectName ? objectName.trim() : '',
             schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '',
             schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : '',
-            // schSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? '' : stuffSearch.schSelSaleStoreId,
             schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '',
             schReceiveUser: receiveUser ? receiveUser.trim() : '',
             schDateType: dateType,
             schTempFlg: tempFlg, //임시저장물건
+            schMyDataCheck: myDataCheck,
             schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
             schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
             code: 'E',
@@ -166,6 +168,7 @@ export default function StuffSearchCondition() {
         schReceiveUser: receiveUser.trim(),
         schDateType: dateType,
         schTempFlg: tempFlg, //임시저장물건
+        schMyDataCheck: myDataCheck,
         schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
         schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
         code: 'E',
@@ -174,7 +177,6 @@ export default function StuffSearchCondition() {
         schSortType: stuffSearch?.schSortType ? stuffSearch.schSortType : 'U',
       })
     } else if (stuffSearch.code === 'E') {
-      // console.log('E로 바꿈????????????')
       if (session.storeId !== 'T01' && session.storeLvl === '1') {
         setStuffSearch({
           schObjectNo: stuffSearch?.schObjectNo ? stuffSearch.schObjectNo.trim() : objectNo.trim(),
@@ -182,11 +184,12 @@ export default function StuffSearchCondition() {
           schAddress: stuffSearch?.schAddress ? stuffSearch.schAddress.trim() : address.trim(),
           schObjectName: stuffSearch?.schObjectName ? stuffSearch.schObjectName.trim() : objectName.trim(),
           schDispCompanyName: stuffSearch?.schDispCompanyName ? stuffSearch.schDispCompanyName.trim() : dispCompanyName.trim(),
-          schSelSaleStoreId: otherSaleStoreId ? schSelSaleStoreId : '',
+          schSelSaleStoreId: myDataCheck ? schSelSaleStoreId : otherSaleStoreId ? schSelSaleStoreId : '',
-          schOtherSelSaleStoreId: otherSaleStoreId,
+          schOtherSelSaleStoreId: myDataCheck ? '' : otherSaleStoreId,
           schReceiveUser: stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser.trim() : receiveUser.trim(),
           schDateType: dateType,
           schTempFlg: tempFlg, //임시저장물건
+          schMyDataCheck: myDataCheck,
           schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
           schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
           code: 'E',
@@ -209,6 +212,7 @@ export default function StuffSearchCondition() {
             schReceiveUser: receiveUser ? receiveUser.trim() : '',
             schDateType: dateType,
             schTempFlg: tempFlg, //임시저장물건
+            schMyDataCheck: myDataCheck,
             schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
             schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
             code: 'E',
@@ -230,6 +234,7 @@ export default function StuffSearchCondition() {
             schReceiveUser: stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser.trim() : receiveUser.trim(),
             schDateType: dateType,
             schTempFlg: tempFlg, //임시저장물건
+            schMyDataCheck: myDataCheck,
             schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
             schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
             code: 'E',
@@ -252,6 +257,7 @@ export default function StuffSearchCondition() {
           schReceiveUser: stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser.trim() : receiveUser.trim(),
           schDateType: dateType,
           schTempFlg: tempFlg, //임시저장물건
+          schMyDataCheck: myDataCheck,
           schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
           schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
           code: 'E',
@@ -263,7 +269,6 @@ export default function StuffSearchCondition() {
         })
       }
     } else {
-      // console.log('최후ELSE:::::::')
       setStuffSearch({
         schObjectNo: objectNo.trim(),
         schSaleStoreName: saleStoreName.trim(),
@@ -275,6 +280,7 @@ export default function StuffSearchCondition() {
         schReceiveUser: receiveUser.trim(),
         schDateType: dateType,
         schTempFlg: tempFlg, //임시저장물건
+        schMyDataCheck: stuffSearch.schMyDataCheck,
         schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
         schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
         code: 'E',
@@ -299,6 +305,7 @@ export default function StuffSearchCondition() {
     receiveUserRef.current.value = ''
     stuffSearch.schDateType = 'U'
     stuffSearch.schTempFlg = ''
+    stuffSearch.schMyDataCheck = false
     setObjectNo('')
     setAddress('')
     setobjectName('')
@@ -307,6 +314,7 @@ export default function StuffSearchCondition() {
     setDispCompanyName('')
     setDateType('U')
     setTempFlg('')
+    setMyDataCheck(false)
     setStartDate(dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'))
     setEndDate(dayjs(new Date()).format('YYYY-MM-DD'))
     if (session?.storeId === 'T01') {
@@ -325,6 +333,7 @@ export default function StuffSearchCondition() {
         schOtherSelSaleStoreId: '',
         schDateType: 'U',
         schTempFlg: '',
+        schMyDataCheck: false,
         startRow: 1,
         endRow: 100,
         schSortType: 'U',
@@ -334,8 +343,9 @@ export default function StuffSearchCondition() {
     } else {
       if (session?.storeLvl === '2') {
         if (otherSaleStoreList.length > 1) {
-          handleClear2()
+          // handleClear2()
-          setOtherSaleStoreId('')
+          setOtherSaleStoreId(session.storeId)
+          stuffSearch.schOtherSelSaleStoreId = session.storeId
           stuffSearch.schObjectNo = ''
           stuffSearch.schAddress = ''
           stuffSearch.schObjectName = ''
@@ -344,6 +354,7 @@ export default function StuffSearchCondition() {
           stuffSearch.schDispCompanyName = ''
           stuffSearch.schDateType = 'U'
           stuffSearch.schTempFlg = ''
+          stuffSearch.schMyDataCheck = false
 
           stuffSearch.startRow = 1
           stuffSearch.endRow = 100
@@ -359,7 +370,41 @@ export default function StuffSearchCondition() {
           stuffSearch.schDispCompanyName = ''
           stuffSearch.schDateType = 'U'
           stuffSearch.schTempFlg = ''
-
+          stuffSearch.schMyDataCheck = false
+          stuffSearch.startRow = 1
+          stuffSearch.endRow = 100
+          stuffSearch.schSortType = 'U'
+          stuffSearch.pageNo = 1
+          stuffSearch.pageSize = 100
+        }
+      } else if (session?.storeLvl === '1') {
+        if (otherSaleStoreList.length > 0) {
+          handleClear2()
+          setOtherSaleStoreId('')
+          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'
+          stuffSearch.pageNo = 1
+          stuffSearch.pageSize = 100
+        } else {
+          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'
@@ -437,13 +482,10 @@ export default function StuffSearchCondition() {
               setSchSelSaleStoreId(allList[0].saleStoreId)
 
               setOtherSaleStoreList(otherList)
-
               if (stuffSearch.schOtherSelSaleStoreId != '') {
                 setOtherSaleStoreId(stuffSearch.schOtherSelSaleStoreId)
               }
             } else {
-              //10X22, 201X112 그냥2차점
-              //2차점인데 34들고있는애 202X217
               setSchSelSaleStoreList(res)
               setFavoriteStoreList(res)
               setShowSaleStoreList(res)
@@ -452,13 +494,31 @@ export default function StuffSearchCondition() {
               setOtherSaleStoreList(otherList)
 
               //선택한 2차점 세션으로 자동셋팅
-              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 {
+                if (stuffSearch.code === 'S') {
+                  setOtherSaleStoreId(session?.storeId)
+                  setStuffSearch({
+                    ...stuffSearch,
+                    code: 'S',
+                    schSelSaleStoreId: res[0].saleStoreId,
+                    schOtherSelSaleStoreId: otherList[0].saleStoreId,
+                  })
+                } else {
+                  setOtherSaleStoreId(stuffSearch?.schOtherSelSaleStoreId)
+                  setStuffSearch({
+                    ...stuffSearch,
+                    code: 'S',
+                  })
+                }
+              }
             }
           }
         }
@@ -481,9 +541,11 @@ export default function StuffSearchCondition() {
 
   //자동완성 인풋
   const onInputChange = (key) => {
+    //내 물건보기 체크 풀어주기
+    setMyDataCheck(false)
+
     if (key !== '') {
       setShowSaleStoreList(schSelSaleStoreList)
-      // setOtherSaleStoreList([])
     } else {
       setShowSaleStoreList(favoriteStoreList)
     }
@@ -491,6 +553,10 @@ export default function StuffSearchCondition() {
 
   //판매대리점 자동완성 변경
   const onSelectionChange = (key) => {
+    //내 물건보기 체크 풀어주기
+    setMyDataCheck(false)
+    stuffSearch.schMyDataCheck = false
+
     if (isObjectNotEmpty(key)) {
       setOtherSaleStoreId('')
       setSchSelSaleStoreId(key.saleStoreId)
@@ -535,12 +601,19 @@ export default function StuffSearchCondition() {
 
   //2차점 자동완성 변경
   const onSelectionChange2 = (key) => {
+    //내 물건보기 체크 풀어주기
+    setMyDataCheck(false)
+    stuffSearch.schMyDataCheck = false
     if (isObjectNotEmpty(key)) {
       setOtherSaleStoreId(key.saleStoreId)
       stuffSearch.schOtherSelSaleStoreId = key.saleStoreId
 
       //2차점 골랐을때 1차점 값
-      stuffSearch.schSelSaleStoreId = schSelSaleStoreId
+      if (session.storeId === 'T01') {
+        stuffSearch.schSelSaleStoreId = schSelSaleStoreId
+      } else {
+        stuffSearch.schSelSaleStoreId = ''
+      }
     } else {
       //X누르면 검색조건에 1차점으로 셋팅
 
@@ -587,6 +660,7 @@ export default function StuffSearchCondition() {
         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
@@ -620,6 +694,7 @@ export default function StuffSearchCondition() {
         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
@@ -643,6 +718,10 @@ export default function StuffSearchCondition() {
       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 = ''
+      }
     }
 
     if (stuffSearch.schDateType === 'R') {
@@ -654,6 +733,12 @@ export default function StuffSearchCondition() {
     } else if (stuffSearch.schTempFlg === '1') {
       setTempFlg('1')
     }
+
+    if (stuffSearch.schMyDataCheck) {
+      setMyDataCheck(true)
+    } else {
+      setMyDataCheck(false)
+    }
   }, [stuffSearch])
 
   useEffect(() => {
@@ -674,7 +759,47 @@ export default function StuffSearchCondition() {
 
   // 내 물건 보기
   const checkMyData = (e) => {
-    // console.log('e:::::::', e.target.checked)
+    if (session?.storeId === 'T01') {
+      if (e.target.checked) {
+        stuffSearch.schMyDataCheck = e.target.value
+        setMyDataCheck(true)
+        setOtherSaleStoreId('') //2차점 비우기
+        setSchSelSaleStoreId('T01')
+        stuffSearch.schSelSaleStoreId = 'T01'
+        stuffSearch.schOtherSelSaleStoreId = ''
+      } else {
+        stuffSearch.schMyDataCheck = e.target.value
+        setMyDataCheck(false)
+      }
+    } else if (session?.storeLvl === '1') {
+      if (e.target.checked) {
+        stuffSearch.schMyDataCheck = e.target.value
+        setMyDataCheck(true)
+        //schOtherSelSaleStoreId 초기화
+        //schSelSaleStoreId에 saleStoreId담아서보내기
+        setOtherSaleStoreId('') //2차점 비우기
+        setSchSelSaleStoreId(schSelSaleStoreId)
+        stuffSearch.schSelSaleStoreId = schSelSaleStoreId
+        stuffSearch.schOtherSelSaleStoreId = ''
+      } else {
+        setMyDataCheck(false)
+      }
+    } else {
+      //2차점인제 3,4가 없으면 상관없음
+      //3,4등등이 있는경우 처리필요
+      if (e.target.checked) {
+        stuffSearch.schMyDataCheck = e.target.value
+        setMyDataCheck(true)
+
+        if (otherSaleStoreList.length > 1) {
+          stuffSearch.schSelSaleStoreId = otherSaleStoreId
+          stuffSearch.schOtherSelSaleStoreId = ''
+        }
+      } else {
+        setMyDataCheck(false)
+        stuffSearch.schMyDataCheck = e.target.value
+      }
+    }
   }
 
   return (
@@ -1021,7 +1146,7 @@ export default function StuffSearchCondition() {
                         onChange={onSelectionChange2}
                         getOptionLabel={(x) => x.saleStoreName}
                         getOptionValue={(x) => x.saleStoreId}
-                        isDisabled={otherSaleStoreList.length > 0 ? false : true}
+                        isDisabled={otherSaleStoreList != null && otherSaleStoreList.length === 1 ? true : false}
                         isClearable={true}
                         value={otherSaleStoreList.filter(function (option) {
                           return option.saleStoreId === otherSaleStoreId
@@ -1029,7 +1154,15 @@ export default function StuffSearchCondition() {
                       />
                     </div>
                     <div className="d-check-box light">
-                      <input type="checkbox" id="schMine" onChange={(e) => checkMyData(e)} />
+                      <input
+                        type="checkbox"
+                        id="schMine"
+                        checked={stuffSearch.schMyDataCheck ? true : false}
+                        onChange={(e) => {
+                          checkMyData(e)
+                          stuffSearch.schMyDataCheck = e.target.checked
+                        }}
+                      />
                       <label htmlFor="schMine">{getMessage('stuff.search.schMine')}</label>
                     </div>
                   </div>

src/store/stuffAtom.js

@@ -21,6 +21,7 @@ export const stuffSearchState = atom({
     pageNo: 1,
     pageSize: 100,
     schTempFlg: '', //임시저장여부
+    schMyDataCheck: false, //내데이터만 보기
   },
   dangerouslyAllowMutability: true,
 })