Browse Source

화면수정

SBK 1 year ago
parent
commit
856818911f

+ 1 - 1
src/main/resources/sqlmap/mappers/co/copop/COPOPMapper.xml

@@ -13,7 +13,7 @@
 		   AND STD_YM = #{stdYm}
 		   AND CC_CD NOT IN (SELECT SPEC_CD FROM SM_COM_COMMCD_D A, SM_COM_COMMCD B WHERE A.COMM_CD_ID = B.COMM_CD_ID AND B.COMM_CD = 'CO004' AND A.USE_YN = 'Y')
 		<if test="ccNm != '' and ccNm != null">
-		   AND (CC_NM LIKE '%'||#{ccNm}||'%' OR CC_CD LIKE '%'||#{ccNm}||'%')
+		   AND (UPPER(CC_NM) LIKE '%'||UPPER(#{ccNm})||'%' OR UPPER(CC_CD) LIKE '%'||UPPER(#{ccNm})||'%')
 		</if>
 		<if test="ccgrpCd != 'all'">
 		   AND CCGRP_CD = #{ccgrpCd}

+ 4 - 4
src/main/webapp/ux/co/co0102/CO01020001U.xml

@@ -380,12 +380,12 @@
      ***************************************************************************/
     scwin.getComboCcgrp = function(){
     	
-    	var pdeptCd = "";  	
+    	var pdeptCd = "";
     	
-    	if(scwin.user.pdeptCd == null){
+    	if(scwin.user.deptCd == null){
     		pdeptCd = "all";
     	} else {
-    		pdeptCd = scwin.user.pdeptCd;
+    		pdeptCd = scwin.user.deptCd.substring(0,2);
     	}
     	
     	var rows = tabc_layout_contents_1811_body_CO003.getRowCount();
@@ -573,7 +573,7 @@
 							dataList="data:dcdataList1" fixedColumnWithHidden="false" id="grdData1" ignoreCellClick="false" ignoreToggleOnDisabled="false"
 							keyMoveEditMode="true" moveKeyEditMode="true" rowNumHeaderValue="No" rowNumStatusResize="true" rowNumVisible="true" rowNumWidth="20"
 							rowStatusHeaderValue="상태" rowStatusVisible="true" rowStatusWidth="20" scrollByColumn="false" scrollByColumnAdaptive="false"
-							style="height: 200px;" summaryAuto="false" useShiftKey="true" visibleRowNum="20" enterKeyMove="none" readOnly="true"
+							style="height: 200px;" summaryAuto="false" useShiftKey="true" visibleRowNum="" enterKeyMove="none" readOnly="true"
 							ev:oncellclick="scwin.grdData1_oncellclick" fixedColumn="" ev:onscrolly="scwin.scrollY_grdData1" syncScrollId="">
 							<w2:caption style="" id="caption1" value="this is a grid caption."></w2:caption>
 							<w2:header style="" id="header1">

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

@@ -390,10 +390,10 @@
     	
     	var pdeptCd = "";  	
     	
-    	if(scwin.user.pdeptCd == null){
+    	if(scwin.user.deptCd == null){
     		pdeptCd = "all";
     	} else {
-    		pdeptCd = scwin.user.pdeptCd;
+    		pdeptCd = scwin.user.deptCd.substring(0,2);
     	}
     	
     	var rows = tabc_layout_contents_1812_body_CO003.getRowCount();

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

@@ -312,10 +312,10 @@
     	
     	var pdeptCd = "";  	
     	
-    	if(scwin.user.pdeptCd == null){
+    	if(scwin.user.deptCd == null){
     		pdeptCd = "all";
     	} else {
-    		pdeptCd = scwin.user.pdeptCd;
+    		pdeptCd = scwin.user.deptCd.substring(0,2);
     	}
     	
     	var rows = tabc_layout_contents_1813_body_CO003.getRowCount();

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

@@ -402,9 +402,9 @@
 					"showvalues": "1",
 			        "numberprefix": "",
 			        "numVisiblePlot": "30",
-			        "scrollheight": "10",
+			        "scrollheight": "12",
 			        "flatScrollBars": "1",
-			        "scrollShowButtons": "0",
+			        "scrollShowButtons": "1",
 			        "scrollColor": "#cccccc",
 			        "showHoverEffect": "1",
 			        "theme": "fusion",
@@ -614,9 +614,9 @@
 					"showvalues": "1",
 			        "numberprefix": "",
 			        "numVisiblePlot": "30",
-			        "scrollheight": "10",
+			        "scrollheight": "12",
 			        "flatScrollBars": "1",
-			        "scrollShowButtons": "0",
+			        "scrollShowButtons": "1",
 			        "scrollColor": "#cccccc",
 			        "showHoverEffect": "1",
 				};
@@ -691,9 +691,9 @@
 					"showvalues": "1",
 			        "numberprefix": "",
 			        "numVisiblePlot": "30",
-			        "scrollheight": "10",
+			        "scrollheight": "12",
 			        "flatScrollBars": "1",
-			        "scrollShowButtons": "0",
+			        "scrollShowButtons": "1",
 			        "scrollColor": "#cccccc",
 			        "showHoverEffect": "1",
 				};
@@ -751,10 +751,10 @@
     	
     	var pdeptCd = "";  	
     	
-    	if(scwin.user.pdeptCd == null){
+    	if(scwin.user.deptCd == null){
     		pdeptCd = "all";
     	} else {
-    		pdeptCd = scwin.user.pdeptCd;
+    		pdeptCd = scwin.user.deptCd.substring(0,2);
     	}
     	
     	var rows = tabc_layout_contents_1816_body_CO003.getRowCount();

+ 2 - 2
src/main/webapp/ux/co/co0105/CO01050002U.xml

@@ -734,10 +734,10 @@
     	
     	var pdeptCd = "";  	
     	
-    	if(scwin.user.pdeptCd == null){
+    	if(scwin.user.deptCd == null){
     		pdeptCd = "all";
     	} else {
-    		pdeptCd = scwin.user.pdeptCd;
+    		pdeptCd = scwin.user.deptCd.substring(0,2);
     	}
     	
     	var rows = CO003.getRowCount();

+ 3 - 3
src/main/webapp/ux/co/co0106/CO01060001U.xml

@@ -328,10 +328,10 @@
 
 		var pdeptCd = "";
 
-		if (scwin.user.pdeptCd == null) {
+		if (scwin.user.deptCd == null) {
 			pdeptCd = "all";
 		} else {
-			pdeptCd = scwin.user.pdeptCd;
+			pdeptCd = scwin.user.deptCd.substring(0,2);
 		}
 
 		var rows = tabc_layout_contents_1817_body_CO003.getRowCount();
@@ -541,7 +541,7 @@
 							dataList="data:dcdataList1" fixedColumnWithHidden="false" id="grdData1" ignoreCellClick="false" ignoreToggleOnDisabled="false"
 							keyMoveEditMode="true" moveKeyEditMode="true" rowNumHeaderValue="No" rowNumStatusResize="true" rowNumVisible="true" rowNumWidth="30"
 							rowStatusHeaderValue="상태" rowStatusVisible="true" rowStatusWidth="30" scrollByColumn="false" scrollByColumnAdaptive="false"
-							style="height: 200px;left:0px;top:5px;" summaryAuto="false" useShiftKey="true" visibleRowNum="18" enterKeyMove="none" readOnly="true"
+							style="height: 200px;left:0px;top:5px;" summaryAuto="false" useShiftKey="true" visibleRowNum="" enterKeyMove="none" readOnly="true"
 							fixedColumn="5" ev:onscrolly="scwin.scrollY_grdData1">
 							<w2:caption style="" id="caption1" value="this is a grid caption."></w2:caption>
 							<w2:header style="" id="header1">

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

@@ -289,10 +289,10 @@
     	
     	var pdeptCd = "";  	
     	
-    	if(scwin.user.pdeptCd == null){
+    	if(scwin.user.deptCd == null){
     		pdeptCd = "all";
     	} else {
-    		pdeptCd = scwin.user.pdeptCd;
+    		pdeptCd = scwin.user.deptCd.substring(0,2);
     	}
     	
     	var rows = tabc_layout_contents_1818_body_CO003.getRowCount();