diff --git a/src/components/management/StuffSearchCondition.jsx b/src/components/management/StuffSearchCondition.jsx
index 421f806f..62e6a9f2 100644
--- a/src/components/management/StuffSearchCondition.jsx
+++ b/src/components/management/StuffSearchCondition.jsx
@@ -15,12 +15,14 @@ import SingleDatePicker from '../common/datepicker/SingleDatePicker'
import { sessionStore } from '@/store/commonAtom'
import { useMessage } from '@/hooks/useMessage'
import { isObjectNotEmpty } from '@/util/common-utils'
+import { searchState } from '@/store/boardAtom'
export default function StuffSearchCondition() {
const sessionState = useRecoilValue(sessionStore)
const [appMessageState, setAppMessageState] = useRecoilState(appMessageStore)
const globalLocaleState = useRecoilValue(globalLocaleStore)
const { getMessage } = useMessage()
const ref = useRef()
+ const ref2 = useRef()
const { get } = useAxios(globalLocaleState)
const objectNoRef = useRef(null)
@@ -59,6 +61,10 @@ export default function StuffSearchCondition() {
const [schSelSaleStoreList, setSchSelSaleStoreList] = useState([]) //판매대리점 자동완성 SELECT 전체
const [favoriteStoreList, setFavoriteStoreList] = useState([]) //즐겨찾기한 판매점목록
const [showSaleStoreList, setShowSaleStoreList] = useState([]) //보여줄 판매점목록
+
+ const [otherSaleStoreList, setOtherSaleStoreList] = useState([]) //1차점 이외 판매점목록
+ const [otherSaleStoreId, setOtherSaleStoreId] = useState('')
+
// 조회
const onSubmit = () => {
let diff = dayjs(endDate).diff(startDate, 'day')
@@ -73,7 +79,7 @@ export default function StuffSearchCondition() {
schAddress: address ? address : stuffSearch?.schAddress,
schObjectName: objectName ? objectName : stuffSearch?.schObjectName,
schDispCompanyName: dispCompanyName ? dispCompanyName : stuffSearch?.schDispCompanyName,
- schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : schSelSaleStoreId,
+ schSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : stuffSearch.schSelSaleStoreId,
schReceiveUser: receiveUser ? receiveUser : stuffSearch?.schReceiveUser,
schDateType: stuffSearch?.schDateType ? stuffSearch.schDateType : dateType,
schFromDt: dayjs(startDate).format('YYYY-MM-DD'),
@@ -90,7 +96,7 @@ export default function StuffSearchCondition() {
schAddress: address ? address : '',
schObjectName: objectName ? objectName : '',
schDispCompanyName: dispCompanyName ? dispCompanyName : '',
- schSelSaleStoreId: schSelSaleStoreId ? schSelSaleStoreId : '',
+ schSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : stuffSearch.schSelSaleStoreId,
schReceiveUser: receiveUser ? receiveUser : '',
schDateType: dateType,
schFromDt: dayjs(startDate).format('YYYY-MM-DD'),
@@ -105,6 +111,7 @@ export default function StuffSearchCondition() {
//초기화
const resetRecoil = () => {
+ //T01아니면 자동완성 초기화 막기
objectNoRef.current.value = ''
saleStoreNameRef.current.value = ''
addressRef.current.value = ''
@@ -121,49 +128,144 @@ export default function StuffSearchCondition() {
setDateType('U')
setStartDate(dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'))
setEndDate(dayjs(new Date()).format('YYYY-MM-DD'))
- setSchSelSaleStoreId('')
- handleClear() //판매대리점선택 자동완성 클리어
- resetStuffRecoil()
+ if (sessionState?.storeId === 'T01') {
+ setSchSelSaleStoreId('')
+ handleClear1() //판매대리점선택 자동완성 클리어
+ resetStuffRecoil()
+ setStuffSearch({
+ ...stuffSearch,
+ code: 'C',
+ schSelSaleStoreId: '',
+ schOtherSelSaleStoreId: '',
+ })
+ } else {
+ if (otherSaleStoreList.length > 1) {
+ handleClear2()
+ setOtherSaleStoreId('')
+ stuffSearch.schObjectNo = ''
+ stuffSearch.schDateType = 'U'
+ } else {
+ stuffSearch.schObjectNo = ''
+ stuffSearch.schDateType = 'U'
+ }
+ }
}
useEffect(() => {
if (isObjectNotEmpty(sessionState)) {
- // storeId가 T01 이거나 1차점일때만 판매대리점 선택 활성화
+ // storeId가 T01 이거나 storeLvl이 1차점일때만 판매대리점 선택 활성화
let url
if (sessionState?.storeId === 'T01') {
- // url = `/api/object/saleStore/${sessionState?.storeId}/list?userId=an1`
- url = `/api/object/saleStore/${sessionState?.storeId}/list?userId=${sessionState?.userId}`
+ //T01일떄
+ url = `/api/object/saleStore/${sessionState?.storeId}/firstList?userId=${sessionState?.userId}`
} else {
- url = `/api/object/saleStore/${sessionState?.storeId}/list`
+ if (sessionState.storeLvl === '1') {
+ //T01아닌 1차점일때
+ url = `/api/object/saleStore/${sessionState?.storeId}/list?firstFlg=1&userId=${sessionState?.userId}`
+ } else {
+ url = `/api/object/saleStore/${sessionState?.storeId}/list?firstFlg=1&userId=${sessionState?.userId}`
+ }
}
+
get({ url: url }).then((res) => {
if (!isEmptyArray(res)) {
res.map((row) => {
row.value = row.saleStoreId
row.label = row.saleStoreName
})
- const allList = res
- const favList = res.filter((row) => row.priority !== 'B')
- setSchSelSaleStoreList(allList)
- setFavoriteStoreList(favList)
- setShowSaleStoreList(favList)
+ let allList
+ let favList
+ let otherList
+ if (sessionState?.storeId === 'T01') {
+ allList = res
+ allList.sort((a, b) => (a.saleStoreId !== 'T01') - (b.saleStoreId !== 'T01') || a.saleStoreId - b.saleStoreId)
+ favList = res.filter((row) => row.saleStoreId === 'T01' || row.priority !== 'B')
+ setSchSelSaleStoreList(allList)
+ setFavoriteStoreList(favList)
+ setShowSaleStoreList(favList)
+ setSchSelSaleStoreId(sessionState?.storeId)
+ setStuffSearch({
+ ...stuffSearch,
+ code: 'S',
+ schSelSaleStoreId: sessionState?.storeId,
+ })
+
+ //T01일때 2차 판매점 호출하기
+ url = `/api/object/saleStore/${sessionState?.storeId}/list?firstFlg=0&userId=${sessionState?.userId}`
+
+ get({ url: url }).then((res) => {
+ if (!isEmptyArray(res)) {
+ res.map((row) => {
+ row.value = row.saleStoreId
+ row.label = row.saleStoreName
+ })
+
+ otherList = res
+ setOtherSaleStoreList(otherList)
+ } else {
+ setOtherSaleStoreList([])
+ }
+ })
+ } else {
+ if (sessionState?.storeLvl === '1') {
+ allList = res
+ favList = res.filter((row) => row.priority !== 'B')
+ otherList = res.filter((row) => row.firstAgentYn === 'N')
+ setSchSelSaleStoreList(allList)
+ setFavoriteStoreList(allList)
+ setShowSaleStoreList(allList)
+ setSchSelSaleStoreId(allList[0].saleStoreId)
+
+ setOtherSaleStoreList(otherList)
+
+ setStuffSearch({
+ ...stuffSearch,
+ code: 'S',
+ schSelSaleStoreId: allList[0].saleStoreId,
+ })
+ } else {
+ //201X112 그냥2차점
+ //2차점인데 34들고있는애 202X217
+ setSchSelSaleStoreList(res)
+ setFavoriteStoreList(res)
+ setShowSaleStoreList(res)
+ setSchSelSaleStoreId(res[0].saleStoreId)
+ otherList = res.filter((row) => row.firstAgentYn === 'N')
+ setOtherSaleStoreList(otherList)
+
+ //선택한 2차점 세션으로 자동셋팅
+ setOtherSaleStoreId(sessionState?.storeId)
+ setStuffSearch({
+ ...stuffSearch,
+ code: 'S',
+ schSelSaleStoreId: otherList[0].saleStoreId,
+ })
+ }
+ }
}
})
}
}, [sessionState])
- //초기화 눌렀을 때 자동완성도..
- const handleClear = () => {
+ //초기화 눌렀을 때 1차판매점 자동완성도..
+ const handleClear1 = () => {
if (ref.current) {
ref.current.clearValue()
}
}
+ const handleClear2 = () => {
+ if (ref2.current) {
+ ref2.current.clearValue()
+ }
+ }
+
//자동완성 인풋
const onInputChange = (key) => {
if (key !== '') {
setShowSaleStoreList(schSelSaleStoreList)
+ setOtherSaleStoreList([])
} else {
setShowSaleStoreList(favoriteStoreList)
}
@@ -172,15 +274,47 @@ export default function StuffSearchCondition() {
//판매대리점 자동완성 변경
const onSelectionChange = (key) => {
if (isObjectNotEmpty(key)) {
+ setOtherSaleStoreId('')
setSchSelSaleStoreId(key.saleStoreId)
- setStuffSearch({
- ...stuffSearch,
- code: 'S',
- schSelSaleStoreId: key.saleStoreId,
+ stuffSearch.schSelSaleStoreId = key.saleStoreId
+ //T01아닌 1차점은 본인으로 디폴트셋팅이고 수정할수없어서 여기안옴
+ //고른 1차점의 saleStoreId로 2차점 API호출하기
+ let url = `/api/object/saleStore/${key.saleStoreId}/list?firstFlg=0&userId=${sessionState?.userId}`
+ let otherList
+ get({ url: url }).then((res) => {
+ if (!isEmptyArray(res)) {
+ res.map((row) => {
+ row.value = row.saleStoreId
+ row.label = row.saleStoreName
+ })
+
+ otherList = res
+ setOtherSaleStoreList(otherList)
+ } else {
+ setOtherSaleStoreList([])
+ }
})
} else {
+ //X누름
setSchSelSaleStoreId('')
- setStuffSearch({ ...stuffSearch, schSelSaleStoreId: '' })
+ stuffSearch.schSelSaleStoreId = ''
+
+ //2차점 판매점목록비우기
+ setOtherSaleStoreList([])
+ }
+ }
+
+ //2차점 자동완성 변경
+ const onSelectionChange2 = (key) => {
+ if (isObjectNotEmpty(key)) {
+ setOtherSaleStoreId(key.saleStoreId)
+ stuffSearch.schOtherSelSaleStoreId = key.saleStoreId
+ } else {
+ //X누르면 검색조건에 1차점으로 셋팅
+ setOtherSaleStoreId('')
+ setSchSelSaleStoreId(schSelSaleStoreId)
+ stuffSearch.schOtherSelSaleStoreId = ''
+ stuffSearch.schSelSaleStoreId = schSelSaleStoreId
}
}
@@ -235,6 +369,8 @@ export default function StuffSearchCondition() {
+
+
@@ -283,6 +419,21 @@ export default function StuffSearchCondition() {
/>
+ | {getMessage('stuff.search.schDispCompanyName')} |
+
+
+ {
+ setDispCompanyName(dispCompanyNameRef.current.value)
+ }}
+ onKeyUp={handleByOnKeyUp}
+ />
+
+ |
| {getMessage('stuff.search.schObjectName')} |
@@ -300,63 +451,6 @@ export default function StuffSearchCondition() {
/>
- {getMessage('stuff.search.schDispCompanyName')} |
-
-
- {
- setDispCompanyName(dispCompanyNameRef.current.value)
- }}
- onKeyUp={handleByOnKeyUp}
- />
-
- |
- {getMessage('stuff.search.schSelSaleStoreId')} |
-
-
- {schSelSaleStoreList?.length > 0 && (
-
- |
-
-
| {getMessage('stuff.search.schReceiveUser')} |
@@ -372,8 +466,130 @@ export default function StuffSearchCondition() {
/>
|
- {getMessage('stuff.search.period')} |
+ {getMessage('stuff.search.schSelSaleStoreId')} |
+
+
+ {sessionState?.storeId === 'T01' && (
+
+
+
+ |
+
+
+ | {getMessage('stuff.search.period')} |
+
diff --git a/src/hooks/roofcover/useMovementSetting.js b/src/hooks/roofcover/useMovementSetting.js
index 355a6bf8..bdee51e4 100644
--- a/src/hooks/roofcover/useMovementSetting.js
+++ b/src/hooks/roofcover/useMovementSetting.js
@@ -2,7 +2,8 @@ import { useRecoilValue } from 'recoil'
import { canvasState } from '@/store/canvasAtom'
import { usePopup } from '@/hooks/usePopup'
import { useMessage } from '@/hooks/useMessage'
-import { useRef, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
+import { useEvent } from '@/hooks/useEvent'
//동선이동 형 올림 내림
export function useMovementSetting(id) {
@@ -11,6 +12,7 @@ export function useMovementSetting(id) {
UP_DOWN: 'updown', //형 올림내림
}
const canvas = useRecoilValue(canvasState)
+ const { initEvent, addCanvasMouseEventListener } = useEvent()
const { closePopup } = usePopup()
const { getMessage } = useMessage()
const buttonType = [
@@ -18,6 +20,7 @@ export function useMovementSetting(id) {
{ id: 2, name: getMessage('modal.movement.flow.line.updown'), type: TYPE.UP_DOWN },
]
const [type, setType] = useState(TYPE.FLOW_LINE)
+ const typeRef = useRef(type)
const FLOW_LINE_REF = {
DOWN_LEFT_INPUT_REF: useRef(null),
@@ -33,7 +36,96 @@ export function useMovementSetting(id) {
DOWN_RADIO_REF: useRef(null),
}
- const handleSave = () => {}
+ useEffect(() => {
+ typeRef.current = type
+ }, [type])
+
+ useEffect(() => {
+ const wallLines = canvas.getObjects().filter((obj) => obj.name === 'wallLine') // 기존 wallLine의 visible false
+ wallLines.forEach((line) => {
+ line.set({ visible: false })
+ })
+ const outerLines = canvas.getObjects().filter((obj) => obj.name === 'outerLine') // 기존 outerLine의 selectable true
+ outerLines.forEach((line) => {
+ line.bringToFront()
+ line.set({ selectable: true })
+ })
+
+ canvas.renderAll()
+ addCanvasMouseEventListener('mouse:move', mouseMoveEvent)
+ return () => {
+ initEvent()
+ const wallLines = canvas.getObjects().filter((obj) => obj.name === 'wallLine')
+ wallLines.forEach((line) => {
+ line.set({ visible: true })
+ })
+ canvas.renderAll()
+ }
+ }, [])
+
+ const mouseMoveEvent = (e) => {
+ if (typeRef.current === TYPE.FLOW_LINE) {
+ flowLineEvent(e)
+ } else {
+ updownEvent(e)
+ }
+ }
+ const flowLineEvent = (e) => {
+ console.log('flow')
+ }
+
+ const updownEvent = (e) => {
+ const target = canvas.getActiveObject()
+ if (!target) {
+ return
+ }
+ const direction = target.direction
+ const { top: targetTop, left: targetLeft } = target
+ const currentX = canvas.getPointer(e.e).x
+ const currentY = Math.floor(canvas.getPointer(e.e).y)
+
+ if (direction === 'left' || direction === 'right') {
+ if (targetTop > currentY) {
+ UP_DOWN_REF.DOWN_RADIO_REF.current.checked = true
+ UP_DOWN_REF.UP_INPUT_REF.current.value = ''
+
+ UP_DOWN_REF.DOWN_INPUT_REF.current.value = Math.floor((Number(Math.abs(targetTop - currentY)) / 10000).toFixed(5) * 100000)
+ } else {
+ UP_DOWN_REF.UP_RADIO_REF.current.checked = true
+ UP_DOWN_REF.DOWN_INPUT_REF.current.value = ''
+
+ UP_DOWN_REF.UP_INPUT_REF.current.value = Math.floor((Number(Math.abs(targetTop - currentY)) / 10000).toFixed(5) * 100000)
+ }
+ } else {
+ if (targetLeft > currentX) {
+ UP_DOWN_REF.DOWN_RADIO_REF.current.checked = true
+ UP_DOWN_REF.UP_INPUT_REF.current.value = ''
+
+ UP_DOWN_REF.DOWN_INPUT_REF.current.value = Math.floor((Number(Math.abs(targetLeft - currentX)) / 10000).toFixed(5) * 100000)
+ } else {
+ UP_DOWN_REF.UP_RADIO_REF.current.checked = true
+ UP_DOWN_REF.DOWN_INPUT_REF.current.value = ''
+
+ UP_DOWN_REF.UP_INPUT_REF.current.value = Math.floor((Number(Math.abs(targetLeft - currentX)) / 10000).toFixed(5) * 100000)
+ }
+ }
+
+ canvas?.renderAll()
+ }
+
+ const getOnlyDecimal = function (_number, _length) {
+ let result
+
+ result = _number % 1
+
+ result = Number(result.toFixed(_length))
+
+ return result * 10
+ }
+
+ const handleSave = () => {
+ closePopup(id)
+ }
return {
TYPE,
diff --git a/src/store/stuffAtom.js b/src/store/stuffAtom.js
index c47321ae..b18fca77 100644
--- a/src/store/stuffAtom.js
+++ b/src/store/stuffAtom.js
@@ -14,7 +14,8 @@ 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',
- schSelSaleStoreId: '', //판매대리점 선택
+ schSelSaleStoreId: '', //1차판매대리점 선택
+ schOtherSelSaleStoreId: '', //1차 이외 판매대리점 선택
startRow: 1,
endRow: 100,
schSortType: 'R', //정렬조건 (R:최근등록일 U:최근수정일)
|