물건목록 리스트화면 수정

src/components/management/Stuff.jsx

@@ -245,7 +245,6 @@ export default function Stuff() {
         }
 
         async function fetchData() {
-          // const apiUrl = `/api/object/list?saleStoreId=T01&${queryStringFormatter(params)}`
           const apiUrl = `/api/object/list?saleStoreId=${sessionState?.storeId}&${queryStringFormatter(params)}`
           await get({
             url: apiUrl,
@@ -294,7 +293,6 @@ export default function Stuff() {
 
   useEffect(() => {
     if (stuffSearchParams?.code === 'E') {
-      //console.log('조회누름::::::::', stuffSearchParams, sessionState)
       stuffSearchParams.startRow = 1
       stuffSearchParams.endRow = 1 * pageSize
       stuffSearchParams.schSortType = defaultSortType

src/components/management/StuffSearchCondition.jsx

@@ -24,6 +24,13 @@ export default function StuffSearchCondition() {
   const ref = useRef()
   const { get } = useAxios(globalLocaleState)
 
+  const objectNoRef = useRef(null)
+  const saleStoreNameRef = useRef(null)
+  const addressRef = useRef(null)
+  const objectNameRef = useRef(null)
+  const dispCompanyNameRef = useRef(null)
+  const receiveUserRef = useRef(null)
+
   //달력 props 관련 날짜 셋팅
   const [startDate, setStartDate] = useState(dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'))
   const [endDate, setEndDate] = useState(dayjs(new Date()).format('YYYY-MM-DD'))
@@ -42,13 +49,13 @@ export default function StuffSearchCondition() {
   const resetStuffRecoil = useResetRecoilState(stuffSearchState)
   const [stuffSearch, setStuffSearch] = useRecoilState(stuffSearchState)
   const [objectNo, setObjectNo] = useState('') //물건번호
+  const [saleStoreName, setSaleStoreName] = useState('') //판매대리점명
   const [address, setAddress] = useState('') //물건주소
   const [objectName, setobjectName] = useState('') //물건명
-  const [saleStoreName, setSaleStoreName] = useState('') //판매대리점명
-  const [receiveUser, setReceiveUser] = useState('') //담당자
   const [dispCompanyName, setDispCompanyName] = useState('') //견적처
-  const [dateType, setDateType] = useState('U') //갱신일(U)/등록일(R)
   const [schSelSaleStoreId, setSchSelSaleStoreId] = useState('') //판매대리점 선택
+  const [receiveUser, setReceiveUser] = useState('') //담당자
+  const [dateType, setDateType] = useState('U') //갱신일(U)/등록일(R)
 
   const [schSelSaleStoreList, setSchSelSaleStoreList] = useState([]) //판매대리점 자동완성 SELECT
   // 조회
@@ -58,26 +65,52 @@ export default function StuffSearchCondition() {
       return alert(getMessage('stuff.message.periodError'))
     }
 
-    setStuffSearch({
+    if (stuffSearch.code === 'S') {
-      schObjectNo: stuffSearch?.schObjectNo ? stuffSearch.schObjectNo : objectNo,
+      setStuffSearch({
-      schAddress: stuffSearch?.schAddress ? stuffSearch.schAddress : address,
+        schObjectNo: objectNo ? objectNo : stuffSearch?.schObjectNo,
-      schObjectName: stuffSearch?.schObjectName ? stuffSearch.schObjectName : objectName,
+        schSaleStoreName: stuffSearch?.schSaleStoreName ? stuffSearch?.schSaleStoreName : saleStoreName,
-      schSaleStoreName: stuffSearch?.schSaleStoreName ? stuffSearch.schSaleStoreName : saleStoreName,
+        schAddress: address ? address : stuffSearch?.schAddress,
-      schReceiveUser: stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser : receiveUser,
+        schObjectName: objectName ? objectName : stuffSearch?.schObjectName,
-      schDispCompanyName: stuffSearch?.schDispCompanyName ? stuffSearch.schDispCompanyName : dispCompanyName,
+        schDispCompanyName: dispCompanyName ? dispCompanyName : stuffSearch?.schDispCompanyName,
-      schDateType: stuffSearch?.schDateType ? stuffSearch.schDateType : dateType,
+        schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : schSelSaleStoreId,
-      schFromDt: dayjs(startDate).format('YYYY-MM-DD'),
+        schReceiveUser: receiveUser ? receiveUser : stuffSearch?.schReceiveUser,
-      schToDt: dayjs(endDate).format('YYYY-MM-DD'),
+        schDateType: stuffSearch?.schDateType ? stuffSearch.schDateType : dateType,
-      code: 'E',
+        schFromDt: dayjs(startDate).format('YYYY-MM-DD'),
-      schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : schSelSaleStoreId,
+        schToDt: dayjs(endDate).format('YYYY-MM-DD'),
-      startRow: stuffSearch?.startRow ? stuffSearch.startRow : 1,
+        code: 'E',
-      endRow: stuffSearch?.endRow ? stuffSearch.endRow : 100,
+        startRow: stuffSearch?.startRow ? stuffSearch.startRow : 1,
-      schSortType: stuffSearch?.schSortType ? stuffSearch.schSortType : 'R',
+        endRow: stuffSearch?.endRow ? stuffSearch.endRow : 100,
-    })
+        schSortType: stuffSearch?.schSortType ? stuffSearch.schSortType : 'R',
+      })
+    } else {
+      setStuffSearch({
+        schObjectNo: objectNo ? objectNo : '',
+        schSaleStoreName: saleStoreName ? saleStoreName : '',
+        schAddress: address ? address : '',
+        schObjectName: objectName ? objectName : '',
+        schDispCompanyName: dispCompanyName ? dispCompanyName : '',
+        schSelSaleStoreId: schSelSaleStoreId ? schSelSaleStoreId : '',
+        schReceiveUser: receiveUser ? receiveUser : '',
+        schDateType: dateType,
+        schFromDt: dayjs(startDate).format('YYYY-MM-DD'),
+        schToDt: dayjs(endDate).format('YYYY-MM-DD'),
+        code: 'E',
+        startRow: 1,
+        endRow: 100,
+        schSortType: stuffSearch?.schSortType ? stuffSearch.schSortType : 'R',
+      })
+    }
   }
 
   //초기화
   const resetRecoil = () => {
+    objectNoRef.current.value = ''
+    saleStoreNameRef.current.value = ''
+    addressRef.current.value = ''
+    objectNameRef.current.value = ''
+    dispCompanyNameRef.current.value = ''
+    receiveUserRef.current.value = ''
+
     setObjectNo('')
     setAddress('')
     setobjectName('')
@@ -143,6 +176,13 @@ export default function StuffSearchCondition() {
     }
   }, [globalLocaleState])
 
+  // 엔터 이벤트
+  const handleByOnKeyUp = (e) => {
+    if (e.key === 'Enter') {
+      onSubmit()
+    }
+  }
+
   return (
     <>
       {/* 퍼블적용시작 */}
@@ -182,12 +222,13 @@ export default function StuffSearchCondition() {
                   <div className="input-wrap">
                     <input
                       type="text"
+                      ref={objectNoRef}
                       className="input-light"
-                      value={stuffSearch?.code === 'E' || stuffSearch?.code === 'M' ? stuffSearch.schObjectNo : objectNo}
+                      defaultValue={stuffSearch.code === 'E' || stuffSearch.code === 'M' ? stuffSearch?.schObjectNo : objectNo}
                       onChange={(e) => {
-                        setObjectNo(e.target.value)
+                        setObjectNo(objectNoRef.current.value)
-                        setStuffSearch({ ...stuffSearch, code: 'S', schObjectNo: e.target.value })
                       }}
+                      onKeyUp={handleByOnKeyUp}
                     />
                   </div>
                 </td>
@@ -196,11 +237,11 @@ export default function StuffSearchCondition() {
                   <div className="input-wrap">
                     <input
                       type="text"
+                      ref={saleStoreNameRef}
                       className="input-light"
-                      value={stuffSearch?.schSaleStoreName ? stuffSearch.schSaleStoreName : saleStoreName}
+                      defaultValue={stuffSearch.code === 'E' ? stuffSearch?.schSaleStoreName : saleStoreName}
                       onChange={(e) => {
-                        setSaleStoreName(e.target.value)
+                        setSaleStoreName(saleStoreNameRef.current.value)
-                        setStuffSearch({ ...stuffSearch, code: 'S', schSaleStoreName: e.target.value })
                       }}
                     />
                   </div>
@@ -210,11 +251,11 @@ export default function StuffSearchCondition() {
                   <div className="input-wrap">
                     <input
                       type="text"
+                      ref={addressRef}
                       className="input-light"
-                      value={stuffSearch?.schAddress ? stuffSearch.schAddress : address}
+                      defaultValue={stuffSearch.code === 'E' ? stuffSearch?.schAddress : address}
                       onChange={(e) => {
-                        setAddress(e.target.value)
+                        setAddress(addressRef.current.value)
-                        setStuffSearch({ ...stuffSearch, code: 'S', schAddress: e.target.value })
                       }}
                     />
                   </div>
@@ -226,11 +267,11 @@ export default function StuffSearchCondition() {
                   <div className="input-wrap">
                     <input
                       type="text"
+                      ref={objectNameRef}
                       className="input-light"
-                      value={stuffSearch?.schObjectName ? stuffSearch.schObjectName : objectName}
+                      defaultValue={stuffSearch.code === 'E' ? stuffSearch?.schObjectName : objectName}
                       onChange={(e) => {
-                        setobjectName(e.target.value)
+                        setobjectName(objectNameRef.current.value)
-                        setStuffSearch({ ...stuffSearch, code: 'S', schObjectName: e.target.value })
                       }}
                     />
                   </div>
@@ -240,11 +281,11 @@ export default function StuffSearchCondition() {
                   <div className="input-wrap">
                     <input
                       type="text"
+                      ref={dispCompanyNameRef}
                       className="input-light"
-                      value={stuffSearch?.schDispCompanyName ? stuffSearch.schDispCompanyName : dispCompanyName}
+                      defaultValue={stuffSearch.code === 'E' ? stuffSearch?.schDispCompanyName : dispCompanyName}
                       onChange={(e) => {
-                        setDispCompanyName(e.target.value)
+                        setDispCompanyName(dispCompanyNameRef.current.value)
-                        setStuffSearch({ ...stuffSearch, code: 'S', schDispCompanyName: e.target.value })
                       }}
                     />
                   </div>
@@ -293,10 +334,10 @@ export default function StuffSearchCondition() {
                     <input
                       type="text"
                       className="input-light"
-                      value={stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser : receiveUser}
+                      ref={receiveUserRef}
+                      defaultValue={stuffSearch.code === 'E' ? stuffSearch?.schReceiveUser : receiveUser}
                       onChange={(e) => {
-                        setReceiveUser(e.target.value)
+                        setReceiveUser(receiveUserRef.current.value)
-                        setStuffSearch({ ...stuffSearch, code: 'S', schReceiveUser: e.target.value })
                       }}
                     />
                   </div>