Browse Source

승인요청시 로직 수정

SH 8 months ago
parent
commit
4ae8a517fe

+ 0 - 3
src/main/resources/sqlmap/mappers/cw/cw0624/CW06240001UMapper.xml

@@ -179,9 +179,6 @@
 		</if>	
 		</if>	
 		<if test="statusCd == '80'">
 		<if test="statusCd == '80'">
 		  	 , STATUS_CD = '50'
 		  	 , STATUS_CD = '50'
-		</if>	
-		<if test="statusCd != '40' and statusCd != '80'">
-		  	 , STATUS_CD = #{statusCd}
 		</if>	
 		</if>	
 		     , MDFT_DT = SYSDATE
 		     , MDFT_DT = SYSDATE
 		     , MDFT_PR = #{mdftPr}
 		     , MDFT_PR = #{mdftPr}

+ 1 - 1
src/main/webapp/ux/cw/cw0622/CW06220001U.xml

@@ -600,7 +600,7 @@
 									displayMode="label" trueValue="Y" falseValue="N" valueType="other">
 									displayMode="label" trueValue="Y" falseValue="N" valueType="other">
 								</w2:column>
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="70" inputType="select" id="addAuth" blockSelect="false"
 								<w2:column removeBorderStyle="false" width="70" inputType="select" id="addAuth" blockSelect="false"
-									displayMode="label" allOption="" chooseOption="true" chooseOptionLabel="선택" ref="">
+									displayMode="label" allOption="" chooseOption="true" chooseOptionLabel="--------" ref="">
 									<w2:choices></w2:choices>
 									<w2:choices></w2:choices>
 								</w2:column>
 								</w2:column>
 							</w2:row>
 							</w2:row>

+ 5 - 16
src/main/webapp/ux/cw/cw0624/CW06240001U.xml

@@ -269,12 +269,6 @@
         }
         }
     	
     	
     	for (var i = 0; i < dcdataList1.getTotalRow(); i++) {
     	for (var i = 0; i < dcdataList1.getTotalRow(); i++) {
-    		
-    	    if(dcdataList1.getRowStatus( i ) == "U"){
-	   			commLib.getAlert("입력된 데이터를 저장 후 승인요청 하세요.");
-	   			return;
-            }
-            
     		if(dcdataList1.getCellData( i , "sel" ) == "Y") {
     		if(dcdataList1.getCellData( i , "sel" ) == "Y") {
     			scwin.checkCnt++;
     			scwin.checkCnt++;
     			if(dcdataList1.getCellData( i , "evalEmpNo1" ) == ""){
     			if(dcdataList1.getCellData( i , "evalEmpNo1" ) == ""){
@@ -282,19 +276,14 @@
                     commLib.getAlert(commLib.getMessage("valid.0111","승인자를","입력"),"데이터확인","V","grdData1:"+i+":"+"evalEmpNo1");
                     commLib.getAlert(commLib.getMessage("valid.0111","승인자를","입력"),"데이터확인","V","grdData1:"+i+":"+"evalEmpNo1");
                     return;
                     return;
                 }
                 }
+    			if(dcdataList1.getCellData( i , "goalCd" ) == ""){
+    				scwin.checkCnt = 0;
+                    commLib.getAlert(commLib.getMessage("valid.0111","목표선택을",""),"데이터확인","V","grdData1:"+i+":"+"goalCd");
+                    return;
+                }
                 
                 
 				// 100:성과평가생성  110:목표설정  120:성과평가  200:반기마감  300:연도마감  400:최종마감
 				// 100:성과평가생성  110:목표설정  120:성과평가  200:반기마감  300:연도마감  400:최종마감
 	            if(gStatusCd.getValue() == "110"){ //목표설정
 	            if(gStatusCd.getValue() == "110"){ //목표설정
-	            	if(dcdataList1.getCellData( i , "goalCd" ) == "") {
-    					scwin.checkCnt = 0;
-	        			commLib.getAlert("목표선택 후 Goal, KPI를 수정하여 입력하시길 바랍니다.");
-	        			return;
-	        		}
-	            	if(dcdataList1.getCellData( i , "jobRate" ) == "") {
-    					scwin.checkCnt = 0;
-	        			commLib.getAlert("업무비중을 입력 후 저장하고 승인요청 하세요.");
-	        			return;
-	        		}
 	            	if(dcdataList1.getCellData( i , "jobGoal" ) == "") {
 	            	if(dcdataList1.getCellData( i , "jobGoal" ) == "") {
     					scwin.checkCnt = 0;
     					scwin.checkCnt = 0;
 	        			commLib.getAlert("Goal을 입력 후 저장하고 승인요청 하세요.");
 	        			commLib.getAlert("Goal을 입력 후 저장하고 승인요청 하세요.");