Compare commits

..

No commits in common. "a1871e105fc18f500d619486cd9718d90ef0a4e7" and "61f1036a248dbc64294185d50e8e0118ab43edc6" have entirely different histories.

2 changed files with 4 additions and 5 deletions

View File

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

View File

@ -130,7 +130,6 @@ export const useEstimateController = (planNo, flag) => {
addFlg: true, addFlg: true,
paDispOrder: null, paDispOrder: null,
dispCableFlg: '0', dispCableFlg: '0',
itemTpCd:'',
}, },
], ],
}) })