qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev

Browse Source
This commit is contained in:
hyojun.choi 2025-02-12 14:48:24 +09:00
commit b789293ae5
2 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/components/management/StuffDetail.jsx
View File

@ -1685,11 +1685,6 @@ export default function StuffDetail() {
{getMessage('stuff.detail.btn.save')} {getMessage('stuff.detail.btn.save')}
</Button> </Button>
)} )}
{/* <Link href="/management/stuff" scroll={false}>
<button type="button" className="btn-origin grey">
{getMessage('stuff.detail.btn.moveList')}
</button>
</Link> */}
<button <button
type="button" type="button"
className="btn-origin grey" className="btn-origin grey"
@ -2198,11 +2193,6 @@ export default function StuffDetail() {
{getMessage('stuff.detail.btn.save')} {getMessage('stuff.detail.btn.save')}
</Button> </Button>
)} )}
{/* <Link href="/management/stuff" scroll={false}>
<button type="button" className="btn-origin grey">
{getMessage('stuff.detail.btn.moveList')}
</button>
</Link> */}
<button <button
type="button" type="button"
className="btn-origin grey" className="btn-origin grey"
@ -2227,11 +2217,6 @@ export default function StuffDetail() {
{managementState?.tempFlg === '0' ? ( {managementState?.tempFlg === '0' ? (
<> <>
<div className="left-unit-box"> <div className="left-unit-box">
{/* <Link href="/management/stuff" scroll={false}>
<button type="button" className="btn-origin grey mr5">
{getMessage('stuff.detail.btn.moveList')}
</button>
</Link> */}
<button <button
type="button" type="button"
className="btn-origin grey mr5" className="btn-origin grey mr5"
@ -2262,11 +2247,6 @@ export default function StuffDetail() {
{getMessage('stuff.detail.btn.save')} {getMessage('stuff.detail.btn.save')}
</Button> </Button>
)} )}
{/* <Link href="/management/stuff" scroll={false}>
<button type="button" className="btn-origin grey">
{getMessage('stuff.detail.btn.moveList')}
</button>
</Link> */}
<button <button
type="button" type="button"
className="btn-origin grey" className="btn-origin grey"
@ -2832,11 +2812,6 @@ export default function StuffDetail() {
</div> </div>
{/* 진짜R 플랜끝 */} {/* 진짜R 플랜끝 */}
<div className="sub-right-footer"> <div className="sub-right-footer">
{/* <Link href="/management/stuff" scroll={false}>
<button type="button" className="btn-origin grey mr5">
{getMessage('stuff.detail.btn.moveList')}
</button>
</Link> */}
<button <button
type="button" type="button"
className="btn-origin grey mr5" className="btn-origin grey mr5"
@ -2867,11 +2842,6 @@ export default function StuffDetail() {
{getMessage('stuff.detail.btn.save')} {getMessage('stuff.detail.btn.save')}
</Button> </Button>
)} )}
{/* <Link href="/management/stuff" scroll={false}>
<button type="button" className="btn-origin grey">
{getMessage('stuff.detail.btn.moveList')}
</button>
</Link> */}
<button <button
type="button" type="button"
className="btn-origin grey" className="btn-origin grey"

2
src/components/management/StuffSearchCondition.jsx
View File

@ -725,6 +725,7 @@ export default function StuffSearchCondition() {
setSchSelSaleStoreId('') setSchSelSaleStoreId('')
setOtherSaleStoreId('') setOtherSaleStoreId('')
stuffSearch.code = 'S'
} else if (stuffSearch.code === 'S') { } else if (stuffSearch.code === 'S') {
setObjectNo('') setObjectNo('')
setSaleStoreName('') setSaleStoreName('')
@ -802,6 +803,7 @@ export default function StuffSearchCondition() {
stuffSearch.schSortType = 'U' stuffSearch.schSortType = 'U'
stuffSearch.pageNo = 1 stuffSearch.pageNo = 1
stuffSearch.pageSize = 100 stuffSearch.pageSize = 100
stuffSearch.code = 'S'
} else { } else {
setStartDate(stuffSearch?.schFromDt ? stuffSearch.schFromDt : dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD')) setStartDate(stuffSearch?.schFromDt ? stuffSearch.schFromDt : dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'))
setEndDate(stuffSearch?.schToDt ? stuffSearch.schToDt : dayjs(new Date()).format('YYYY-MM-DD')) setEndDate(stuffSearch?.schToDt ? stuffSearch.schToDt : dayjs(new Date()).format('YYYY-MM-DD'))