diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/excel.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/excel.tsx index aa550dcd1..d9016410d 100644 --- a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/excel.tsx +++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/excel.tsx @@ -1,17 +1,16 @@ -import type { SelectDataType } from "@common/business_components/ui"; -import { - chkMngType, - chkSpwtPositnType, - useTypes, - type Buildingtype, -} from "../rainChkgdn/excel"; import { TEST_UUID } from "@/app/store/ruseFcltMng/fcltReg/rainReg"; -import type { rswtChkZodType } from "."; import { isInvalidDate, isInvalidNumber, parseRawValue, } from "@/components/lib/func/excelFunc"; +import type { SelectDataType } from "@common/business_components/ui"; +import type { rswtChkZodType } from "."; +import { + chkSpwtPositnType, + useTypes, + type Buildingtype +} from "../rainChkgdn/excel"; export const rswtMakeExcelSample = ( buildings: Buildingtype[], @@ -284,15 +283,6 @@ const rswtExcelDataCheck = ( defaultMessage + ` 처리용량(m³): 숫자 형식 아님 (${rswt.prcsCpct})` ); } - if ( - rswt.oilqMeasMthd.length > 1 && - !chkMngType.includes(rswt.oilqMeasMthd) - ) { - issues.push( - defaultMessage + - `유량측정방법: 위탁 혹은 자체 만 허용) /입력값:${rswt.oilqMeasMthd}` - ); - } if ( rswt.spwtPositn.length > 1 && !chkSpwtPositnType.includes(rswt.spwtPositn) diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList.tsx index 04914b236..8ec8c3f41 100644 --- a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList.tsx +++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList.tsx @@ -163,11 +163,11 @@ export const rswtChkHeadListExport: TableUpperProps[] = [ }, { id: "trbt", title: "탁도(NTU)", upName: "useQuilty", upSequnce: 3 ,type: "number"}, { id: "bod", title: "BOD(mg/L)", upName: "useQuilty", upSequnce: 4 ,type: "number"}, - { id: "smll", title: "냄새", upName: "useQuilty", upSequnce: 5 ,type: "number"}, + { id: "smll", title: "냄새", upName: "useQuilty", upSequnce: 5 ,type: "text"}, { id: "crmty", title: "색도(도)", upName: "useQuilty", upSequnce: 6 ,type: "number"}, { id: "tn", title: "총질소(T-N)(mg/L)", upName: "useQuilty", upSequnce: 7 ,type: "number"}, { id: "tph", title: "총인(T-P)(mg/L)", upName: "useQuilty", upSequnce: 8 ,type: "number"}, - { id: "ph", title: "수소이온농도(PH)", upName: "useQuilty", upSequnce: 9,type: "number" }, + { id: "ph", title: "수소이온농도(PH)", upName: "useQuilty", upSequnce: 9,type: "text" }, { id: "clIonQnt", title: "염화물(mg/L)", upName: "useQuilty", upSequnce: 10 ,type: "number"}, { diff --git a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/headList.tsx b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/headList.tsx index e000c550a..0fc025272 100644 --- a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/headList.tsx +++ b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/headList.tsx @@ -47,7 +47,7 @@ export const rswtChkSttnHeadListExport: TableUpperProps[] = [ title: "냄새", upName: "useQuilty", upSequnce: 5, - type: "number", + type: "text", }, { id: "crmty", @@ -64,7 +64,7 @@ export const rswtChkSttnHeadListExport: TableUpperProps[] = [ upSequnce: 8, type: "number", }, - { id: "ph", title: "수소이온농도(PH)", upName: "useQuilty", upSequnce: 9, type: "number" }, + { id: "ph", title: "수소이온농도(PH)", upName: "useQuilty", upSequnce: 9, type: "text" }, { id: "clIonQnt", title: "염화물(mg/L)", diff --git a/apps/wr/components/lib/func/TableData.tsx b/apps/wr/components/lib/func/TableData.tsx index f114df1e4..bee5e093d 100644 --- a/apps/wr/components/lib/func/TableData.tsx +++ b/apps/wr/components/lib/func/TableData.tsx @@ -234,6 +234,8 @@ export const chRowspanTable = ( }} /> ) + ) : ["smll", "ph"].includes(head.id) && head.type === "text" ? ( + <>- ) : [ "totalSplyUswtrUtztnQnt", "totalRuseFcltUtztnQnt", @@ -344,6 +346,17 @@ export const InputTableBody = ( return ( {headList.map((head, headIndex) => { + //냄새, ph면 계산 못하게 - 로 수정 + if (["smll", "ph"].includes(head.id)) { + return ( + + - + + ); + } const isTextColumn = head.id === "구분" || head.id === "용수명"; const textAlignClass = isTextColumn ? "text-center"