Bläddra i källkod

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

juney 2 år sedan
förälder
incheckning
4de0d9b7b9

+ 2 - 1
src/main/webapp/js/app/locales/locale-ko.js

@@ -279,7 +279,8 @@ const ITP_MSG_LOCALE = (function() {
279 279
 			"trscBfBal": "거래 전 잔액",
280 280
 			"trscAfBal": "거래 후 잔액",
281 281
 			"authTpNm": "권한",
282
-			"rtnRsn": "반품사유"
282
+			"rtnRsn": "반품사유",
283
+			"reqTypeNm":"요청구분"
283 284
 		},
284 285
 		"table": {
285 286
 			"brandId": "브랜드ID",

+ 40 - 0
src/main/webapp/js/app/oper/ITP_OPER01010.js

@@ -47,6 +47,44 @@ let API_CHECK_DUPLICATE 	= '/api/user/check-duplicate';
47 47
 let API_INTI_USERPW 		= '/api/user/inti-userpw';
48 48
 let API_POP_GRID_LIST 		= '/api/brand/pop-grid-list';
49 49
 
50
+let gridParams=null;
51
+function itp_fn_grid_make_remote(option) {
52
+	var options = $.extend({
53
+		mtype: 'POST',
54
+		multiselect: false,
55
+		rownumbers: true,
56
+		
57
+		ondblClickRow: null,
58
+		loadBeforeSend: function(jqXHR) {
59
+			jqXHR.setRequestHeader('X-AUTH-TOKEN', CONN_KEY);
60
+		},
61
+		onPaging: function(action) {
62
+			console.log("xxxxxx onPaging xxxxxxxx", option.param, gridParams );
63
+			itp_fn_grid_paging(option.gridId, action, gridParams);
64
+		},
65
+		loadError: function(jqXHR, textStatus, errorThrown) {
66
+			itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);
67
+		}
68
+	}, option);
69
+
70
+	$(options.gridId).jqGrid({
71
+		colModel: options.colModel,
72
+		postData: JSON.stringify(options.param),
73
+		mtype: options.mtype,
74
+		url: options.url,
75
+		pager: options.pager,
76
+		multiselect: options.multiselect,
77
+		rownumbers: options.rownumbers,
78
+		loadBeforeSend: options.loadBeforeSend,
79
+		onCellSelect: options.onCellSelect,
80
+		ondblClickRow: options.ondblClickRow,
81
+		loadComplete: options.loadComplete,
82
+		loadError: options.loadError,
83
+		onPaging: options.onPaging
84
+	}).navGrid(options.pager, ITP_GRID_NAV_DEFAULTS.navGrid); 
85
+	console.log("xxxxxx itp_fn_grid_make_remote xxxxxxxx", options );
86
+}
87
+
50 88
 /*화면 Grid ColModel*/
51 89
 const gridColModel = {
52 90
 	list: [
@@ -199,6 +237,7 @@ const gridColModel = {
199 237
 /*화면공통 Object*/
200 238
 let pageObj = {
201 239
 	init: function () {
240
+		itp_fn_jqgrid_resize(OPER01010_GRID_ID, OPER01010_GRID_LIST, 'lg');
202 241
 		this.ui.init();
203 242
 		this.event.init();
204 243
 		afflShopObj.init();
@@ -384,6 +423,7 @@ let listObj = {
384 423
 			let param = $('#ITP_FORM_OPER01010_SEARCH').serializeObject();
385 424
 			param.gridSize = $.jgrid.defaults.rowNum;
386 425
 			param.gridPage = $.jgrid.defaults.page;
426
+			gridParams=param;
387 427
 			$(OPER01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
388 428
 		},
389 429
 		create:  function () {

+ 7 - 0
src/main/webapp/js/app/pomng/ITP_POMNG02010.js

@@ -72,6 +72,13 @@ const gridColModel = {
72 72
 			width: '13', fixed: false, align: 'center',
73 73
 			sortable: false, hidden: true
74 74
 		},
75
+		{
76
+			index: 'REQ_TYPE_NM', name: 'reqTypeNm',
77
+			label: ITP_MSG_LOCALE.label.reqTypeNm, //요청구분
78
+			width: '13', fixed: false, align: 'center',
79
+			minwidth: 40,
80
+			sortable: false, hidden: false
81
+		},
75 82
 		{
76 83
 			index: 'PCH_REQ_UNQ_NO', name: 'pchReqUnqNo',
77 84
 			label: ITP_MSG_LOCALE.label.pchReqUnqNo, //구매요청번호

+ 2 - 2
src/main/webapp/mobile/css/style.css

@@ -456,8 +456,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
456 456
 .scroll_area li .left_info .check_box input[type=checkbox] {width:15px; margin:10px 0 0 7px;}
457 457
 .scroll_area li .left_info .thick {float:left; text-align: left; width: 90%; height:38px; font-weight: 100;}
458 458
 .scroll_area li .left_info .thick .itp_item {color:gray;text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:60%; top:7px; text-align:left; position:relative;}
459
-.scroll_area li .left_info .thick .itp_gram {position:relative; top:7px; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; color:#aaa; font-size:14pt; text-align:left; width:45px;}
460
-.scroll_area li .left_info .thick .itp_amt {color:#b88278; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:60%; top: 7px; position:relative; text-align:left;}
459
+.scroll_area li .left_info .thick .itp_gram {position:relative; top:7px; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; color:#aaa; font-size:14pt; text-align:right; width: 85px;}
460
+.scroll_area li .left_info .thick .itp_amt {color:#b88278; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:auto; top: 7px; position:relative; text-align:left;}
461 461
 .scroll_area li .left_info .history {font-weight: 700; font-size: 1.1rem; margin-top:-2px;}
462 462
 .scroll_area li .left_info .history input{width: 150px;}
463 463
 .scroll_area li.history_list {height: 140px; padding-top:8px;}