diff --git a/apps/wr/app/(with-layout)/matMng/coMat/coMatRvw/page.tsx b/apps/wr/app/(with-layout)/matMng/coMat/coMatRvw/page.tsx
index d88906641..f4aaef471 100644
--- a/apps/wr/app/(with-layout)/matMng/coMat/coMatRvw/page.tsx
+++ b/apps/wr/app/(with-layout)/matMng/coMat/coMatRvw/page.tsx
@@ -210,10 +210,10 @@ export default function CoMatRvw() {
*/
const constCostSimulation = () => {
const url = `/constCostSimulation`;
- const width = Math.floor(window.screen.availWidth * 0.6);
- const height = 500;
- const left = Math.floor((window.screen.availWidth - width) / 2);
- const top = 0;
+ const width = Math.floor(window.screen.availWidth * 0.8);
+ const height = Math.floor(window.screen.availHeight * 0.8);
+ const left = Math.floor(window.screenX + (window.outerWidth - width) / 2);
+ const top = Math.floor(window.screenY + (window.outerHeight - height) / 2);
const popupOptions = `width=${width},height=${height},left=${left},top=${top},resizable=yes,scrollbars=yes`;
window.open(url, "candidatePopup", popupOptions);
};
diff --git a/apps/wr/app/store/common/searchCode/index.ts b/apps/wr/app/store/common/searchCode/index.ts
index 31f5bd3fe..5454c1b74 100644
--- a/apps/wr/app/store/common/searchCode/index.ts
+++ b/apps/wr/app/store/common/searchCode/index.ts
@@ -53,7 +53,7 @@ export type comFcltState = {
searchFclts: pubHasuType[];
demandCompList: DemandCompType[];
checkDemand: DemandCompType;
- constCostRes:conCostFeeType[], // 표준사업비
+ constCostRes:conCostFeeType[], // 표준사업비 (공사비 산정표)
rateFeeRes:rateFeeType[],
};
@@ -168,7 +168,7 @@ export const comFcltSearchAction: (set: any) => comFcltActions = (set: any) => {
console.log(" error ", e);
}
},
- // 공사금액 조회 : ONSEMIRO_NEW.EM_STD_COST_REUSE 설치관리표준사업비 재이용시설 공사비
+ // 공사금액 (공사비 산정표) 조회 : ONSEMIRO_NEW.EM_STD_COST_REUSE 설치관리표준사업비 재이용시설 공사비
getConstCostFee: async (year: string) => {
try {
const url = `/prcsFclt/CstRuse/${year}`;
diff --git a/apps/wr/app/store/matDmd/coMatRvw/headList.tsx b/apps/wr/app/store/matDmd/coMatRvw/headList.tsx
index c6ef94875..180e5dc5c 100644
--- a/apps/wr/app/store/matDmd/coMatRvw/headList.tsx
+++ b/apps/wr/app/store/matDmd/coMatRvw/headList.tsx
@@ -24,17 +24,18 @@ export const coRvwNodeListExport: CommonTableProps[] = [
];
export const constCostHeadListExport: CommonTableProps[] = [
- { id: "gubun", title: "구분", visible: true, },
- { id: "500", title: "500", visible: true, },
- { id: "1000", title: "1,000", visible: true, },
- { id: "2000", title: "2,000", visible: true, },
- { id: "3000", title: "3,000", visible: true, }, //바꾸기
- { id: "5000", title: "5,000", visible: true, }, //바꾸기
- { id: "10000", title: "10,000", visible: true, }, //
- { id: "20000", title: "20,000", visible: true, }, //
- { id: "30000", title: "30,000", visible: true, }, //
- { id: "50000", title: "50,000", visible: true, }, //
- { id: "100000", title: "100,000", visible: true, }, //바꾸기
+ { id: "gubun", title: "구분", visible: true, row: 0, rowSpan: 2, colSpan: 1 },
+ { id: "A", title: "처리시설용량(m³)", visible: true, row: 0, rowSpan: 1, colSpan: 10 },
+ { id: "500", title: "500", visible: true, row: 1, rowSpan: 1, colSpan: 1 },
+ { id: "1000", title: "1,000", visible: true, row: 1, rowSpan: 1, colSpan: 1 },
+ { id: "2000", title: "2,000", visible: true, row: 1, rowSpan: 1, colSpan: 1 },
+ { id: "3000", title: "3,000", visible: true, row: 1, rowSpan: 1, colSpan: 1 },
+ { id: "5000", title: "5,000", visible: true, row: 1, rowSpan: 1, colSpan: 1 },
+ { id: "10000", title: "10,000", visible: true, row: 1, rowSpan: 1, colSpan: 1 },
+ { id: "20000", title: "20,000", visible: true, row: 1, rowSpan: 1, colSpan: 1 },
+ { id: "30000", title: "30,000", visible: true, row: 1, rowSpan: 1, colSpan: 1 },
+ { id: "50000", title: "50,000", visible: true, row: 1, rowSpan: 1, colSpan: 1 },
+ { id: "100000", title: "100,000", visible: true, row: 1, rowSpan: 1, colSpan: 1 },
];
export const rateFeeHeadListExport: CommonTableProps[] = [
diff --git a/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx b/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx
index 3e118154b..68ef09abf 100644
--- a/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx
+++ b/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx
@@ -169,6 +169,10 @@ export default function ConCostForm({
alert("목록에서 수요신청 건을 선택하세요.");
return;
}
+ if (!useUsgCdWatch) {
+ alert("용도 값이 없습니다.");
+ return;
+ }
if (!dmndQtyWatch) {
alert("요구수량(m³/일)을 확인해주세요 계산할수 없습니다. ");
return;
@@ -426,6 +430,7 @@ export default function ConCostForm({
{isSim ? (