diff --git a/src/components/management/Stuff.jsx b/src/components/management/Stuff.jsx index 9b5bc193..51154e92 100644 --- a/src/components/management/Stuff.jsx +++ b/src/components/management/Stuff.jsx @@ -230,8 +230,6 @@ export default function Stuff() { startRow: (stuffSearch.pageNo - 1) * stuffSearchParams.pageSize + 1, endRow: stuffSearchParams?.endRow, schSaleStoreId: stuffSearchParams?.schMyDataCheck ? stuffSearchParams.schSaleStoreId : '', - // schSelSaleStoreId: stuffSearchParams?.schSelSaleStoreId ? stuffSearchParams.schSelSaleStoreId : '', - // schOtherSelSaleStoreId: stuffSearchParams?.schOtherSelSaleStoreId ? stuffSearchParams.schOtherSelSaleStoreId : '', schSelSaleStoreId: stuffSearchParams?.schMyDataCheck ? '' : stuffSearchParams.schSelSaleStoreId, schOtherSelSaleStoreId: stuffSearchParams?.schMyDataCheck ? '' : stuffSearchParams.schOtherSelSaleStoreId, schSortType: stuffSearchParams.schSortType, diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx index 684b464d..191b3156 100644 --- a/src/components/management/StuffDetail.jsx +++ b/src/components/management/StuffDetail.jsx @@ -282,8 +282,8 @@ export default function StuffDetail() { autoHeight: true, cellStyle: { justifyContent: 'center' }, cellRenderer: (params) => { - let buttonStyle - let buttonStyle2 + let buttonStyle = { display: 'flex' } + let buttonStyle2 = { display: 'flex' } if (params.value == null) { buttonStyle = { display: 'none', @@ -292,7 +292,7 @@ export default function StuffDetail() { display: 'none', } } else { - if (managementState?.createSaleStoreId === 'T01') { + if (params?.data?.createSaleStoreId === 'T01') { if (session?.storeId !== 'T01') { buttonStyle = { display: 'none' } } diff --git a/src/components/management/StuffSearchCondition.jsx b/src/components/management/StuffSearchCondition.jsx index d9aaba6e..62b75483 100644 --- a/src/components/management/StuffSearchCondition.jsx +++ b/src/components/management/StuffSearchCondition.jsx @@ -204,14 +204,14 @@ export default function StuffSearchCondition() { }) } else { setStuffSearch({ - 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(), + schObjectNo: objectNo ? objectNo.trim() : '', + schSaleStoreName: saleStoreName ? saleStoreName.trim() : '', + schAddress: address ? address.trim() : '', + schObjectName: objectName ? objectName.trim() : '', + schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '', schSelSaleStoreId: myDataCheck ? schSelSaleStoreId : otherSaleStoreId ? schSelSaleStoreId : '', schOtherSelSaleStoreId: myDataCheck ? '' : otherSaleStoreId, - schReceiveUser: stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser.trim() : receiveUser.trim(), + schReceiveUser: receiveUser ? receiveUser.trim() : '', schDateType: dateType, schTempFlg: tempFlg, //임시저장물건 schMyDataCheck: myDataCheck, @@ -250,14 +250,14 @@ export default function StuffSearchCondition() { }) } else { setStuffSearch({ - 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(), + schObjectNo: objectNo ? objectNo.trim() : '', + schSaleStoreName: saleStoreName ? saleStoreName.trim() : '', + schAddress: address ? address.trim() : '', + schObjectName: objectName ? objectName.trim() : '', + schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '', schSelSaleStoreId: schSelSaleStoreId, schOtherSelSaleStoreId: otherSaleStoreId, - schReceiveUser: stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser.trim() : receiveUser.trim(), + schReceiveUser: receiveUser ? receiveUser.trim() : '', schDateType: dateType, schTempFlg: tempFlg, //임시저장물건 schMyDataCheck: myDataCheck, @@ -273,14 +273,15 @@ export default function StuffSearchCondition() { } } else { setStuffSearch({ - 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(), + schObjectNo: objectNo ? objectNo.trim() : '', + schSaleStoreName: saleStoreName ? saleStoreName.trim() : '', + schAddress: address ? address.trim() : '', + schObjectName: objectName ? objectName.trim() : '', + schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '', schSelSaleStoreId: schSelSaleStoreId, schOtherSelSaleStoreId: otherSaleStoreId, - schReceiveUser: stuffSearch?.schReceiveUser ? stuffSearch.schReceiveUser.trim() : receiveUser.trim(), + schReceiveUser: receiveUser ? receiveUser.trim() : '', + schDateType: dateType, schTempFlg: tempFlg, //임시저장물건 schMyDataCheck: myDataCheck, diff --git a/src/locales/ja.json b/src/locales/ja.json index 067b92a6..0951418c 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -902,7 +902,7 @@ "estimate.detail.showPrice.description4": "クリックして製品の特異性を確認する", "estimate.detail.showPrice.addItem": "製品追加", "estimate.detail.showPrice.delItem": "製品の削除", - "estimate.detail.itemTableHeader.dispOrder": "アイテム", + "estimate.detail.itemTableHeader.dispOrder": "No.", "estimate.detail.itemTableHeader.itemId": "品番", "estimate.detail.itemTableHeader.itemNo": "兄弟", "estimate.detail.itemTableHeader.amount": "数量", diff --git a/src/locales/ko.json b/src/locales/ko.json index 5552dbb0..9037ade4 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -634,7 +634,7 @@ "stuff.gridHeader.address": "물건주소", "stuff.gridHeader.dispCompanyName": "견적처", "stuff.gridHeader.receiveUser": "담당자", - "stuff.gridHeader.specificationConfirmDate": "사양확인일", + "stuff.gridHeader.specificationConfirmDate": "사양확정일", "stuff.gridHeader.createDatetime": "등록일", "stuff.gridData.tempObjectNo": "임시저장물건", "stuff.message.periodError": "최대1년 조회 가능합니다.", @@ -902,7 +902,7 @@ "estimate.detail.showPrice.description4": "클릭하여 제품 특이사항 확인", "estimate.detail.showPrice.addItem": "제품추가", "estimate.detail.showPrice.delItem": "제품삭제", - "estimate.detail.itemTableHeader.dispOrder": "Item", + "estimate.detail.itemTableHeader.dispOrder": "No.", "estimate.detail.itemTableHeader.itemId": "품번", "estimate.detail.itemTableHeader.itemNo": "형명", "estimate.detail.itemTableHeader.amount": "수량",