Merge pull request '[1116] 양단케이블 오작동 => M12, S13 추가' (#127) from feature/ysCha into dev

Reviewed-on: #127
This commit is contained in:
ysCha 2025-06-19 15:41:41 +09:00
commit a37bf6e4f7

View File

@ -731,7 +731,7 @@ export default function Estimate({}) {
/* 케이블 select 변경시 */
const onChangeDisplayCableItem = (value, itemList) => {
itemList.map((item, index) => {
if (item.dispCableFlg === '1' && item.itemTpCd !== 'M12') {
if (item.dispCableFlg === '1' && item.itemTpCd !== 'M12' && item.itemTpCd !== 'S13') {
if (value !== '') {
onChangeDisplayItem(value, item.dispOrder, index, true)
}
@ -743,7 +743,7 @@ export default function Estimate({}) {
/* 케이블 select 변경시 */
const onChangeDisplayDoubleCableItem = (value, itemList) => {
itemList.map((item, index) => {
if (item.dispCableFlg === '1' && item.itemTpCd === 'M12') {
if (item.dispCableFlg === '1' && (item.itemTpCd === 'M12' || item.itemTpCd === 'S13')) {
if (value !== '') {
onChangeDisplayItem(value, item.dispOrder, index, true)
}
@ -1103,7 +1103,7 @@ export default function Estimate({}) {
if (item.dispCableFlg === '1' ) {
dispCableFlgCnt++
if(item.itemTpCd === 'M12') {
if(item.itemTpCd === 'M12' || item.itemTpCd === 'S13') {
setCableDbItem(item.itemId)
}else{
setCableItem(item.itemId)
@ -1179,7 +1179,7 @@ export default function Estimate({}) {
if (item.dispCableFlg === '1'){
if(item.itemTpCd === 'M12') {
if(item.itemTpCd === 'M12' || item.itemTpCd === 'S13') {
setCableDbItem(item.itemId)
}else{
setCableItem(item.itemId)
@ -2031,13 +2031,13 @@ export default function Estimate({}) {
getOptionValue={(x) => x.clRefChr1}
components={{
SingleValue: ({ children, ...props }) => {
return <components.SingleValue {...props}>{(item.itemTpCd === 'M12')? item.itemName : props.data.clRefChr3}</components.SingleValue>
return <components.SingleValue {...props}>{(item.itemTpCd === 'M12' || item.itemTpCd === 'S13')? item.itemName : props.data.clRefChr3}</components.SingleValue>
},
}}
isClearable={false}
isDisabled={true}
value={cableItemList.filter(function (option) {
return (item.itemTpCd === 'M12')? item.itemId : option.clRefChr1 === item.itemId
return (item.itemTpCd === 'M12' || item.itemTpCd === 'S13' )? item.itemId : option.clRefChr1 === item.itemId
})}
/>
)}