diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx
index 83ce0860..a544ced7 100644
--- a/src/components/estimate/Estimate.jsx
+++ b/src/components/estimate/Estimate.jsx
@@ -13,7 +13,7 @@ import dayjs from 'dayjs'
import { useCommonCode } from '@/hooks/common/useCommonCode'
import { useEstimateController } from '@/hooks/floorPlan/estimate/useEstimateController'
import { SessionContext } from '@/app/SessionProvider'
-import Select from 'react-select'
+import Select, {components} from 'react-select'
import { convertNumberToPriceDecimal, convertNumberToPriceDecimalToFixed } from '@/util/common-utils'
import ProductFeaturesPop from './popup/ProductFeaturesPop'
import { v4 as uuidv4 } from 'uuid'
@@ -1883,8 +1883,17 @@ export default function Estimate({}) {
}
}}
menuPlacement={'auto'}
- getOptionLabel={(x) => x.itemName}
+ getOptionLabel={(x) => x.itemName + " (" + x.itemNo + ")"}
getOptionValue={(x) => x.itemNo}
+ components={{
+ SingleValue:({children, ...props}) =>{
+ return (
+
+ {props.data.itemName}
+
+ )
+ }
+ }}
isClearable={false}
isDisabled={!!item?.paDispOrder}
value={displayItemList.filter(function (option) {
@@ -1904,8 +1913,17 @@ export default function Estimate({}) {
placeholder="Select"
options={cableItemList}
menuPlacement={'auto'}
- getOptionLabel={(x) => x.clRefChr3}
+ getOptionLabel={(x) => x.clRefChr3 + " (" + x.clRefChr1 + ")"}
getOptionValue={(x) => x.clRefChr1}
+ components={{
+ SingleValue:({children, ...props}) =>{
+ return (
+
+ {props.data.clRefChr3}
+
+ )
+ }
+ }}
isClearable={false}
isDisabled={true}
value={cableItemList.filter(function (option) {