Browse Source

공급사 수거관리 세부조정-1

yhl88 2 years ago
parent
commit
e13198bfea

+ 9 - 10
src/main/webapp/js/app/collmng/ITP_COLLMNG01010.js

@@ -36,7 +36,7 @@ const gridColModel = {
36
 			index: 'BRAND_NM', name: 'brandNm',
36
 			index: 'BRAND_NM', name: 'brandNm',
37
 			label: ITP_MSG_LOCALE.label.brandNm, 			// 브랜드명
37
 			label: ITP_MSG_LOCALE.label.brandNm, 			// 브랜드명
38
 			width: '10', fixed: false, align: 'left',
38
 			width: '10', fixed: false, align: 'left',
39
-			sortable: false, hidden: false
39
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
40
 		},
40
 		},
41
 		{
41
 		{
42
 			index: 'RTN_PODR_UNQ_NO', name: 'rtnPodrUnqNo',
42
 			index: 'RTN_PODR_UNQ_NO', name: 'rtnPodrUnqNo',
@@ -47,7 +47,7 @@ const gridColModel = {
47
 		{
47
 		{
48
 			index: 'RTN_ODR_STNM', name: 'rtnOdrStNm',
48
 			index: 'RTN_ODR_STNM', name: 'rtnOdrStNm',
49
 			label: ITP_MSG_LOCALE.label.rtnOdrStNm, 		// 번품발주상태명
49
 			label: ITP_MSG_LOCALE.label.rtnOdrStNm, 		// 번품발주상태명
50
-			width: '8', fixed: false, align: 'left',
50
+			width: '8', fixed: false, align: 'center',
51
 			sortable: false, hidden: false
51
 			sortable: false, hidden: false
52
 		},
52
 		},
53
 		{
53
 		{
@@ -66,8 +66,7 @@ const gridColModel = {
66
 			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
66
 			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
67
 			label: ITP_MSG_LOCALE.label.rtnWhsNm, 			// 수거장소
67
 			label: ITP_MSG_LOCALE.label.rtnWhsNm, 			// 수거장소
68
 			width: '10', fixed: false, align: 'left',
68
 			width: '10', fixed: false, align: 'left',
69
-			minwidth: 240,
70
-			sortable: false, hidden: false
69
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
71
 		},
70
 		},
72
 		{
71
 		{
73
 			index: 'RTN_DODR_TOTAL_AMT', name: 'rtnDodrTotalAmt',
72
 			index: 'RTN_DODR_TOTAL_AMT', name: 'rtnDodrTotalAmt',
@@ -86,7 +85,7 @@ const gridColModel = {
86
 			index: 'RTN_MGR_NM', name: 'rtnMgrNm',
85
 			index: 'RTN_MGR_NM', name: 'rtnMgrNm',
87
 			label: ITP_MSG_LOCALE.label.rtnMgrNm, 			// 수거 담당자
86
 			label: ITP_MSG_LOCALE.label.rtnMgrNm, 			// 수거 담당자
88
 			width: '7', fixed: false, align: 'center',
87
 			width: '7', fixed: false, align: 'center',
89
-			sortable: false, hidden: false
88
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
90
 		}
89
 		}
91
 	],
90
 	],
92
 	view: [],
91
 	view: [],
@@ -94,20 +93,20 @@ const gridColModel = {
94
 		{
93
 		{
95
 			index: 'RTN_PODR_DTL_NO', name: 'rtnPodrDtlNo',
94
 			index: 'RTN_PODR_DTL_NO', name: 'rtnPodrDtlNo',
96
 			label: ITP_MSG_LOCALE.label.rtnPodrDtlNo, 		// 반품발주항번
95
 			label: ITP_MSG_LOCALE.label.rtnPodrDtlNo, 		// 반품발주항번
97
-			width: '8', fixed: false, align: 'center',
96
+			width: '6', fixed: false, align: 'center',
98
 			sortable: false, hidden: false
97
 			sortable: false, hidden: false
99
 		},
98
 		},
100
 		{
99
 		{
101
 			index: 'ITEM_ID', name: 'itemId',
100
 			index: 'ITEM_ID', name: 'itemId',
102
 			label: ITP_MSG_LOCALE.label.itemId, 			// 품목번호
101
 			label: ITP_MSG_LOCALE.label.itemId, 			// 품목번호
103
-			width: '12', fixed: false, align: 'center',
102
+			width: '10', fixed: false, align: 'center',
104
 			sortable: false, hidden: false
103
 			sortable: false, hidden: false
105
 		},
104
 		},
106
 		{
105
 		{
107
 			index: 'ITEM_NM', name: 'itemNm',
106
 			index: 'ITEM_NM', name: 'itemNm',
108
 			label: ITP_MSG_LOCALE.label.itemNm, 			// 품목명
107
 			label: ITP_MSG_LOCALE.label.itemNm, 			// 품목명
109
-			width: '8', fixed: false, align: 'left',
110
-			sortable: false, hidden: false
108
+			width: '16', fixed: false, align: 'left',
109
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
111
 		},
110
 		},
112
 		{
111
 		{
113
 			index: 'UNIT_AMT', name: 'unitAmt',
112
 			index: 'UNIT_AMT', name: 'unitAmt',
@@ -138,7 +137,7 @@ const gridColModel = {
138
 		{
137
 		{
139
 			index: 'COL_REQ_DT', name: 'colReqDt',
138
 			index: 'COL_REQ_DT', name: 'colReqDt',
140
 			label: ITP_MSG_LOCALE.label.colReqDt, 			// 수거요청일
139
 			label: ITP_MSG_LOCALE.label.colReqDt, 			// 수거요청일
141
-			width: '10', fixed: false, align: 'center',
140
+			width: '8', fixed: false, align: 'center',
142
 			sortable: false, hidden: false
141
 			sortable: false, hidden: false
143
 		}
142
 		}
144
 	]
143
 	]

+ 7 - 6
src/main/webapp/js/app/collmng/ITP_COLLMNG02010.js

@@ -49,7 +49,7 @@ const gridColModel = {
49
 			index: 'BRAND_NM', name: 'brandNm',
49
 			index: 'BRAND_NM', name: 'brandNm',
50
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
50
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
51
 			width: '10', fixed: false, align: 'left',
51
 			width: '10', fixed: false, align: 'left',
52
-			sortable: false, hidden: false
52
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
53
 		},
53
 		},
54
 		{
54
 		{
55
 			index: 'RTN_PODR_UNQ_NO', name: 'rtnPodrUnqNo',
55
 			index: 'RTN_PODR_UNQ_NO', name: 'rtnPodrUnqNo',
@@ -74,7 +74,7 @@ const gridColModel = {
74
 			index: 'ITEM_NM', name: 'itemNm',
74
 			index: 'ITEM_NM', name: 'itemNm',
75
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
75
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
76
 			width: '10', fixed: false, align: 'left',
76
 			width: '10', fixed: false, align: 'left',
77
-			sortable: false, hidden: false
77
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
78
 		},
78
 		},
79
 		{
79
 		{
80
 			index: 'RTN_WHS_ID', name: 'rtnWhsId',
80
 			index: 'RTN_WHS_ID', name: 'rtnWhsId',
@@ -87,7 +87,7 @@ const gridColModel = {
87
 			label: ITP_MSG_LOCALE.label.rtnWhsNm, //수거창고명
87
 			label: ITP_MSG_LOCALE.label.rtnWhsNm, //수거창고명
88
 			width: '15', fixed: false, align: 'left',
88
 			width: '15', fixed: false, align: 'left',
89
 			minwidth: 220,
89
 			minwidth: 220,
90
-			sortable: false, hidden: false
90
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
91
 		},
91
 		},
92
 		{
92
 		{
93
 			index: 'RTN_LOCATION', name: 'rtnLocation',
93
 			index: 'RTN_LOCATION', name: 'rtnLocation',
@@ -141,7 +141,7 @@ const gridColModel = {
141
 			index: 'ITEM_NM', name: 'itemNm',
141
 			index: 'ITEM_NM', name: 'itemNm',
142
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
142
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
143
 			width: '10', fixed: false, align: 'left',
143
 			width: '10', fixed: false, align: 'left',
144
-			sortable: false, hidden: false
144
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
145
 		},
145
 		},
146
 		{
146
 		{
147
 			index: 'UNIT', name: 'unit',
147
 			index: 'UNIT', name: 'unit',
@@ -177,7 +177,7 @@ const gridColModel = {
177
 			index: 'RTN_RSN_DVSN_NM', name: 'rtnRsnDvsnNm',
177
 			index: 'RTN_RSN_DVSN_NM', name: 'rtnRsnDvsnNm',
178
 			label: ITP_MSG_LOCALE.label.rtnRsnDvsnNm, //반품사유
178
 			label: ITP_MSG_LOCALE.label.rtnRsnDvsnNm, //반품사유
179
 			width: '10', fixed: false, align: 'center',
179
 			width: '10', fixed: false, align: 'center',
180
-			sortable: false, hidden: false
180
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
181
 		},
181
 		},
182
 		{
182
 		{
183
 			index: 'RTN_RSN_DVSN', name: 'rtnRsnDvsn',
183
 			index: 'RTN_RSN_DVSN', name: 'rtnRsnDvsn',
@@ -189,7 +189,7 @@ const gridColModel = {
189
 			index: 'RTN_RSN', name: 'rtnRsn',
189
 			index: 'RTN_RSN', name: 'rtnRsn',
190
 			label: ITP_MSG_LOCALE.label.rtnRsn, //비고
190
 			label: ITP_MSG_LOCALE.label.rtnRsn, //비고
191
 			width: '10', fixed: false, align: 'center',
191
 			width: '10', fixed: false, align: 'center',
192
-			sortable: false, hidden: false
192
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
193
 		},
193
 		},
194
 		{
194
 		{
195
 			index: 'COL_AMT', name: 'colAmt',
195
 			index: 'COL_AMT', name: 'colAmt',
@@ -443,6 +443,7 @@ let listObj = {
443
 			param.gridSize = $.jgrid.defaults.rowNum;
443
 			param.gridSize = $.jgrid.defaults.rowNum;
444
 			var option = {
444
 			var option = {
445
 				multiselect: true,
445
 				multiselect: true,
446
+				rownumbers: false,
446
 				autowidth: true,
447
 				autowidth: true,
447
 				gridId: COLLMNG02010_GRID_ID,
448
 				gridId: COLLMNG02010_GRID_ID,
448
 				colModel: gridColModel.list,
449
 				colModel: gridColModel.list,

+ 5 - 8
src/main/webapp/js/app/collmng/ITP_COLLMNG03010.js

@@ -37,7 +37,7 @@ const gridColModel = {
37
 			label: ITP_MSG_LOCALE.label.brandNm,			// 브랜드명
37
 			label: ITP_MSG_LOCALE.label.brandNm,			// 브랜드명
38
 			width: '10', fixed: false, align: 'left',
38
 			width: '10', fixed: false, align: 'left',
39
 			minwidth: 120,
39
 			minwidth: 120,
40
-			sortable: false, hidden: false
40
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
41
 		},
41
 		},
42
 		{
42
 		{
43
 			index: 'COL_PICK_UNQ_NO', name: 'colPickUnqNo',
43
 			index: 'COL_PICK_UNQ_NO', name: 'colPickUnqNo',
@@ -84,9 +84,8 @@ const gridColModel = {
84
 		{
84
 		{
85
 			index: 'ITEM_NM', name: 'itemNm',
85
 			index: 'ITEM_NM', name: 'itemNm',
86
 			label: ITP_MSG_LOCALE.label.itemNm,				// 품목명
86
 			label: ITP_MSG_LOCALE.label.itemNm,				// 품목명
87
-			width: '8', fixed: false, align: 'left',
88
-			minwidth: 140,
89
-			sortable: false, hidden: false
87
+			width: '10', fixed: false, align: 'left',
88
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
90
 		},
89
 		},
91
 		{
90
 		{
92
 			index: 'COL_REQ_QTY', name: 'colReqQty',
91
 			index: 'COL_REQ_QTY', name: 'colReqQty',
@@ -120,8 +119,7 @@ const gridColModel = {
120
 			index: 'WHS_NM', name: 'whsNm',
119
 			index: 'WHS_NM', name: 'whsNm',
121
 			label: ITP_MSG_LOCALE.label.whsNm,				// 납품장소
120
 			label: ITP_MSG_LOCALE.label.whsNm,				// 납품장소
122
 			width: '10', fixed: false, align: 'left',
121
 			width: '10', fixed: false, align: 'left',
123
-			minwidth: 240,
124
-			sortable: false, hidden: false
122
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
125
 		},
123
 		},
126
 		{
124
 		{
127
 			index: 'PICK_MGR_NM', name: 'pickMgrNm',
125
 			index: 'PICK_MGR_NM', name: 'pickMgrNm',
@@ -142,7 +140,6 @@ const gridColModel = {
142
 };
140
 };
143
 
141
 
144
 
142
 
145
-
146
 /*화면공통 Object*/
143
 /*화면공통 Object*/
147
 let pageObj = {
144
 let pageObj = {
148
 	init: function() {
145
 	init: function() {
@@ -174,7 +171,7 @@ let pageObj = {
174
 			$('#ITP_FORM_COLLMNG03010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
171
 			$('#ITP_FORM_COLLMNG03010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
175
 		},
172
 		},
176
 		grid: function() {
173
 		grid: function() {
177
-			//itp_fn_jqgrid_resize(COLLMNG03010_GRID_ID, COLLMNG03010_GRID_LIST, 'lg');
174
+			itp_fn_jqgrid_resize(COLLMNG03010_GRID_ID, COLLMNG03010_GRID_LIST, 'lg');
178
 			itp_fn_fire_window_resize();
175
 			itp_fn_fire_window_resize();
179
 		},
176
 		},
180
 		ready: function() {
177
 		ready: function() {