diff --git a/src/components/management/StuffSearchCondition.jsx b/src/components/management/StuffSearchCondition.jsx
index a8f86718..cf310719 100644
--- a/src/components/management/StuffSearchCondition.jsx
+++ b/src/components/management/StuffSearchCondition.jsx
@@ -99,7 +99,6 @@ export default function StuffSearchCondition() {
useEffect(() => {
if (isObjectNotEmpty(sessionState)) {
- // console.log('판매대리점 리스트 가져오기 위한 세션정보::::::::', sessionState)
// storeId가 T01 이거나 1차점일때만 판매대리점 선택 활성화
// get({ url: `/api/object/saleStore/201TES01/list` }).then((res) => {
get({ url: `/api/object/saleStore/${sessionState?.storeId}/list` }).then((res) => {
@@ -190,7 +189,6 @@ export default function StuffSearchCondition() {
{
setObjectNo(e.target.value)
@@ -205,7 +203,6 @@ export default function StuffSearchCondition() {
{
setSaleStoreName(e.target.value)
@@ -220,7 +217,6 @@ export default function StuffSearchCondition() {
{
setAddress(e.target.value)
@@ -237,7 +233,6 @@ export default function StuffSearchCondition() {
{
setobjectName(e.target.value)
@@ -252,7 +247,6 @@ export default function StuffSearchCondition() {
{
setDispCompanyName(e.target.value)
diff --git a/src/components/management/popup/PlanRequestPop.jsx b/src/components/management/popup/PlanRequestPop.jsx
index 224519d0..46afad46 100644
--- a/src/components/management/popup/PlanRequestPop.jsx
+++ b/src/components/management/popup/PlanRequestPop.jsx
@@ -12,6 +12,9 @@ import dayjs from 'dayjs'
import PlanRequestPopQGrid from './PlanRequestPopQGrid'
import { sessionStore } from '@/store/commonAtom'
import { planReqSearchState } from '@/store/planReqAtom'
+import { isObjectNotEmpty } from '@/util/common-utils'
+
+import Select from 'react-select'
export default function PlanRequestPop(props) {
const sessionState = useRecoilValue(sessionStore)
@@ -20,6 +23,7 @@ export default function PlanRequestPop(props) {
const { get } = useAxios(globalLocaleState)
const { getMessage } = useMessage()
+ const ref = useRef()
// 검색조건 달력 셋팅
const [startDate, setStartDate] = useState(dayjs(new Date()).add(-3, 'month').format('YYYY-MM-DD'))
const [endDate, setEndDate] = useState(dayjs(new Date()).format('YYYY-MM-DD'))
@@ -34,7 +38,6 @@ export default function PlanRequestPop(props) {
setStartDate: setEndDate,
}
- const ref = useRef()
const resetPlanReqRecoil = useResetRecoilState(planReqSearchState)
const [planReqSearch, setPlanReqSearch] = useRecoilState(planReqSearchState)
@@ -47,14 +50,42 @@ export default function PlanRequestPop(props) {
const [schDateGbn, setSchDateGbn] = useState('S') //기간구분코드(S/R)
//초기화
- const resetRecoil = () => {}
+ const resetRecoil = () => {
+ console.log('초기화')
+ setSchPlanReqNo('')
+ setSchTitle('')
+ setSchAddress('')
+ setSchSaleStoreName('')
+ setSchPlanReqName('')
+ setSchDateGbn('S')
+ setStartDate(dayjs(new Date()).add(-3, 'month').format('YYYY-MM-DD'))
+ setEndDate(dayjs(new Date()).format('YYYY-MM-DD'))
+ setSchPlanStatCd('')
+ handleClear() //셀렉트 자동완성 초기화
+ resetPlanReqRecoil()
+ }
- //초기화 눌렀을 때 자동완성도..
+ //셀렉트 자동완성 초기화
const handleClear = () => {
- if (ref.current.state.dropDown) {
- ref.current.methods.dropDown()
+ if (ref.current) {
+ ref.current.clearValue()
+ }
+ }
+
+ // 상태 검색조건 변경
+ const onSelectionChange = (key) => {
+ //임시작업
+ console.log('E::::::::', key)
+ if (isObjectNotEmpty(key)) {
+ setSchPlanStatCd(key.value)
+ setPlanReqSearch({
+ ...planReqSearch,
+ schPlanStatCd: key.value,
+ })
} else {
- ref.current.state.values = []
+ //X누름
+ setSchPlanStatCd('')
+ setPlanReqSearch({ ...planReqSearch, schPlanStatCd: '' })
}
}
@@ -63,6 +94,11 @@ export default function PlanRequestPop(props) {
setEndDate(planReqSearch?.schEndDt ? planReqSearch.schEndDt : dayjs(new Date()).format('YYYY-MM-DD'))
}, [planReqSearch])
+ // 조회
+ const onSubmit = () => {
+ console.log('조회!!!!', planReqSearch)
+ }
+
const [gridProps, setGridProps] = useState({
gridData: [],
isPageable: false,
@@ -117,6 +153,25 @@ export default function PlanRequestPop(props) {
],
})
+ const tempList = [
+ {
+ label: '완료',
+ value: 'C',
+ },
+ {
+ label: '저장',
+ value: 'I',
+ },
+ {
+ label: '접수',
+ value: 'R',
+ },
+ {
+ label: '제출',
+ value: 'S',
+ },
+ ]
+
return (
@@ -132,8 +187,12 @@ export default function PlanRequestPop(props) {
{getMessage('stuff.planReqPopup.popTitle')}
-
-
+
+
@@ -223,13 +282,22 @@ export default function PlanRequestPop(props) {
{getMessage('stuff.planReqPopup.search.planStatName')} |
-
- |
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 980d1400..0de634d4 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -511,6 +511,11 @@
"stuff.search.period": "期間検索",
"stuff.search.schDateTypeU": "更新日",
"stuff.search.schDateTypeR": "登録日",
+ "stuff.search.grid.title": "商品リスト",
+ "stuff.search.grid.all": "全体",
+ "stuff.search.grid.selected": "選択",
+ "stuff.search.grid.schSortTypeR": "最近の登録日",
+ "stuff.search.grid.schSortTypeU": "最近の更新日",
"stuff.windSelectPopup.title": "風速選択",
"stuff.windSelectPopup.table.selected": "選択",
"stuff.windSelectPopup.table.windspeed": "風速",
diff --git a/src/locales/ko.json b/src/locales/ko.json
index 21aca2be..5f557e27 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -516,6 +516,11 @@
"stuff.search.period": "기간검색",
"stuff.search.schDateTypeU": "갱신일",
"stuff.search.schDateTypeR": "등록일",
+ "stuff.search.grid.title": "물건목록",
+ "stuff.search.grid.all": "전체",
+ "stuff.search.grid.selected": "선택",
+ "stuff.search.grid.schSortTypeR": "최근 등록일",
+ "stuff.search.grid.schSortTypeU": "최근 갱신일",
"stuff.windSelectPopup.title": "풍속선택",
"stuff.windSelectPopup.table.selected": "선택",
"stuff.windSelectPopup.table.windspeed": "풍속",