From 64fa119ead2bac2132dfda2b72a9ce4369b8630b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EC=B0=BD=EC=88=98?= <chang9811@interplug.co.kr>
Date: Wed, 30 Oct 2024 11:12:42 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A7=80=EB=B6=95=ED=98=95=EC=83=81=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=20pop=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EB=AC=BC?=
 =?UTF-8?q?=EA=B1=B4=20=EB=AA=A9=EB=A1=9D=20=EA=B2=80=EC=83=89=EC=98=81?=
 =?UTF-8?q?=EC=97=AD=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/canvas/page.jsx                       |  2 +-
 .../discriminationtab/DiscriminationTab06.jsx |  7 +++
 src/components/publishpage/PublishPage.jsx    | 15 ++++--
 .../productstate/PropertyStatus.jsx           | 46 +++++++++++--------
 4 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/src/app/canvas/page.jsx b/src/app/canvas/page.jsx
index 147c3f9..e7de386 100644
--- a/src/app/canvas/page.jsx
+++ b/src/app/canvas/page.jsx
@@ -104,7 +104,7 @@ export default function CanvasPage() {
                     {/* <PropertiesSetting/> */}
 
                     {/* 지붕형상 설정 */}
-                    {/* <RoofShapeOption/> */}
+                    <RoofShapeOption/>
 
                     {/* 지붕형상 수동 설정 */}
                     {/* <ManualRoofShape/> */}
diff --git a/src/components/canvas/modal/roofshapeoption/discriminationtab/DiscriminationTab06.jsx b/src/components/canvas/modal/roofshapeoption/discriminationtab/DiscriminationTab06.jsx
index 5115151..3238072 100644
--- a/src/components/canvas/modal/roofshapeoption/discriminationtab/DiscriminationTab06.jsx
+++ b/src/components/canvas/modal/roofshapeoption/discriminationtab/DiscriminationTab06.jsx
@@ -1,6 +1,13 @@
 export default function DiscriminationTab06(){
     return(
         <>
+            <div className="outline-form mb10">
+                <span className="mr10">傾斜</span>
+                <div className="input-grid mr5" style={{width: '100px'}}>
+                    <input type="text" className="input-origin block" defaultValue={600}/>
+                </div>
+                <span className="thin">寸法</span>
+            </div>
             <div className="outline-form">
                 <span className="mr10">片流幅</span>
                 <div className="input-grid mr5" style={{width: '100px'}}>
diff --git a/src/components/publishpage/PublishPage.jsx b/src/components/publishpage/PublishPage.jsx
index 5ab3df7..93dfd19 100644
--- a/src/components/publishpage/PublishPage.jsx
+++ b/src/components/publishpage/PublishPage.jsx
@@ -143,16 +143,20 @@ export default function PublishPage() {
                 </td>
                 <td className="coding_stat_web"></td>
                 <td className='red al-c'>
-                  <ul className='mb5'>
+                  <ul className='mb10'>
                     <li>2024-10-28</li>
                     <li>canvas-setting pop 수정</li>
                     <li>이미지 크기조절 pop 추가</li>
                   </ul>
-                  <ul>
+                  <ul className='mb10'>
                     <li>2024-10-29</li>
                     <li>견적서 하단 테이블 변경</li>
                     <li>배치면 초기 설정 pop 이미지파일 업로드 추가</li>
                   </ul>
+                  <ul>
+                    <li>2024-10-30</li>
+                    <li>지붕형상설정 pop 변별로 설정 탭 하단 한쪽 흐름 input 추가</li>
+                  </ul>
                 </td>
                 <td className="t-center">2024-10-28</td>
               </tr>
@@ -263,7 +267,12 @@ export default function PublishPage() {
                   </Link>
                 </td>
                 <td className="coding_stat_web"></td>
-                <td className='red al-c'></td>
+                <td className='red al-c'>
+                  <ul>
+                    <li>2024-10-30</li>
+                    <li>물건목록 검색 영역 수정</li>
+                  </ul>
+                </td>
                 <td className="t-center">2024-09-24</td>
               </tr>
               <tr>
diff --git a/src/components/sub/management/productstate/PropertyStatus.jsx b/src/components/sub/management/productstate/PropertyStatus.jsx
index 99a7a45..2c9a0b3 100644
--- a/src/components/sub/management/productstate/PropertyStatus.jsx
+++ b/src/components/sub/management/productstate/PropertyStatus.jsx
@@ -1,4 +1,5 @@
 import SingleDatePicker from "@/components/common/datepicker/SingleDatePicker";
+import ReactSelect from "@/components/common/reactselect/ReactSelect";
 
 export default function PropertyStatus(){
     return(
@@ -8,7 +9,7 @@ export default function PropertyStatus(){
                     <h3>物件状況</h3>
                 </div>
                 <div className="left-unit-box">
-                    <button className="btn-origin navy mr5">物件登録</button>
+                    <button className="btn-origin navy mr5">新規物件登録</button>
                     <button className="btn-origin navy mr5">照会</button>
                     <button className="btn-origin grey">初期化</button>
                 </div>
@@ -22,6 +23,8 @@ export default function PropertyStatus(){
                         <col />
                         <col style={{width : '160px'}}/>
                         <col />
+                        <col style={{width : '160px'}}/>
+                        <col />
                     </colgroup>
                     <tbody>
                         <tr>
@@ -31,7 +34,7 @@ export default function PropertyStatus(){
                                     <input type="text" className="input-light" />
                                 </div>
                             </td>
-                            <th>販売代理店ID</th>
+                            <th>販売代理店名</th>
                             <td>
                                 <div className="input-wrap">
                                     <input type="text" className="input-light" />
@@ -43,6 +46,12 @@ export default function PropertyStatus(){
                                     <input type="text" className="input-light" />
                                 </div>
                             </td>
+                            <th>見積もり</th>
+                            <td>
+                                <div className="input-wrap">
+                                    <input type="text" className="input-light" />
+                                </div>
+                            </td>
                         </tr>
                         <tr>
                             <th>商品名</th>
@@ -51,31 +60,28 @@ export default function PropertyStatus(){
                                     <input type="text" className="input-light" />
                                 </div>
                             </td>
-                            <th>見積もり</th>
-                            <td>
-                                <div className="input-wrap">
-                                    <input type="text" className="input-light" />
-                                </div>
-                            </td>
-                            <th>販売代理店の選択</th>
-                            <td>
-                                <div className="select-wrap">
-                                    <select className="select-light" name="" id="" >
-                                        <option>販売代理店リスト</option>
-                                    </select>
-                                </div>
-                            </td>
-                        </tr>
-                        
-                        <tr>
                             <th>担当者</th>
                             <td>
                                 <div className="input-wrap">
                                     <input type="text" className="input-light" />
                                 </div>
                             </td>
-                            <th>期間検索</th>
+                            <th>販売代理店を選択</th>
                             <td colSpan={3}>
+                                <div className="form-flex-wrap">
+                                    <div className="select-wrap mr5" style={{flex: 1}}>
+                                        <ReactSelect/>
+                                    </div>
+                                    <div className="select-wrap" style={{flex: 1}}>
+                                        <ReactSelect/>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+                        
+                        <tr>
+                            <th>期間検索</th>
+                            <td colSpan={7}>
                                 <div className="form-flex-wrap">
                                     <div className="radio-wrap mr10">
                                         <div className="d-check-radio light mr10">