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

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

@@ -38,12 +38,6 @@ let API_DETAIL_SAVE 	 = '/api/pomng/inoutmng/save-inst-shmt';			// 출하지시
 /*화면 Grid ColModel*/
 const gridColModel = {
 	list: [
-		{
-			index: 'BRAND_ID', name: 'brandId',
-			label: ITP_MSG_LOCALE.label.brandId, //브랜드아이디
-			width: '13', fixed: false, align: 'center',
-			sortable: false, hidden: true
-		},
 		{
 			index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
 			label: ITP_MSG_LOCALE.label.pchPodrUnqNo, //구매발주번호
@@ -647,6 +641,46 @@ let listObj = {
 				rownumbers: false,
 				loadComplete: function(data) {
 					itp_fn_grid_load_complete(data, INOUTMNG01010_GRID_ID, true, 'number', 'INOUTMNG01010', listObj.itp_INOUTMNG01010_search, listObj.empty, true, data.gridRecords, true);
+					const self=this;
+					if(self.sortUse) return;
+					self.sortUse=true;
+					$(INOUTMNG01010_GRID_LIST).find('.ui-jqgrid-labels .ui-th-div').css('cursor','default');
+					$(INOUTMNG01010_GRID_LIST).find('.ui-jqgrid-labels .ui-th-div').eq(1).css('cursor','pointer');
+					$(INOUTMNG01010_GRID_LIST).find('.ui-jqgrid-labels .ui-th-div').eq(2).css('cursor','pointer');
+					$(INOUTMNG01010_GRID_LIST).find('.ui-jqgrid-labels .ui-th-div').eq(4).css('cursor','pointer');
+					$(INOUTMNG01010_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==1 || idx==2 || idx==4) {
+							var field='',sort=self['sort'+idx];
+							if(sort ) {
+								sort=sort=='asc'?'desc':'asc';
+							} else {
+								// 등록일 내림차순, 제목 오름차순
+								sort=idx==1? 'asc':idx==2? 'desc': 'asc';
+							}
+							const icon=sort=='asc'? '.glyphicon-triangle-bottom': '.glyphicon-triangle-top'; 
+							self['sort'+idx]=sort;
+							if(idx==1) {
+								field='pchPodrUnqNo';
+							} else if(idx==2) {
+								field='pchPodrDtlNo';
+							} else if(idx==4) {
+								field='itemNm';
+							} 
+							param.page=1;
+							param.sidx=field;
+							param.sord=sort;
+							
+							$(INOUTMNG01010_GRID_ID).jqGrid('setGridParam',{
+								postData:JSON.stringify(param)
+							}).trigger('reloadGrid');
+							$(this).find('.s-ico').show();
+							$(this).find('.ui-grid-ico-sort').hide();
+							$(this).find(icon).show();
+
+						}
+					});
 				},
 				onPaging: function(action) {
 					itp_fn_grid_paging(INOUTMNG01010_GRID_ID, action, param);

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

@@ -379,6 +379,43 @@ let listObj = {
 				loadComplete: function(data) {
                     itp_fn_grid_load_complete(data, INOUTMNG02010_GRID_ID, true, 'number', 'INOUTMNG02010', listObj.itp_INOUTMNG02010_search, listObj.empty, true, data.gridRecords, true);
 					$('#cb_ITP_INOUTMNG02010_jqGrid').hide();
+					const self=this;
+					if(self.sortUse) return;
+					self.sortUse=true;
+					$(INOUTMNG02010_GRID_LIST).find('.ui-jqgrid-labels .ui-th-div').css('cursor','default');
+					$(INOUTMNG02010_GRID_LIST).find('.ui-jqgrid-labels .ui-th-div').eq(7).css('cursor','pointer');
+					$(INOUTMNG02010_GRID_LIST).find('.ui-jqgrid-labels .ui-th-div').eq(14).css('cursor','pointer');
+					$(INOUTMNG02010_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==7 || idx==14) {
+							var field='',sort=self['sort'+idx];
+							if(sort ) {
+								sort=sort=='asc'?'desc':'asc';
+							} else {
+								// 등록일 내림차순, 제목 오름차순
+								sort=idx==7? 'asc':idx==14? 'desc': 'asc';
+							}
+							const icon=sort=='asc'? '.glyphicon-triangle-bottom': '.glyphicon-triangle-top'; 
+							self['sort'+idx]=sort;
+							if(idx==7) {
+								field='itemNm';
+							} else if(idx==14) {
+								field='rtnPodrDtlNo';
+							} 
+							param.page=1;
+							param.sidx=field;
+							param.sord=sort;
+							
+							$(INOUTMNG02010_GRID_ID).jqGrid('setGridParam',{
+								postData:JSON.stringify(param)
+							}).trigger('reloadGrid');
+							$(this).find('.s-ico').show();
+							$(this).find('.ui-grid-ico-sort').hide();
+							$(this).find(icon).show();
+
+						}
+					});
 				},
 				onCellSelect: function(rowId, cellIdx, cellValue) {
 					$(this).resetSelection();

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

@@ -22,18 +22,6 @@ let API_RTNMNG_INOUTMNG_OUTSEARCH_GRID_LIST = '/api/rtnmng/inoutmng/colsearch-gr
 //화면 grid ColModel
 const gridColModel = {
 	list:[
-		{
-			index: 'VIEW_CD', name: 'viewCd',
-			label: ITP_MSG_LOCALE.label.viewCd,
-			width: '10', fixed: false, align: 'center',
-			sortable: false, hidden: true
-		},
-		{
-			index: 'BRAND_NM', name: 'brandId',
-			label: ITP_MSG_LOCALE.label.brandId,				// 브랜드아이디
-			width: '10', fixed: false, align: 'center',
-			sortable: false, hidden: true
-		},
 		{
 			index: 'SHMT_REQ_UNQ_NO', name: 'colCmdUnqNo',
 			label: '수거번호',										// 수거지시번호
@@ -313,6 +301,49 @@ let listObj = {
             	loadComplete: function(data) {
                     itp_fn_grid_load_complete(data, INOUTMNG04010_GRID_ID, true, 'number', 'INOUTMNG04010', listObj.itp_INOUTMNG04010_search, listObj.empty, true, data.gridRecords, true);
 					$('#cb_ITP_INOUTMNG04010_jqGrid').hide();
+					const self=this;
+					if(self.sortUse) return;
+					self.sortUse=true;
+					$(INOUTMNG04010_GRID_LIST).find('.ui-jqgrid-labels .ui-th-div').css('cursor','default');
+					$(INOUTMNG04010_GRID_LIST).find('.ui-jqgrid-labels .ui-th-div').eq(1).css('cursor','pointer');
+					$(INOUTMNG04010_GRID_LIST).find('.ui-jqgrid-labels .ui-th-div').eq(2).css('cursor','pointer');
+					$(INOUTMNG04010_GRID_LIST).find('.ui-jqgrid-labels .ui-th-div').eq(3).css('cursor','pointer');
+					$(INOUTMNG04010_GRID_LIST).find('.ui-jqgrid-labels .ui-th-div').eq(4).css('cursor','pointer');
+					$(INOUTMNG04010_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==1 || idx==2 || idx==3 || idx==4) {
+							var field='',sort=self['sort'+idx];
+							if(sort ) {
+								sort=sort=='asc'?'desc':'asc';
+							} else {
+								// 등록일 내림차순, 제목 오름차순
+								sort=idx==1? 'asc':idx==2? 'desc': 'asc';
+							}
+							const icon=sort=='asc'? '.glyphicon-triangle-bottom': '.glyphicon-triangle-top'; 
+							self['sort'+idx]=sort;
+							if(idx==1) {
+								field='colCmdUnqNo';
+							} else if(idx==2) {
+								field='colCmdDtlNo';
+							} else if(idx==3) {
+								field='rtnPodrUnqNo';
+							} else if(idx==4) {
+								field='rtnPodrDtlNo';
+							} 
+							param.page=1;
+							param.sidx=field;
+							param.sord=sort;
+							
+							$(INOUTMNG04010_GRID_ID).jqGrid('setGridParam',{
+								postData:JSON.stringify(param)
+							}).trigger('reloadGrid');
+							$(this).find('.s-ico').show();
+							$(this).find('.ui-grid-ico-sort').hide();
+							$(this).find(icon).show();
+
+						}
+					});
 				},
 				onCellSelect: function(rowId, cellIdx, cellValue) {
 					$(this).resetSelection();