Merge branch 'master' of http://211.38.140.247:3000/sgc/sgc-portal

src/main/webapp/ux/co/co0103/CO01030001U.xml

@@ -678,7 +678,7 @@
 								<w2:column width="120" id="column26" value="G.매출액&lt;br/&gt;[ A*D ]&lt;br/&gt;(VAT제외)" rowSpan="2"></w2:column>
 								<w2:column width="120" id="column27" value="H.매출총이익&lt;br/&gt;[ G-F ]" rowSpan="2"></w2:column>
 								<w2:column width="120" id="column28" value="준공예정원가" rowSpan="2"></w2:column>
-								<w2:column width="120" id="column29" value="준공예정원가율%&lt;br/&gt;(도급액대비)" rowSpan="2"></w2:column>
+								<w2:column width="120" id="column29" value="준공예정원가율&lt;br/&gt;(도급액대비)" rowSpan="2"></w2:column>
 								<w2:column width="120" id="column30" value="I.미청구공사&lt;br/&gt;[ G-J ]&lt;br/&gt;(VAT제외)" rowSpan="2"></w2:column>
 								<w2:column width="120" id="column31" value="J.기성청구액&lt;br/&gt;누계&lt;br/&gt;(VAT제외)" rowSpan="2"></w2:column>
 								<w2:column width="120" id="column32" value="K.기성청구액&lt;br/&gt;누계&lt;br/&gt;(VAT포함)" rowSpan="2"></w2:column>
@@ -736,11 +736,12 @@
 								<w2:column width="70" id="costTotAmtDiff" textAlign="right" dataType="number" displayFormat="#,###,###"></w2:column>
 								<w2:column width="70" id="saleAmt" textAlign="right" dataType="number" displayFormat="#,###,###"></w2:column>
 								<w2:column width="70" id="saleProfAmt" textAlign="right" dataType="number" displayFormat="#,###,###"></w2:column>
-								<w2:column width="70" id="complAmtPlan" textAlign="right" dataType="number" displayFormat="#,###,###" inputType="link"
-									style="text-decoration:underline;">
+								<w2:column width="70" id="complAmtPlan" textAlign="right" dataType="number" displayFormat="#,###,###"
+									inputType="link" style="text-decoration:underline;">
+								</w2:column>
+								<w2:column width="70" id="complAmtPlanRt" textAlign="right" displayFormat="###.##%" dataType="number"
+									inputType="link" style="text-decoration:underline;">
 								</w2:column>
-								<w2:column width="70" id="complAmtPlanRt" textAlign="right" displayFormat="###.##" dataType="number" inputType="link"
-									style="text-decoration:underline;"></w2:column>
 								<w2:column width="70" id="nonPyrqNasAmt" textAlign="right" dataType="number" displayFormat="#,###,###"></w2:column>
 								<w2:column width="70" id="pyrqNasAmt" textAlign="right" dataType="number" displayFormat="#,###,###"></w2:column>
 								<w2:column width="70" id="pyrqAmt" textAlign="right" dataType="number" displayFormat="#,###,###"></w2:column>
@@ -757,90 +758,119 @@
 						</w2:gBody>
 						<w2:footer style="" id="footer1">
 							<w2:row style="" id="row4">
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column1" blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column1" blockSelect="false"
+									displayMode="label">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column2" blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column2" blockSelect="false"
+									displayMode="label">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column3" blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column3" blockSelect="false"
+									displayMode="label">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="100" inputType="text" id="column4" value="합계" blockSelect="false"
-									displayMode="label" colSpan="11">
+								<w2:column removeBorderStyle="false" width="100" inputType="text" id="column4" value="합계"
+									blockSelect="false" displayMode="label" colSpan="11">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column5" expression="SUM('bidAmt')"
-									blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column5"
+									expression="SUM('bidAmt')" blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="100" inputType="expression" id="column6" expression="SUM('orcoNasActAmt')"
-									blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="100" inputType="expression" id="column6"
+									expression="SUM('orcoNasActAmt')" blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="100" inputType="expression" id="column7" expression="SUM('orcoActAmt')"
-									blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="100" inputType="expression" id="column7"
+									expression="SUM('orcoActAmt')" blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="100" inputType="expression" id="column8" expression="SUM('orcoActAmtDiff')"
-									blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="100" inputType="expression" id="column8"
+									expression="SUM('orcoActAmtDiff')" blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="text" id="column9" blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="120" inputType="text" id="column9" blockSelect="false"
+									displayMode="label">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="text" id="column10" blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="120" inputType="text" id="column10" blockSelect="false"
+									displayMode="label">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column11" expression="SUM('actProfAmt')"
-									blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column11"
+									expression="SUM('actProfAmt')" blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="text" id="column12" blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="120" inputType="text" id="column12" blockSelect="false"
+									displayMode="label">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="text" id="column13" blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="120" inputType="text" id="column13" blockSelect="false"
+									displayMode="label">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column14" expression="SUM('costTotNasAmt')"
-									blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column14"
+									expression="SUM('costTotNasAmt')" blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column15" expression="SUM('costTotAmt')"
-									blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column15"
+									expression="SUM('costTotAmt')" blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column16" expression="SUM('costTotAmtDiff')"
-									blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column16"
+									expression="SUM('costTotAmtDiff')" blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column17" expression="SUM('saleAmt')"
-									blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column17"
+									expression="SUM('saleAmt')" blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column18" expression="SUM('saleProfAmt')"
-									blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column18"
+									expression="SUM('saleProfAmt')" blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column19" expression="SUM('complAmtPlan')"
-									blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column19"
+									expression="SUM('complAmtPlan')" blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column20" blockSelect="false"
 									displayMode="label" textAlign="right">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column21" expression="SUM('nonPyrqNasAmt')"
-									blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column21"
+									expression="SUM('nonPyrqNasAmt')" blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column22" expression="SUM('pyrqNasAmt')"
-									blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column22"
+									expression="SUM('pyrqNasAmt')" blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column23" expression="SUM('pyrqAmt')"
-									blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column23"
+									expression="SUM('pyrqAmt')" blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column24" expression="SUM('ctmnAmt')"
-									blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column24"
+									expression="SUM('ctmnAmt')" blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column25" expression="SUM('pyrqCostnasAmt')"
-									blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column25"
+									expression="SUM('pyrqCostnasAmt')" blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column26" expression="SUM('adventCtmnAmt')"
-									blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column26"
+									expression="SUM('adventCtmnAmt')" blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column27" expression="SUM('notAdventCtmnAmt')"
-									blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column27"
+									expression="SUM('notAdventCtmnAmt')" blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="text" id="column28" blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="120" inputType="text" id="column28" blockSelect="false"
+									displayMode="label">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="text" id="column29" blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="120" inputType="text" id="column29" blockSelect="false"
+									displayMode="label">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="text" id="column30" blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="120" inputType="text" id="column30" blockSelect="false"
+									displayMode="label">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column31" expression="SUM('bidPyrqNasAmt')"
-									blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="120" inputType="expression" id="column31"
+									expression="SUM('bidPyrqNasAmt')" blockSelect="false" displayMode="label" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="60" inputType="text" id="column32" blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="60" inputType="text" id="column32" blockSelect="false"
+									displayMode="label">
 								</w2:column>
 							</w2:row>
 						</w2:footer>
@@ -876,7 +906,7 @@
 								<w2:column id="notAdventCtmnAmt" value="미수금(미경과)" width="100"></w2:column>
 								<w2:column id="nonPyrqNasAmt" value="미청구공사" width="100"></w2:column>
 								<w2:column id="complAmtPlan" value="준공예정원가" width="100"></w2:column>
-								<w2:column id="complAmtPlanRt" value="준공예정원가율%&lt;br/&gt;(도급액대비)" width="100"></w2:column>
+								<w2:column id="complAmtPlanRt" value="준공예정원가율&lt;br/&gt;(도급액대비)" width="100"></w2:column>
 							</w2:row>
 						</w2:header>
 						<w2:gBody id="gBody1" style="">
@@ -892,35 +922,39 @@
 								<w2:column dataType="number" displayFormat="#,###,###" id="adventCtmnAmt" textAlign="right" width="70"></w2:column>
 								<w2:column dataType="number" displayFormat="#,###,###" id="notAdventCtmnAmt" textAlign="right" width="70"></w2:column>
 								<w2:column dataType="number" displayFormat="#,###,###" id="nonPyrqNasAmt" textAlign="right" width="70"></w2:column>
-								<w2:column dataType="number" displayFormat="#,###,###" id="complAmtPlan" textAlign="right" width="70" inputType="link"
-									style=";text-decoration:underline;">
+								<w2:column dataType="number" displayFormat="#,###,###" id="complAmtPlan" textAlign="right" width="70"
+									inputType="link" style=";text-decoration:underline;">
+								</w2:column>
+								<w2:column dataType="number" displayFormat="###.##%" id="complAmtPlanRt" textAlign="right" width="70"
+									inputType="link" style=";text-decoration:underline;">
 								</w2:column>
-								<w2:column dataType="number" displayFormat="###.##" id="complAmtPlanRt" textAlign="right" width="70" inputType="link"
-									style=";text-decoration:underline;"></w2:column>
 							</w2:row>
 						</w2:gBody>
 						<w2:footer style="" id="footer1">
 							<w2:row style="" id="row3">
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="cmpnCd" blockSelect="false" displayMode="label"
-									colSpan="7" value="합 &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp;계">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="cmpnCd" blockSelect="false"
+									displayMode="label" colSpan="7" value="합 &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp;계">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="expression" id="bidAmt" blockSelect="false" displayMode="label"
-									expression="sum('bidAmt')" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="70" inputType="expression" id="bidAmt" blockSelect="false"
+									displayMode="label" expression="sum('bidAmt')" textAlign="right" displayFormat="#,###,###" dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="expression" id="adventCtmnAmt" blockSelect="false"
-									displayMode="label" expression="sum('adventCtmnAmt')" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="70" inputType="expression" id="adventCtmnAmt"
+									blockSelect="false" displayMode="label" expression="sum('adventCtmnAmt')" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="expression" id="notAdventCtmnAmt" blockSelect="false"
-									displayMode="label" expression="sum('notAdventCtmnAmt')" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="70" inputType="expression" id="notAdventCtmnAmt"
+									blockSelect="false" displayMode="label" expression="sum('notAdventCtmnAmt')" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="expression" id="nonPyrqNasAmt" blockSelect="false"
-									displayMode="label" expression="sum('nonPyrqNasAmt')" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="70" inputType="expression" id="nonPyrqNasAmt"
+									blockSelect="false" displayMode="label" expression="sum('nonPyrqNasAmt')" textAlign="right" displayFormat="#,###,###"
+									dataType="number">
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="70" inputType="expression" id="complAmtPlan" blockSelect="false"
 									displayMode="label" expression="sum('complAmtPlan')" textAlign="right" displayFormat="#,###,###" dataType="number">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="expression" id="complAmtPlanRt" blockSelect="false"
-									displayMode="label" textAlign="right">
+								<w2:column removeBorderStyle="false" width="70" inputType="expression" id="complAmtPlanRt"
+									blockSelect="false" displayMode="label" textAlign="right">
 								</w2:column>
 							</w2:row>
 						</w2:footer>

src/main/webapp/ux/co/co0107/CO01070001U.xml

@@ -204,7 +204,7 @@
 			var cstrUcdNm = dcdataList1.getCellData( row , "cstrUcdNm" );
 			popupLib.open("CO01070001P", "/ux/co/co0107/CO01070001P.xml", {
                 title: "실행예산 대비 계약금액",
-                useLayer: true,
+                useLayer: false,
                 modal: true,
                 width: 1500,
                 height: 800,
@@ -478,7 +478,7 @@
 									value="준공<br/>예정원가<br/>(B)=ⓐ+ⓑ" blockSelect="false" displayMode="label" rowSpan="3">
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="50" inputType="text" id="column6"
-									value="준공예정&lt;br/&gt;원가율%" blockSelect="false" displayMode="label" rowSpan="3">
+									value="준공예정원가율&lt;br/&gt;(도급액대비)" blockSelect="false" displayMode="label" rowSpan="3">
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column7"
 									value="실행예산&lt;br/&gt;초과 Risk&lt;br/&gt;(A) - (B)" blockSelect="false" displayMode="label" rowSpan="3">
@@ -503,8 +503,8 @@
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column13" value="발주예정"
 									blockSelect="false" displayMode="label" colSpan="2">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column14" value="당월까지&lt;br/&gt;누적실적 ⓒ"
-									blockSelect="false" displayMode="label" rowSpan="2">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column14"
+									value="당월까지&lt;br/&gt;누적실적 (C)" blockSelect="false" displayMode="label" rowSpan="2">
 								</w2:column>
 							</w2:row>
 							<w2:row style="" id="row3">
@@ -555,7 +555,7 @@
 									displayMode="label" textAlign="right" displayFormat="#,###" dataType="number">
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="complAmtPlanRt" blockSelect="false"
-									displayMode="label" textAlign="" displayFormat="###.##" dataType="number">
+									displayMode="label" displayFormat="###.##%" dataType="number">
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="actAmtOver" blockSelect="false"
 									displayMode="label" textAlign="right" displayFormat="#,###" dataType="number">