Browse Source

리스크점검사유등록 컬럼제거 컬럼 위치 변경

SBK 1 year ago
parent
commit
35474ffe37

+ 0 - 1
src/main/java/sgc/portal/co/co0102/model/CO01020001U.java

@@ -14,7 +14,6 @@ public class CO01020001U extends Domain {
 	private String ccgrpNm;     /*프로젝트 그룹명*/
 	private String ccCd;     /*프로젝트 코드*/
 	private String ccNm;     /*프로젝트 명*/
-	private String orderNm;     /*발주처명*/
 	private String prjtDt;     /*공사 기간*/
 	private String bidAmt;     /*총 도급 공급가*/
 	private String saleAmt;     /*매출액*/

+ 0 - 2
src/main/resources/sqlmap/mappers/co/co0102/CO01020001UMapper.xml

@@ -10,7 +10,6 @@
 		     , CCGRP_NM
 		     , CC_CD
 		     , CC_NM
-		     , ORDER_NM
 		     , PRJT_DT
 		     , COMPL_NM
 		     , BID_AMT
@@ -41,7 +40,6 @@
 					     , A.CCGRP_NM
 					     , A.CC_CD
 					     , A.CC_NM
-					     , A.ORDER_NM
 					     , TO_CHAR(TO_DATE(A.PRJT_START_DT,'YYYY/MM/DD'),'YYYY/MM/DD') || '~' || TO_CHAR(TO_DATE(A.PRJT_END_DT,'YYYY/MM/DD'),'YYYY/MM/DD') PRJT_DT
 					     , E.COMPL_NM
 					     , TRUNC(NVL(A.ORCO_CONT_AMT,0)) BID_AMT --도급액

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

@@ -34,7 +34,6 @@
 						<w2:column id="ccgrpNm" name="본부" dataType="text"></w2:column>
 						<w2:column id="ccCd" name="PJT 코드" dataType="text"></w2:column>
 						<w2:column id="ccNm" name="PJT 명" dataType="text"></w2:column>
-						<w2:column id="orderNm" name="발주처" dataType="text"></w2:column>
 						<w2:column id="prjtDt" name="공사기간" dataType="text"></w2:column>
 						<w2:column id="bidAmt" name="도급액" dataType="number"></w2:column>
 						<w2:column id="nonCtmn" name="미수금" dataType="number"></w2:column>
@@ -126,7 +125,6 @@
 		scwin.getComboCcgrp();	//본부조회
 		chkResn.setValue( '' );
 		ccPop.hideComp(false,false,false,true,true,true);	//현장udc
-        rightDiv.setSize( null , document.getElementById("tabc_layout_contents_1811_body_grdData1").clientHeight );
         scwin.grdSearch();	//조회 
         dcdataList1.setRowPosition( 0 );
         
@@ -294,14 +292,14 @@
 		}
 		
 		if(rdoOrder.getValue() == "PYRQ"){
-			selCo002.setValue( scwin.getComonDefaultRow(dl002,"ESBS_CD3") );
+			selCo002.setValue( scwin.getComonDefaultRow(dl002,"ESBS_CD4") );
 			selCo007.setValue( 0 );
 			selCo002.setDisabled( false );
 			selCo007.setDisabled( true );
 		}
 		
 		if(rdoOrder.getValue() == "CTMN"){
-			selCo002.setValue( scwin.getComonDefaultRow(dl002,"ESBS_CD4") );
+			selCo002.setValue( scwin.getComonDefaultRow(dl002,"ESBS_CD3") );
 			selCo007.setValue( 0 );
 			selCo002.setDisabled( false );
 			selCo007.setDisabled( true );
@@ -464,7 +462,7 @@
      * 기능 : 스크롤 위치 변경
      ***************************************************************************/
     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="prjtDt"]', grdData1.body_table).each(function(idx, obj) {
         	var cell = $(obj);
         	cell.attr('title',cell.text());
         });
@@ -667,7 +665,6 @@
 									<w2:column width="100" id="ccgrpNm" value="본부"></w2:column>
 									<w2:column width="80" id="ccCd" value="PJT 코드"></w2:column>
 									<w2:column width="220" id="ccNm" value="PJT 명"></w2:column>
-									<w2:column width="220" id="orderNm" value="발주처"></w2:column>
 									<w2:column width="150" id="prjtDt" value="공사기간"></w2:column>
 									<w2:column width="35" id="complNm" value="준공"></w2:column>
 									<w2:column width="120" id="bidAmt" value="도급액"></w2:column>
@@ -679,15 +676,15 @@
 									<w2:column width="80" id="progActORt" value="공정율실적"></w2:column>
 									<w2:column width="90" id="progActORtDiff" value="공정율 GAP"></w2:column>
 									<w2:column width="35" id="progActRtRsnYn" value="사유"></w2:column>
-									<w2:column width="100" id="empPmNm" value="PM"></w2:column>
-									<w2:column width="100" id="empPeNm" value="PE"></w2:column>
-									<w2:column width="100" id="empPsNm" value="공무"></w2:column>
 									<w2:column width="150" id="npyrqRsn" value="미청구사유"></w2:column>
 									<w2:column width="150" id="npyrqMeasr" value="미청구대책"></w2:column>
 									<w2:column width="150" id="rcamtRsn" value="미수금사유"></w2:column>
 									<w2:column width="150" id="rcamtMeasr" value="미수금대책"></w2:column>
 									<w2:column width="150" id="progActRtRsn" value="공정율사유"></w2:column>
 									<w2:column width="150" id="progActRtMeasr" value="공정율대책"></w2:column>
+									<w2:column width="100" id="empPmNm" value="PM"></w2:column>
+									<w2:column width="100" id="empPeNm" value="PE"></w2:column>
+									<w2:column width="100" id="empPsNm" value="공무"></w2:column>
 									<w2:column width="100" id="mdftPr" value="최종수정자"></w2:column>
 									<w2:column width="150" id="mdftDt" value="최종수정일"></w2:column>
 								</w2:row>
@@ -700,7 +697,6 @@
 									<w2:column width="70" id="ccgrpNm"></w2:column>
 									<w2:column width="70" id="ccCd"></w2:column>
 									<w2:column width="70" id="ccNm" textAlign="left"></w2:column>
-									<w2:column width="70" id="orderNm" textAlign="left"></w2:column>
 									<w2:column width="70" id="prjtDt"></w2:column>
 									<w2:column width="70" id="complNm"></w2:column>
 									<w2:column width="70" id="bidAmt" textAlign="right" displayFormat="#,###,###" dataType="number"></w2:column>
@@ -718,6 +714,12 @@
 									<w2:column width="70" id="progActRtRsnYn" inputType="checkbox" displayMode="label" falseValue="N"
 										trueValue="Y" valueType="other">
 									</w2:column>
+									<w2:column width="70" id="npyrqRsn" inputType="textarea" textAlign="left"></w2:column>
+									<w2:column width="70" id="npyrqMeasr" inputType="textarea" textAlign="left"></w2:column>
+									<w2:column width="70" id="rcamtRsn" inputType="textarea" textAlign="left"></w2:column>
+									<w2:column width="70" id="rcamtMeasr" inputType="textarea" textAlign="left"></w2:column>
+									<w2:column width="70" id="progActRtRsn" inputType="textarea" textAlign="left"></w2:column>
+									<w2:column width="70" id="progActRtMeasr" inputType="textarea" textAlign="left"></w2:column>
 									<w2:column removeBorderStyle="false" width="70" inputType="text" id="empPmNm" blockSelect="false"
 										displayMode="label" textAlign="center">
 									</w2:column>
@@ -727,12 +729,6 @@
 									<w2:column removeBorderStyle="false" width="70" inputType="text" id="empPsNm" blockSelect="false"
 										displayMode="label" textAlign="center">
 									</w2:column>
-									<w2:column width="70" id="npyrqRsn" inputType="textarea" textAlign="left"></w2:column>
-									<w2:column width="70" id="npyrqMeasr" inputType="textarea" textAlign="left"></w2:column>
-									<w2:column width="70" id="rcamtRsn" inputType="textarea" textAlign="left"></w2:column>
-									<w2:column width="70" id="rcamtMeasr" inputType="textarea" textAlign="left"></w2:column>
-									<w2:column width="70" id="progActRtRsn" inputType="textarea" textAlign="left"></w2:column>
-									<w2:column width="70" id="progActRtMeasr" inputType="textarea" textAlign="left"></w2:column>
 									<w2:column width="70" id="mdftPr" inputType="textarea" textAlign="center"></w2:column>
 									<w2:column width="70" id="mdftDt" inputType="textarea" textAlign="center"></w2:column>
 								</w2:row>
@@ -767,7 +763,6 @@
 									<w2:column removeBorderStyle="false" width="70" id="footForm05"></w2:column>
 									<w2:column removeBorderStyle="false" width="70" id="footForm05"></w2:column>
 									<w2:column removeBorderStyle="false" width="70" id="footForm05"></w2:column>
-									<w2:column removeBorderStyle="false" width="70" id="footForm05"></w2:column>
 								</w2:row>
 							</w2:footer>
 						</w2:gridView>
@@ -790,7 +785,7 @@
 								<xf:group style="width:15%;" tagname="col"></xf:group>
 								<xf:group style="width:85%;" tagname="col"></xf:group>
 							</xf:group>
-							<xf:group tagname="tr" style="height:10%;">
+							<xf:group tagname="tr" style="height: 100px">
 								<xf:group class="w2tb_th" style="text-align:center;font-weight:bold;padding-left: 0px;" tagname="th">PJT 명</xf:group>		
 								<xf:group class="w2tb_td" style="" tagname="td">
 									<xf:output label=""
@@ -805,13 +800,13 @@
 								<xf:group class="" tagname="th"></xf:group>
 								<xf:group class="" tagname="th"></xf:group>
 							</xf:group>
-							<xf:group tagname="tr" style="">
+							<xf:group tagname="tr" style="height: 80px">
 								<xf:group class="w2tb_th" style="text-align:center;font-weight:bold;padding-left: 0px;color:#0000FF;" tagname="th">미청구<br/>사유</xf:group>
 								<xf:group class="w2tb_td" style="" tagname="td">
 									<xf:textarea id="txtNpyrqRsn" style="width:100%;height: 100%;" ref="data:dcdataList1.npyrqRsn"></xf:textarea>
 								</xf:group>								
 							</xf:group>
-							<xf:group tagname="tr" style="">
+							<xf:group tagname="tr" style="height: 80px">
 								<xf:group class="w2tb_th" style="text-align:center;font-weight:bold;padding-left: 0px;color:#0000FF;" tagname="th">미청구<br/>대책</xf:group>
 								<xf:group class="w2tb_td" style="" tagname="td">
 									<xf:textarea id="txtNpyrqMeasr" style="width:100%;height: 100%;" ref="data:dcdataList1.npyrqMeasr"></xf:textarea>
@@ -821,13 +816,13 @@
 								<xf:group class="" tagname="th"></xf:group>
 								<xf:group class="" tagname="th"></xf:group>
 							</xf:group>
-							<xf:group tagname="tr" style="">
+							<xf:group tagname="tr" style="height: 80px">
 								<xf:group class="w2tb_th" style="text-align:center;font-weight:bold;padding-left: 0px;color:#FF0000;" tagname="th">미수금<br/>사유</xf:group>
 								<xf:group class="w2tb_td" style="" tagname="td">
 									<xf:textarea id="txtRcamtRsn" style="width:100%;height: 100%;" ref="data:dcdataList1.rcamtRsn"></xf:textarea>
 								</xf:group>
 							</xf:group>
-							<xf:group tagname="tr" style="">
+							<xf:group tagname="tr" style="height: 80px">
 								<xf:group class="w2tb_th" style="text-align:center;font-weight:bold;padding-left: 0px;color:#FF0000;" tagname="th">미수금<br/>대책</xf:group>
 								<xf:group class="w2tb_td" style="" tagname="td">
 									<xf:textarea id="txtRcamtMeasr" style="width:100%;height: 100%;" ref="data:dcdataList1.rcamtMeasr"></xf:textarea>
@@ -837,13 +832,13 @@
 								<xf:group class="" tagname="th"></xf:group>
 								<xf:group class="" tagname="th"></xf:group>
 							</xf:group>
-							<xf:group tagname="tr" style="">
+							<xf:group tagname="tr" style="height: 80px">
 								<xf:group class="w2tb_th" style="text-align:center;font-weight:bold;padding-left: 0px;" tagname="th">공정율<br/>사유</xf:group>
 								<xf:group class="w2tb_td" style="" tagname="td">
 									<xf:textarea id="txtProgActRtRsn" style="width:100%;height: 100%;" ref="data:dcdataList1.progActRtRsn"></xf:textarea>
 								</xf:group>
 							</xf:group>
-							<xf:group tagname="tr" style="">
+							<xf:group tagname="tr" style="height:80px;">
 								<xf:group class="w2tb_th" style="text-align:center;font-weight:bold;padding-left: 0px;" tagname="th">공정율<br/>대책</xf:group>
 								<xf:group class="w2tb_td" style="" tagname="td">
 									<xf:textarea id="txtProgActRtMeasr" style="width:100%;height: 100%;" ref="data:dcdataList1.progActRtMeasr"></xf:textarea>