From 325cef14f0306eafc1390dafba14fda55ed40f7d Mon Sep 17 00:00:00 2001
From: basssy <basssy@interplug.co.kr>
Date: Fri, 18 Oct 2024 14:15:00 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AC=BC=EA=B1=B4=ED=98=84=ED=99=A9=20?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=88=98=EC=A0=95=20react-select=20=20scs?=
 =?UTF-8?q?s,=20svg=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/images/common/select_del.svg    |  4 +
 src/components/management/Stuff.jsx           | 17 ++--
 src/components/management/StuffDetail.jsx     | 86 ++++++++++---------
 .../management/StuffSearchCondition.jsx       |  2 +
 .../management/popup/PlanRequestPop.jsx       | 17 ++--
 src/styles/_reset.scss                        | 10 ++-
 6 files changed, 73 insertions(+), 63 deletions(-)
 create mode 100644 public/static/images/common/select_del.svg

diff --git a/public/static/images/common/select_del.svg b/public/static/images/common/select_del.svg
new file mode 100644
index 00000000..2376f16b
--- /dev/null
+++ b/public/static/images/common/select_del.svg
@@ -0,0 +1,4 @@
+<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.998535 1L3.99723 3.99594L6.99593 1" stroke="#697C8F" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 6.98376L3.99319 3.99595L1.00263 6.99999" stroke="#697C8F" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/management/Stuff.jsx b/src/components/management/Stuff.jsx
index 9d6ff743..5ce7c8b3 100644
--- a/src/components/management/Stuff.jsx
+++ b/src/components/management/Stuff.jsx
@@ -245,9 +245,8 @@ export default function Stuff() {
         }
 
         async function fetchData() {
-          // const apiUrl = `/api/object/list?saleStoreId=${sessionState?.storeId}&${queryStringFormatter(params)}`
-          const apiUrl = `/api/object/list?saleStoreId=T01&${queryStringFormatter(params)}`
-
+          // const apiUrl = `/api/object/list?saleStoreId=T01&${queryStringFormatter(params)}`
+          const apiUrl = `/api/object/list?saleStoreId=${sessionState?.storeId}&${queryStringFormatter(params)}`
           await get({
             url: apiUrl,
           }).then((res) => {
@@ -303,8 +302,8 @@ export default function Stuff() {
       setPageNo(1)
 
       async function fetchData() {
-        const apiUrl = `/api/object/list?saleStoreId=T01&${queryStringFormatter(stuffSearchParams)}`
-        // const apiUrl = `/api/object/list?saleStoreId=${sessionState?.storeId}&${queryStringFormatter(stuffSearchParams)}`
+        // const apiUrl = `/api/object/list?saleStoreId=T01&${queryStringFormatter(stuffSearchParams)}`
+        const apiUrl = `/api/object/list?saleStoreId=${sessionState?.storeId}&${queryStringFormatter(stuffSearchParams)}`
         await get({ url: apiUrl }).then((res) => {
           if (!isEmptyArray(res)) {
             setGridProps({ ...gridProps, gridData: res, count: res[0].totCnt })
@@ -333,8 +332,8 @@ export default function Stuff() {
     })
 
     setPageNo(1)
-    // const apiUrl = `/api/object/list?saleStoreId=${sessionState?.storeId}&${queryStringFormatter(stuffSearchParams)}`
-    const apiUrl = `/api/object/list?saleStoreId=T01&${queryStringFormatter(stuffSearchParams)}`
+    // const apiUrl = `/api/object/list?saleStoreId=T01&${queryStringFormatter(stuffSearchParams)}`
+    const apiUrl = `/api/object/list?saleStoreId=${sessionState?.storeId}&${queryStringFormatter(stuffSearchParams)}`
     get({ url: apiUrl }).then((res) => {
       if (!isEmptyArray(res)) {
         setGridProps({ ...gridProps, gridData: res, count: res[0].totCnt })
@@ -364,8 +363,8 @@ export default function Stuff() {
 
     setPageNo(1)
 
-    const apiUrl = `/api/object/list?saleStoreId=T01&${queryStringFormatter(stuffSearchParams)}`
-    // const apiUrl = `/api/object/list?saleStoreId=${sessionState?.storeId}&${queryStringFormatter(stuffSearchParams)}`
+    // const apiUrl = `/api/object/list?saleStoreId=T01&${queryStringFormatter(stuffSearchParams)}`
+    const apiUrl = `/api/object/list?saleStoreId=${sessionState?.storeId}&${queryStringFormatter(stuffSearchParams)}`
     get({ url: apiUrl }).then((res) => {
       if (!isEmptyArray(res)) {
         setGridProps({ ...gridProps, gridData: res, count: res[0].totCnt })
diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx
index c480b055..3727555e 100644
--- a/src/components/management/StuffDetail.jsx
+++ b/src/components/management/StuffDetail.jsx
@@ -127,7 +127,7 @@ export default function StuffDetail() {
         }
       })
     }
-  }, [objectNo])
+  }, [objectNo, sessionState])
 
   useEffect(() => {
     if (isObjectNotEmpty(detailData)) {
@@ -303,7 +303,7 @@ export default function StuffDetail() {
       }
 
       // console.log('임시저장용::', errors)
-      setIsFormValid(Object.keys(errors).length === 0)
+      setIsFormValid(Object.keys(errors).length === 0 ? true : false)
     } else {
       console.log('상세일때 폼체크')
     }
@@ -362,25 +362,14 @@ export default function StuffDetail() {
     form.setValue('areaId', e.target.value)
   }
 
-  // useEffect(() => {
-  //   if (!isEmptyArray(areaIdList)) {
-  //     let _prefName = form.watch('prefName')
-  //     // console.log('기준풍속 가져오는 API', _prefName)
-  //     get({ url: `/api/object/windSpeed/${_prefName}/list` }).then((res) => {
-  //       // console.log('res::', res)
-  //       if (!isEmptyArray(res)) {
-  //         setWindSpeedList(res)
-  //       }
-  //     })
-  //   }
-  // }, [areaIdList])
-
   //필수값 다 입력했을때
-  const onValid = (data) => {
+  const onValid = (data, e) => {
+    const formData = form.getValues()
+    console.log('필수값 통과:::', data, formData)
+    // console.log('필수값 formData:::', formData)
     // 수정모드일때는 PUT
     // console.log('필수값 다 있고 저장')
     // console.log('data::::::', data)
-    const formData = form.getValues()
     // console.log('formData::::', formData)
     // const _dispCompanyName = watch('dispCompanyName')
     // const _objectStatusId = watch('objectStatusId')
@@ -408,6 +397,8 @@ export default function StuffDetail() {
 
   // 임시저장
   const onTempSave = async () => {
+    console.log('임시저장:::::')
+    return
     const formData = form.getValues()
     // console.log('formData::', formData)
     const params = {
@@ -487,9 +478,9 @@ export default function StuffDetail() {
                         <div className="input-wrap mr5" style={{ width: '200px' }}>
                           <input type="text" className="input-light" readOnly />
                         </div>
-                        <button className="btn-origin grey" onClick={onSearchDesignRequestPopOpen}>
+                        <Button className="btn-origin grey" onClick={onSearchDesignRequestPopOpen}>
                           {getMessage('stuff.planReqPopup.title')}
-                        </button>
+                        </Button>
                       </div>
                     </td>
                   </tr>
@@ -555,6 +546,8 @@ export default function StuffDetail() {
                       <div className="flx-box">
                         <div className="select-wrap mr5" style={{ width: '567px' }}>
                           <Select
+                            id="long-value-select1"
+                            instanceId="long-value-select1"
                             className="react-select-custom"
                             classNamePrefix="custom"
                             placeholder="Select"
@@ -587,6 +580,8 @@ export default function StuffDetail() {
                       <div className="flx-box">
                         <div className="select-wrap mr5" style={{ width: '567px' }}>
                           <Select
+                            id="long-value-select2"
+                            instanceId="long-value-select2"
                             className="react-select-custom"
                             classNamePrefix="custom"
                             placeholder="Select"
@@ -695,9 +690,9 @@ export default function StuffDetail() {
                           </select>
                         </div> */}
                         <span className="mr10">{getMessage('stuff.detail.windSpeedSpan')}</span>
-                        <button className="btn-origin grey" onClick={onSearchWindSpeedPopOpen}>
+                        <Button className="btn-origin grey" onClick={onSearchWindSpeedPopOpen}>
                           {getMessage('stuff.detail.btn.windSpeedPop')}
-                        </button>
+                        </Button>
                       </div>
                     </td>
                   </tr>
@@ -790,18 +785,18 @@ export default function StuffDetail() {
             </div>
             <div className="sub-table-footer">
               {!isFormValid ? (
-                <button className="btn-origin grey mr5" onClick={onTempSave}>
+                <Button className="btn-origin grey mr5" onClick={onTempSave}>
                   New화면 임시저장
-                </button>
+                </Button>
               ) : (
-                <button type="submit" className="btn-origin navy mr5">
+                <Button type="submit" className="btn-origin navy mr5">
                   NEW 화면 저장
-                </button>
+                </Button>
               )}
               <Link href="/management/stuff">
-                <button type="button" className="btn-origin grey">
+                <Button type="button" className="btn-origin grey">
                   NEW화면 물건목록이동
-                </button>
+                </Button>
               </Link>
             </div>
           </div>
@@ -827,9 +822,9 @@ export default function StuffDetail() {
                           <div className="input-wrap mr5" style={{ width: '200px' }}>
                             <input type="text" className="input-light" readOnly />
                           </div>
-                          <button className="btn-origin grey" onClick={onSearchDesignRequestPopOpen}>
+                          <Button className="btn-origin grey" onClick={onSearchDesignRequestPopOpen}>
                             {getMessage('stuff.planReqPopup.title')}
-                          </button>
+                          </Button>
                         </div>
                       </td>
                     </tr>
@@ -916,32 +911,32 @@ export default function StuffDetail() {
           {objectNo.substring(0, 1) === 'R' ? (
             <>
               <Link href="/management/stuff">
-                <button type="button" className="btn-origin grey mr5">
+                <Button type="button" className="btn-origin grey mr5">
                   R상세:물건목록
-                </button>
+                </Button>
               </Link>
-              <button type="submit" className="btn-origin navy mr5">
+              <Button type="submit" className="btn-origin navy mr5">
                 R상세:저장
-              </button>
-              <button type="submit" className="btn-origin navy" onClick={onDelete}>
+              </Button>
+              <Button type="submit" className="btn-origin navy" onClick={onDelete}>
                 R상세:물건삭제
-              </button>
+              </Button>
             </>
           ) : (
             <>
               {!isFormValid ? (
-                <button type="submit" className="btn-origin navy mr5" onClick={onTempSave}>
+                <Button type="submit" className="btn-origin navy mr5" onClick={onTempSave}>
                   TEMP상세:임시저장
-                </button>
+                </Button>
               ) : (
-                <button type="submit" className="btn-origin navy mr5">
+                <Button type="submit" className="btn-origin navy mr5">
                   TEMP상세:저장
-                </button>
+                </Button>
               )}
               <Link href="/management/stuff">
-                <button type="button" className="btn-origin grey">
+                <Button type="button" className="btn-origin grey">
                   T상세:물건목록
-                </button>
+                </Button>
               </Link>
             </>
           )}
@@ -949,7 +944,14 @@ export default function StuffDetail() {
       )}
       {showAddressButtonValid && <FindAddressPop setShowAddressButtonValid={setShowAddressButtonValid} zipInfo={setZipInfo} />}
       {showDesignRequestButtonValid && (
-        <PlanRequestPop setShowDesignRequestButtonValid={setShowDesignRequestButtonValid} planReqInfo={setPlanReqInfo} />
+        <PlanRequestPop
+          setShowDesignRequestButtonValid={setShowDesignRequestButtonValid}
+          saleStoreId={form.watch('saleStoreId')}
+          saleStoreLevel={form.watch('saleStoreLevel')}
+          otherSaleStoreId={form.watch('otherSaleStoreId')}
+          otherSaleStoreLevel={form.watch('otherSaleStoreLevel')}
+          planReqInfo={setPlanReqInfo}
+        />
       )}
       {showWindSpeedButtonValid && (
         <WindSelectPop setShowWindSpeedButtonValid={setShowWindSpeedButtonValid} prefName={form.watch('prefName')} windSpeedInfo={setWindSppedInfo} />
diff --git a/src/components/management/StuffSearchCondition.jsx b/src/components/management/StuffSearchCondition.jsx
index 3717e43f..ed84073c 100644
--- a/src/components/management/StuffSearchCondition.jsx
+++ b/src/components/management/StuffSearchCondition.jsx
@@ -254,6 +254,8 @@ export default function StuffSearchCondition() {
                   <div className="select-wrap">
                     {schSelSaleStoreList?.length > 0 && (
                       <Select
+                        id="long-value-select1"
+                        instanceId="long-value-select1"
                         className="react-select-custom"
                         classNamePrefix="custom"
                         placeholder="Select"
diff --git a/src/components/management/popup/PlanRequestPop.jsx b/src/components/management/popup/PlanRequestPop.jsx
index fe6e2d2a..ab2a836c 100644
--- a/src/components/management/popup/PlanRequestPop.jsx
+++ b/src/components/management/popup/PlanRequestPop.jsx
@@ -20,8 +20,6 @@ export default function PlanRequestPop(props) {
   const [pageSize, setPageSize] = useState(20) //페이지 당 게시물 개수
   const [totalCount, setTotalCount] = useState(0) //총 갯수
 
-  const sessionState = useRecoilValue(sessionStore)
-
   const globalLocaleState = useRecoilValue(globalLocaleStore)
 
   const [planReqObject, setPlanReqObject] = useState({})
@@ -103,10 +101,10 @@ export default function PlanRequestPop(props) {
   // 조회
   const onSubmit = (page, type) => {
     const params = {
-      saleStoreId: 'T100',
-      saleStoreLevel: '1',
-      // saleStoreId: sessionState?.storeId,
-      // saleStoreLevel: sessionState?.storeLvl,
+      // saleStoreId: 'T100',
+      // saleStoreLevel: '1',
+      saleStoreId: props?.otherSaleStoreId ? props.otherSaleStoreId : props.saleStoreId,
+      saleStoreLevel: props?.otherSaleStoreLevel ? props.otherSaleStoreLevel : props.saleStoreLevel,
       schPlanReqNo: planReqSearch?.schPlanReqNo ? planReqSearch.schPlanReqNo : schPlanReqNo,
       schTitle: planReqSearch?.schTitle ? planReqSearch.schTitle : schTitle,
       schAddress: planReqSearch?.schAddress ? planReqSearch.schAddress : schAddress,
@@ -114,8 +112,8 @@ export default function PlanRequestPop(props) {
       schPlanReqName: planReqSearch?.schPlanReqName ? planReqSearch.schPlanReqName : schPlanReqName,
       schPlanStatCd: planReqSearch?.schPlanStatCd ? planReqSearch.schPlanStatCd : schPlanStatCd,
       schDateGbn: planReqSearch?.schDateGbn ? planReqSearch.schDateGbn : schDateGbn,
-      // schStartDt: dayjs(startDate).format('YYYY-MM-DD'),
-      // schEndDt: dayjs(endDate).format('YYYY-MM-DD'),
+      schStartDt: dayjs(startDate).format('YYYY-MM-DD'),
+      schEndDt: dayjs(endDate).format('YYYY-MM-DD'),
       startRow: type === 'S' ? (1 - 1) * pageSize + 1 : (page - 1) * pageSize + 1,
       endRow: type === 'S' ? 1 * pageSize : page * pageSize,
     }
@@ -124,6 +122,7 @@ export default function PlanRequestPop(props) {
     } else {
       setPageNo(page)
     }
+    // console.log(params)
 
     const apiUrl = `/api/object/planReq/list?${queryStringFormatter(params)}`
     promiseGet({ url: apiUrl }).then((res) => {
@@ -363,6 +362,8 @@ export default function PlanRequestPop(props) {
                         <td>
                           <div className="select-wrap">
                             <Select
+                              id="long-value-select1"
+                              instanceId="long-value-select1"
                               className="react-select-custom"
                               classNamePrefix="custom"
                               ref={ref}
diff --git a/src/styles/_reset.scss b/src/styles/_reset.scss
index 47cb3efa..ef4cee0d 100644
--- a/src/styles/_reset.scss
+++ b/src/styles/_reset.scss
@@ -981,16 +981,18 @@ input[type='text'] {
     color: #bbbbbb;
     font-weight: 400;
   }
-  .custom__clear-indicator,
-  .custom__indicator-separator {
-    display: none;
-  }
   .custom__indicator {
     padding: 0;
     svg {
       display: none;
     }
   }
+  .custom__clear-indicator {
+    width: 30px;
+    height: 100%;
+    background: url(../../public/static/images/common/select_del.svg) no-repeat center;
+    background-size: 8px 8px;
+  }
   .custom__dropdown-indicator {
     width: 30px;
     height: 100%;