diff --git a/src/components/main/MainContents.jsx b/src/components/main/MainContents.jsx
index ccae193a..15d11c0a 100644
--- a/src/components/main/MainContents.jsx
+++ b/src/components/main/MainContents.jsx
@@ -125,7 +125,10 @@ export default function MainContents() {
<>
{dayjs(recentNoticeList[0]?.regDt).format('YYYY.MM.DD')}
{recentNoticeList[0]?.title}
- {recentNoticeList[0]?.contents}
+ ') : '' }}
+ >
>
) : (
diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx
index 870a3101..6fe185c7 100644
--- a/src/components/management/StuffDetail.jsx
+++ b/src/components/management/StuffDetail.jsx
@@ -1,7 +1,7 @@
'use client'
import { useState, useEffect, useRef, useContext } from 'react'
-import { useRouter, useSearchParams, usePathname } from 'next/navigation'
+import { useRouter, useSearchParams } from 'next/navigation'
import { Button } from '@nextui-org/react'
import Select, { components } from 'react-select'
import Link from 'next/link'
@@ -147,7 +147,8 @@ export default function StuffDetail() {
let capacity
if (origin) {
capacity = origin / 1000
- return capacity.toFixed(3)
+ //#400 소수점 2자리까지만 변경
+ return capacity.toFixed(2) + 'kW'
} else {
return null
}
@@ -317,6 +318,7 @@ export default function StuffDetail() {
setIsFormValid(true)
}
promiseGet({ url: `/api/object/${objectNo}/detail` }).then((res) => {
+ // console.log('res::::', res.data)
if (res.status === 200) {
if (isObjectNotEmpty(res.data)) {
let surfaceTypeValue
@@ -1449,6 +1451,18 @@ export default function StuffDetail() {
)
}
+
+ // 그리드 더블 클릭
+ const getCellDoubleClicked = (params) => {
+ // if (params?.column?.colId !== 'estimateDate') {
+ // if (params?.data?.planNo && params?.data?.objectNo) {
+ // let objectNo = params?.data?.objectNo
+ // let planNo = params?.data?.planNo
+ // router.push(`/floor-plan?pid=${planNo}&objectNo=${objectNo}`)
+ // }
+ // }
+ }
+
return (
<>
{(editMode === 'NEW' && (
@@ -1709,7 +1723,7 @@ export default function StuffDetail() {
onChange={onSelectionChange2}
getOptionLabel={(x) => x.saleStoreName}
getOptionValue={(x) => x.saleStoreId}
- isDisabled={otherSaleStoreList.length > 0 ? false : true}
+ isDisabled={otherSaleStoreList.length > 1 ? false : true}
isClearable={true}
value={otherSaleStoreList.filter(function (option) {
return option.saleStoreId === otherSelOptions
@@ -2547,7 +2561,7 @@ export default function StuffDetail() {
{/* 진짜R 플랜끝 */}
diff --git a/src/components/management/StuffPlanQGrid.jsx b/src/components/management/StuffPlanQGrid.jsx
index c1e2c605..72c74eb5 100644
--- a/src/components/management/StuffPlanQGrid.jsx
+++ b/src/components/management/StuffPlanQGrid.jsx
@@ -27,13 +27,10 @@ export default function StuffPlanQGrid(props) {
planGridData ? setRowData(planGridData) : ''
}, [planGridData])
- // const onGridReady = useCallback(
- // (params) => {
- // setGridApi(params.api)
- // planGridData ? setRowData(planGridData) : ''
- // },
- // [planGridData],
- // )
+ //그리드 더블클릭 추가
+ const onCellDoubleClicked = useCallback((params) => {
+ props.getCellDoubleClicked(params)
+ }, [])
return (
@@ -47,6 +44,7 @@ export default function StuffPlanQGrid(props) {
pagination={isPageable}
domLayout="autoHeight"
suppressCellFocus={true}
+ onCellDoubleClicked={onCellDoubleClicked}
overlayNoRowsTemplate={`${getMessage('stuff.grid.noData')}`}
/>
diff --git a/src/components/management/StuffSearchCondition.jsx b/src/components/management/StuffSearchCondition.jsx
index 111383ed..3b093201 100644
--- a/src/components/management/StuffSearchCondition.jsx
+++ b/src/components/management/StuffSearchCondition.jsx
@@ -86,14 +86,14 @@ export default function StuffSearchCondition() {
if (stuffSearch.code === 'S') {
if (stuffSearch.pageNo !== 1) {
setStuffSearch({
- schObjectNo: objectNo ? objectNo : stuffSearch.schObjectNo,
- schSaleStoreName: saleStoreName ? saleStoreName : '',
- schAddress: address ? address : '',
- schObjectName: objectName ? objectName : '',
- schDispCompanyName: dispCompanyName ? dispCompanyName : '',
+ schObjectNo: objectNo ? objectNo.trim() : stuffSearch.schObjectNo.trim(),
+ schSaleStoreName: saleStoreName ? saleStoreName.trim() : '',
+ schAddress: address ? address.trim() : '',
+ schObjectName: objectName ? objectName.trim() : '',
+ schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '',
schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : '',
schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '',
- schReceiveUser: receiveUser ? receiveUser : '',
+ schReceiveUser: receiveUser ? receiveUser.trim() : '',
schDateType: dateType,
schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
@@ -106,14 +106,14 @@ export default function StuffSearchCondition() {
})
} else {
setStuffSearch({
- schObjectNo: objectNo ? objectNo : stuffSearch.schObjectNo,
- schSaleStoreName: saleStoreName ? saleStoreName : '',
- schAddress: address ? address : '',
- schObjectName: objectName ? objectName : '',
- schDispCompanyName: dispCompanyName ? dispCompanyName : '',
+ schObjectNo: objectNo ? objectNo.trim() : stuffSearch.schObjectNo.trim(),
+ schSaleStoreName: saleStoreName ? saleStoreName.trim() : '',
+ schAddress: address ? address.trim() : '',
+ schObjectName: objectName ? objectName.trim() : '',
+ schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '',
schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : '',
schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '',
- schReceiveUser: receiveUser ? receiveUser : '',
+ schReceiveUser: receiveUser ? receiveUser.trim() : '',
schDateType: dateType,
schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
@@ -127,14 +127,14 @@ export default function StuffSearchCondition() {
}
} else if (stuffSearch.code === 'FINISH') {
setStuffSearch({
- schObjectNo: objectNo,
- schSaleStoreName: saleStoreName,
- schAddress: address,
- schObjectName: objectName,
- schDispCompanyName: dispCompanyName,
+ schObjectNo: objectNo.trim(),
+ schSaleStoreName: saleStoreName.trim(),
+ schAddress: address.trim(),
+ schObjectName: objectName.trim(),
+ schDispCompanyName: dispCompanyName.trim(),
schSelSaleStoreId: schSelSaleStoreId,
schOtherSelSaleStoreId: otherSaleStoreId,
- schReceiveUser: receiveUser,
+ schReceiveUser: receiveUser.trim(),
schDateType: dateType,
schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
@@ -146,14 +146,14 @@ export default function StuffSearchCondition() {
} else if (stuffSearch.code === 'E') {
if (session.storeId !== 'T01' && session.storeLvl === '1') {
setStuffSearch({
- schObjectNo: stuffSearch?.schObjectNo ? stuffSearch.schObjectNo : objectNo,
- schSaleStoreName: stuffSearch?.schSaleStoreName ? stuffSearch.schSaleStoreName : saleStoreName,
- schAddress: stuffSearch?.schAddress ? stuffSearch.schAddress : address,
- schObjectName: stuffSearch?.schObjectName ? stuffSearch.schObjectName : objectName,
- schDispCompanyName: stuffSearch?.schDispCompanyName ? stuffSearch.schDispCompanyName : dispCompanyName,
+ schObjectNo: stuffSearch?.schObjectNo ? stuffSearch.schObjectNo.trim() : objectNo.trim(),
+ schSaleStoreName: stuffSearch?.schSaleStoreName ? stuffSearch.schSaleStoreName.trim() : saleStoreName.trim(),
+ schAddress: stuffSearch?.schAddress ? stuffSearch.schAddress.trim() : address.trim(),
+ schObjectName: stuffSearch?.schObjectName ? stuffSearch.schObjectName.trim() : objectName.trim(),
+ schDispCompanyName: stuffSearch?.schDispCompanyName ? stuffSearch.schDispCompanyName.trim() : dispCompanyName.trim(),
schSelSaleStoreId: otherSaleStoreId ? schSelSaleStoreId : '',
schOtherSelSaleStoreId: otherSaleStoreId,
- schReceiveUser: stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser : receiveUser,
+ schReceiveUser: stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser.trim() : receiveUser.trim(),
schDateType: dateType,
schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
@@ -167,35 +167,34 @@ export default function StuffSearchCondition() {
} else if (session.storeId === 'T01') {
if (stuffSearch.pageNo !== 1) {
setStuffSearch({
- schObjectNo: objectNo ? objectNo : stuffSearch.schObjectNo,
- schSaleStoreName: saleStoreName ? saleStoreName : '',
- schAddress: address ? address : '',
- schObjectName: objectName ? objectName : '',
- schDispCompanyName: dispCompanyName ? dispCompanyName : '',
+ schObjectNo: objectNo ? objectNo.trim() : stuffSearch.schObjectNo.trim(),
+ schSaleStoreName: saleStoreName ? saleStoreName.trim() : '',
+ schAddress: address ? address.trim() : '',
+ schObjectName: objectName ? objectName.trim() : '',
+ schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '',
schSelSaleStoreId: stuffSearch?.schSelSaleStoreId ? stuffSearch.schSelSaleStoreId : '',
schOtherSelSaleStoreId: stuffSearch?.schOtherSelSaleStoreId ? stuffSearch.schOtherSelSaleStoreId : '',
- schReceiveUser: receiveUser ? receiveUser : '',
+ schReceiveUser: receiveUser ? receiveUser.trim() : '',
schDateType: dateType,
schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
code: 'E',
startRow: 1,
endRow: 1 * stuffSearch?.pageSize,
- // schSortType: stuffSearch?.schSortType ? stuffSearch.schSortType : 'R',
schSortType: 'R',
pageNo: 1,
pageSize: stuffSearch?.pageSize,
})
} else {
setStuffSearch({
- schObjectNo: stuffSearch?.schObjectNo ? stuffSearch.schObjectNo : objectNo,
- schSaleStoreName: stuffSearch?.schSaleStoreName ? stuffSearch.schSaleStoreName : saleStoreName,
- schAddress: stuffSearch?.schAddress ? stuffSearch.schAddress : address,
- schObjectName: stuffSearch?.schObjectName ? stuffSearch.schObjectName : objectName,
- schDispCompanyName: stuffSearch?.schDispCompanyName ? stuffSearch.schDispCompanyName : dispCompanyName,
+ schObjectNo: stuffSearch?.schObjectNo ? stuffSearch.schObjectNo.trim() : objectNo.trim(),
+ schSaleStoreName: stuffSearch?.schSaleStoreName ? stuffSearch.schSaleStoreName.trim() : saleStoreName.trim(),
+ schAddress: stuffSearch?.schAddress ? stuffSearch.schAddress.trim() : address.trim(),
+ schObjectName: stuffSearch?.schObjectName ? stuffSearch.schObjectName.trim() : objectName.trim(),
+ schDispCompanyName: stuffSearch?.schDispCompanyName ? stuffSearch.schDispCompanyName.trim() : dispCompanyName.trim(),
schSelSaleStoreId: schSelSaleStoreId,
schOtherSelSaleStoreId: otherSaleStoreId,
- schReceiveUser: stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser : receiveUser,
+ schReceiveUser: stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser.trim() : receiveUser.trim(),
schDateType: dateType,
schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
@@ -209,14 +208,14 @@ export default function StuffSearchCondition() {
}
} else {
setStuffSearch({
- schObjectNo: stuffSearch?.schObjectNo ? stuffSearch.schObjectNo : objectNo,
- schSaleStoreName: stuffSearch?.schSaleStoreName ? stuffSearch.schSaleStoreName : saleStoreName,
- schAddress: stuffSearch?.schAddress ? stuffSearch.schAddress : address,
- schObjectName: stuffSearch?.schObjectName ? stuffSearch.schObjectName : objectName,
- schDispCompanyName: stuffSearch?.schDispCompanyName ? stuffSearch.schDispCompanyName : dispCompanyName,
+ schObjectNo: stuffSearch?.schObjectNo ? stuffSearch.schObjectNo.trim() : objectNo.trim(),
+ schSaleStoreName: stuffSearch?.schSaleStoreName ? stuffSearch.schSaleStoreName.trim() : saleStoreName.trim(),
+ schAddress: stuffSearch?.schAddress ? stuffSearch.schAddress.trim() : address.trim(),
+ schObjectName: stuffSearch?.schObjectName ? stuffSearch.schObjectName.trim() : objectName.trim(),
+ schDispCompanyName: stuffSearch?.schDispCompanyName ? stuffSearch.schDispCompanyName.trim() : dispCompanyName.trim(),
schSelSaleStoreId: schSelSaleStoreId,
schOtherSelSaleStoreId: otherSaleStoreId,
- schReceiveUser: stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser : receiveUser,
+ schReceiveUser: stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser.trim() : receiveUser.trim(),
schDateType: dateType,
schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
@@ -230,14 +229,14 @@ export default function StuffSearchCondition() {
}
} else {
setStuffSearch({
- schObjectNo: objectNo,
- schSaleStoreName: saleStoreName,
- schAddress: address,
- schObjectName: objectName,
- schDispCompanyName: dispCompanyName,
+ schObjectNo: objectNo.trim(),
+ schSaleStoreName: saleStoreName.trim(),
+ schAddress: address.trim(),
+ schObjectName: objectName.trim(),
+ schDispCompanyName: dispCompanyName.trim(),
schSelSaleStoreId: schSelSaleStoreId,
schOtherSelSaleStoreId: otherSaleStoreId,
- schReceiveUser: receiveUser,
+ schReceiveUser: receiveUser.trim(),
schDateType: dateType,
schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
@@ -347,6 +346,8 @@ export default function StuffSearchCondition() {
get({ url: url }).then((res) => {
if (!isEmptyArray(res)) {
res.map((row) => {
+ //#399
+ row.saleStoreName = row.saleStoreName + ' - ' + row.saleStoreId
row.value = row.saleStoreId
row.label = row.saleStoreName
})
@@ -367,6 +368,8 @@ export default function StuffSearchCondition() {
get({ url: url }).then((res) => {
if (!isEmptyArray(res)) {
res.map((row) => {
+ //#399
+ row.saleStoreName = row.saleStoreName + ' - ' + row.saleStoreId
row.value = row.saleStoreId
row.label = row.saleStoreName
})
@@ -456,6 +459,8 @@ export default function StuffSearchCondition() {
get({ url: url }).then((res) => {
if (!isEmptyArray(res)) {
res.map((row) => {
+ //#399
+ row.saleStoreName = row.saleStoreName + ' - ' + row.saleStoreId
row.value = row.saleStoreId
row.label = row.saleStoreName
})
@@ -474,6 +479,10 @@ export default function StuffSearchCondition() {
if (stuffSearch.code === 'S') {
stuffSearch.schSelSaleStoreId = ''
stuffSearch.schOtherSelSaleStoreId = ''
+ } else if (stuffSearch.code === 'E') {
+ //#401
+ stuffSearch.schSelSaleStoreId = ''
+ stuffSearch.schOtherSelSaleStoreId = ''
}
//2차점 판매점목록비우기