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

src/main/webapp/app/loanmng/LOANMNG01010.html

@@ -127,7 +127,7 @@
 										<div class="col-xs-12">
 											<form id="ITP_FORM_LOANMNG01010_VIEW_SEARCH" class="form-horizontal">
 												<input type="hidden" id="ITP_FORM_LOANMNG01010_VIEW_SEARCH_LOAN_MGNT_UNQ_NO" name="sloanMgntUnqNo" value="">
-												<div class="col-xs-1 itp_ip itp_noMar" style="left:15px">
+												<div class="col-xs-1 itp_ip itp_noMar" style="left:-15px">
 													<select id="ITP_AJAX_LOANMNG01010_VIEW_SEARCH" class="form-control itp_input" name="servicePchReqDt">
 														<option value="A">거래일자</option>											
 													</select>

src/main/webapp/js/app/loanmng/ITP_LOANMNG02010.js

@@ -104,7 +104,7 @@ const gridColModel = {
 			index: 'DPST_ST_NM', name: 'dpstStNm',
 			label: "입금상태", 
 			width: '6', fixed: false, align: 'center',
-			minwidth: 80,
+			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{

src/main/webapp/js/app/loanmng/ITP_LOANMNG03010.js

@@ -108,7 +108,7 @@ const gridColModel = {
 		{
 			index: 'UNPAId_AMT', name: 'right',
 			label: '미납금액', 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},		
@@ -154,7 +154,7 @@ const gridColModel = {
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: "품목명",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, editable: false, edittype: 'text'
 		},
 		{
@@ -166,28 +166,28 @@ const gridColModel = {
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: "단가",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PODR_QTY', name: 'podrQty',
 			label: "발주수량",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'DLV_QTY', name: 'dlvQty',
 			label: "납품수량",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'WHS_COL_QTY', name: 'whsColQty',
 			label: "입고/수거수량",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		}, 
@@ -200,7 +200,7 @@ const gridColModel = {
 		{
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
 			label: "입고/수거금액",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},

src/main/webapp/js/app/settmng/ITP_SETTMNG01010.js

@@ -222,7 +222,7 @@ const gridColModel = {
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: "품목명",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, editable: false, edittype: 'text'
 		},
 		{
@@ -234,41 +234,41 @@ const gridColModel = {
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: "단가",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PODR_QTY', name: 'podrQty',
 			label: "발주수량",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'DLV_QTY', name: 'dlvQty',
 			label: "납품수량",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'WHS_COL_QTY', name: 'whsColQty',
 			label: "입고/수거수량",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		}, 
 		{
 			index: 'WHS_COL_DT', name: 'whsColDt',
 			label: "입고/수거일자",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text'
 		},
 		{
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
 			label: "입고/수거금액",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},

src/main/webapp/js/app/settmng/ITP_SETTMNG02010.js

@@ -63,7 +63,7 @@ const gridColModel = {
 		{
 			index: 'STTL_MGNT_UNQ_NO', name: 'sttlMgntUnqNo',
 			label: "정산번호", 
-			minwidth: 160,
+			minwidth: 180,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
@@ -147,13 +147,14 @@ const gridColModel = {
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: "품목코드",
+			minwidth: 300,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text'
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: "품목명",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, editable: false, edittype: 'text'
 		},
 		{
@@ -165,41 +166,44 @@ const gridColModel = {
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: "단가",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PODR_QTY', name: 'podrQty',
 			label: "발주수량",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'DLV_QTY', name: 'dlvQty',
 			label: "납품수량",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'WHS_COL_QTY', name: 'whsColQty',
 			label: "입고/수거수량",
-			width: '8', fixed: false, align: 'center',
+			minwidth: 100,
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		}, 
 		{
 			index: 'WHS_COL_DT', name: 'whsColDt',
 			label: "입고/수거일자",
+			minwidth: 100,
 			width: '8', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text'
 		},
 		{
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
 			label: "입고/수거금액",
-			width: '8', fixed: false, align: 'center',
+			minwidth: 100,
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -247,14 +251,12 @@ let pageObj = {
 		view: function() {
 			// 버튼 권한설정
 			fn_proc_btn_auth('SETTMNG02010');
-			
 			// 공통코드 표시
 			$('select').each(function() {
 		        if($(this).data('select-code')) {
 		            fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
 		        }
 		    });
-
 			// 조회일자 지정
 			var now = new Date();
 			$('#ITP_TAB_SETTMNG02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);			
@@ -268,7 +270,6 @@ let pageObj = {
 				$('#ITP_FORM_SETTMNG02010_SEARCH_STORE_ID').val(fn_make_user_info.get('storeId'));
 				$('#ITP_FORM_SETTMNG02010_SEARCH_STORE_SPPLY_NM').val(fn_make_user_info.get('storeNm'));	
 			}
-			
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(SETTMNG02010_GRID_ID, SETTMNG02010_GRID_LIST, 'lg');
@@ -434,6 +435,7 @@ let listObj = {
 			this.unload();
 			this.load();
 		},
+		
 		load: function() {			
 			let param = $('#ITP_FORM_SETTMNG02010_SEARCH').serializeObject();
 			param.gridSize = $.jgrid.defaults.rowNum;
@@ -485,6 +487,7 @@ let listObj = {
 let modifyObj = {
 	init: function (param) {
 		this.load(param);
+		this.grid.init();
 	},
 	button: {
 		cancel: function() {
@@ -562,11 +565,11 @@ let modifyObj = {
 			this.unload();
 			this.load();
 		},
+		colModel: gridColModel.view,
 		load : function() {
 			let param = $('#ITP_FORM_SETTMNG02010_DETAIL').serializeObject();
 			param.gridSize = $.jgrid.defaults.rowNum;
-			param.pagingYn = false; // 페이징안함
-
+			//param.pagingYn = false; // 페이징안함
 			var option = {
 				gridId: SETTMNG02010_DETAIL_GRID_ID,
 				colModel: gridColModel.view,
@@ -615,4 +618,5 @@ let modifyObj = {
 			$.jgrid.gridUnload(SETTMNG02010_DETAIL_GRID_ID);
 		}
 	}
+	
 };

src/main/webapp/js/app/settmng/ITP_SETTMNG03010.js

@@ -158,7 +158,7 @@ const gridColModel = {
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: "품목명",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, editable: false, edittype: 'text'
 		},
 		{
@@ -170,28 +170,28 @@ const gridColModel = {
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: "단가",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PODR_QTY', name: 'podrQty',
 			label: "발주수량",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'DLV_QTY', name: 'dlvQty',
 			label: "납품수량",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'WHS_COL_QTY', name: 'whsColQty',
 			label: "입고/수거수량",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		}, 
@@ -204,7 +204,7 @@ const gridColModel = {
 		{
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
 			label: "입고/수거금액",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -217,7 +217,7 @@ const gridColModel = {
 		{
 			index: 'PODR_UNQ_NO', name: 'podrUnqNo',
 			label: "발주번호",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text'
 		},
 		{