Browse Source

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

SBK 1 year ago
parent
commit
463d75b8b4

+ 8 - 8
src/main/webapp/ux/co/co0103/CO01030001P.xml

@@ -25,8 +25,7 @@
 				<data xmlns="" />
 				<data xmlns="" />
 			</xf:instance>
 			</xf:instance>
 			<w2:dataCollection baseNode="map">
 			<w2:dataCollection baseNode="map">
-				<w2:dataList baseNode="list" repeatNode="map" id="dcdataList1" saveRemovedData=""
-					ev:onrowpositionchange="scwin.dcdataList1_onrowpositionchange">
+				<w2:dataList baseNode="list" repeatNode="map" id="dcdataList1" saveRemovedData="">
 					<w2:columnInfo>
 					<w2:columnInfo>
 						<w2:column id="cmpnCd" name="회사코드" dataType="text"></w2:column>
 						<w2:column id="cmpnCd" name="회사코드" dataType="text"></w2:column>
 						<w2:column id="stdYm" name="월" dataType="text"></w2:column>
 						<w2:column id="stdYm" name="월" dataType="text"></w2:column>
@@ -228,11 +227,11 @@
             callback: function(result, e) {
             callback: function(result, e) {
                 dcdataList1.setJSON(result);
                 dcdataList1.setJSON(result);
 		    	listCount1.setValue(grdData1.getTotalRow());
 		    	listCount1.setValue(grdData1.getTotalRow());
-		    	dcdataList1.setRowPosition( 0 );
-		    	var rows = dcdataList1.getRowCount();
 		    	grdData1.mergeClear();
 		    	grdData1.mergeClear();
 		    	grdData1.mergeByRestricCol( );
 		    	grdData1.mergeByRestricCol( );
 		    	
 		    	
+		    	var rows = dcdataList1.getRowCount();
+		    	
 		    	for (var i=0; i<rows; i++) {
 		    	for (var i=0; i<rows; i++) {
 		    		if(dcdataList1.getCellData( i , "dore" ) > 0) {
 		    		if(dcdataList1.getCellData( i , "dore" ) > 0) {
 		    			grdData1.setCellColor( i , "dore" , "red" );
 		    			grdData1.setCellColor( i , "dore" , "red" );
@@ -305,7 +304,9 @@
 		    	grdData1.setFooterValue( "doreSum" , dcdataList1.getCellData( rows-1 , "doreSum" ) );
 		    	grdData1.setFooterValue( "doreSum" , dcdataList1.getCellData( rows-1 , "doreSum" ) );
 		    	grdData1.setFooterValue( "midoreSum" , dcdataList1.getCellData( rows-1 , "midoreSum" ) );
 		    	grdData1.setFooterValue( "midoreSum" , dcdataList1.getCellData( rows-1 , "midoreSum" ) );
 		    	
 		    	
-		    	scwin.scrollY_grdData1();
+		    	grdData1.setFocusedCell( rows - 1 );
+		    	
+		    	//scwin.scrollY_grdData1();
             }
             }
         });
         });
     };
     };
@@ -387,9 +388,8 @@
 						dataList="data:dcdataList1" fixedColumnWithHidden="false" id="grdData1" ignoreCellClick="false" ignoreToggleOnDisabled="false"
 						dataList="data:dcdataList1" fixedColumnWithHidden="false" id="grdData1" ignoreCellClick="false" ignoreToggleOnDisabled="false"
 						keyMoveEditMode="true" moveKeyEditMode="true" rowNumHeaderValue="No" rowNumStatusResize="true" rowNumVisible="true" rowNumWidth="20"
 						keyMoveEditMode="true" moveKeyEditMode="true" rowNumHeaderValue="No" rowNumStatusResize="true" rowNumVisible="true" rowNumWidth="20"
 						rowStatusHeaderValue="상태" rowStatusVisible="false" rowStatusWidth="20" scrollByColumn="false" scrollByColumnAdaptive="false"
 						rowStatusHeaderValue="상태" rowStatusVisible="false" rowStatusWidth="20" scrollByColumn="false" scrollByColumnAdaptive="false"
-						style="height: 200px;" summaryAuto="false" useShiftKey="true" visibleRowNum="" enterKeyMove="none" readOnly="true"
-						ev:oncellclick="scwin.grdData1_oncellclick" fixedColumn="" mergeCells="" mergeCellsFixedRows="" mergeCol=''
-						ev:onscrolly="scwin.scrollY_grdData1">
+						style="height: 200px;" summaryAuto="false" useShiftKey="true" visibleRowNum="" enterKeyMove="none" readOnly="true" fixedColumn=""
+						mergeCells="" mergeCellsFixedRows="" mergeCol='' ev:onscrolly="scwin.scrollY_grdData1">
 						<w2:caption style="" id="caption1" value="this is a grid caption."></w2:caption>
 						<w2:caption style="" id="caption1" value="this is a grid caption."></w2:caption>
 						<w2:header style="" id="header1">
 						<w2:header style="" id="header1">
 							<w2:row style="" id="row1">
 							<w2:row style="" id="row1">

+ 1 - 1
src/main/webapp/ux/co/co0103/CO01030001U.xml

@@ -481,7 +481,7 @@
      * 기능 : 스크롤 위치 변경
      * 기능 : 스크롤 위치 변경
      ***************************************************************************/
      ***************************************************************************/
     scwin.scrollY_grdData1 = function() {
     scwin.scrollY_grdData1 = function() {
-        $('tbody td[col_id="ccNm"],tbody td[col_id="orderNm"]', grdData1.body_table).each(function(idx, obj) {
+        $('tbody td[col_id="ccNm"],tbody td[col_id="orderNm"],tbody td[col_id="empPmNm"],tbody td[col_id="empPeNm"],tbody td[col_id="empPsNm"],tbody td[col_id="pyrqCndt"],tbody td[col_id="ctmnCndt"]', grdData1.body_table).each(function(idx, obj) {
         	var cell = $(obj);
         	var cell = $(obj);
         	cell.attr('title',cell.text());
         	cell.attr('title',cell.text());
         });
         });

+ 79 - 87
src/main/webapp/ux/co/co0104/CO01040001U.xml

@@ -25,8 +25,7 @@
 				<data xmlns="" />
 				<data xmlns="" />
 			</xf:instance>
 			</xf:instance>
 			<w2:dataCollection baseNode="map">
 			<w2:dataCollection baseNode="map">
-				<w2:dataList baseNode="list" repeatNode="map" id="dcdataList1" saveRemovedData=""
-					ev:onrowpositionchange="scwin.dcdataList1_onrowpositionchange">
+				<w2:dataList baseNode="list" repeatNode="map" id="dcdataList1" saveRemovedData="">
 					<w2:columnInfo>
 					<w2:columnInfo>
 						<w2:column id="cmpnCd" name="회사코드" dataType="text"></w2:column>
 						<w2:column id="cmpnCd" name="회사코드" dataType="text"></w2:column>
 						<w2:column id="stdYm" name="월" dataType="text"></w2:column>
 						<w2:column id="stdYm" name="월" dataType="text"></w2:column>
@@ -240,10 +239,10 @@
             callback: function(result, e) {
             callback: function(result, e) {
                 dcdataList1.setJSON(result);
                 dcdataList1.setJSON(result);
 		    	listCount1.setValue(grdData1.getTotalRow());
 		    	listCount1.setValue(grdData1.getTotalRow());
-		    	dcdataList1.setRowPosition( 0 );
-		    	var rows = dcdataList1.getRowCount();
 		    	grdData1.mergeClear();
 		    	grdData1.mergeClear();
-		    	grdData1.mergeByRestricCol( );
+		    	grdData1.mergeByRestricCol();
+		    	
+		    	var rows = dcdataList1.getRowCount();
 		    	
 		    	
 		    	for (var i=0; i<rows; i++) {
 		    	for (var i=0; i<rows; i++) {
 		    	
 		    	
@@ -263,7 +262,6 @@
 		    		
 		    		
 		    		if(dcdataList1.getCellData( i , "stdYm" ) == dcdataList1.getCellData( i+1 , "stdYm" )){
 		    		if(dcdataList1.getCellData( i , "stdYm" ) == dcdataList1.getCellData( i+1 , "stdYm" )){
     		
     		
-						
 						if(yyyymm1 != yyyymm2){
 						if(yyyymm1 != yyyymm2){
 							for (var j=0; j<rows; j++) {
 							for (var j=0; j<rows; j++) {
 			    				if(dcdataList1.getCellData( j , "stdYm" ) == yyyymm1){
 			    				if(dcdataList1.getCellData( j , "stdYm" ) == yyyymm1){
@@ -287,6 +285,7 @@
 		    		if(dcdataList1.getCellData( i , "docuNo" ) == dcdataList1.getCellData( i+1 , "docuNo" )){
 		    		if(dcdataList1.getCellData( i , "docuNo" ) == dcdataList1.getCellData( i+1 , "docuNo" )){
 		    			
 		    			
 		    			if(dcdataList1.getCellData( i , "stdYm" ) == dcdataList1.getCellData( i+1 , "stdYm" )){
 		    			if(dcdataList1.getCellData( i , "stdYm" ) == dcdataList1.getCellData( i+1 , "stdYm" )){
+		    			
 		    				if(docuNo1 != docuNo2){
 		    				if(docuNo1 != docuNo2){
 						
 						
 								for (var j=0; j<rows; j++) {
 								for (var j=0; j<rows; j++) {
@@ -318,6 +317,8 @@
 		    	grdData1.setFooterValue( "doreSum" , dcdataList1.getCellData( rows-1 , "doreSum" ) );
 		    	grdData1.setFooterValue( "doreSum" , dcdataList1.getCellData( rows-1 , "doreSum" ) );
 		    	grdData1.setFooterValue( "midoreSum" , dcdataList1.getCellData( rows-1 , "midoreSum" ) );
 		    	grdData1.setFooterValue( "midoreSum" , dcdataList1.getCellData( rows-1 , "midoreSum" ) );
 		    	
 		    	
+		    	grdData1.setFocusedCell( rows - 1 );
+		    	
 		    	scwin.scrollY_grdData1();
 		    	scwin.scrollY_grdData1();
             }
             }
         });
         });
@@ -486,29 +487,28 @@
 						dataList="data:dcdataList1" fixedColumnWithHidden="false" id="grdData1" ignoreCellClick="false" ignoreToggleOnDisabled="false"
 						dataList="data:dcdataList1" fixedColumnWithHidden="false" id="grdData1" ignoreCellClick="false" ignoreToggleOnDisabled="false"
 						keyMoveEditMode="true" moveKeyEditMode="true" rowNumHeaderValue="No" rowNumStatusResize="true" rowNumVisible="true" rowNumWidth="20"
 						keyMoveEditMode="true" moveKeyEditMode="true" rowNumHeaderValue="No" rowNumStatusResize="true" rowNumVisible="true" rowNumWidth="20"
 						rowStatusHeaderValue="상태" rowStatusVisible="false" rowStatusWidth="20" scrollByColumn="false" scrollByColumnAdaptive="false"
 						rowStatusHeaderValue="상태" rowStatusVisible="false" rowStatusWidth="20" scrollByColumn="false" scrollByColumnAdaptive="false"
-						style="height: 200px;" summaryAuto="false" useShiftKey="true" visibleRowNum="" enterKeyMove="none" readOnly="true"
-						ev:oncellclick="scwin.grdData1_oncellclick" fixedColumn="" mergeCells="" mergeCellsFixedRows="" mergeCol=''
-						ev:onscrolly="scwin.scrollY_grdData1">
+						style="height: 200px;" summaryAuto="false" useShiftKey="true" visibleRowNum="" enterKeyMove="none" readOnly="true" fixedColumn=""
+						mergeCells="" mergeCellsFixedRows="" mergeCol='' ev:onscrolly="scwin.scrollY_grdData1">
 						<w2:caption style="" id="caption1" value="this is a grid caption."></w2:caption>
 						<w2:caption style="" id="caption1" value="this is a grid caption."></w2:caption>
 						<w2:header style="" id="header1">
 						<w2:header style="" id="header1">
 							<w2:row style="" id="row1">
 							<w2:row style="" id="row1">
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column1" value="회사코드"
-									blockSelect="false" displayMode="label" rowSpan="2" hidden="true">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column1" value="회사코드" blockSelect="false"
+									displayMode="label" rowSpan="2" hidden="true">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column2" value="본부코드"
-									blockSelect="false" displayMode="label" rowSpan="2" hidden="true">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column2" value="본부코드" blockSelect="false"
+									displayMode="label" rowSpan="2" hidden="true">
 								</w2:column>
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column3" value="매출" blockSelect="false"
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column3" value="매출" blockSelect="false"
 									displayMode="label" colSpan="2">
 									displayMode="label" colSpan="2">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column4" value="청구액 ( VAT 포함 )"
-									blockSelect="false" displayMode="label" colSpan="4">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column4" value="청구액 ( VAT 포함 )" blockSelect="false"
+									displayMode="label" colSpan="4">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column5" value="수금액 ( VAT 포함 )"
-									blockSelect="false" displayMode="label" colSpan="3">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column5" value="수금액 ( VAT 포함 )" blockSelect="false"
+									displayMode="label" colSpan="3">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column6" value="미수금"
-									blockSelect="false" displayMode="label" colSpan="3">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column6" value="미수금" blockSelect="false"
+									displayMode="label" colSpan="3">
 								</w2:column>
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="100" inputType="text" id="column7"
 								<w2:column removeBorderStyle="false" width="100" inputType="text" id="column7"
 									value="매출대비청구 ( VAT 제외 )&lt;br/&gt;[ 청구(VAT제외) - 매출액 ]" blockSelect="false" displayMode="label" colSpan="1">
 									value="매출대비청구 ( VAT 제외 )&lt;br/&gt;[ 청구(VAT제외) - 매출액 ]" blockSelect="false" displayMode="label" colSpan="1">
@@ -521,84 +521,79 @@
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column9" value="누계" blockSelect="false"
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column9" value="누계" blockSelect="false"
 									displayMode="label">
 									displayMode="label">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="200" inputType="text" id="column10" value="차수"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="200" inputType="text" id="column10" value="차수" blockSelect="false"
+									displayMode="label">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="50" inputType="text" id="column11" value="청구일"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="50" inputType="text" id="column11" value="청구일" blockSelect="false"
+									displayMode="label">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column12" value="금액"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column12" value="금액" blockSelect="false"
+									displayMode="label">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column13" value="누계"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column13" value="누계" blockSelect="false"
+									displayMode="label">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="50" inputType="text" id="column14" value="수금일"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="50" inputType="text" id="column14" value="수금일" blockSelect="false"
+									displayMode="label">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column15" value="금액"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column15" value="금액" blockSelect="false"
+									displayMode="label">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column16" value="누계"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column16" value="누계" blockSelect="false"
+									displayMode="label">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="50" inputType="text" id="column17" value="수금예정일"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="50" inputType="text" id="column17" value="수금예정일" blockSelect="false"
+									displayMode="label">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column18" value="경과"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column18" value="경과" blockSelect="false"
+									displayMode="label">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column19" value="미경과"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column19" value="미경과" blockSelect="false"
+									displayMode="label">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column21" value="누계"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column21" value="누계" blockSelect="false"
+									displayMode="label">
 								</w2:column>
 								</w2:column>
 							</w2:row>
 							</w2:row>
 						</w2:header>
 						</w2:header>
 						<w2:gBody style="" id="gBody1">
 						<w2:gBody style="" id="gBody1">
 							<w2:row style="" id="row2">
 							<w2:row style="" id="row2">
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="cmpnCd" blockSelect="false"
-									displayMode="label">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="cmpnCd" blockSelect="false" displayMode="label">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="ccCd" blockSelect="false"
-									displayMode="label">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="ccCd" blockSelect="false" displayMode="label">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="stdYm" blockSelect="false"
-									displayMode="label" displayFormat="####-##">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="stdYm" blockSelect="false" displayMode="label"
+									displayFormat="####-##">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="saleAmtSum" blockSelect="false"
-									displayMode="label" dataType="number" textAlign="right" displayFormat="#,###">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="saleAmtSum" blockSelect="false" displayMode="label"
+									dataType="number" textAlign="right" displayFormat="#,###">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="pyrqDgrCn" blockSelect="false"
-									displayMode="label" textAlign="left">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="pyrqDgrCn" blockSelect="false" displayMode="label"
+									textAlign="left">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="pyrqDt" blockSelect="false"
-									displayMode="label">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="pyrqDt" blockSelect="false" displayMode="label">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="pyrqAmt" blockSelect="false"
-									displayMode="label" dataType="number" textAlign="right" displayFormat="#,###">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="pyrqAmt" blockSelect="false" displayMode="label"
+									dataType="number" textAlign="right" displayFormat="#,###">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="pyrqAmtSum" blockSelect="false"
-									displayMode="label" dataType="number" textAlign="right" displayFormat="#,###">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="pyrqAmtSum" blockSelect="false" displayMode="label"
+									dataType="number" textAlign="right" displayFormat="#,###">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="ctmnDt" blockSelect="false"
-									displayMode="label">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="ctmnDt" blockSelect="false" displayMode="label">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="ctmnAmt" blockSelect="false"
-									displayMode="label" dataType="number" textAlign="right" displayFormat="#,###">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="ctmnAmt" blockSelect="false" displayMode="label"
+									dataType="number" textAlign="right" displayFormat="#,###">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="ctmnAmtSum" blockSelect="false"
-									displayMode="label" dataType="number" textAlign="right" displayFormat="#,###">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="ctmnAmtSum" blockSelect="false" displayMode="label"
+									dataType="number" textAlign="right" displayFormat="#,###">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="ctmnExpDt" blockSelect="false"
-									displayMode="label">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="ctmnExpDt" blockSelect="false" displayMode="label">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="dore" blockSelect="false"
-									displayMode="label" dataType="number" textAlign="right" displayFormat="#,###">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="dore" blockSelect="false" displayMode="label"
+									dataType="number" textAlign="right" displayFormat="#,###">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="midore" blockSelect="false"
-									displayMode="label" dataType="number" textAlign="right" displayFormat="#,###">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="midore" blockSelect="false" displayMode="label"
+									dataType="number" textAlign="right" displayFormat="#,###">
 								</w2:column>
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="salePyrqNasAmtSum" blockSelect="false"
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="salePyrqNasAmtSum" blockSelect="false"
 									displayMode="label" dataType="number" textAlign="right" displayFormat="#,###">
 									displayMode="label" dataType="number" textAlign="right" displayFormat="#,###">
@@ -607,32 +602,29 @@
 						</w2:gBody>
 						</w2:gBody>
 						<w2:footer style="" id="footer1">
 						<w2:footer style="" id="footer1">
 							<w2:row style="" id="row3">
 							<w2:row style="" id="row3">
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column36" blockSelect="false"
-									displayMode="label">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column36" blockSelect="false" displayMode="label">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column35" blockSelect="false"
-									displayMode="label">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column35" blockSelect="false" displayMode="label">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="50" inputType="text" id="column34" blockSelect="false"
-									displayMode="label" colSpan="2" value="청구/수금 조건">
+								<w2:column removeBorderStyle="false" width="50" inputType="text" id="column34" blockSelect="false" displayMode="label"
+									colSpan="2" value="청구/수금 조건">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="150" inputType="text" id="pyrqCndt" blockSelect="false"
-									displayMode="label" colSpan="4">
+								<w2:column removeBorderStyle="false" width="150" inputType="text" id="pyrqCndt" blockSelect="false" displayMode="label"
+									colSpan="4">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="50" inputType="text" id="ctmnCndt" blockSelect="false"
-									displayMode="label" colSpan="3">
+								<w2:column removeBorderStyle="false" width="50" inputType="text" id="ctmnCndt" blockSelect="false" displayMode="label"
+									colSpan="3">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="50" inputType="text" id="column25" value="합계"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="50" inputType="text" id="column25" value="합계" blockSelect="false"
+									displayMode="label">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="doreSum" blockSelect="false"
-									displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="doreSum" blockSelect="false" displayMode="label"
+									textAlign="right" displayFormat="#,###,###" dataType="number">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="midoreSum" blockSelect="false"
-									displayMode="label" textAlign="right" displayFormat="#,###,###" dataType="number">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="midoreSum" blockSelect="false" displayMode="label"
+									textAlign="right" displayFormat="#,###,###" dataType="number">
 								</w2:column>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="100" inputType="text" id="column22" blockSelect="false"
-									displayMode="label">
+								<w2:column removeBorderStyle="false" width="100" inputType="text" id="column22" blockSelect="false" displayMode="label">
 								</w2:column>
 								</w2:column>
 							</w2:row>
 							</w2:row>
 						</w2:footer>
 						</w2:footer>

+ 19 - 5
src/main/webapp/ux/co/co0105/CO01050001U.xml

@@ -200,12 +200,12 @@
 			scwin.grdSearch2();
 			scwin.grdSearch2();
 		}
 		}
     };
     };
-	
-	/**************************************************************************
+    
+    /**************************************************************************
      * Event : scwin.search_onviewchange
      * Event : scwin.search_onviewchange
      * 기 능 : 조회조건 체인지 이벤트
      * 기 능 : 조회조건 체인지 이벤트
      **************************************************************************/
      **************************************************************************/
-	scwin.search_onviewchange = function(info) {
+    scwin.rdoGubun_onchange = function() {
 		if(rdoGubun.getValue() == "01"){
 		if(rdoGubun.getValue() == "01"){
 			view01.show();
 			view01.show();
 			view02.hide();
 			view02.hide();
@@ -223,6 +223,19 @@
 			scwin.grdSearch2();
 			scwin.grdSearch2();
 		}
 		}
 	};
 	};
+	
+	/**************************************************************************
+     * Event : scwin.search_onviewchange
+     * 기 능 : 조회조건 체인지 이벤트
+     **************************************************************************/
+	scwin.search_onviewchange = function(info) {
+		if(rdoGubun.getValue() == "01"){
+			scwin.grdSearch1();
+		}
+		if(rdoGubun.getValue() == "02"){
+			scwin.grdSearch2();
+		}
+	};
 
 
 	/**************************************************************************
 	/**************************************************************************
      * Event : scwin.grdData1_oncellclick
      * Event : scwin.grdData1_oncellclick
@@ -538,7 +551,8 @@
         	var cell = $(obj);
         	var cell = $(obj);
         	cell.attr('title',cell.text());
         	cell.attr('title',cell.text());
         });
         });
-    };]]></script>
+    };
+	]]></script>
 	</head>
 	</head>
 	<body>
 	<body>
 		<xf:group id="sub_contents" style="" class="sub_contents fixed_cont">
 		<xf:group id="sub_contents" style="" class="sub_contents fixed_cont">
@@ -600,7 +614,7 @@
 							<xf:group class="w2tb_th" style="" tagname="th">현황종류</xf:group>
 							<xf:group class="w2tb_th" style="" tagname="th">현황종류</xf:group>
 							<xf:group class="w2tb_td" style="" tagname="td">
 							<xf:group class="w2tb_td" style="" tagname="td">
 								<xf:select1 id="rdoGubun" selectedIndex="0" appearance="full" style="height: 21px;clear:both;" rows="1" ref=""
 								<xf:select1 id="rdoGubun" selectedIndex="0" appearance="full" style="height: 21px;clear:both;" rows="1" ref=""
-									renderType="table" cols="" ev:onviewchange="scwin.search_onviewchange">
+									renderType="table" cols="" ev:onviewchange="" ev:onchange="scwin.rdoGubun_onchange">
 									<xf:choices>
 									<xf:choices>
 										<xf:item>
 										<xf:item>
 											<xf:label><![CDATA[미수금]]></xf:label>
 											<xf:label><![CDATA[미수금]]></xf:label>

+ 2 - 2
src/main/webapp/ux/co/co0107/CO01070001U.xml

@@ -478,7 +478,7 @@
 									value="준공&lt;br/&gt;예정원가&lt;br/&gt;(B)=ⓐ+ⓑ" blockSelect="false" displayMode="label" rowSpan="3">
 									value="준공&lt;br/&gt;예정원가&lt;br/&gt;(B)=ⓐ+ⓑ" blockSelect="false" displayMode="label" rowSpan="3">
 								</w2:column>
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="50" inputType="text" id="column6"
 								<w2:column removeBorderStyle="false" width="50" inputType="text" id="column6"
-									value="준공예정원가율&lt;br/&gt;(도급액대비)" blockSelect="false" displayMode="label" rowSpan="3">
+									value="준공예정&lt;br/&gt;원가율&lt;br/&gt;(도급액대비)" blockSelect="false" displayMode="label" rowSpan="3">
 								</w2:column>
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column7"
 								<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">
 									value="실행예산&lt;br/&gt;초과 Risk&lt;br/&gt;(A) - (B)" blockSelect="false" displayMode="label" rowSpan="3">
@@ -490,7 +490,7 @@
 									value="실행예산&lt;br/&gt;대비&lt;br/&gt;진행률&lt;br/&gt;(C) / (A)" blockSelect="false" displayMode="label" rowSpan="3">
 									value="실행예산&lt;br/&gt;대비&lt;br/&gt;진행률&lt;br/&gt;(C) / (A)" blockSelect="false" displayMode="label" rowSpan="3">
 								</w2:column>
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="50" inputType="text" id="column10"
 								<w2:column removeBorderStyle="false" width="50" inputType="text" id="column10"
-									value="준공예상금액&lt;br/&gt;대비&lt;br/&gt;진행률&lt;br/&gt;(C) / (B)" blockSelect="false" displayMode="label" rowSpan="3">
+									value="준공예정원가&lt;br/&gt;대비&lt;br/&gt;진행률&lt;br/&gt;(C) / (B)" blockSelect="false" displayMode="label" rowSpan="3">
 								</w2:column>
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="50" inputType="text" id="column11" value="진행률&lt;br/&gt;차이"
 								<w2:column removeBorderStyle="false" width="50" inputType="text" id="column11" value="진행률&lt;br/&gt;차이"
 									blockSelect="false" displayMode="label" rowSpan="3">
 									blockSelect="false" displayMode="label" rowSpan="3">