From dabb4542ecc42e8917ec81716f378295de30fd54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=B0=BD=EC=88=98?= Date: Tue, 29 Oct 2024 14:50:08 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EB=B0=8F=20?= =?UTF-8?q?=EB=B0=B0=EC=B9=98=EB=A9=B4=20=EC=B4=88=EA=B8=B0=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=ED=8C=9D=EC=97=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/images/canvas/img_check_fail.svg | 6 + .../images/canvas/img_check_success.svg | 4 + public/static/images/canvas/img_edit_ico.svg | 4 + public/static/images/sub/attachment_ico.svg | 14 +- public/static/images/sub/change_ico.svg | 7 + public/static/images/sub/click_check_ico.svg | 7 +- public/static/images/sub/open_ico.svg | 6 + src/app/canvas/page.jsx | 6 +- src/components/canvas/CanvasEstimate.jsx | 308 ++++++++++++------ .../placementsetting/PlacementSettingPop.jsx | 16 + .../common/reactselect/ReactSelect.jsx | 5 + src/components/publishpage/PublishPage.jsx | 7 +- src/styles/_contents.scss | 70 ++-- src/styles/_grid-detail.scss | 7 - src/styles/_layout.scss | 2 +- src/styles/_modal.scss | 53 +++ src/styles/_table.scss | 78 +++++ 17 files changed, 452 insertions(+), 148 deletions(-) create mode 100644 public/static/images/canvas/img_check_fail.svg create mode 100644 public/static/images/canvas/img_check_success.svg create mode 100644 public/static/images/canvas/img_edit_ico.svg create mode 100644 public/static/images/sub/change_ico.svg create mode 100644 public/static/images/sub/open_ico.svg diff --git a/public/static/images/canvas/img_check_fail.svg b/public/static/images/canvas/img_check_fail.svg new file mode 100644 index 0000000..2941a08 --- /dev/null +++ b/public/static/images/canvas/img_check_fail.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/public/static/images/canvas/img_check_success.svg b/public/static/images/canvas/img_check_success.svg new file mode 100644 index 0000000..0ced9e6 --- /dev/null +++ b/public/static/images/canvas/img_check_success.svg @@ -0,0 +1,4 @@ + + + + diff --git a/public/static/images/canvas/img_edit_ico.svg b/public/static/images/canvas/img_edit_ico.svg new file mode 100644 index 0000000..abc1118 --- /dev/null +++ b/public/static/images/canvas/img_edit_ico.svg @@ -0,0 +1,4 @@ + + + + diff --git a/public/static/images/sub/attachment_ico.svg b/public/static/images/sub/attachment_ico.svg index 7e622a4..71b132f 100644 --- a/public/static/images/sub/attachment_ico.svg +++ b/public/static/images/sub/attachment_ico.svg @@ -1,11 +1,5 @@ - - - - - - - - - - + + + + diff --git a/public/static/images/sub/change_ico.svg b/public/static/images/sub/change_ico.svg new file mode 100644 index 0000000..b0dda7e --- /dev/null +++ b/public/static/images/sub/change_ico.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/public/static/images/sub/click_check_ico.svg b/public/static/images/sub/click_check_ico.svg index 4fc2dae..d92ca90 100644 --- a/public/static/images/sub/click_check_ico.svg +++ b/public/static/images/sub/click_check_ico.svg @@ -1,4 +1,5 @@ - - - + + + + diff --git a/public/static/images/sub/open_ico.svg b/public/static/images/sub/open_ico.svg new file mode 100644 index 0000000..2ef23b7 --- /dev/null +++ b/public/static/images/sub/open_ico.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/app/canvas/page.jsx b/src/app/canvas/page.jsx index bee72a7..351a6fd 100644 --- a/src/app/canvas/page.jsx +++ b/src/app/canvas/page.jsx @@ -87,10 +87,10 @@ export default function CanvasPage() { {/* */} {/* 배치면 초기 설정 */} - {/* */} + {/* 캔버스 기본 셋팅 */} - {modalOption.option && } + {/* {modalOption.option && } */} {/* 점·선 그리드 설정 */} {/* {modalOption.gridoption && } */} @@ -198,7 +198,7 @@ export default function CanvasPage() { {/* */} {/* 이미지 크기 조절 */} - + {/* */} {menuValue === 5 &&
} diff --git a/src/components/canvas/CanvasEstimate.jsx b/src/components/canvas/CanvasEstimate.jsx index 946e184..7eb12c3 100644 --- a/src/components/canvas/CanvasEstimate.jsx +++ b/src/components/canvas/CanvasEstimate.jsx @@ -1,101 +1,12 @@ -'use client' -import { useState } from "react"; import SingleDatePicker from "../common/datepicker/SingleDatePicker"; -import Footer from "../layout/Footer"; + import FileDownOptionPop from "./estimatepop/FileDownOptionPop"; import ProductFeaturesPop from "./estimatepop/ProductFeaturesPop"; -import QGrid from "../common/grid/QGrid"; -const HeaderCheckButton = () => { - return( -
- - -
- ) -} -const CellCheckButton = () => { - return( -
- - -
- ) -} - -const CellProductName = () => { - return( -
-
- -
-
- -
-
- ) -} - -const CellShapePlate = () => { - return( -
-
HNW-MC4-CHN30
- -
- ) -} - -const CellQuantity = () =>{ - return( -
- -
- ) -} - -const CellUnitPrice = () =>{ - return( -
-
- -
-
- -
-
- ) -} +import ReactSelect from "../common/reactselect/ReactSelect"; export default function CanvasEstimate() { - const [gridProps, setGridProps] = useState({ - gridData: [ - { status: "受付", item: "100", unit: "セット", amountExTax: "5,561,000 " }, - { status: "受付", item: "100", unit: "セット", amountExTax: "5,561,000 " }, - { status: "受付", item: "100", unit: "セット", amountExTax: "5,561,000 " }, - { status: "受付", item: "100", unit: "セット", amountExTax: "5,561,000 " }, - { status: "受付", item: "100", unit: "セット", amountExTax: "5,561,000 " }, - { status: "受付", item: "100", unit: "セット", amountExTax: "5,561,000 " }, - { status: "受付", item: "100", unit: "セット", amountExTax: "5,561,000 " }, - { status: "受付", item: "100", unit: "セット", amountExTax: "5,561,000 " }, - { status: "受付", item: "100", unit: "セット", amountExTax: "5,561,000 " }, - { status: "受付", item: "100", unit: "セット", amountExTax: "5,561,000 " }, - { status: "受付", item: "100", unit: "セット", amountExTax: "5,561,000 " }, - ], - gridColumns:[ - { field: "check", width: 45, cellRenderer: CellCheckButton, headerComponent: HeaderCheckButton, cellStyle: { display: 'flex', alignItems: 'center', justifyContent: 'center' }}, - { headerName: "アイテム ", field: "item", width: 100, cellStyle: { textAlign: "right" } }, - { headerName: "品番", field: "productName", flex: 1, cellRenderer: CellProductName, cellStyle: { display: 'flex', alignItems: 'center'} }, - { headerName: "型板", field: "shapePlate", width: 200, cellRenderer: CellShapePlate, cellStyle: { display: 'flex', alignItems: 'center'} }, - { headerName: "数量", field: "quantity", width: 120, cellRenderer: CellQuantity, cellStyle: { display: 'flex', alignItems: 'center'} }, - { headerName: "単位", field: "unit", width: 100, }, - { headerName: "単価", field: "unitPrice", cellRenderer: CellUnitPrice, cellStyle: { display: 'flex', alignItems: 'center'} }, - { headerName: "金額 (税別別) ", field: "amountExTax", cellStyle: { textAlign: "right" }, width: 240, }, - ], - isPageable: true, - }) return(
@@ -485,18 +396,221 @@ export default function CanvasEstimate() {
-
-
添付必須
-
クリックして製品の特異性を確認する
-
+
    +
  • 製品価格 OPEN
    • +
  • 追加, 変更資材
    • +
  • 添付必須
    • +
  • クリックして製品の特異性を確認する
    • +
-
- +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+ 		アイテム品番型板数量単位単価金額 (税別別)
+
+ + +
+ 		100 +
+
+ +
+
+ +
+
+ 		+
+
HNW-MC4-CHN30
+
+ + +
+
+ 		+
+ +
+ 		セット +
+
+ +
+
+ +
+
+ 		5,561,000
+
+ + +
+ 		100 +
+
+ +
+
+ +
+
+ 		+
+
HNW-MC4-CHN30
+
+ +
+
+ 		+
+ +
+ 		セット +
+
+ +
+
+ +
+
+ 		5,561,000
+
+ + +
+ 		100 +
+
+ +
+
+ +
+
+ 		+
+
HNW-MC4-CHN30
+ +
+ 		+
+ +
+ 		セット +
+
+ +
+
+ +
+
+ 		5,561,000
+
+ + +
+ 		100 +
+
+ +
+ +
+ 		+
+
HNW-MC4-CHN30
+
+ +
+
+ 		+
+ +
+ 		セット +
+
+ +
+ +
+ 		5,561,000
diff --git a/src/components/canvas/modal/placementsetting/PlacementSettingPop.jsx b/src/components/canvas/modal/placementsetting/PlacementSettingPop.jsx index 2cd493f..62ce0f1 100644 --- a/src/components/canvas/modal/placementsetting/PlacementSettingPop.jsx +++ b/src/components/canvas/modal/placementsetting/PlacementSettingPop.jsx @@ -152,6 +152,22 @@ export default function PlacementSettingPop(){ */} + + ファイルを読み込む + +
+ +
+ + + +
+
+ + diff --git a/src/components/common/reactselect/ReactSelect.jsx b/src/components/common/reactselect/ReactSelect.jsx index e9627e5..0139287 100644 --- a/src/components/common/reactselect/ReactSelect.jsx +++ b/src/components/common/reactselect/ReactSelect.jsx @@ -10,6 +10,11 @@ export default function ReactSelect(){ { label: '敬称選択', value: '3' }, { label: '敬称選択', value: '5' }, { label: '敬称選択', value: '6' }, + { label: '敬称選択', value: '7' }, + { label: '敬称選択', value: '8' }, + { label: '敬称選択', value: '9' }, + { label: '敬称選択', value: '10' }, + { label: '敬称選択', value: '11' }, ] diff --git a/src/components/publishpage/PublishPage.jsx b/src/components/publishpage/PublishPage.jsx index 7eb6c8f..5ab3df7 100644 --- a/src/components/publishpage/PublishPage.jsx +++ b/src/components/publishpage/PublishPage.jsx @@ -143,11 +143,16 @@ export default function PublishPage() { -