浏览代码

정산관리-정산요청, 정산현황 세부수정

yhl88 2 年之前
父节点
当前提交
37435d7d1a

+ 1 - 1
src/main/webapp/app/popup/biz/BIZPOP_BRAND_STORE.html

@@ -5,7 +5,7 @@
5
 				<input type="hidden" name="brandId" id="ITP_FORM_BIZPOP_BRAND_ID" />
5
 				<input type="hidden" name="brandId" id="ITP_FORM_BIZPOP_BRAND_ID" />
6
 				<div class="modal-header">
6
 				<div class="modal-header">
7
 					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
7
 					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
8
-					<h5 class="modal-title">브랜드그룹 검색</h5>
8
+					<h5 class="modal-title">매장 검색</h5>
9
 				</div>
9
 				</div>
10
 				<div class="modal-body">
10
 				<div class="modal-body">
11
 					<div class="itp_form fix">
11
 					<div class="itp_form fix">

+ 4 - 3
src/main/webapp/js/app/inoutmng/ITP_INOUTMNG01010.js

@@ -163,7 +163,7 @@ const gridColModel = {
163
 		{
163
 		{
164
 			index: 'SHMT_WHS_ID', name: 'shmtWhsId',
164
 			index: 'SHMT_WHS_ID', name: 'shmtWhsId',
165
 			label: ITP_MSG_LOCALE.label.shmtWhsId, //출고창고아이디
165
 			label: ITP_MSG_LOCALE.label.shmtWhsId, //출고창고아이디
166
-			width: '10', fixed: false, align: 'right',
166
+			width: '10', fixed: false, align: 'center',
167
 			sortable: false, hidden: true
167
 			sortable: false, hidden: true
168
 		},
168
 		},
169
 		{
169
 		{
@@ -306,7 +306,7 @@ const gridColModel = {
306
 		{
306
 		{
307
 			index: 'SHMT_WHS_ID', name: 'shmtWhsId',
307
 			index: 'SHMT_WHS_ID', name: 'shmtWhsId',
308
 			label: ITP_MSG_LOCALE.label.shmtWhsId, //출고창고아이디
308
 			label: ITP_MSG_LOCALE.label.shmtWhsId, //출고창고아이디
309
-			width: '10', fixed: false, align: 'right',
309
+			width: '10', fixed: false, align: 'center',
310
 			sortable: false, hidden: true
310
 			sortable: false, hidden: true
311
 		},
311
 		},
312
 		{
312
 		{
@@ -318,7 +318,8 @@ const gridColModel = {
318
 		{
318
 		{
319
 			index: 'SHMT_WHS_NM', name: 'shmtWhsNm',
319
 			index: 'SHMT_WHS_NM', name: 'shmtWhsNm',
320
 			label: ITP_MSG_LOCALE.label.shmtWhsNm, //출고창고명
320
 			label: ITP_MSG_LOCALE.label.shmtWhsNm, //출고창고명
321
-			width: '10', fixed: false, align: 'center',
321
+			width: '10', fixed: false, align: 'left',
322
+			minwidth: 220,
322
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
323
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
323
 		}
324
 		}
324
 	]
325
 	]

+ 17 - 16
src/main/webapp/js/app/settmng/ITP_SETTMNG01010.js

@@ -109,7 +109,7 @@ const gridColModel = {
109
 			index: 'ITEM_NM', name: 'itemNm',
109
 			index: 'ITEM_NM', name: 'itemNm',
110
 			label: "품목명",
110
 			label: "품목명",
111
 			width: '12', fixed: false, align: 'left',
111
 			width: '12', fixed: false, align: 'left',
112
-			sortable: false, editable: false, edittype: 'text', classes: 'ui-ellipsis'
112
+			sortable: false, editable: false, classes: 'ui-ellipsis'
113
 		},
113
 		},
114
 		{
114
 		{
115
 			index: 'UNIT', name: 'unit',
115
 			index: 'UNIT', name: 'unit',
@@ -120,7 +120,7 @@ const gridColModel = {
120
 		{
120
 		{
121
 			index: 'UNIT_AMT', name: 'unitAmt',
121
 			index: 'UNIT_AMT', name: 'unitAmt',
122
 			label: "단가",
122
 			label: "단가",
123
-			width: '12', fixed: false, align: 'right',
123
+			width: '13', fixed: false, align: 'right',
124
 			sortable: false, editable: false, edittype: 'text', 
124
 			sortable: false, editable: false, edittype: 'text', 
125
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
125
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
126
 		},
126
 		},
@@ -209,8 +209,9 @@ const gridColModel = {
209
 		{
209
 		{
210
 			index: 'STORE_NM', name: 'storeNm',
210
 			index: 'STORE_NM', name: 'storeNm',
211
 			label: "매장명",
211
 			label: "매장명",
212
+			minwidth: 60,
212
 			width: '10', fixed: false, align: 'center',
213
 			width: '10', fixed: false, align: 'center',
213
-			sortable: false, hidden: true
214
+			sortable: false, hidden: true, classes: 'ui-ellipsis'
214
 		},
215
 		},
215
 		{
216
 		{
216
 			index: 'ITEM_ID', name: 'itemId',
217
 			index: 'ITEM_ID', name: 'itemId',
@@ -221,72 +222,72 @@ const gridColModel = {
221
 		{
222
 		{
222
 			index: 'ITEM_NM', name: 'itemNm',
223
 			index: 'ITEM_NM', name: 'itemNm',
223
 			label: "품목명",
224
 			label: "품목명",
224
-			width: '10', fixed: false, align: 'left',
225
-			sortable: false, editable: false, edittype: 'text'
225
+			width: '12', fixed: false, align: 'left',
226
+			sortable: false, edittype: 'text', classes: 'ui-ellipsis'
226
 		},
227
 		},
227
 		{
228
 		{
228
 			index: 'UNIT', name: 'unit',
229
 			index: 'UNIT', name: 'unit',
229
 			label: "단위",
230
 			label: "단위",
230
-			width: '8', fixed: false, align: 'center',
231
+			width: '6', fixed: false, align: 'center',
231
 			sortable: false, editable: false, edittype: 'text'
232
 			sortable: false, editable: false, edittype: 'text'
232
 		},
233
 		},
233
 		{
234
 		{
234
 			index: 'UNIT_AMT', name: 'unitAmt',
235
 			index: 'UNIT_AMT', name: 'unitAmt',
235
 			label: "단가",
236
 			label: "단가",
236
-			width: '8', fixed: false, align: 'right',
237
+			width: '13', fixed: false, align: 'right',
237
 			sortable: false, editable: false, edittype: 'text', 
238
 			sortable: false, editable: false, edittype: 'text', 
238
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
239
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
239
 		},
240
 		},
240
 		{
241
 		{
241
 			index: 'PODR_QTY', name: 'podrQty',
242
 			index: 'PODR_QTY', name: 'podrQty',
242
 			label: "발주수량",
243
 			label: "발주수량",
243
-			width: '8', fixed: false, align: 'right',
244
+			width: '13', fixed: false, align: 'right',
244
 			sortable: false, editable: false, edittype: 'text', 
245
 			sortable: false, editable: false, edittype: 'text', 
245
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
246
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
246
 		},
247
 		},
247
 		{
248
 		{
248
 			index: 'DLV_QTY', name: 'dlvQty',
249
 			index: 'DLV_QTY', name: 'dlvQty',
249
 			label: "납품수량",
250
 			label: "납품수량",
250
-			width: '8', fixed: false, align: 'right',
251
+			width: '13', fixed: false, align: 'right',
251
 			sortable: false, editable: false, edittype: 'text', 
252
 			sortable: false, editable: false, edittype: 'text', 
252
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
253
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
253
 		},
254
 		},
254
 		{
255
 		{
255
 			index: 'WHS_COL_QTY', name: 'whsColQty',
256
 			index: 'WHS_COL_QTY', name: 'whsColQty',
256
 			label: "입고/수거수량",
257
 			label: "입고/수거수량",
257
-			width: '8', fixed: false, align: 'right',
258
+			width: '13', fixed: false, align: 'right',
258
 			sortable: false, editable: false, edittype: 'text', 
259
 			sortable: false, editable: false, edittype: 'text', 
259
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
260
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
260
 		}, 
261
 		}, 
261
 		{
262
 		{
262
 			index: 'WHS_COL_DT', name: 'whsColDt',
263
 			index: 'WHS_COL_DT', name: 'whsColDt',
263
 			label: "입고/수거일자",
264
 			label: "입고/수거일자",
264
-			width: '8', fixed: false, align: 'right',
265
+			width: '13', fixed: false, align: 'center',
265
 			sortable: false, editable: false, edittype: 'text'
266
 			sortable: false, editable: false, edittype: 'text'
266
 		},
267
 		},
267
 		{
268
 		{
268
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
269
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
269
 			label: "입고/수거금액",
270
 			label: "입고/수거금액",
270
-			width: '8', fixed: false, align: 'right',
271
+			width: '13', fixed: false, align: 'right',
271
 			sortable: false, editable: false, edittype: 'text', 
272
 			sortable: false, editable: false, edittype: 'text', 
272
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
273
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
273
 		},
274
 		},
274
 		{
275
 		{
275
 			index: 'STTL_DVSN_NM', name: 'sttlDvsnNm',
276
 			index: 'STTL_DVSN_NM', name: 'sttlDvsnNm',
276
 			label: "정산구분",
277
 			label: "정산구분",
277
-			width: '8', fixed: false, align: 'center',
278
+			width: '6', fixed: false, align: 'center',
278
 			sortable: false, editable: false, edittype: 'text'
279
 			sortable: false, editable: false, edittype: 'text'
279
 		},
280
 		},
280
 		{
281
 		{
281
 			index: 'PODR_UNQ_NO', name: 'podrUnqNo',
282
 			index: 'PODR_UNQ_NO', name: 'podrUnqNo',
282
 			label: "발주번호",
283
 			label: "발주번호",
283
-			width: '8', fixed: false, align: 'center',
284
+			width: '10', fixed: false, align: 'center',
284
 			sortable: false, editable: false, edittype: 'text'
285
 			sortable: false, editable: false, edittype: 'text'
285
 		},
286
 		},
286
 		{
287
 		{
287
 			index: 'PODR_DTL_NO', name: 'podrDtlNo',
288
 			index: 'PODR_DTL_NO', name: 'podrDtlNo',
288
 			label: "발주항번",
289
 			label: "발주항번",
289
-			width: '8', fixed: false, align: 'center',
290
+			width: '6', fixed: false, align: 'center',
290
 			sortable: false, editable: false, edittype: 'text'
291
 			sortable: false, editable: false, edittype: 'text'
291
 		}
292
 		}
292
 	]
293
 	]
@@ -359,7 +360,7 @@ let pageObj = {
359
 					switch (id) {
360
 					switch (id) {
360
 						case 'ITP_BTN_SETTMNG01010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
361
 						case 'ITP_BTN_SETTMNG01010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
361
 						case 'ITP_BTN_SETTMNG01010_CANCELLIST'		: modifyObj.button.cancel(); 	break;	// 취소/목록 버튼
362
 						case 'ITP_BTN_SETTMNG01010_CANCELLIST'		: modifyObj.button.cancel(); 	break;	// 취소/목록 버튼
362
-						case 'ITP_BTN_SETTMNG01010_NEWREG'			: listObj.button.reqSttl();	break;	// 정산요청 버튼
363
+						case 'ITP_BTN_SETTMNG01010_NEWREG'			: listObj.button.reqSttl();		break;	// 정산요청 버튼
363
 						case 'ITP_BTN_SETTMNG01010_REQUEST'			: modifyObj.button.request();	break;	// 요청 버튼
364
 						case 'ITP_BTN_SETTMNG01010_REQUEST'			: modifyObj.button.request();	break;	// 요청 버튼
364
 						case 'ITP_BTN_SETTMNG01010_STORE_SEARCH'	: listObj.button.storePop();	break;	// 매장검색 팝업
365
 						case 'ITP_BTN_SETTMNG01010_STORE_SEARCH'	: listObj.button.storePop();	break;	// 매장검색 팝업
365
 						case 'ITP_BTN_SETTMNG01010_STORE_ERASE'		: listObj.button.storeErase();	break;	// 매장 지움
366
 						case 'ITP_BTN_SETTMNG01010_STORE_ERASE'		: listObj.button.storeErase();	break;	// 매장 지움

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

@@ -152,7 +152,7 @@ const gridColModel = {
152
 		{
152
 		{
153
 			index: 'ITEM_ID', name: 'itemId',
153
 			index: 'ITEM_ID', name: 'itemId',
154
 			label: "품목코드",
154
 			label: "품목코드",
155
-			width: '10', fixed: false, align: 'center',
155
+			width: '13', fixed: false, align: 'center',
156
 			sortable: false, editable: false, edittype: 'text'
156
 			sortable: false, editable: false, edittype: 'text'
157
 		},
157
 		},
158
 		{
158
 		{
@@ -212,19 +212,19 @@ const gridColModel = {
212
 		{
212
 		{
213
 			index: 'STTL_DVSN_NM', name: 'sttlDvsnNm',
213
 			index: 'STTL_DVSN_NM', name: 'sttlDvsnNm',
214
 			label: "정산구분",
214
 			label: "정산구분",
215
-			width: '8', fixed: false, align: 'center',
215
+			width: '6', fixed: false, align: 'center',
216
 			sortable: false, editable: false, edittype: 'text'
216
 			sortable: false, editable: false, edittype: 'text'
217
 		},
217
 		},
218
 		{
218
 		{
219
 			index: 'PODR_UNQ_NO', name: 'podrUnqNo',
219
 			index: 'PODR_UNQ_NO', name: 'podrUnqNo',
220
 			label: "발주번호",
220
 			label: "발주번호",
221
-			width: '8', fixed: false, align: 'right',
221
+			width: '10', fixed: false, align: 'right',
222
 			sortable: false, editable: false, edittype: 'text'
222
 			sortable: false, editable: false, edittype: 'text'
223
 		},
223
 		},
224
 		{
224
 		{
225
 			index: 'PODR_DTL_NO', name: 'podrDtlNo',
225
 			index: 'PODR_DTL_NO', name: 'podrDtlNo',
226
 			label: "발주항번",
226
 			label: "발주항번",
227
-			width: '8', fixed: false, align: 'center',
227
+			width: '6', fixed: false, align: 'center',
228
 			sortable: false, editable: false, edittype: 'text'
228
 			sortable: false, editable: false, edittype: 'text'
229
 		}
229
 		}
230
 	]
230
 	]