결함 오류 수정

apps/wr/app/matMng/coMat/coMatRvw/page.tsx

@@ -316,7 +316,7 @@ export default function CoMatRvw() {
                         control={form.control}
                         name="dmndQty"
                         render={({ field }) => (
-                          <FormUi label="요구수량(M3/d)">
+                          <FormUi label="요구수량(m³/일)">
                             <Input
                               placeholder=""
                               type="number"

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

@@ -101,7 +101,9 @@ export default function CoSttn() {
           ...item,
           telno: formatPhoneNumber(item.telno || undefined),
           regDt: moment(item.regDt).format("YYYY-MM-DD"),
-        }));
+          dmdInfoId: `${item.dmdInfoId.slice(0, 3)}-${item.dmdInfoId.slice(3, 5)}-${item.dmdInfoId.slice(5,10)}-${item.dmdInfoId.slice(10)}`
+      }));
+      console.log("chData:", chData)
         // .filter((item: any) => item !== undefined);
         setBdstTable(chData);
       } else if (coSttnRes?.length == 0) {

apps/wr/app/store/matDmd/coMatRvw/headList.tsx

@@ -20,7 +20,7 @@ export const coRvwHeadListExport: CommonTableProps[]= [
   },
   {
     id: "daddr",
-    title: "공장주소",
+    title: "주소",
     visible: true,
   },
   {

apps/wr/app/store/matDmd/ruseRvwHstry/headList.tsx

@@ -19,7 +19,7 @@ export const ruseHstryHeadListExport:TableUpperProps[]= [
   },
   {
     id: "daddr",
-    title: "공장주소",
+    title: "주소",
     visible: true,
   },
   {
@@ -49,7 +49,7 @@ export const ruseHstryHeadListExport:TableUpperProps[]= [
   },
   {
     id: "dmndQty", //바꾸기
-    title: "요구수량(M3/d)",
+    title: "요구수량(m³/일)",
     visible: true,
   },
   {

apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/headList.tsx

@@ -53,7 +53,7 @@ export const pbnstDemandHeadListExport: TableUpperProps[] = [
 
 export const pbnstOrgwtHeadListRxport: TableUpperProps[] = [
   { id: "ruseUtztnFcltNm", title: "하수처리장명" },
-  { id: "orgwtWtritQnt", title: "원수취수량", type: "number" },
+  { id: "orgwtWtritQnt", title: "원수취수량(m³/일)", type: "number" },
   { id: "tmsYn", title: "하수처리량TMS 전후" },
   { id: "dschgFmYn", title: "하수처리장 방류 유량계 전·후​" },
   { id: "dtlPstnExpln", title: "상세위치", edit: true },

apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/headList.tsx

@@ -141,7 +141,7 @@ export const pbnstSttNodeListExport: CommonTableProps[] = [
   },
   {
     id: "fctCpc",
-    title: "시설용량(톤/일)",
+    title: "시설용량(m³/일)",
     visible: true,
     row: 1,
     rowSpan: 2,
@@ -157,7 +157,7 @@ export const pbnstSttNodeListExport: CommonTableProps[] = [
   },
   {
     id: "rusSup",
-    title: "재이용수공급가능량",
+    title: "재이용수공급가능량(m³/일)",
     visible: true,
     row: 1,
     rowSpan: 1,
@@ -226,7 +226,7 @@ export const pbnstSttNodeListExport: CommonTableProps[] = [
   },
   {
     id: "fcltCpct",
-    title: "시설용량(m³/일)",
+    title: "시설용량",
     upName: "rusSup",
     visible: true,
     row: 2,
@@ -235,7 +235,7 @@ export const pbnstSttNodeListExport: CommonTableProps[] = [
   },
   {
     id: "splyExtraCpct",
-    title: "하수처리량(m³/일)",
+    title: "하수처리량",
     upName: "rusSup",
     visible: true,
     row: 2,
@@ -244,7 +244,7 @@ export const pbnstSttNodeListExport: CommonTableProps[] = [
   },
   {
     id: "ruseCpct",
-    title: "재이용량(m³/일)",
+    title: "재이용량",
     upName: "rusSup",
     visible: true,
     row: 2,
@@ -337,7 +337,7 @@ export const ruseFcltNodeListExport: TableUpperProps[] = [
   },
   {
     id: "mainSplyPumpCpct",
-    title: "메인공급펌프용량",
+    title: "메인공급펌프용량(m³/일)",
     visible: true,
     row: 1,
     rowSpan: 3,
@@ -345,7 +345,7 @@ export const ruseFcltNodeListExport: TableUpperProps[] = [
   },
   {
     id: "buziFee",
-    title: "사업비(백만원)",
+    title: "사업비(원)",
     visible: true,
     row: 2,
     rowSpan: 1,
@@ -418,7 +418,7 @@ export const ruseFcltNodeListExport: TableUpperProps[] = [
   },
   {
     id: "cusrAlotm",
-    title: "민간투자비",
+    title: "민간투자비",
     visible: true,
     row: 3,
     rowSpan: 1,
@@ -438,7 +438,7 @@ export const ruseFcltNodeListExport: TableUpperProps[] = [
 
 export const ruseSplyHeadListExport: TableUpperProps[] = [
   { id: "cycl", title: "차수", visible: true },
-  { id: "orgwtWtritQnt", title: "원수취수량", visible: true },
+  { id: "orgwtWtritQnt", title: "원수취수량(m³/일)", visible: true },
   { id: "tmsYn", title: "하수처리량TMS 전후", visible: true },
   { id: "dschgFmYn", title: "하수처리장 방류 유량계 전·후​", visible: true },
   { id: "dtlPstnExpln", title: "상세위치 설명", visible: true },
@@ -447,8 +447,8 @@ export const ruseSplyHeadListExport: TableUpperProps[] = [
 export const rusePplHeadListExport: TableUpperProps[] = [
   { id: "cycl", title: "차수", visible: true },
   { id: "ppMqlt", title: "관재질", type: "select", visible: true },
-  { id: "pdmt", title: "관경", type: "select", visible: true },
-  { id: "cpct", title: "연장", edit: true, visible: true },
+  { id: "pdmt", title: "관경(mm)", type: "select", visible: true },
+  { id: "cpct", title: "연장(m)", edit: true, visible: true },
 ];
 
 export const ruseGuranteeHeadListExport: TableUpperProps[] = [
@@ -458,10 +458,10 @@ export const ruseGuranteeHeadListExport: TableUpperProps[] = [
   { id: "combResdch", title: "결합잔류염소(mh/L)", visible: true },
   { id: "trbt", title: "탁도(NTU)", visible: true },
   { id: "smll", title: "냄새", visible: true },
-  { id: "crmty", title: "색도", visible: true },
+  { id: "crmty", title: "색도(도)", visible: true },
   { id: "tn", title: "총질소(mg/L)", visible: true },
   { id: "tph", title: "총인(mg/L)", visible: true },
-  { id: "ph", title: "수소이온농도", visible: true },
+  { id: "ph", title: "수소이온농도(PH)", visible: true },
   { id: "clIonQnt", title: "염화물(mg/L)", visible: true },
   { id: "cdtnv", title: "전기전도도(μs/cm)​", visible: true },
 ];

apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/headList.tsx

@@ -228,7 +228,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [
   },
   {
     id: "archArea",
-    title: "건축면적",
+    title: "건축면적(m³)",
     upName: "bdnstInfo",
     visible: true,
     row: 2,
@@ -265,7 +265,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [
 
   {
     id: "instlCst",
-    title: "설치비용",
+    title: "설치비용(원)",
     upName: "rainFcltInfo",
     visible: true,
     row: 2,
@@ -285,7 +285,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [
 
   {
     id: "pntfColKnd",
-    title: "집수지점종류",
+    title: "종류",
     upName: "pntfCol",
     visible: true,
     row: 3,
@@ -294,7 +294,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [
   },
   {
     id: "pntfColArea",
-    title: "집수지점면적",
+    title: "면적(m²)",
     upName: "pntfCol",
     visible: true,
     row: 3,
@@ -304,7 +304,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [
 
   {
     id: "dtfcltCpct",
-    title: "저류조용량",
+    title: "저류조용량(m³)",
     upName: "rainFcltInfo",
     visible: true,
     row: 2,
@@ -322,7 +322,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [
   },
   {
     id: "filtrTrtmfctCpct",
-    title: "여과처리시설용량",
+    title: "여과처리시설용량(m³)",
     upName: "filtrTrtmfct",
     visible: true,
     row: 3,
@@ -359,7 +359,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [
   },
   {
     id: "instlCstSprtAmt",
-    title: "설치지원비용",
+    title: "설치지원비용(원)",
     upName: "instlCstSprt",
     visible: true,
     row: 3,
@@ -379,7 +379,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [
 
   {
     id: "grntchBdstCertYn",
-    title: "녹색건축물인증여부",
+    title: "인증여부",
     upName: "grntchBdstCert",
     visible: true,
     row: 3,
@@ -388,7 +388,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [
   },
   {
     id: "grntchBdstCertYr",
-    title: "녹색건축물인증년도",
+    title: "인증년도",
     upName: "grntchBdstCert",
     visible: true,
     row: 3,
@@ -397,7 +397,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [
   },
   {
     id: "grntchBdstCertNo",
-    title: "녹색건축물인증번호",
+    title: "인증번호",
     upName: "grntchBdstCert",
     visible: true,
     row: 3,
@@ -406,7 +406,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [
   },
   {
     id: "grntchBdstCertGrd",
-    title: "녹색건축물인증등급",
+    title: "인증등급",
     upName: "grntchBdstCert",
     visible: true,
     row: 3,

apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx

@@ -85,7 +85,7 @@ export default function ConCostForm({
   const calculateConstCost = useCallback(() => {
     const usgPrcsProcs = usgPrcsProcsWatch;
     if (!dmndQtyWatch) {
-      toast.error("요구수량(M3/d)을 확인해주세요 계산할수 없습니다. ");
+      toast.error("요구수량(m³/일)을 확인해주세요 계산할수 없습니다. ");
       return;
     }
     if (usgPrcsProcs === null || usgPrcsProcs === undefined) {
@@ -278,7 +278,7 @@ export default function ConCostForm({
               control={form.control}
               name="dmndQty"
               render={({ field }) => (
-                <FormUi label="요구수량(M3/d)">
+                <FormUi label="요구수량(m³/일)">
                   <Input
                     placeholder=""
                     type="number"
@@ -315,7 +315,7 @@ export default function ConCostForm({
                     ]}
                     pageSize={0}
                     total={0}
-                    cellClick={() => {}}
+                    cellClick={undefined}
                     onPageChange={() => {}}
                   />
                 </>
@@ -344,7 +344,7 @@ export default function ConCostForm({
               control={form.control}
               name="dmndQty"
               render={({ field }) => (
-                <FormUi label="처리시설 용량（요구수량 * 365일)">
+                <FormUi label="처리시설용량(m³/일)">
                   <Input
                     placeholder=""
                     type="number"

apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx

@@ -155,7 +155,7 @@ export default function HtdflRegForm({
           {/* <div className="flex justify-between items-center mx-3"> */}
           <div>
             <h1 className="text-2xl font-bold text-gray-900 mt-3 ml-1">
-              {readonly && `(${htdflForm?.bdstNm})`}
+              {readonly && `(시설명 : ${htdflForm?.bdstNm})`}
             </h1>
             <div className="grid grid-cols-12 flex items-center card-header">
               <h1 className="text-2xl font-medium text-label col-span-10">
@@ -346,7 +346,7 @@ export default function HtdflRegForm({
                   control={form.control}
                   name="reuseBuilding.0.htdflObj.amtgnr"
                   render={({ field }) => (
-                    <FormUi label="발생량(m³/년)">
+                    <FormUi label="발생량(m³/일)">
                       <Input
                         className={selectClass}
                         placeholder="1,000,000"
@@ -428,7 +428,7 @@ export default function HtdflRegForm({
                   control={form.control}
                   name="reuseBuilding.0.htdflObj.utztnCpct"
                   render={({ field }) => (
-                    <FormUi label="이용량(m³/년)">
+                    <FormUi label="이용량(m³/일)">
                       <Input
                         className={selectClass}
                         placeholder="1,000,000"

apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegForm.tsx

@@ -286,7 +286,7 @@ export function PbnstMngForm({
                     render={({ field }) => (
                       <FormUi label="">
                         <Input
-                          className="!text-2xl"
+                          className="!text-2xl ml-4 mt-1"
                           placeholder=""
                           type="text"
                           onChange={(e) => {

apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx

@@ -159,7 +159,7 @@ export default function RainRegForm({
         <form onSubmit={form.handleSubmit(onSubmit)}>
           <div>
             <h1 className="text-2xl font-bold text-gray-900 mt-3 ml-1">
-              {readonly && `(${rainForm?.bdstNm})`}
+              {readonly && `(시설명 : ${rainForm?.bdstNm})`}
             </h1>
             <div className="grid grid-cols-12 flex items-center card-header">
               <h1 className="text-2xl font-medium text-label col-span-10">
@@ -316,7 +316,7 @@ export default function RainRegForm({
                     const isUnknown = value === null || value === -1; // 또는 Number(value) === -1
                     return (
                       <div className="flex items-center gap-2">
-                        <FormUi label="집수면 용량(m³)">
+                        <FormUi label="집수면 면적(m²)">
                           <Input
                             className={selectClass}
                             placeholder="1,000,000"

apps/wr/components/ui/modal/coMat/constCostFeeTable.tsx

@@ -10,7 +10,7 @@ import { yearOptions } from "@/components/lib/func/commom";
 import { SelectBox, UiTable } from "@common/business_components/ui";
 import ListDiv from "@common/business_components/ui/list_div";
 import { Label, } from "@common/components/ui";
-import {  useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 
 export function ConstCostFeeTable() {
   const { coRvw, constCostRes } = useWrStore((state) => state);
@@ -19,7 +19,7 @@ export function ConstCostFeeTable() {
   const [constCostData, setConstCostData] = useState<ContCostMap[]>([]);
 
 
-   const getFctDescription = (fctCd: string) => {
+  const getFctDescription = (fctCd: string) => {
     const fctMap: { [key: string]: string } = {
       "001": "총인처리시설",
       "002": "염소소독",
@@ -73,26 +73,19 @@ export function ConstCostFeeTable() {
           공사비 산정표 보기
         </h3>
         <hr />
-        <div className="flex items-center">
-          <Label className="text-xl text-gray-600">기준년도</Label>
-          <SelectBox
-            className="h-full text-2xl"
-            label=""
-            selectClass={"ml-4"}
-            selectArray={yearOptions}
-            value={year}
-            onSelectValue={(val: string | number) => setYear(String(val))}
-          />
+        <div className="col-span-5 flex items-center">
+          <Label className="ml-2 mr-1 text-xl text-gray-600">기준년도</Label>
+          <span>{new Date().getFullYear() || ""}</span>
         </div>
-          <UiTable
-            headName={""}
-            tableData={constCostData || []}
-            headlist={coRvw.constCostHeadList}
-            pageSize={0}
-            total={0}
-            cellClick={() => {}}
-            onPageChange={() => {}}
-          />
+        <UiTable
+          headName={""}
+          tableData={constCostData || []}
+          headlist={coRvw.constCostHeadList}
+          pageSize={0}
+          total={0}
+          cellClick={undefined}
+          onPageChange={() => { }}
+        />
       </ListDiv>
     </>
   );

apps/wr/components/ui/modal/coMat/rateFeeModal.tsx

@@ -80,7 +80,7 @@ export function RateFeeTableModal() {
           <hr className="col-span-6 border-gray-300" />
 
           <div className="col-span-5 flex items-center">
-            <Label className="  text-xl text-gray-600">기준년도</Label>
+            <Label className="mr-1 text-xl text-gray-600">기준년도</Label>
             <span>{new Date().getFullYear() || ""}</span>
           </div>
           <div className="col-span-6 pr-6">

apps/wr/public/locales/ko/message.json

@@ -19,7 +19,7 @@
   "saveRowErrMsg": "수정을 원하는 행을 선택하고 저장버튼을 눌러주세요.",
   "costCalcErrMsg":"공사비 계산 진행 후 저장을 눌러주세요",
   "maxYearErrMsg": "최대 {{year}}년까지 선택가능합니다.",
-  "checkQtyMsg": "요구수량(M3/d)을 확인해주세요 계산할 수 없습니다."
+  "checkQtyMsg": "요구수량(m³/일)을 확인해주세요 계산할 수 없습니다."
   
 }