Merge commit '9bdf01e7f3272aec4aed2c9031bc59851730b111' into iipbs/wr/dev

apps/wr/app/matMng/coMng/coSttn/page.tsx

@@ -129,7 +129,7 @@ export default function CoSttn() {
         coExcel as [],
         "수요처 관리",
         "sample_coSttn.xlsx",
-        "A1:H1",
+        "A1:G1",
         2
       );
     }
@@ -289,7 +289,7 @@ export default function CoSttn() {
         </div>
         <UiModal
           bodyClass={
-            "w-[40vw] max-w-none h-[80vh] " // +upadateData?.dmdInfoId?'h-[60vh]':'h-[90vh]'
+            "w-[40vw] max-w-none h-[83vh] " // +upadateData?.dmdInfoId?'h-[60vh]':'h-[90vh]'
           }
           open={isDmdModal.isMoal}
           onOpenChange={() => {

apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx

@@ -21,6 +21,8 @@ import ListDiv from "@common/business_components/ui/list_div";
 import { HeadMakeColSpan } from "@common/business_components/ui/table/HeadMakeColSpan";
 import { Button, Label } from "@common/components/ui";
 import { useCallback, useEffect, useRef, useState } from "react";
+import toast, { Toaster } from "react-hot-toast";
+import { useTranslation } from "react-i18next";
 
 export default function PbnstSttn() {
   const {
@@ -46,10 +48,11 @@ export default function PbnstSttn() {
     isModal: boolean;
     data: customPbnst;
   }>({ isModal: false, data: {} as customPbnst });
-
+  const isDownloadTriggered = useRef(false);
   const [pbnRuseNm, setPbnRuseNm] = useState<string>("");
-
+  const { t } = useTranslation('base');
   const excelClick = useCallback(() => {
+    isDownloadTriggered.current = true;
     pbnstSttnSearch(
       true,
       String(1),
@@ -77,9 +80,9 @@ export default function PbnstSttn() {
   }, [pbnstSttn.isInit]);
   useEffect(() => {
 
-      pbnSttnInit("1", "15", ref.current, searchYear, fclts);
+    pbnSttnInit("1", "15", ref.current, searchYear, fclts);
   }, [fclts]);
-  
+
   useEffect(() => {
     if (pbnstSttnRes && pbnstSttnRes.length > 0) {
       setBdstTable(pbnstSttnRes);
@@ -90,7 +93,10 @@ export default function PbnstSttn() {
 
 
   useEffect(() => {
-    if (pbnstSttn.excelList.length >= 0) {
+    if (!isDownloadTriggered.current) {
+      return;
+    }
+    if (pbnstSttn.excelList.length > 0) {
       excelDownload(
         pbnstSttn.excelList,
         "하수재이용시설 현황",
@@ -98,7 +104,10 @@ export default function PbnstSttn() {
         "A1:U2",
         3
       );
+    } else {
+      toast.error(t('excelDownErrMsg'));
     }
+    isDownloadTriggered.current = false;
   }, [pbnstSttn.excelList]);
 
 
@@ -162,8 +171,8 @@ export default function PbnstSttn() {
                   />
                 </div>
               }
-              queryClick={ ()=> {
-               // pbnSearch(returnType);
+              queryClick={() => {
+                // pbnSearch(returnType);
 
                 //setTableIndex(0)
                 setIsReset(true);
@@ -202,7 +211,7 @@ export default function PbnstSttn() {
                   );
                   setIsReset(false);
                 }}
-              
+
                 resetPageNo={isReset}
               >
                 <HeadMakeColSpan upHeadList={pbnstSttn.pbnstSttNodeList} />
@@ -242,6 +251,7 @@ export default function PbnstSttn() {
           }}
         />
       </ContentsDiv>
+      <Toaster position="top-center" />
     </>
   );
 }

apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx

@@ -158,7 +158,7 @@ export default function RswtrRegForm({
             </h1>
             <div className="grid grid-cols-12 flex items-center card-header">
               <h1 className="text-2xl font-medium text-label col-span-10">
-                건축물 운영정보
+                건축물 정보
               </h1>
               {!readonly && (
                 <Button

apps/wr/components/ui/modal/sttn/sttnDetailModal/coDatailModal.tsx

@@ -48,22 +48,21 @@ export default function CoDetailModal({
 
   return (
     <div>
-      <ScrollArea className="h-[85vh] mx-8">
-        <Form {...form}>
-          <form onSubmit={form.handleSubmit(onFormSubmit)}>
-            <div className="grid grid-cols-12 items-center card-header">
-              <h1 className="text-2xl font-medium text-label col-span-10">
-                잠재수요처 상세정보
-              </h1>
-              <Button type="submit"
-                className="col-start-12 col-span-1"
-                size={"sm"}
-                disabled={readonly}
-              >
-                저장
-              </Button>
-            </div>
-
+      <Form {...form}>
+        <form onSubmit={form.handleSubmit(onFormSubmit)}>
+          <div className="grid grid-cols-12 items-center card-header">
+            <h1 className="text-2xl font-medium text-label col-span-10">
+              잠재수요처 상세정보
+            </h1>
+            <Button type="submit"
+              className="col-start-12 col-span-1"
+              size={"sm"}
+              disabled={readonly}
+            >
+              저장
+            </Button>
+          </div>
+          <ScrollArea className="h-[79vh] mx-8">
             <FormField
               control={form.control}
               name="fctryMngSn"
@@ -865,9 +864,9 @@ export default function CoDetailModal({
                 />
               </div>
             </div>
-          </form>
-        </Form>
-      </ScrollArea>
+          </ScrollArea>
+        </form>
+      </Form>
     </div>
   );
 }