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

src/main/resources/sqlmap/mappers/co/cocom/COCOMMapper.xml

@@ -8,11 +8,6 @@
 		     , CCGRP_NM
 		  FROM CON_PJT_MST
 		 WHERE CMPN_CD = #{cmpnCd}
-		<if test="ccgrpCd1 != 'all'">
-			<if test="ccgrpCd1 == 'J0' or ccgrpCd1 == 'N0' or ccgrpCd1 == 'Y0'">
-	   	   AND CCGRP_CD = #{ccgrpCd1}
-			</if>
-		</if>
 		 GROUP BY CCGRP_CD, CCGRP_NM
 	</select>
 	

src/main/webapp/ux/co/co0102/CO01020001U.xml

@@ -114,7 +114,6 @@
   				
 		comboCommon.setCommonCode([{"code":"CO002","compID":"selCo002"}	//조회기준 금액
 								  ,{"code":"CO007","compID":"selCo007"}	//조회기준 GAP
-								  ,{"code":"CO003","compID":""}	//본부조회권한 예외사용자
         						  ]);
 
 		selCo002.setValue( 0 );
@@ -488,24 +487,7 @@
      ***************************************************************************/
     scwin.getComboCcgrp = function(){
     	
-    	var pdeptCd = "";
-    	
-    	if(scwin.user.deptCd == null){
-    		pdeptCd = "all";
-    	} else {
-    		pdeptCd = scwin.user.deptCd.substring(0,2);
-    	}
-    	
-    	var rows = tabc_layout_contents_1811_body_CO003.getRowCount();
-    	
-    	for (var i=0; i<rows; i++) {
-    		if(tabc_layout_contents_1811_body_CO003.getCellData( i , "CODE_CD" ) == scwin.user.empNo){
-    			pdeptCd = "all";
-    		}
-    	}
-    	
     	dcsearchMap1.set( "cmpnCd" 	, scwin.cmpnCd );
-    	dcsearchMap1.set( "ccgrpCd1" , pdeptCd );
     	
 		ajaxLib.ajax("co/cocom/COCOM/getComboCcgrp", {
             method: "POST",
@@ -513,11 +495,6 @@
             requestData : strLib.serialize(dcsearchMap1.getJSON({ DB: true })),
             callback: function(result, e) {
             	dcComboCcgrp.setJSON(result);
-            	var rows = dcComboCcgrp.getRowCount();
-            	if(pdeptCd != "all" && rows == 1){
-            		selCcgrp.setSelectedIndex( 1 );
-            		selCcgrp.setDisabled( true );
-            	}
 			}
         });
     };
@@ -697,7 +674,7 @@
 				<xf:group class="ly_column col_8" style="height:100%;">
 					<xf:group class="dfbox" id="dfbox1" style="">
 						<xf:group class="dfbox pt0" id="" style="">
-							<w2:textbox class="df_tit fl" id="" label="미청구 미수금 내역" style=""></w2:textbox>
+							<w2:textbox class="df_tit fl" id="" label="리스크 사유 내역" style=""></w2:textbox>
 							<w2:udc_list_count id="listCount1" />
 							<w2:textbox class="" id="" label="※ 사유등록기준 → 미청구공사 : 10억이상, 미수금(경과분) : 1억이상, 공정율 : 계획대비실적(누계기준) 3%이상 지연" style="position:absolute;left:250px;font-weight: bold;font-size:14px;color:red"></w2:textbox>
 						</xf:group>

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

@@ -124,7 +124,6 @@
     scwin.initScreen = function() {
     	
     	comboCommon.setCommonCode([{"code":"CO001","compID":"selCo001"}	//금액단위
-        						  ,{"code":"CO003","compID":""}	//본부조회권한 예외사용자
         						  ]);
         						  
 		udcYm.setValue(dateLib.addDays(dateLib.getCurrentDate('yyyyMMdd'), -15).substring(0, 6));	//기준년월
@@ -442,24 +441,7 @@
      ***************************************************************************/
     scwin.getComboCcgrp = function(){
     	
-    	var pdeptCd = "";  	
-    	
-    	if(scwin.user.deptCd == null){
-    		pdeptCd = "all";
-    	} else {
-    		pdeptCd = scwin.user.deptCd.substring(0,2);
-    	}
-    	
-    	var rows = tabc_layout_contents_1812_body_CO003.getRowCount();
-    	
-    	for (var i=0; i<rows; i++) {
-    		if(tabc_layout_contents_1812_body_CO003.getCellData( i , "CODE_CD" ) == scwin.user.empNo){
-    			pdeptCd = "all";
-    		}
-    	}
-    	
     	dcsearchMap1.set( "cmpnCd" 	, scwin.cmpnCd );
-    	dcsearchMap1.set( "ccgrpCd1" , pdeptCd );
     	
 		ajaxLib.ajax("co/cocom/COCOM/getComboCcgrp", {
             method: "POST",
@@ -467,11 +449,6 @@
             requestData : strLib.serialize(dcsearchMap1.getJSON({ DB: true })),
             callback: function(result, e) {
             	dcComboCcgrp.setJSON(result);
-            	var rows = dcComboCcgrp.getRowCount();
-            	if(pdeptCd != "all" && rows == 1){
-            		selCcgrp.setSelectedIndex( 1 );
-            		selCcgrp.setDisabled( true );
-            	}
 			}
         });
     };

src/main/webapp/ux/co/co0104/CO01040001U.xml

@@ -101,7 +101,6 @@
     scwin.initScreen = function() {
     	
     	comboCommon.setCommonCode([{"code":"CO001","compID":"selCo001"}	//금액단위
-        						  ,{"code":"CO003","compID":""}	//본부조회권한 예외사용자
         						  ]);
         						  
 		udcYm.setValue(dateLib.addDays(dateLib.getCurrentDate('yyyyMMdd'), -15).substring(0, 6));	//기준년월
@@ -330,24 +329,7 @@
      ***************************************************************************/
     scwin.getComboCcgrp = function(){
     	
-    	var pdeptCd = "";  	
-    	
-    	if(scwin.user.deptCd == null){
-    		pdeptCd = "all";
-    	} else {
-    		pdeptCd = scwin.user.deptCd.substring(0,2);
-    	}
-    	
-    	var rows = tabc_layout_contents_1813_body_CO003.getRowCount();
-    	
-    	for (var i=0; i<rows; i++) {
-    		if(tabc_layout_contents_1813_body_CO003.getCellData( i , "CODE_CD" ) == scwin.user.empNo){
-    			pdeptCd = "all";
-    		}
-    	}
-    	
     	dcsearchMap1.set( "cmpnCd" 	, scwin.cmpnCd );
-    	dcsearchMap1.set( "ccgrpCd1" , pdeptCd );
     	
 		ajaxLib.ajax("co/cocom/COCOM/getComboCcgrp", {
             method: "POST",
@@ -355,11 +337,6 @@
             requestData : strLib.serialize(dcsearchMap1.getJSON({ DB: true })),
             callback: function(result, e) {
             	dcComboCcgrp.setJSON(result);
-            	var rows = dcComboCcgrp.getRowCount();
-            	if(pdeptCd != "all" && rows == 1){
-            		selCcgrp.setSelectedIndex( 1 );
-            		selCcgrp.setDisabled( true );
-            	}
 			}
         });
     };

src/main/webapp/ux/co/co0105/CO01050001U.xml

@@ -123,7 +123,6 @@
     	
     	comboCommon.setCommonCode([{"code":"CO001","compID":"selCo001"}	//금액단위
     							  ,{"code":"CO002","compID":"selCo002"}	//조회기준
-        						  ,{"code":"CO003","compID":""}	//본부조회권한 예외사용자
         						  ]);
         						  
 		udcYm.setValue(dateLib.addDays(dateLib.getCurrentDate('yyyyMMdd'), -15).substring(0, 6));	//기준년월
@@ -497,24 +496,7 @@
      ***************************************************************************/
     scwin.getComboCcgrp = function(){
     	
-    	var pdeptCd = "";  	
-    	
-    	if(scwin.user.deptCd == null){
-    		pdeptCd = "all";
-    	} else {
-    		pdeptCd = scwin.user.deptCd.substring(0,2);
-    	}
-    	
-    	var rows = tabc_layout_contents_1816_body_CO003.getRowCount();
-    	
-    	for (var i=0; i<rows; i++) {
-    		if(tabc_layout_contents_1816_body_CO003.getCellData( i , "CODE_CD" ) == scwin.user.empNo){
-    			pdeptCd = "all";
-    		}
-    	}
-    	
     	dcsearchMap1.set( "cmpnCd" 	, scwin.cmpnCd );
-    	dcsearchMap1.set( "ccgrpCd1" , pdeptCd );
     	
 		ajaxLib.ajax("co/cocom/COCOM/getComboCcgrp", {
             method: "POST",
@@ -522,11 +504,6 @@
             requestData : strLib.serialize(dcsearchMap1.getJSON({ DB: true })),
             callback: function(result, e) {
             	dcComboCcgrp.setJSON(result);
-            	var rows = dcComboCcgrp.getRowCount();
-            	if(pdeptCd != "all" && rows == 1){
-            		selCcgrp.setSelectedIndex( 1 );
-            		selCcgrp.setDisabled( true );
-            	}
 			}
         });
     };

src/main/webapp/ux/co/co0106/CO01060001U.xml

@@ -99,8 +99,7 @@
 	 ***************************************************************************/
 	scwin.initScreen = function() {
 
-		comboCommon.setCommonCode([{"code" : "CO003","compID" : ""} //본부조회권한 예외사용자
-								  ]);
+		comboCommon.setCommonCode([]);
 
 		udcYm.setValue(dateLib.addDays(dateLib.getCurrentDate('yyyyMMdd'), -15).substring(0, 6));	//기준년월
 		rdoComplCd.setValue("01"); //진행구분
@@ -327,23 +326,7 @@
 	 ***************************************************************************/
 	scwin.getComboCcgrp = function() {
 
-		var pdeptCd = "";
-
-		if (scwin.user.deptCd == null) {
-			pdeptCd = "all";
-		} else {
-			pdeptCd = scwin.user.deptCd.substring(0,2);
-		}
-
-		var rows = tabc_layout_contents_1817_body_CO003.getRowCount();
-		for (var i = 0; i < rows; i++) {
-			if (tabc_layout_contents_1817_body_CO003.getCellData(i, "CODE_CD") == scwin.user.empNo) {
-				pdeptCd = "all";
-			}
-		}
-
 		dcsearchMap1.set("cmpnCd", scwin.cmpnCd);
-		dcsearchMap1.set("ccgrpCd1", pdeptCd);
 
 		ajaxLib.ajax("co/cocom/COCOM/getComboCcgrp", {
 			method : "POST",
@@ -351,11 +334,6 @@
 			requestData : strLib.serialize(dcsearchMap1.getJSON({DB : true})),
 			callback : function(result, e) {
 				dcComboCcgrp.setJSON(result);
-				var rows = dcComboCcgrp.getRowCount();
-            	if(pdeptCd != "all" && rows == 1){
-					selCcgrp.setSelectedIndex(1);
-					selCcgrp.setDisabled(true);
-				}
 			}
 		});
 	};

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

@@ -99,8 +99,7 @@
 		ccPop.hideComp(false,false,false,true,true,true);	//현장udc      
         
         if(param_data.stdYm == undefined){
-	    	comboCommon.setCommonCode([{"code":"CO003","compID":""}	//본부조회권한 예외사용자
-	        						  ]);
+	    	comboCommon.setCommonCode([]);
 			btnClose.hide();
 			udcYm.setValue(dateLib.addDays(dateLib.getCurrentDate('yyyyMMdd'), -15).substring(0, 6));	//기준년월
 			rdoComplCd.setValue( "01" ); //진행구분
@@ -310,24 +309,7 @@
      ***************************************************************************/
     scwin.getComboCcgrp = function(){
     	
-    	var pdeptCd = "";  	
-    	
-    	if(scwin.user.deptCd == null){
-    		pdeptCd = "all";
-    	} else {
-    		pdeptCd = scwin.user.deptCd.substring(0,2);
-    	}
-    	
-    	var rows = tabc_layout_contents_1818_body_CO003.getRowCount();
-    	
-    	for (var i=0; i<rows; i++) {
-    		if(tabc_layout_contents_1818_body_CO003.getCellData( i , "CODE_CD" ) == scwin.user.empNo){
-    			pdeptCd = "all";
-    		}
-    	}
-    	
     	dcsearchMap1.set( "cmpnCd" 	, scwin.cmpnCd );
-    	dcsearchMap1.set( "ccgrpCd1" , pdeptCd );
     	
 		ajaxLib.ajax("co/cocom/COCOM/getComboCcgrp", {
             method: "POST",
@@ -335,11 +317,6 @@
             requestData : strLib.serialize(dcsearchMap1.getJSON({ DB: true })),
             callback: function(result, e) {
             	dcComboCcgrp.setJSON(result);
-            	var rows = dcComboCcgrp.getRowCount();
-            	if(pdeptCd != "all" && rows == 1){
-            		selCcgrp.setSelectedIndex( 1 );
-            		selCcgrp.setDisabled( true );
-            	}
 			}
         });
     };]]></script>

src/main/webapp/ux/co/co0108/CO01080001U.xml

@@ -100,8 +100,7 @@
      ***************************************************************************/
     scwin.initScreen = function() {
     	
-    	comboCommon.setCommonCode([{"code":"CO003","compID":""}	//본부조회권한 예외사용자
-        						  ]);
+    	comboCommon.setCommonCode([]);
         						  
 		udcYm.setValue(dateLib.addDays(dateLib.getCurrentDate('yyyyMMdd'), -15).substring(0, 6));	//기준년월
 		scwin.getComboCcgrp();	//본부
@@ -458,24 +457,7 @@
      ***************************************************************************/
     scwin.getComboCcgrp = function(){
     	
-    	var pdeptCd = "";  	
-    	
-    	if(scwin.user.deptCd == null){
-    		pdeptCd = "all";
-    	} else {
-    		pdeptCd = scwin.user.deptCd.substring(0,2);
-    	}
-    	
-    	var rows = tabc_layout_contents_1820_body_CO003.getRowCount();
-    	
-    	for (var i=0; i<rows; i++) {
-    		if(tabc_layout_contents_1820_body_CO003.getCellData( i , "CODE_CD" ) == scwin.user.empNo){
-    			pdeptCd = "all";
-    		}
-    	}
-    	
     	dcsearchMap1.set( "cmpnCd" 	, scwin.cmpnCd );
-    	dcsearchMap1.set( "ccgrpCd1" , pdeptCd );
     	
 		ajaxLib.ajax("co/cocom/COCOM/getComboCcgrp", {
             method: "POST",
@@ -483,11 +465,6 @@
             requestData : strLib.serialize(dcsearchMap1.getJSON({ DB: true })),
             callback: function(result, e) {
             	dcComboCcgrp.setJSON(result);
-            	var rows = dcComboCcgrp.getRowCount();
-            	if(pdeptCd != "all" && rows == 1){
-            		selCcgrp.setSelectedIndex( 1 );
-            		selCcgrp.setDisabled( true );
-            	}
 			}
         });
     };

src/main/webapp/ux/cw/cw1502/CW15020001U.xml

@@ -364,6 +364,12 @@
         });
         
 	};
+	
+	scwin.udcYmd_onChange1 = function() {
+
+        txtDay.setValue(dateLib.getDayOfWeek(udcYmd.getValue()));
+        scwin.grdSearch();
+    };
 
     /**************************************************************************
      * [4] Callback
@@ -512,7 +518,7 @@
 							</w2:anchor>
 						</xf:group>
 						<xf:group tagname="td" class="w2tb_td">
-							<w2:udc_ymd style="" id="udcYmd" ref="data:dcsample.ymd" width="100%" />
+							<w2:udc_ymd style="" id="udcYmd" ref="data:dcsample.ymd" width="100%" ev:onChange1="scwin.udcYmd_onChange1"/>
 						</xf:group>
 						<xf:group tagname="td" class="w2tb_td">
 							<xf:input class="" id="txtDay" style="width:100%;text-align:center;" />