물건 목록 화면 검색시 파라미터 셋팅 관련 변경

src/components/management/Stuff.jsx

@@ -42,7 +42,6 @@ export default function Stuff() {
   //그리드 내부 복사버튼
   const copyNo = async (value) => {
     if (navigator.clipboard && window.isSecureContext) {
-      console.log('trttt')
       await navigator.clipboard
         .writeText(value)
         .then(() => {
@@ -51,9 +50,11 @@ export default function Stuff() {
             type: 'alert',
           })
         })
-        .catch((e) => {
+        .catch(() => {
-          console.log(e)
+          swalFire({
-          alert(getMessage('stuff.detail.header.failCopy'))
+            text: getMessage('stuff.detail.header.failCopy'),
+            type: 'alert',
+          })
         })
     } else {
       // Use the 'out of viewport hidden text area' trick
@@ -213,8 +214,11 @@ export default function Stuff() {
         schToDt: dayjs(new Date()).format('YYYY-MM-DD'),
         startRow: (stuffSearch.pageNo - 1) * stuffSearchParams.pageSize + 1,
         endRow: stuffSearchParams?.endRow,
-        schSelSaleStoreId: stuffSearchParams?.schSelSaleStoreId ? stuffSearchParams.schSelSaleStoreId : '',
+        schSaleStoreId: stuffSearchParams?.schMyDataCheck ? stuffSearchParams.schSaleStoreId : '',
-        schOtherSelSaleStoreId: stuffSearchParams?.schOtherSelSaleStoreId ? stuffSearchParams.schOtherSelSaleStoreId : '',
+        // schSelSaleStoreId: stuffSearchParams?.schSelSaleStoreId ? stuffSearchParams.schSelSaleStoreId : '',
+        // schOtherSelSaleStoreId: stuffSearchParams?.schOtherSelSaleStoreId ? stuffSearchParams.schOtherSelSaleStoreId : '',
+        schSelSaleStoreId: stuffSearchParams?.schMyDataCheck ? '' : stuffSearchParams.schSelSaleStoreId,
+        schOtherSelSaleStoreId: stuffSearchParams?.schMyDataCheck ? '' : stuffSearchParams.schOtherSelSaleStoreId,
         schSortType: stuffSearchParams.schSortType,
         pageNo: stuffSearchParams?.pageNo ? stuffSearchParams.pageNo : 1,
         pageSize: stuffSearchParams?.pageSize ? stuffSearchParams.pageSize : 100,
@@ -223,6 +227,7 @@ export default function Stuff() {
       if (!params.saleStoreId) {
         params.saleStoreId = session.storeId
       }
+
       async function fetchData() {
         const apiUrl = `/api/object/list?${queryStringFormatter(params)}`
         await get({
@@ -279,11 +284,15 @@ export default function Stuff() {
         stuffSearchParams.saleStoreId = session.storeId
       }
       if (stuffSearchParams.schMyDataCheck) {
-        if (session.storeLvl === '1') {
+        //0203 내물건보기 체크시 schSaleStoreId에 storeId셋팅 schSelSaleStoreId, schOtherSelSaleStoreId 비우기
-          //schOtherSelSaleStoreId 초기화 schSelSaleStoreId 에 saleStoreId 담아서 보내기
+        stuffSearchParams.schSaleStoreId = session.storeId
-          stuffSearchParams.schOtherSelSaleStoreId = ''
+        stuffSearchParams.schOtherSelSaleStoreId = ''
-          stuffSearchParams.schSelSaleStoreId = session.storeId
+        stuffSearchParams.schSelSaleStoreId = ''
-        }
+        // if (session.storeLvl === '1') {
+        //   stuffSearchParams.schSaleStoreId = session.storeId
+        //   stuffSearchParams.schOtherSelSaleStoreId = ''
+        //   stuffSearchParams.schSelSaleStoreId = ''
+        // }
       }
 
       async function fetchData() {

src/components/management/StuffSearchCondition.jsx

@@ -87,6 +87,7 @@ export default function StuffSearchCondition() {
     }
 
     setIsGlobalLoading(true)
+
     if (stuffSearch.code === 'S') {
       if (stuffSearch.pageNo !== 1) {
         setStuffSearch({
@@ -95,8 +96,11 @@ export default function StuffSearchCondition() {
           schAddress: address ? address.trim() : '',
           schObjectName: objectName ? objectName.trim() : '',
           schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '',
-          schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : '',
+          // schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : '',
-          schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '',
+          // schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '',
+          schSaleStoreId: stuffSearch?.schMyDataCheck ? stuffSearch?.schSaleStoreId : '',
+          schSelSaleStoreId: stuffSearch?.schMyDataCheck ? '' : stuffSearch.schSelSaleStoreId,
+          schOtherSelSaleStoreId: stuffSearch?.schMyDataCheck ? '' : stuffSearch.schOtherSelSaleStoreId,
           schReceiveUser: receiveUser ? receiveUser.trim() : '',
           schDateType: dateType,
           schTempFlg: tempFlg, //임시저장물건
@@ -307,6 +311,7 @@ export default function StuffSearchCondition() {
     stuffSearch.schDateType = 'U'
     stuffSearch.schTempFlg = ''
     stuffSearch.schMyDataCheck = false
+    stuffSearch.schSaleStoreId = ''
     setObjectNo('')
     setAddress('')
     setobjectName('')
@@ -332,6 +337,7 @@ export default function StuffSearchCondition() {
         schDispCompanyName: '',
         schSelSaleStoreId: '',
         schOtherSelSaleStoreId: '',
+        schSaleStoreId: '',
         schDateType: 'U',
         schTempFlg: '',
         schMyDataCheck: false,
@@ -346,6 +352,7 @@ export default function StuffSearchCondition() {
         if (otherSaleStoreList.length === 1) {
           setOtherSaleStoreId(session.storeId)
           stuffSearch.schOtherSelSaleStoreId = session.storeId
+          stuffSearch.schSaleStoreId = ''
           stuffSearch.schObjectNo = ''
           stuffSearch.schAddress = ''
           stuffSearch.schObjectName = ''
@@ -364,6 +371,7 @@ export default function StuffSearchCondition() {
         } else if (otherSaleStoreList.length > 1) {
           setOtherSaleStoreId('')
           stuffSearch.schOtherSelSaleStoreId = session.storeId
+          stuffSearch.schSaleStoreId = ''
           stuffSearch.schObjectNo = ''
           stuffSearch.schAddress = ''
           stuffSearch.schObjectName = ''
@@ -394,11 +402,13 @@ export default function StuffSearchCondition() {
           stuffSearch.schSortType = 'U'
           stuffSearch.pageNo = 1
           stuffSearch.pageSize = 100
+          stuffSearch.schSaleStoreId = ''
         }
       } else if (session?.storeLvl === '1') {
         if (otherSaleStoreList.length > 0) {
           handleClear2()
           setOtherSaleStoreId('')
+          stuffSearch.schSaleStoreId = ''
           stuffSearch.schObjectNo = ''
           stuffSearch.schAddress = ''
           stuffSearch.schObjectName = ''
@@ -414,6 +424,7 @@ export default function StuffSearchCondition() {
           stuffSearch.pageNo = 1
           stuffSearch.pageSize = 100
         } else {
+          stuffSearch.schSaleStoreId = ''
           stuffSearch.schObjectNo = ''
           stuffSearch.schAddress = ''
           stuffSearch.schObjectName = ''
@@ -583,8 +594,8 @@ export default function StuffSearchCondition() {
   //판매대리점 자동완성 변경
   const onSelectionChange = (key) => {
     //내 물건보기 체크 풀어주기
-    setMyDataCheck(false)
+    setMyDataCheck(stuffSearch.schMyDataCheck)
-    stuffSearch.schMyDataCheck = false
+    // stuffSearch.schMyDataCheck = false
 
     if (isObjectNotEmpty(key)) {
       setOtherSaleStoreId('')
@@ -695,6 +706,7 @@ export default function StuffSearchCondition() {
         stuffSearch.endRow = 100
         stuffSearch.schSelSaleStoreId = ''
         stuffSearch.schOtherSelSaleStoreId = ''
+        stuffSearch.schSaleStoreId = ''
         stuffSearch.schSortType = 'U'
         stuffSearch.pageNo = 1
         stuffSearch.pageSize = 100
@@ -729,6 +741,7 @@ export default function StuffSearchCondition() {
         stuffSearch.endRow = 100
         stuffSearch.schSelSaleStoreId = ''
         stuffSearch.schOtherSelSaleStoreId = ''
+        stuffSearch.schSaleStoreId = ''
         stuffSearch.schSortType = 'U'
         stuffSearch.pageNo = 1
         stuffSearch.pageSize = 100
@@ -759,7 +772,6 @@ export default function StuffSearchCondition() {
           stuffSearch.schOtherSelSaleStoreId = ''
           setOtherSaleStoreId('')
         }
-
         setObjectNo('')
         setSaleStoreName('')
         setAddress('')
@@ -841,47 +853,59 @@ export default function StuffSearchCondition() {
 
   // 내 물건 보기
   const checkMyData = (e) => {
+    //0203 내물건보기 체크시 공통 schSaleStoreId에 storeId담아 전송 schSelSaleStoreId, schOtherSelSaleStoreId 비우기
     if (session?.storeId === 'T01') {
       if (e.target.checked) {
-        stuffSearch.schMyDataCheck = e.target.value
+        stuffSearch.schMyDataCheck = e.target.checked
         setMyDataCheck(true)
         setOtherSaleStoreId('') //2차점 비우기
         setSchSelSaleStoreId('T01')
-        stuffSearch.schSelSaleStoreId = 'T01'
+
+        stuffSearch.schSaleStoreId = session.storeId
+        stuffSearch.schSelSaleStoreId = ''
         stuffSearch.schOtherSelSaleStoreId = ''
+        const key = { saleStoreId: session.storeId }
+        onSelectionChange(key)
       } else {
-        stuffSearch.schMyDataCheck = e.target.value
+        stuffSearch.schSaleStoreId = ''
+        stuffSearch.schMyDataCheck = e.target.checked
+        setSchSelSaleStoreId('')
         setMyDataCheck(false)
+        onSelectionChange(null)
       }
     } else if (session?.storeLvl === '1') {
       if (e.target.checked) {
-        stuffSearch.schMyDataCheck = e.target.value
+        stuffSearch.schMyDataCheck = e.target.checked
         setMyDataCheck(true)
-        //schOtherSelSaleStoreId 초기화
-        //schSelSaleStoreId에 saleStoreId담아서보내기
         setOtherSaleStoreId('') //2차점 비우기
         setSchSelSaleStoreId(schSelSaleStoreId)
-        stuffSearch.schSelSaleStoreId = schSelSaleStoreId
+        stuffSearch.schSaleStoreId = session.storeId
+        stuffSearch.schSelSaleStoreId = ''
         stuffSearch.schOtherSelSaleStoreId = ''
       } else {
+        stuffSearch.schMyDataCheck = e.target.checked
+        stuffSearch.schSaleStoreId = ''
         setMyDataCheck(false)
       }
     } else {
       //2차점인제 3,4가 없으면 상관없음
       //3,4등등이 있는경우 처리필요
       if (e.target.checked) {
-        stuffSearch.schMyDataCheck = e.target.value
+        stuffSearch.schMyDataCheck = e.target.checked
         setMyDataCheck(true)
         if (otherSaleStoreList.length > 1) {
-          stuffSearch.schOtherSelSaleStoreId = session.storeId
+          stuffSearch.schSaleStoreId = session.storeId
+          stuffSearch.schOtherSelSaleStoreId = ''
           setOtherSaleStoreId(session.storeId)
         } else {
+          stuffSearch.schSaleStoreId = session.storeId
           stuffSearch.schSelSaleStoreId = ''
-          stuffSearch.schOtherSelSaleStoreId = session.storeId
+          stuffSearch.schOtherSelSaleStoreId = ''
         }
       } else {
         setMyDataCheck(false)
-        stuffSearch.schMyDataCheck = e.target.value
+        stuffSearch.schMyDataCheck = e.target.checked
+        stuffSearch.schSaleStoreId = ''
       }
     }
   }

src/store/stuffAtom.js

@@ -13,6 +13,7 @@ export const stuffSearchState = atom({
     schFromDt: dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'), //시작일
     schToDt: dayjs(new Date()).format('YYYY-MM-DD'), //종료일
     code: 'S',
+    schSaleStoreId: '', //내물건보기 체크용
     schSelSaleStoreId: '', //1차판매대리점 선택
     schOtherSelSaleStoreId: '', //1차 이외 판매대리점 선택
     startRow: 1,