From 62b86764d5952c7cc1106f664abbc1291d253a76 Mon Sep 17 00:00:00 2001 From: basssy Date: Tue, 11 Feb 2025 10:27:02 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20swalFire=20icon?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/management/StuffQGrid.jsx | 1 + .../estimate/useEstimateController.js | 23 ++++++++++--------- src/locales/ja.json | 2 +- src/locales/ko.json | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/components/management/StuffQGrid.jsx b/src/components/management/StuffQGrid.jsx index 6de31379..0f589447 100644 --- a/src/components/management/StuffQGrid.jsx +++ b/src/components/management/StuffQGrid.jsx @@ -97,6 +97,7 @@ export default function StuffQGrid(props) { overlayNoRowsTemplate={`${getMessage('stuff.grid.noData')}`} getRowClass={getRowClass} autoSizeAllColumns={true} + enableCellTextSelection={true} /> ) diff --git a/src/hooks/floorPlan/estimate/useEstimateController.js b/src/hooks/floorPlan/estimate/useEstimateController.js index c87e77de..fbcea158 100644 --- a/src/hooks/floorPlan/estimate/useEstimateController.js +++ b/src/hooks/floorPlan/estimate/useEstimateController.js @@ -168,19 +168,19 @@ export const useEstimateController = (planNo) => { if (estimateData?.charger === null || estimateData?.charger?.trim().length === 0) { flag = false setIsGlobalLoading(false) - return swalFire({ text: getMessage('estimate.detail.save.requiredCharger'), type: 'alert' }) + return swalFire({ text: getMessage('estimate.detail.save.requiredCharger'), type: 'alert', icon: 'warning' }) } if (estimateData?.objectName === null || estimateData?.objectName?.trim().length === 0) { flag = false setIsGlobalLoading(false) - return swalFire({ text: getMessage('estimate.detail.save.requiredObjectName'), type: 'alert' }) + return swalFire({ text: getMessage('estimate.detail.save.requiredObjectName'), type: 'alert', icon: 'warning' }) } if (isNaN(Date.parse(estimateData.estimateDate))) { flag = false setIsGlobalLoading(false) - return swalFire({ text: getMessage('estimate.detail.save.requiredEstimateDate'), type: 'alert' }) + return swalFire({ text: getMessage('estimate.detail.save.requiredEstimateDate'), type: 'alert', icon: 'warning' }) } if (estimateData.estimateType === 'YJSS') { @@ -188,7 +188,7 @@ export const useEstimateController = (planNo) => { if (pkgAsp === '0') { flag = false setIsGlobalLoading(false) - return swalFire({ text: getMessage('estimate.detail.save.requiredPkgAsp'), type: 'alert' }) + return swalFire({ text: getMessage('estimate.detail.save.requiredPkgAsp'), type: 'alert', icon: 'warning' }) } } @@ -214,7 +214,7 @@ export const useEstimateController = (planNo) => { if (estimateData?.northArrangement === '1') { fileFlg = false setIsGlobalLoading(false) - return swalFire({ text: getMessage('estimate.detail.save.requiredNorthArrangementFileUpload'), type: 'alert' }) + return swalFire({ text: getMessage('estimate.detail.save.requiredNorthArrangementFileUpload'), type: 'alert', icon: 'warning' }) } } @@ -226,7 +226,7 @@ export const useEstimateController = (planNo) => { if (estimateData.fileFlg === '0') { fileFlg = false setIsGlobalLoading(false) - return swalFire({ text: getMessage('estimate.detail.save.requiredFileUpload'), type: 'alert' }) + return swalFire({ text: getMessage('estimate.detail.save.requiredFileUpload'), type: 'alert', icon: 'warning' }) } } } @@ -244,7 +244,7 @@ export const useEstimateController = (planNo) => { if (item.itemId === '') { itemFlg = false setIsGlobalLoading(false) - return swalFire({ text: getMessage('estimate.detail.save.requiredItemId'), type: 'alert' }) + return swalFire({ text: getMessage('estimate.detail.save.requiredItemId'), type: 'alert', icon: 'warning' }) } } @@ -260,7 +260,7 @@ export const useEstimateController = (planNo) => { if (item.amount < 1) { itemFlg = false setIsGlobalLoading(false) - return swalFire({ text: getMessage('estimate.detail.save.requiredAmount'), type: 'alert' }) + return swalFire({ text: getMessage('estimate.detail.save.requiredAmount'), type: 'alert', icon: 'warning' }) } if (estimateData.estimateType !== 'YJSS') { @@ -272,7 +272,7 @@ export const useEstimateController = (planNo) => { if (item.salePrice < 1) { itemFlg = false setIsGlobalLoading(false) - return swalFire({ text: getMessage('estimate.detail.save.requiredSalePrice'), type: 'alert' }) + return swalFire({ text: getMessage('estimate.detail.save.requiredSalePrice'), type: 'alert', icon: 'warning' }) } } @@ -283,7 +283,7 @@ export const useEstimateController = (planNo) => { if (isNaN(item.salePrice)) { itemFlg = false setIsGlobalLoading(false) - return swalFire({ text: getMessage('estimate.detail.save.requiredSalePrice'), type: 'alert' }) + return swalFire({ text: getMessage('estimate.detail.save.requiredSalePrice'), type: 'alert', icon: 'warning' }) } } } @@ -301,7 +301,7 @@ export const useEstimateController = (planNo) => { }) if (delCnt === estimateData.itemList.length) { setIsGlobalLoading(false) - return swalFire({ text: getMessage('estimate.detail.save.requiredItem'), type: 'alert' }) + return swalFire({ text: getMessage('estimate.detail.save.requiredItem'), type: 'alert', icon: 'warning' }) } } @@ -387,6 +387,7 @@ export const useEstimateController = (planNo) => { estimateData.pkgAsp = estimateData.pkgAsp.replaceAll(',', '') } + return //2. 상세데이터 저장 try { setIsGlobalLoading(true) diff --git a/src/locales/ja.json b/src/locales/ja.json index 441cb9d7..817c6f6e 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -905,7 +905,7 @@ "estimate.detail.header.showPrice": "価格表示", "estimate.detail.header.unitPrice": "定価", "estimate.detail.showPrice.pricingBtn": "Pricing", - "estimate.detail.showPrice.pricingBtn.noItemId": "Pricingが欠落しているアイテムがあります。 Pricingを進めてください。", + "estimate.detail.showPrice.pricingBtn.noItemId": "Pricingが欠落しているアイテムがあります. 製品を選択してPricingを進めてください.", "estimate.detail.showPrice.description1": "製品価格OPEN", "estimate.detail.showPrice.description2": "追加の変更品目", "estimate.detail.showPrice.description3": "添付必須", diff --git a/src/locales/ko.json b/src/locales/ko.json index d044217c..35f7e55f 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -906,7 +906,7 @@ "estimate.detail.header.showPrice": "가격표시", "estimate.detail.header.unitPrice": "정가", "estimate.detail.showPrice.pricingBtn": "Pricing", - "estimate.detail.showPrice.pricingBtn.noItemId": "Pricing이 누락된 아이템이 있습니다. Pricing을 진행해주세요.", + "estimate.detail.showPrice.pricingBtn.noItemId": "Pricing이 누락된 아이템이 있습니다. 제품 선택 후 Pricing을 진행해주세요.", "estimate.detail.showPrice.description1": "제품 가격 OPEN", "estimate.detail.showPrice.description2": "추가 변경 자재", "estimate.detail.showPrice.description3": "첨부필수",