Просмотр исходного кода

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

dwkim лет назад: 2
Родитель
Сommit
140d8eeab9

+ 1 - 1
src/main/webapp/app/loanmng/LOANMNG01010.html

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

+ 1 - 1
src/main/webapp/js/app/loanmng/ITP_LOANMNG02010.js

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

+ 7 - 7
src/main/webapp/js/app/loanmng/ITP_LOANMNG03010.js

@@ -108,7 +108,7 @@ const gridColModel = {
108 108
 		{
109 109
 			index: 'UNPAId_AMT', name: 'right',
110 110
 			label: '미납금액', 
111
-			width: '10', fixed: false, align: 'center',
111
+			width: '10', fixed: false, align: 'right',
112 112
 			sortable: false, hidden: false, 
113 113
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
114 114
 		},		
@@ -154,7 +154,7 @@ const gridColModel = {
154 154
 		{
155 155
 			index: 'ITEM_NM', name: 'itemNm',
156 156
 			label: "품목명",
157
-			width: '10', fixed: false, align: 'center',
157
+			width: '10', fixed: false, align: 'left',
158 158
 			sortable: false, editable: false, edittype: 'text'
159 159
 		},
160 160
 		{
@@ -166,28 +166,28 @@ const gridColModel = {
166 166
 		{
167 167
 			index: 'UNIT_AMT', name: 'unitAmt',
168 168
 			label: "단가",
169
-			width: '8', fixed: false, align: 'center',
169
+			width: '8', fixed: false, align: 'right',
170 170
 			sortable: false, editable: false, edittype: 'text', 
171 171
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
172 172
 		},
173 173
 		{
174 174
 			index: 'PODR_QTY', name: 'podrQty',
175 175
 			label: "발주수량",
176
-			width: '8', fixed: false, align: 'center',
176
+			width: '8', fixed: false, align: 'right',
177 177
 			sortable: false, editable: false, edittype: 'text', 
178 178
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
179 179
 		},
180 180
 		{
181 181
 			index: 'DLV_QTY', name: 'dlvQty',
182 182
 			label: "납품수량",
183
-			width: '8', fixed: false, align: 'center',
183
+			width: '8', fixed: false, align: 'right',
184 184
 			sortable: false, editable: false, edittype: 'text', 
185 185
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
186 186
 		},
187 187
 		{
188 188
 			index: 'WHS_COL_QTY', name: 'whsColQty',
189 189
 			label: "입고/수거수량",
190
-			width: '8', fixed: false, align: 'center',
190
+			width: '8', fixed: false, align: 'right',
191 191
 			sortable: false, editable: false, edittype: 'text', 
192 192
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
193 193
 		}, 
@@ -200,7 +200,7 @@ const gridColModel = {
200 200
 		{
201 201
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
202 202
 			label: "입고/수거금액",
203
-			width: '8', fixed: false, align: 'center',
203
+			width: '8', fixed: false, align: 'right',
204 204
 			sortable: false, editable: false, edittype: 'text', 
205 205
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
206 206
 		},

+ 7 - 7
src/main/webapp/js/app/settmng/ITP_SETTMNG01010.js

@@ -222,7 +222,7 @@ const gridColModel = {
222 222
 		{
223 223
 			index: 'ITEM_NM', name: 'itemNm',
224 224
 			label: "품목명",
225
-			width: '10', fixed: false, align: 'center',
225
+			width: '10', fixed: false, align: 'left',
226 226
 			sortable: false, editable: false, edittype: 'text'
227 227
 		},
228 228
 		{
@@ -234,41 +234,41 @@ const gridColModel = {
234 234
 		{
235 235
 			index: 'UNIT_AMT', name: 'unitAmt',
236 236
 			label: "단가",
237
-			width: '8', fixed: false, align: 'center',
237
+			width: '8', fixed: false, align: 'right',
238 238
 			sortable: false, editable: false, edittype: 'text', 
239 239
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
240 240
 		},
241 241
 		{
242 242
 			index: 'PODR_QTY', name: 'podrQty',
243 243
 			label: "발주수량",
244
-			width: '8', fixed: false, align: 'center',
244
+			width: '8', fixed: false, align: 'right',
245 245
 			sortable: false, editable: false, edittype: 'text', 
246 246
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
247 247
 		},
248 248
 		{
249 249
 			index: 'DLV_QTY', name: 'dlvQty',
250 250
 			label: "납품수량",
251
-			width: '8', fixed: false, align: 'center',
251
+			width: '8', fixed: false, align: 'right',
252 252
 			sortable: false, editable: false, edittype: 'text', 
253 253
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
254 254
 		},
255 255
 		{
256 256
 			index: 'WHS_COL_QTY', name: 'whsColQty',
257 257
 			label: "입고/수거수량",
258
-			width: '8', fixed: false, align: 'center',
258
+			width: '8', fixed: false, align: 'right',
259 259
 			sortable: false, editable: false, edittype: 'text', 
260 260
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
261 261
 		}, 
262 262
 		{
263 263
 			index: 'WHS_COL_DT', name: 'whsColDt',
264 264
 			label: "입고/수거일자",
265
-			width: '8', fixed: false, align: 'center',
265
+			width: '8', fixed: false, align: 'right',
266 266
 			sortable: false, editable: false, edittype: 'text'
267 267
 		},
268 268
 		{
269 269
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
270 270
 			label: "입고/수거금액",
271
-			width: '8', fixed: false, align: 'center',
271
+			width: '8', fixed: false, align: 'right',
272 272
 			sortable: false, editable: false, edittype: 'text', 
273 273
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
274 274
 		},

+ 16 - 12
src/main/webapp/js/app/settmng/ITP_SETTMNG02010.js

@@ -63,7 +63,7 @@ const gridColModel = {
63 63
 		{
64 64
 			index: 'STTL_MGNT_UNQ_NO', name: 'sttlMgntUnqNo',
65 65
 			label: "정산번호", 
66
-			minwidth: 160,
66
+			minwidth: 180,
67 67
 			width: '10', fixed: false, align: 'center',
68 68
 			sortable: false, hidden: false
69 69
 		},
@@ -147,13 +147,14 @@ const gridColModel = {
147 147
 		{
148 148
 			index: 'ITEM_ID', name: 'itemId',
149 149
 			label: "품목코드",
150
+			minwidth: 300,
150 151
 			width: '10', fixed: false, align: 'center',
151 152
 			sortable: false, editable: false, edittype: 'text'
152 153
 		},
153 154
 		{
154 155
 			index: 'ITEM_NM', name: 'itemNm',
155 156
 			label: "품목명",
156
-			width: '10', fixed: false, align: 'center',
157
+			width: '10', fixed: false, align: 'left',
157 158
 			sortable: false, editable: false, edittype: 'text'
158 159
 		},
159 160
 		{
@@ -165,41 +166,44 @@ const gridColModel = {
165 166
 		{
166 167
 			index: 'UNIT_AMT', name: 'unitAmt',
167 168
 			label: "단가",
168
-			width: '8', fixed: false, align: 'center',
169
+			width: '8', fixed: false, align: 'right',
169 170
 			sortable: false, editable: false, edittype: 'text', 
170 171
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
171 172
 		},
172 173
 		{
173 174
 			index: 'PODR_QTY', name: 'podrQty',
174 175
 			label: "발주수량",
175
-			width: '8', fixed: false, align: 'center',
176
+			width: '8', fixed: false, align: 'right',
176 177
 			sortable: false, editable: false, edittype: 'text', 
177 178
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
178 179
 		},
179 180
 		{
180 181
 			index: 'DLV_QTY', name: 'dlvQty',
181 182
 			label: "납품수량",
182
-			width: '8', fixed: false, align: 'center',
183
+			width: '8', fixed: false, align: 'right',
183 184
 			sortable: false, editable: false, edittype: 'text', 
184 185
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
185 186
 		},
186 187
 		{
187 188
 			index: 'WHS_COL_QTY', name: 'whsColQty',
188 189
 			label: "입고/수거수량",
189
-			width: '8', fixed: false, align: 'center',
190
+			minwidth: 100,
191
+			width: '8', fixed: false, align: 'right',
190 192
 			sortable: false, editable: false, edittype: 'text', 
191 193
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
192 194
 		}, 
193 195
 		{
194 196
 			index: 'WHS_COL_DT', name: 'whsColDt',
195 197
 			label: "입고/수거일자",
198
+			minwidth: 100,
196 199
 			width: '8', fixed: false, align: 'center',
197 200
 			sortable: false, editable: false, edittype: 'text'
198 201
 		},
199 202
 		{
200 203
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
201 204
 			label: "입고/수거금액",
202
-			width: '8', fixed: false, align: 'center',
205
+			minwidth: 100,
206
+			width: '8', fixed: false, align: 'right',
203 207
 			sortable: false, editable: false, edittype: 'text', 
204 208
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
205 209
 		},
@@ -247,14 +251,12 @@ let pageObj = {
247 251
 		view: function() {
248 252
 			// 버튼 권한설정
249 253
 			fn_proc_btn_auth('SETTMNG02010');
250
-			
251 254
 			// 공통코드 표시
252 255
 			$('select').each(function() {
253 256
 		        if($(this).data('select-code')) {
254 257
 		            fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
255 258
 		        }
256 259
 		    });
257
-
258 260
 			// 조회일자 지정
259 261
 			var now = new Date();
260 262
 			$('#ITP_TAB_SETTMNG02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);			
@@ -268,7 +270,6 @@ let pageObj = {
268 270
 				$('#ITP_FORM_SETTMNG02010_SEARCH_STORE_ID').val(fn_make_user_info.get('storeId'));
269 271
 				$('#ITP_FORM_SETTMNG02010_SEARCH_STORE_SPPLY_NM').val(fn_make_user_info.get('storeNm'));	
270 272
 			}
271
-			
272 273
 		},
273 274
 		grid: function() {
274 275
 			itp_fn_jqgrid_resize(SETTMNG02010_GRID_ID, SETTMNG02010_GRID_LIST, 'lg');
@@ -434,6 +435,7 @@ let listObj = {
434 435
 			this.unload();
435 436
 			this.load();
436 437
 		},
438
+		
437 439
 		load: function() {			
438 440
 			let param = $('#ITP_FORM_SETTMNG02010_SEARCH').serializeObject();
439 441
 			param.gridSize = $.jgrid.defaults.rowNum;
@@ -485,6 +487,7 @@ let listObj = {
485 487
 let modifyObj = {
486 488
 	init: function (param) {
487 489
 		this.load(param);
490
+		this.grid.init();
488 491
 	},
489 492
 	button: {
490 493
 		cancel: function() {
@@ -562,11 +565,11 @@ let modifyObj = {
562 565
 			this.unload();
563 566
 			this.load();
564 567
 		},
568
+		colModel: gridColModel.view,
565 569
 		load : function() {
566 570
 			let param = $('#ITP_FORM_SETTMNG02010_DETAIL').serializeObject();
567 571
 			param.gridSize = $.jgrid.defaults.rowNum;
568
-			param.pagingYn = false; // 페이징안함
569
-
572
+			//param.pagingYn = false; // 페이징안함
570 573
 			var option = {
571 574
 				gridId: SETTMNG02010_DETAIL_GRID_ID,
572 575
 				colModel: gridColModel.view,
@@ -615,4 +618,5 @@ let modifyObj = {
615 618
 			$.jgrid.gridUnload(SETTMNG02010_DETAIL_GRID_ID);
616 619
 		}
617 620
 	}
621
+	
618 622
 };

+ 7 - 7
src/main/webapp/js/app/settmng/ITP_SETTMNG03010.js

@@ -158,7 +158,7 @@ const gridColModel = {
158 158
 		{
159 159
 			index: 'ITEM_NM', name: 'itemNm',
160 160
 			label: "품목명",
161
-			width: '10', fixed: false, align: 'center',
161
+			width: '10', fixed: false, align: 'left',
162 162
 			sortable: false, editable: false, edittype: 'text'
163 163
 		},
164 164
 		{
@@ -170,28 +170,28 @@ const gridColModel = {
170 170
 		{
171 171
 			index: 'UNIT_AMT', name: 'unitAmt',
172 172
 			label: "단가",
173
-			width: '8', fixed: false, align: 'center',
173
+			width: '8', fixed: false, align: 'right',
174 174
 			sortable: false, editable: false, edittype: 'text', 
175 175
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
176 176
 		},
177 177
 		{
178 178
 			index: 'PODR_QTY', name: 'podrQty',
179 179
 			label: "발주수량",
180
-			width: '8', fixed: false, align: 'center',
180
+			width: '8', fixed: false, align: 'right',
181 181
 			sortable: false, editable: false, edittype: 'text', 
182 182
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
183 183
 		},
184 184
 		{
185 185
 			index: 'DLV_QTY', name: 'dlvQty',
186 186
 			label: "납품수량",
187
-			width: '8', fixed: false, align: 'center',
187
+			width: '8', fixed: false, align: 'right',
188 188
 			sortable: false, editable: false, edittype: 'text', 
189 189
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
190 190
 		},
191 191
 		{
192 192
 			index: 'WHS_COL_QTY', name: 'whsColQty',
193 193
 			label: "입고/수거수량",
194
-			width: '8', fixed: false, align: 'center',
194
+			width: '8', fixed: false, align: 'right',
195 195
 			sortable: false, editable: false, edittype: 'text', 
196 196
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
197 197
 		}, 
@@ -204,7 +204,7 @@ const gridColModel = {
204 204
 		{
205 205
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
206 206
 			label: "입고/수거금액",
207
-			width: '8', fixed: false, align: 'center',
207
+			width: '8', fixed: false, align: 'right',
208 208
 			sortable: false, editable: false, edittype: 'text', 
209 209
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
210 210
 		},
@@ -217,7 +217,7 @@ const gridColModel = {
217 217
 		{
218 218
 			index: 'PODR_UNQ_NO', name: 'podrUnqNo',
219 219
 			label: "발주번호",
220
-			width: '8', fixed: false, align: 'center',
220
+			width: '8', fixed: false, align: 'right',
221 221
 			sortable: false, editable: false, edittype: 'text'
222 222
 		},
223 223
 		{