Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

src/main/webapp/css/ui.jqgrid-bootstrap.css

@@ -325,6 +325,7 @@ div.tablediv > .table-bordered {
 .ui-jqgrid .ui-pager-control .ui-pager-table td {
 	border-top : 0px none !important;
 	min-height : 20px !important;
+	width: 80px;
 }
 .ui-jqgrid .ui-pg-button  {
 	height:auto;
@@ -419,6 +420,7 @@ div.tablediv > .table-bordered {
 {
 	table-layout:auto;
 	height:100%;
+	width: 160px;
 }
 .ui-jqgrid .ui-jqgrid-pager .navtable,
 .ui-jqgrid .ui-jqgrid-toppager .navtable

src/main/webapp/js/app/oper/ITP_OPER01010.js

@@ -47,14 +47,6 @@ let API_CHECK_DUPLICATE 	= '/api/user/check-duplicate';
 let API_INTI_USERPW 		= '/api/user/inti-userpw';
 let API_POP_GRID_LIST 		= '/api/brand/pop-grid-list';
  
-$(window).on('resize', function(e) {
-	setTimeout(()=>{
-		const left=$(OPER01010_GRID_PAGER+'_left'), pageing=$(OPER01010_GRID_PAGER+'_center').find('table');
-		left.width(60);
-		pageing.width(150);
-	}, 100);
-});
- 
 /*화면 Grid ColModel*/
 const gridColModel = {
 	list: [

src/main/webapp/js/app/pomng/ITP_POMNG03010.js

@@ -991,6 +991,15 @@ let modifyObj = {
 		cancel: function() {
 			document.getElementById('ITP_FORM_POMNG03010_DETAIL').reset();
 			document.getElementById('ITP_FORM_POMNG03010_NDETAIL').reset();
+			
+			$('#ITP_FORM_POMNG03010_DETAIL #ITP_FORM_POMNG03010_DETAIL_SHMT_WHS_ID').val('');
+			$('#ITP_FORM_POMNG03010_DETAIL #ITP_FORM_POMNG03010_DETAIL_SHMT_LOCATION').val('');
+			
+			$('#ITP_FORM_POMNG03010_NDETAIL #ITP_FORM_POMNG03010_NDETAIL_SPPLY_ID').val('');
+			$('#ITP_FORM_POMNG03010_NDETAIL #ITP_FORM_POMNG03010_NDETAIL_WHS_ID').val('');
+			$('#ITP_FORM_POMNG03010_NDETAIL #ITP_FORM_POMNG03010_NDETAIL_LOCATION').val('');
+			
+			
 			listObj.grid.search();
 		},
 		rejectSave: function(param) {

src/main/webapp/js/app/rtnmng/ITP_RTNMNG03010.js

@@ -987,6 +987,15 @@ let modifyObj = {
 		cancel: function() {
 			document.getElementById('ITP_FORM_RTNMNG03010_DETAIL').reset();
 			document.getElementById('ITP_FORM_RTNMNG03010_NDETAIL').reset();
+			
+			$('#ITP_FORM_RTNMNG03010_DETAIL #ITP_FORM_RTNMNG03010_DETAIL_WHS_ID').val('');
+			$('#ITP_FORM_RTNMNG03010_DETAIL #ITP_FORM_RTNMNG03010_DETAIL_LOCATION').val('');
+			
+			$('#ITP_FORM_RTNMNG03010_NDETAIL #ITP_FORM_RTNMNG03010_NDETAIL_SPPLY_ID').val('');
+			$('#ITP_FORM_RTNMNG03010_NDETAIL #ITP_FORM_RTNMNG03010_NDETAIL_RTN_WHS_ID').val('');
+			$('#ITP_FORM_RTNMNG03010_NDETAIL #ITP_FORM_RTNMNG03010_NDETAIL_RTN_LOCATION').val('');
+			
+			
 			listObj.grid.search();
 		},
 		rejectSave: function(param) {