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

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG01010.js

@@ -648,6 +648,7 @@ let listObj = {
 					const th=$(INOUTMNG01010_GRID_LIST).find('.ui-jqgrid-labels .ui-th-div').eq(1);
 					th.find('.s-ico').show();
 					th.find('.ui-grid-ico-sort').hide();
+					th.find('.glyphicon-triangle-top').show();//asc 는 bottom 으로
 					//$(INOUTMNG01010_GRID_LIST).find('.ui-jqgrid-labels .ui-th-div').css('cursor','default');
 					$(INOUTMNG01010_GRID_LIST).find('th').eq(1).css({cursor:'pointer',background:'#FFEBCD'});
 					$(INOUTMNG01010_GRID_LIST).find('th').eq(2).css({cursor:'pointer',background:'#FFEBCD'});

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

@@ -317,7 +317,7 @@ let listObj = {
 			let param = $('#ITP_FORM_POMNG04010_SEARCH').serializeObject();
 			param.gridSize = $.jgrid.defaults.rowNum;
             param.gridPage = $.jgrid.defaults.page;
-            param.sidx = '';
+            param.sidx = '0';
 			$(POMNG04010_GRID_ID).data('grid-param',param);
             $(POMNG04010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
         }
@@ -349,7 +349,7 @@ let listObj = {
 		load: function() {
             let param = $('#ITP_FORM_POMNG04010_SEARCH').serializeObject();
             param.gridSize = $.jgrid.defaults.rowNum;
-            param.sidx = '';
+            param.sidx = '0';
             var option = {
             	gridId: POMNG04010_GRID_ID,
             	colModel: gridColModel.list,
@@ -383,23 +383,24 @@ let listObj = {
 					th.find('.glyphicon-triangle-top').show();//asc 는 bottom 으로 desc 는 top
 					//$(POMNG04010_GRID_LIST).find('.ui-jqgrid-labels .ui-th-div').css('cursor','default');
 					$(POMNG04010_GRID_LIST).find('th').eq(2).css({cursor:'pointer',background:'#FFEBCD'});
+					$(POMNG04010_GRID_LIST).find('th').eq(3).css({cursor:'pointer',background:'#FFEBCD'});
 					$(POMNG04010_GRID_LIST).find('.ui-jqgrid-labels>th').on('click', function() {
 						const idx=$(this).index();
 						console.log("xxxx grid header click xxxxxxx index=="+idx, param );
-						if(idx==2 || idx==15 ) {
+						if(idx==2 || idx==3 ) {
 							var field='',sort=self['sort'+idx];
 							if(sort ) {
 								sort=sort=='asc'?'desc':'asc';
 							} else {
 								// 등록일 내림차순, 제목 오름차순
-								sort=idx==2? 'desc':idx==15? 'asc': 'desc';
+								sort=idx==2? 'desc':idx==3? 'asc': 'desc';
 							}
 							const icon=sort=='asc'? '.glyphicon-triangle-bottom': '.glyphicon-triangle-top'; 
 							self['sort'+idx]=sort;
 							if(idx==2) {
 								field='pchPodrUnqNo';
-							} else if(idx==15) {
-								field='itemNm';
+							} else if(idx==3) {
+								field='pchOdrStNm';
 							} 
 							param.page=1;
 							param.sidx=field;