물건 현황 검색조건 추가 ing

src/components/management/Stuff.jsx

@@ -207,6 +207,7 @@ export default function Stuff() {
         schReceiveUser: stuffSearchParams?.schReceiveUser,
         schDispCompanyName: stuffSearchParams?.schDispCompanyName,
         schDateType: stuffSearchParams.schDateType,
+        schTempFlg: stuffSearchParams.schTempFlg, //임시저장 물건
         schFromDt: dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'),
         schToDt: dayjs(new Date()).format('YYYY-MM-DD'),
         startRow: (stuffSearch.pageNo - 1) * stuffSearchParams.pageSize + 1,
@@ -249,6 +250,7 @@ export default function Stuff() {
         schReceiveUser: '',
         schDispCompanyName: '',
         schDateType: 'U',
+        schTempFlg: '',
         schFromDt: dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'),
         schToDt: dayjs(new Date()).format('YYYY-MM-DD'),
         startRow: (pageNo - 1) * pageSize + 1,
@@ -322,6 +324,7 @@ export default function Stuff() {
         schReceiveUser: '',
         schDispCompanyName: '',
         schDateType: 'U',
+        schTempFlg: '',
         schFromDt: dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'),
         schToDt: dayjs(new Date()).format('YYYY-MM-DD'),
         startRow: 1,

src/components/management/StuffSearchCondition.jsx

@@ -60,6 +60,7 @@ export default function StuffSearchCondition() {
   const [schSelSaleStoreId, setSchSelSaleStoreId] = useState('') //판매대리점 선택
   const [receiveUser, setReceiveUser] = useState('') //담당자
   const [dateType, setDateType] = useState('U') //갱신일(U)/등록일(R)
+  const [tempFlg, setTempFlg] = useState('') //임시저장여부
 
   const [schSelSaleStoreList, setSchSelSaleStoreList] = useState([]) //판매대리점 자동완성 SELECT 전체
   const [favoriteStoreList, setFavoriteStoreList] = useState([]) //즐겨찾기한 판매점목록
@@ -95,6 +96,7 @@ export default function StuffSearchCondition() {
           schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '',
           schReceiveUser: receiveUser ? receiveUser.trim() : '',
           schDateType: dateType,
+          schTempFlg: tempFlg, //임시저장물건
           schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
           schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
           code: 'E',
@@ -115,6 +117,7 @@ export default function StuffSearchCondition() {
           schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '',
           schReceiveUser: receiveUser ? receiveUser.trim() : '',
           schDateType: dateType,
+          schTempFlg: tempFlg, //임시저장물건
           schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
           schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
           code: 'E',
@@ -136,6 +139,7 @@ export default function StuffSearchCondition() {
         schOtherSelSaleStoreId: otherSaleStoreId,
         schReceiveUser: receiveUser.trim(),
         schDateType: dateType,
+        schTempFlg: tempFlg, //임시저장물건
         schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
         schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
         code: 'E',
@@ -155,6 +159,7 @@ export default function StuffSearchCondition() {
           schOtherSelSaleStoreId: otherSaleStoreId,
           schReceiveUser: stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser.trim() : receiveUser.trim(),
           schDateType: dateType,
+          schTempFlg: tempFlg, //임시저장물건
           schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
           schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
           code: 'E',
@@ -176,6 +181,7 @@ export default function StuffSearchCondition() {
             schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '',
             schReceiveUser: receiveUser ? receiveUser.trim() : '',
             schDateType: dateType,
+            schTempFlg: tempFlg, //임시저장물건
             schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
             schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
             code: 'E',
@@ -196,6 +202,7 @@ export default function StuffSearchCondition() {
             schOtherSelSaleStoreId: otherSaleStoreId,
             schReceiveUser: stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser.trim() : receiveUser.trim(),
             schDateType: dateType,
+            schTempFlg: tempFlg, //임시저장물건
             schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
             schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
             code: 'E',
@@ -217,6 +224,7 @@ export default function StuffSearchCondition() {
           schOtherSelSaleStoreId: otherSaleStoreId,
           schReceiveUser: stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser.trim() : receiveUser.trim(),
           schDateType: dateType,
+          schTempFlg: tempFlg, //임시저장물건
           schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
           schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
           code: 'E',
@@ -238,6 +246,7 @@ export default function StuffSearchCondition() {
         schOtherSelSaleStoreId: otherSaleStoreId,
         schReceiveUser: receiveUser.trim(),
         schDateType: dateType,
+        schTempFlg: tempFlg, //임시저장물건
         schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
         schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
         code: 'E',
@@ -261,6 +270,7 @@ export default function StuffSearchCondition() {
     dispCompanyNameRef.current.value = ''
     receiveUserRef.current.value = ''
     stuffSearch.schDateType = 'U'
+    stuffSearch.schTempFlg = ''
     setObjectNo('')
     setAddress('')
     setobjectName('')
@@ -268,6 +278,7 @@ export default function StuffSearchCondition() {
     setReceiveUser('')
     setDispCompanyName('')
     setDateType('U')
+    setTempFlg('')
     setStartDate(dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'))
     setEndDate(dayjs(new Date()).format('YYYY-MM-DD'))
     if (session?.storeId === 'T01') {
@@ -285,6 +296,7 @@ export default function StuffSearchCondition() {
         schSelSaleStoreId: '',
         schOtherSelSaleStoreId: '',
         schDateType: 'U',
+        schTempFlg: '',
         startRow: 1,
         endRow: 100,
         schSortType: 'U',
@@ -302,6 +314,7 @@ export default function StuffSearchCondition() {
         stuffSearch.schReceiveUser = ''
         stuffSearch.schDispCompanyName = ''
         stuffSearch.schDateType = 'U'
+        stuffSearch.schTempFlg = ''
 
         stuffSearch.startRow = 1
         stuffSearch.endRow = 100
@@ -316,6 +329,7 @@ export default function StuffSearchCondition() {
         stuffSearch.schReceiveUser = ''
         stuffSearch.schDispCompanyName = ''
         stuffSearch.schDateType = 'U'
+        stuffSearch.schTempFlg = ''
 
         stuffSearch.startRow = 1
         stuffSearch.endRow = 100
@@ -542,6 +556,7 @@ export default function StuffSearchCondition() {
         stuffSearch.schReceiveUser = ''
         stuffSearch.schDispCompanyName = ''
         stuffSearch.schDateType = 'U'
+        stuffSearch.schTempFlg = ''
         stuffSearch.schFromDt = dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD')
         stuffSearch.schToDt = dayjs(new Date()).format('YYYY-MM-DD')
         stuffSearch.startRow = 1
@@ -574,6 +589,7 @@ export default function StuffSearchCondition() {
         stuffSearch.schReceiveUser = ''
         stuffSearch.schDispCompanyName = ''
         stuffSearch.schDateType = 'U'
+        stuffSearch.schTempFlg = ''
         stuffSearch.schFromDt = dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD')
         stuffSearch.schToDt = dayjs(new Date()).format('YYYY-MM-DD')
         stuffSearch.startRow = 1
@@ -596,6 +612,17 @@ export default function StuffSearchCondition() {
       setDispCompanyName(stuffSearch.schDispCompanyName ? stuffSearch.schDispCompanyName : dispCompanyName)
       setReceiveUser(stuffSearch.schReceiveUser ? stuffSearch.schReceiveUser : receiveUser)
       setDateType(stuffSearch.schDateType ? stuffSearch.schDateType : dateType)
+      setTempFlg(stuffSearch.schTempFlg ? stuffSearch.schTempFlg : tempFlg)
+    }
+
+    if (stuffSearch.schDateType === 'R') {
+      setDateType('R')
+    }
+
+    if (stuffSearch.schTempFlg === '0') {
+      setTempFlg('0')
+    } else if (stuffSearch.schTempFlg === '1') {
+      setTempFlg('1')
     }
   }, [stuffSearch])
 
@@ -647,8 +674,8 @@ export default function StuffSearchCondition() {
               <col />
               <col style={{ width: '160px' }} />
               <col />
-              <col style={{ width: '160px' }} />
+              {/* <col style={{ width: '160px' }} />
-              <col />
+              <col /> */}
             </colgroup>
             <tbody>
               <tr>
@@ -684,22 +711,7 @@ export default function StuffSearchCondition() {
                     />
                   </div>
                 </td>
-                <th>{getMessage('stuff.search.schAddress')}</th>
+
-                <td>
-                  <div className="input-wrap">
-                    <input
-                      type="text"
-                      ref={addressRef}
-                      className="input-light"
-                      defaultValue={stuffSearch?.schAddress ? stuffSearch.schAddress : address}
-                      onChange={() => {
-                        stuffSearch.schAddress = addressRef.current.value
-                        setAddress(addressRef.current.value)
-                      }}
-                      onKeyUp={handleByOnKeyUp}
-                    />
-                  </div>
-                </td>
                 <th>{getMessage('stuff.search.schDispCompanyName')}</th>
                 <td>
                   <div className="input-wrap">
@@ -750,8 +762,127 @@ export default function StuffSearchCondition() {
                     />
                   </div>
                 </td>
-                <th>{getMessage('stuff.search.schSelSaleStoreId')}</th>
+                <th>{getMessage('stuff.search.schAddress')}</th>
+                <td>
+                  <div className="input-wrap">
+                    <input
+                      type="text"
+                      ref={addressRef}
+                      className="input-light"
+                      defaultValue={stuffSearch?.schAddress ? stuffSearch.schAddress : address}
+                      onChange={() => {
+                        stuffSearch.schAddress = addressRef.current.value
+                        setAddress(addressRef.current.value)
+                      }}
+                      onKeyUp={handleByOnKeyUp}
+                    />
+                  </div>
+                </td>
+              </tr>
+              <tr>
+                <th>{getMessage('stuff.search.period')}</th>
                 <td colSpan={3}>
+                  <div className="form-flex-wrap">
+                    <div className="radio-wrap mr10">
+                      <div className="d-check-radio light mr10">
+                        <input
+                          type="radio"
+                          name="radio_ptype"
+                          id="radio_u"
+                          // checked={stuffSearch.schDateType === 'U' ? true : false}
+                          checked={dateType === 'U' ? true : false}
+                          value={'U'}
+                          onChange={(e) => {
+                            setDateType(e.target.value)
+                            stuffSearch.schDateType = e.target.value
+                          }}
+                        />
+                        <label htmlFor="radio_u">{getMessage('stuff.search.schDateTypeU')}</label>
+                      </div>
+                      <div className="d-check-radio light">
+                        <input
+                          type="radio"
+                          name="radio_ptype"
+                          id="radio_r"
+                          // checked={stuffSearch.schDateType === 'R' ? true : false}
+                          checked={dateType === 'R' ? true : false}
+                          value={'R'}
+                          onChange={(e) => {
+                            setDateType(e.target.value)
+                            stuffSearch.schDateType = e.target.value
+                          }}
+                        />
+                        <label htmlFor="radio_r">{getMessage('stuff.search.schDateTypeR')}</label>
+                      </div>
+                    </div>
+                    <div className="date-picker-wrap">
+                      <div className="date-picker" style={{ flex: 1 }}>
+                        <SingleDatePicker {...rangeDatePickerProps1} />
+                      </div>
+                      <span> ~ </span>
+                      <div className="date-picker" style={{ flex: 1 }}>
+                        <SingleDatePicker {...rangeDatePickerProps2} />
+                      </div>
+                    </div>
+                  </div>
+                </td>
+                <th>{getMessage('stuff.search.schTempFlgT')}</th>
+                <td>
+                  <div className="form-flex-wrap">
+                    <div className="radio-wrap mr10">
+                      <div className="d-check-radio light mr10">
+                        <input
+                          type="radio"
+                          name="schTempFlg"
+                          id="schTempFlg"
+                          checked={stuffSearch.schTempFlg === '' ? true : false}
+                          value={''}
+                          onChange={(e) => {
+                            // let tempFlg = e.target.value
+                            // setTempFlg(tempFlg)
+                            // console.log('포함을 눌렀어:::::11:::::::', e.target.value)
+                            // console.log('포함을 눌렀어::::22::::::::', tempFlg)
+                            setTempFlg(e.target.value)
+                            stuffSearch.schTempFlg = e.target.value
+                          }}
+                        />
+                        <label htmlFor="schTempFlg">{getMessage('stuff.search.schTempFlg')}</label>
+                      </div>
+                      <div className="d-check-radio light mr10">
+                        <input
+                          type="radio"
+                          name="schTempFlg"
+                          id="schTempFlg0"
+                          checked={stuffSearch.schTempFlg === '0' ? true : false}
+                          value={'0'}
+                          onChange={(e) => {
+                            setTempFlg(e.target.value)
+                            stuffSearch.schTempFlg = e.target.value
+                          }}
+                        />
+                        <label htmlFor="schTempFlg0">{getMessage('stuff.search.schTempFlg0')}</label>
+                      </div>
+                      <div className="d-check-radio light">
+                        <input
+                          type="radio"
+                          name="schTempFlg"
+                          id="schTempFlg1"
+                          checked={stuffSearch.schTempFlg === '1' ? true : false}
+                          value={'1'}
+                          onChange={(e) => {
+                            setTempFlg(e.target.value)
+                            stuffSearch.schTempFlg = e.target.value
+                          }}
+                        />
+                        <label htmlFor="schTempFlg1">{getMessage('stuff.search.schTempFlg1')}</label>
+                      </div>
+                    </div>
+                  </div>
+                </td>
+              </tr>
+              <tr>
+                <th>{getMessage('stuff.search.schSelSaleStoreId')}</th>
+                <td colSpan={5}>
                   <div className="form-flex-wrap">
                     <div className="select-wrap mr5" style={{ flex: 1 }}>
                       {session?.storeId === 'T01' && (
@@ -875,52 +1006,6 @@ export default function StuffSearchCondition() {
                   </div>
                 </td>
               </tr>
-              <tr>
-                <th>{getMessage('stuff.search.period')}</th>
-                <td colSpan={7}>
-                  <div className="form-flex-wrap">
-                    <div className="radio-wrap mr10">
-                      <div className="d-check-radio light mr10">
-                        <input
-                          type="radio"
-                          name="radio_ptype"
-                          id="radio_u"
-                          defaultChecked={stuffSearch.schDateType === 'U' ? true : false}
-                          value={'U'}
-                          onChange={(e) => {
-                            setDateType(e.target.value)
-                            stuffSearch.schDateType = e.target.value
-                          }}
-                        />
-                        <label htmlFor="radio_u">{getMessage('stuff.search.schDateTypeU')}</label>
-                      </div>
-                      <div className="d-check-radio light">
-                        <input
-                          type="radio"
-                          name="radio_ptype"
-                          id="radio_r"
-                          defaultChecked={stuffSearch.schDateType === 'R' ? true : false}
-                          value={'R'}
-                          onChange={(e) => {
-                            setDateType(e.target.value)
-                            stuffSearch.schDateType = e.target.value
-                          }}
-                        />
-                        <label htmlFor="radio_r">{getMessage('stuff.search.schDateTypeR')}</label>
-                      </div>
-                    </div>
-                    <div className="date-picker-wrap">
-                      <div className="date-picker" style={{ flex: 1 }}>
-                        <SingleDatePicker {...rangeDatePickerProps1} />
-                      </div>
-                      <span> ~ </span>
-                      <div className="date-picker" style={{ flex: 1 }}>
-                        <SingleDatePicker {...rangeDatePickerProps2} />
-                      </div>
-                    </div>
-                  </div>
-                </td>
-              </tr>
             </tbody>
           </table>
         </div>

src/locales/ja.json

@@ -724,6 +724,10 @@
   "stuff.search.period": "期間検索",
   "stuff.search.schDateTypeU": "更新日",
   "stuff.search.schDateTypeR": "登録日",
+  "stuff.search.schTempFlgT": "一時保存物",
+  "stuff.search.schTempFlg": "含む",
+  "stuff.search.schTempFlg0": "除外",
+  "stuff.search.schTempFlg1": "一時的なものだけを見る",
   "stuff.search.grid.title": "商品リスト",
   "stuff.search.grid.all": "全体",
   "stuff.search.grid.selected": "選択",

src/locales/ko.json

@@ -734,6 +734,10 @@
   "stuff.search.period": "기간검색",
   "stuff.search.schDateTypeU": "갱신일",
   "stuff.search.schDateTypeR": "등록일",
+  "stuff.search.schTempFlgT": "임시저장 물건",
+  "stuff.search.schTempFlg": "포함",
+  "stuff.search.schTempFlg0": "제외",
+  "stuff.search.schTempFlg1": "임시물건만 조회",
   "stuff.search.grid.title": "물건목록",
   "stuff.search.grid.all": "전체",
   "stuff.search.grid.selected": "선택",

src/store/stuffAtom.js

@@ -20,6 +20,7 @@ export const stuffSearchState = atom({
     schSortType: 'U', //정렬조건 (R:최근등록일 U:최근수정일)
     pageNo: 1,
     pageSize: 100,
+    schTempFlg: '', //임시저장여부
   },
   dangerouslyAllowMutability: true,
 })