Browse Source

확인서 합의(요청)일 경우 저장되도록 처리

LYK 1 year ago
parent
commit
c9236ed9bb

+ 1 - 1
src/main/resources/sqlmap/mappers/cd/cd0304/CD03040001PMapper.xml

@@ -169,7 +169,7 @@
 		);
 		);
 		
 		
 		UPDATE CON_WKI_ODR
 		UPDATE CON_WKI_ODR
-		   SET PRGS_STUS_GB_CD = 'B10'
+		   SET PRGS_STUS_GB_CD = DECODE(#{upperProgramId}, 'CD03040001U', 'B10', PRGS_STUS_GB_CD)
 		     , MDFT_DT = SYSDATE
 		     , MDFT_DT = SYSDATE
 		     , MDFT_PR = #{mdftPr}
 		     , MDFT_PR = #{mdftPr}
 		 WHERE CMPN_CD = #{cmpnCd}
 		 WHERE CMPN_CD = #{cmpnCd}

+ 51 - 10
src/main/webapp/ux/cd/cd0304/CD03040001P.xml

@@ -135,6 +135,9 @@
       	dsConWkiOdr.set( "upperProgramId" , scwin.param_data.openProgramId );
       	dsConWkiOdr.set( "upperProgramId" , scwin.param_data.openProgramId );
       	dsConWkiOdr.set( "cmpnCd" , scwin.param_data.cmpnCd );
       	dsConWkiOdr.set( "cmpnCd" , scwin.param_data.cmpnCd );
       	dsConWkiOdr.set( "wkiSeq" , scwin.param_data.wkiSeq );
       	dsConWkiOdr.set( "wkiSeq" , scwin.param_data.wkiSeq );
+      	if (scwin.param_data.openProgramId == "CD03050001U") {
+      		btnRequest.setValue( txtConsensus.getValue() );
+      	}
 		ccPopGlobal.readOnlyComp(true,true,true,true);//현장명
 		ccPopGlobal.readOnlyComp(true,true,true,true);//현장명
 		vendPop2.readOnlyComp(true,true,true);//협력업체
 		vendPop2.readOnlyComp(true,true,true);//협력업체
 		udcYmd.readOnlyComp(true);//작업지시일
 		udcYmd.readOnlyComp(true);//작업지시일
@@ -180,7 +183,6 @@
      * 기능: 저장 버튼 클릭 이벤트
      * 기능: 저장 버튼 클릭 이벤트
      ***************************************************************************/    
      ***************************************************************************/    
 	scwin.btnSave_onclick = function() {
 	scwin.btnSave_onclick = function() {
-		/*
     	if(dsConWkiOdr.get( "reqConfDt" ) == ''){//합의요청일자
     	if(dsConWkiOdr.get( "reqConfDt" ) == ''){//합의요청일자
     		commLib.getAlert(commLib.getMsgGlobal("valid.0098",scwin.langCd.CWC_REQ_CONF_DT),commLib.getMsgGlobal("alert.0001"),"V","udcReqConfDt");
     		commLib.getAlert(commLib.getMsgGlobal("valid.0098",scwin.langCd.CWC_REQ_CONF_DT),commLib.getMsgGlobal("alert.0001"),"V","udcReqConfDt");
     		return;
     		return;
@@ -208,7 +210,7 @@
     		commLib.getAlert(commLib.getMsgGlobal("valid.0098",scwin.langCd.CWO_EST_VAT),commLib.getMsgGlobal("alert.0001"),"V","txtConfAmt");
     		commLib.getAlert(commLib.getMsgGlobal("valid.0098",scwin.langCd.CWO_EST_VAT),commLib.getMsgGlobal("alert.0001"),"V","txtConfAmt");
     		return;
     		return;
     	}
     	}
-		*/
+		
 		commLib.getConfirmMsg(commLib.getMessage("crud.0001"),commLib.getMessage("alert.0002"), "scwin.fnSaved");
 		commLib.getConfirmMsg(commLib.getMessage("crud.0001"),commLib.getMessage("alert.0002"), "scwin.fnSaved");
 	};
 	};
 
 
@@ -217,8 +219,31 @@
      * 기능: 합의요청 버튼 클릭 이벤트
      * 기능: 합의요청 버튼 클릭 이벤트
      ***************************************************************************/    
      ***************************************************************************/    
 	scwin.btnRequest_onclick = function() {
 	scwin.btnRequest_onclick = function() {
-    	if(dsConWkiOdr.get( "wkiSeq2" ) == ""){
-    		commLib.getAlert(commLib.getMsgGlobal("valid.0097",""),"","V","txtWkiNo1");
+    	if(dsConWkiOdr.get( "reqConfDt" ) == ''){//합의요청일자
+    		commLib.getAlert(commLib.getMsgGlobal("valid.0098",scwin.langCd.CWC_REQ_CONF_DT),commLib.getMsgGlobal("alert.0001"),"V","udcReqConfDt");
+    		return;
+    	}
+    	if(dsConWkiOdr.get( "covendConfDt" ) == ''){//합의일자
+    		commLib.getAlert(commLib.getMsgGlobal("valid.0098",scwin.langCd.CWC_COVEND_CONF_DT),commLib.getMsgGlobal("alert.0001"),"V","udcCovendConfDt");
+    		return;
+    	}
+    	if(dsConWkiOdr.get( "uctCntrtYn" ) == 'N' && dsConWkiOdr.get( "uctNewYn" ) == 'N' && dsConWkiOdr.get( "uctEstYn" ) == 'N'
+    	&& dsConWkiOdr.get( "uctInjtYn" ) == 'N' && dsConWkiOdr.get( "uctItpolYn" ) == 'N' && dsConWkiOdr.get( "uctEtcYn" ) == 'N'
+    	){//단가결정
+    		alert("uctCntrtYn="+dsConWkiOdr.get( "uctCntrtYn" ));
+    		commLib.getAlert(commLib.getMsgGlobal("valid.0098",scwin.langCd.CWC_UCT_DECISION),commLib.getMsgGlobal("alert.0001"),"V","chkAddUctCntrtYn");
+    		return;
+    	}
+    	if(dsConWkiOdr.get( "rvwCn" ) == ''){//검토의견
+    		commLib.getAlert(commLib.getMsgGlobal("valid.0098",scwin.langCd.CWC_RVW_CN),commLib.getMsgGlobal("alert.0001"),"V","txtRvwCn");
+    		return;
+    	}
+    	if(dsConWkiOdr.get( "lastConfDt" ) == ''){//최종확인일자
+    		commLib.getAlert(commLib.getMsgGlobal("valid.0098",scwin.langCd.CWC_LAST_CONF_DT),commLib.getMsgGlobal("alert.0001"),"V","udcLastConfDt");
+    		return;
+    	}
+    	if(dsConWkiOdr.get( "confAmt" ) == ''){//확정금액
+    		commLib.getAlert(commLib.getMsgGlobal("valid.0098",scwin.langCd.CWO_EST_VAT),commLib.getMsgGlobal("alert.0001"),"V","txtConfAmt");
     		return;
     		return;
     	}
     	}
 	
 	
@@ -396,7 +421,7 @@
 						btnSave.setDisabled( true );
 						btnSave.setDisabled( true );
 						btnRequest.setDisabled( true );
 						btnRequest.setDisabled( true );
 						btnDraft.setDisabled( false );
 						btnDraft.setDisabled( false );
-						udcLastConfDt.readOnlyComp( false );//최종확인일자
+						udcLastConfDt.readOnlyComp( true );//최종확인일자
 						scwin.fnRequestEnable( true );
 						scwin.fnRequestEnable( true );
 						cwcCovendConfDtTitle.setStyle( "background-color" , "#e7e6ec" );//합의일자
 						cwcCovendConfDtTitle.setStyle( "background-color" , "#e7e6ec" );//합의일자
 						uctCntrtTitle.setStyle( "background-color" , "#e7e6ec" );//단가결정구분
 						uctCntrtTitle.setStyle( "background-color" , "#e7e6ec" );//단가결정구분
@@ -473,14 +498,29 @@
 						cwoAtchfileAddTitle.setStyle( "background-color" , "#e7e6ec" );//파일첨부
 						cwoAtchfileAddTitle.setStyle( "background-color" , "#e7e6ec" );//파일첨부
 					}
 					}
 				} else if (scwin.param_data.openProgramId == "CD03050001U") {
 				} else if (scwin.param_data.openProgramId == "CD03050001U") {
-					if (dsConWkiOdr.get( "prgsStusGbCd" ) == "B20") {
+					if (dsConWkiOdr.get( "prgsStusGbCd" ) == "B20") {//확인서 합의(요청)
+						btnSave.setDisabled( false );
 						btnRequest.setDisabled( false );
 						btnRequest.setDisabled( false );
 						scwin.fnRequestEnable( false );
 						scwin.fnRequestEnable( false );
+						cwcCovendConfDtTitle.setStyle( "background-color" , "#F2CB61" );//합의일자
+						cwcCovendConfDtRemark.setStyle( "background-color" , "#FAF4C0" );//합의일자
+						uctCntrtTitle.setStyle( "background-color" , "#F2CB61" );//단가결정구분
+						uctCntrtRemark.setStyle( "background-color" , "#FAF4C0" );//단가결정구분
+						conWkiOdrTitle.setStyle( "background-color" , "#F2CB61" );//검토의견
+						conWkiOdrRemark.setStyle( "background-color" , "#FAF4C0" );//검토의견
+						cwcConfTitle.setStyle( "background-color" , "#F2CB61" );//확정금액
+						cwcConfRemark.setStyle( "background-color" , "#FAF4C0" );//확정금액
+						cwcLastConfDtTitle.setStyle( "background-color" , "#e7e6ec" );//최종확인일자
+						//cwcLastConfDtRemark.setStyle( "background-color" , "#FFFFFF" );//최종확인일자
+						cwoAddDocTitle.setStyle( "background-color" , "#F2CB61" );//첨부자료
+						cwoAddDocRemark.setStyle( "background-color" , "#FAF4C0" );//첨부자료
+						cwoAtchfileAddTitle.setStyle( "background-color" , "#F2CB61" );//파일첨부
+						cwoAtchfileAddRemark.setStyle( "background-color" , "#FAF4C0" );//파일첨부
 					} else {
 					} else {
+						btnSave.setDisabled( true );
 						btnRequest.setDisabled( true );
 						btnRequest.setDisabled( true );
 						scwin.fnRequestEnable( true );
 						scwin.fnRequestEnable( true );
 					}
 					}
-					btnSave.setDisabled( true );
 					btnDraft.setDisabled( true );
 					btnDraft.setDisabled( true );
 					udcLastConfDt.readOnlyComp( true );//최종확인일자
 					udcLastConfDt.readOnlyComp( true );//최종확인일자
 				}else if (scwin.param_data.openProgramId ==  "CD03070001U") {
 				}else if (scwin.param_data.openProgramId ==  "CD03070001U") {
@@ -711,7 +751,7 @@
 		if(info.checked){
 		if(info.checked){
 			//chkAddAdddocAfPhotoYn.setValue( "N" );
 			//chkAddAdddocAfPhotoYn.setValue( "N" );
 			//chkAddAdddocEtcYn.setValue( "N" );
 			//chkAddAdddocEtcYn.setValue( "N" );
-			txtAdddocEtcCn.setDisabled( true );
+			txtAdddocEtcCn.setDisabled( false );
 		} else {
 		} else {
 			txtAdddocEtcCn.setDisabled( true );
 			txtAdddocEtcCn.setDisabled( true );
 			txtAdddocEtcCn.setValue( "" );
 			txtAdddocEtcCn.setValue( "" );
@@ -727,7 +767,7 @@
 		chkAddUctItpolYn.setDisabled( pBoolean );//보간법
 		chkAddUctItpolYn.setDisabled( pBoolean );//보간법
 		chkAddUctEtcYn.setDisabled( pBoolean );//기타
 		chkAddUctEtcYn.setDisabled( pBoolean );//기타
 		if (dsConWkiOdr.get( "uctEtcYn" ) == "Y") {
 		if (dsConWkiOdr.get( "uctEtcYn" ) == "Y") {
-			txtUctEtcCn.setDisabled( false );//단가 기타내용
+			txtUctEtcCn.setDisabled( pBoolean );//단가 기타내용
 		} else {
 		} else {
 			txtUctEtcCn.setDisabled( true );//단가 기타내용
 			txtUctEtcCn.setDisabled( true );//단가 기타내용
 		}
 		}
@@ -738,7 +778,7 @@
 		chkAddAdddocAfPhotoYn.setDisabled( pBoolean );//작업 종료사진
 		chkAddAdddocAfPhotoYn.setDisabled( pBoolean );//작업 종료사진
 		chkAddAdddocEtcYn.setDisabled( pBoolean );//기타
 		chkAddAdddocEtcYn.setDisabled( pBoolean );//기타
 		if (dsConWkiOdr.get( "adddocEtcYn" ) == "Y") {
 		if (dsConWkiOdr.get( "adddocEtcYn" ) == "Y") {
-			txtAdddocEtcCn.setDisabled( false );//첨부파일 기타내용
+			txtAdddocEtcCn.setDisabled( pBoolean );//첨부파일 기타내용
 		} else {
 		} else {
 			txtAdddocEtcCn.setDisabled( true );//첨부파일 기타내용
 			txtAdddocEtcCn.setDisabled( true );//첨부파일 기타내용
 		}
 		}
@@ -781,6 +821,7 @@
 						</xf:group>
 						</xf:group>
 						<xf:group class="ly_column col_3" id="" style="">
 						<xf:group class="ly_column col_3" id="" style="">
 							<w2:textbox class="pgt_tit" id="page2Title" label="작업내용 확인" localeRef="CD03040001U_subTitle3"></w2:textbox>
 							<w2:textbox class="pgt_tit" id="page2Title" label="작업내용 확인" localeRef="CD03040001U_subTitle3"></w2:textbox>
+							<w2:textbox class="" id="txtConsensus" label="합의" localeRef="BTN_CONSENSUS" style="display:none"></w2:textbox>
 			                <xf:group class="fr">
 			                <xf:group class="fr">
 			                	<w2:anchor class="btn_cm btn_search" ev:onclick="scwin.btnSave_onclick" id="btnSave" outerDiv="true" style=""
 			                	<w2:anchor class="btn_cm btn_search" ev:onclick="scwin.btnSave_onclick" id="btnSave" outerDiv="true" style=""
 			                		localeRef="BTN_SAVE" useLocale="true">
 			                		localeRef="BTN_SAVE" useLocale="true">