From 2e762537fc1bac06ff8b68fd3fdfe5c0cfcf18db Mon Sep 17 00:00:00 2001 From: basssy Date: Tue, 18 Mar 2025 13:24:58 +0900 Subject: [PATCH 1/3] =?UTF-8?q?#918=20=EA=B2=AC=EC=A0=81=EC=84=9C=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=ED=99=94=EB=A9=B4=20=EA=B2=AC=EC=A0=81?= =?UTF-8?q?=EC=9D=BC=20->=20=EA=B2=AC=EC=A0=81=EC=9E=91=EC=84=B1=EC=9D=BC?= =?UTF-8?q?=20=EB=A9=94=EC=84=B8=EC=A7=80=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/ja.json | 2 +- src/locales/ko.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/ja.json b/src/locales/ja.json index d6670702..ee4c6d28 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -886,7 +886,7 @@ "estimate.detail.drawingEstimateCreateDate": "登録日", "estimate.detail.lastEditDatetime": "変更日時", "estimate.detail.saleStoreId": "一次販売店名", - "estimate.detail.estimateDate": "見積日", + "estimate.detail.estimateDate": "見積作成日", "estimate.detail.otherSaleStoreId": "二次販売店名", "estimate.detail.noOtherSaleStoreId": "二次店なし", "estimate.detail.receiveUser": "担当者", diff --git a/src/locales/ko.json b/src/locales/ko.json index 4c051305..5cfbc50b 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -886,7 +886,7 @@ "estimate.detail.drawingEstimateCreateDate": "등록일", "estimate.detail.lastEditDatetime": "변경일시", "estimate.detail.saleStoreId": "1차 판매점명", - "estimate.detail.estimateDate": "견적일", + "estimate.detail.estimateDate": "견적작성일", "estimate.detail.otherSaleStoreId": "2차 판매점명", "estimate.detail.noOtherSaleStoreId": "2차점 없음", "estimate.detail.receiveUser": "담당자", From 11438773a1b24739623c8495f307933ed3c408be Mon Sep 17 00:00:00 2001 From: basssy Date: Tue, 18 Mar 2025 13:28:58 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20=ED=97=A4=EB=8D=94=EB=A9=94=EB=89=B4=20=EB=AC=B8?= =?UTF-8?q?=EC=84=9C=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/ja.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/ja.json b/src/locales/ja.json index ee4c6d28..b0db31ce 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -178,7 +178,7 @@ "modal.roof.alloc.select.parallel": "筋配置", "modal.roof.alloc.select.stairs": "千鳥配置", "modal.roof.alloc.apply": "選択した屋根材として割り当て", - "plan.menu.estimate.docDown": "各種資料ダウンロード", + "plan.menu.estimate.docDown": "見積書出力", "plan.menu.estimate.save": "保存", "plan.menu.estimate.reset": "初期化", "plan.menu.estimate.copy": "見積書のコピー", From 82e35274322d8eec63591695b1da46c7183eee18 Mon Sep 17 00:00:00 2001 From: cha Date: Mon, 24 Mar 2025 13:27:30 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C::=EC=A3=BC?= =?UTF-8?q?=EB=AC=B8=EB=B6=84=EB=A5=98=EC=97=90=EC=84=9C=20storePriceList?= =?UTF-8?q?=EC=9D=98=20pkgRank=EC=9D=98=20=EA=B0=92=EC=9D=B4=20=EC=97=86?= =?UTF-8?q?=EC=9C=BC=EB=A9=B4=20YJSS=20=EC=84=A0=ED=83=9D=EB=B6=88?= =?UTF-8?q?=EA=B0=80,=20=EA=B8=B0=EB=93=B1=EB=A1=9D=EC=9D=80=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EA=B0=80=EB=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/estimate/Estimate.jsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx index a44af878..592d5306 100644 --- a/src/components/estimate/Estimate.jsx +++ b/src/components/estimate/Estimate.jsx @@ -1342,7 +1342,11 @@ export default function Estimate({}) {
-
+ {/*pkgRank is null, empty 인 경우 : 사용불가, 이전에 등록된 경우 사용가능, style로 제어*/} +
0 + && storePriceList[0].pkgRank !== null + && storePriceList[0].pkgRank !== '') ? "" : "none"}}>