Browse Source

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

yhl88 2 years ago
parent
commit
9cad03431c

+ 4 - 1
src/main/webapp/app/rtnmng/RTNMNG06010.html

@@ -31,7 +31,7 @@
31 31
 										</div>
32 32
 										<div class="col-xs-3 itp_ip itp_noMar">
33 33
 											<div class="input-group">
34
-												<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" placeholder="매장/창고" readonly="readonly" />
34
+												<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" placeholder="매장/브랜드 창고" readonly="readonly" />
35 35
 												<span class="input-group-btn">
36 36
 													<button id="ITP_BTN_RTNMNG06010_SEARCH_DEL_SRTN_WHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
37 37
 													<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_POP_SRTN_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
@@ -49,6 +49,7 @@
49 49
 												</span>
50 50
 											</div>
51 51
 										</div>
52
+										<!-- 
52 53
 										<div class="col-xs-3 itp_ip itp_noMar" style="margin-left: 4px; width: 177px;">
53 54
 											<div class="input-group">
54 55
 												<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SWHS_NM" class="form-control itp_input" placeholder="반품입고창고" readonly="readonly" />
@@ -58,9 +59,11 @@
58 59
 												</span>
59 60
 											</div>
60 61
 										</div>
62
+										 -->
61 63
 										<div class="col-xs-3 itp_ip itp_noMar">
62 64
 											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
63 65
 										</div>
66
+										
64 67
 									</div>
65 68
 								</form>
66 69
 							</div>

+ 6 - 6
src/main/webapp/js/app/rtnmng/ITP_RTNMNG05010.js

@@ -266,15 +266,15 @@ let listObj = {
266 266
 			
267 267
 			$.each(rowData, function(key, value) {		
268 268
 				
269
-				if (value.colQty != '') {
269
+				if (value.colQty !== '') {
270 270
 									
271 271
 					if (parseInt(value.colQty) > parseInt(value.colReqQty)) {									
272 272
 						chkQtyYn1 = false;
273 273
 					}								
274
-					if (swhsId != "" && swhsId != value.whsId) {
274
+					if (swhsId !== "" && swhsId !== value.whsId) {
275 275
 						chkQtyYn2 = false;
276 276
 					}
277
-					if (srtnWhsId != "" && srtnWhsId != value.rtnWhsId) {
277
+					if (srtnWhsId !== "" && srtnWhsId !== value.rtnWhsId) {
278 278
 						chkQtyYn3 = false;
279 279
 					}
280 280
 					swhsId = value.whsId;
@@ -284,15 +284,15 @@ let listObj = {
284 284
 				}						
285 285
 			});
286 286
 			
287
-			if (chkQtyYn1 == false) {
287
+			if (chkQtyYn1 === false) {
288 288
 				itp_fn_modal_alert("수거요청수량보다 수거수량이 더 많습니다.");
289 289
 				return;	
290 290
 			}
291
-			if (chkQtyYn2 == false) {
291
+			if (chkQtyYn2 === false) {
292 292
 				itp_fn_modal_alert("서로 다른 반품입고창고 품목은 처리할 수 없습니다.");
293 293
 				return;	
294 294
 			}
295
-			if (chkQtyYn3 == false) {
295
+			if (chkQtyYn3 === false) {
296 296
 				itp_fn_modal_alert("서로 다른 수거창고 품목은 처리할 수 없습니다.");
297 297
 				return;	
298 298
 			}						

+ 3 - 1
src/main/webapp/js/app/rtnmng/ITP_RTNMNG06010.js

@@ -148,7 +148,7 @@ let pageObj = {
148 148
 			
149 149
 			$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SRTN_WHS_NM').show();
150 150
 			$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SSPPLY_NM').show();
151
-			$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SWHS_NM').show();
151
+			//$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SWHS_NM').show();
152 152
 			
153 153
 			$('#ITP_BTN_RTNMNG06010_EXCEL').show();
154 154
 			
@@ -292,6 +292,7 @@ let listObj = {
292 292
 		});
293 293
 		
294 294
 		// 매장/창고 조회 버튼 클릭
295
+		/*
295 296
 		$('#ITP_BTN_RTNMNG06010_SEARCH_POP_SWHS_NM').on('click', function() {
296 297
 			_this.popup('whs');
297 298
 		});
@@ -300,6 +301,7 @@ let listObj = {
300 301
 			$('#ITP_FORM_RTNMNG06010_SEARCH_SWHS_NM').val('');
301 302
 			$('#ITP_FORM_RTNMNG06010_SEARCH_SWHS_ID').val('');
302 303
 		});
304
+		*/
303 305
 		
304 306
 		// 매장/창고 조회 버튼 클릭
305 307
 		$('#ITP_BTN_RTNMNG06010_SEARCH_POP_SRTN_WHS_NM').on('click', function() {

+ 14 - 14
src/main/webapp/mobile/app/mcollmng/MCOLLMNG01010.html

@@ -1,6 +1,6 @@
1 1
 <section id="ITP_MOBILE_MCOLLMNG01010">
2 2
 	<div id="ITP_AJAX_MCOLLMNG01010_LIST_CONTAINER" style="display: none;">
3
-	  <form id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
3
+	  <form id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH" class="area_full form-horizontal" onsubmit="return false;">
4 4
 		  <input type="hidden" id="ITP_FORM_MCOLLMNG01010_SEARCH_BRAND_ID" name="sbrandId" value="">
5 5
 		  <input type="hidden" id="ITP_FORM_MCOLLMNG01010_SEARCH_STORE_ID" name="sstoreId" value="">
6 6
 		  <input type="hidden" id="ITP_FORM_MCOLLMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
@@ -57,31 +57,31 @@
57 57
 			<div id="ITP_LIST_MCOLLMNG01010_LIST_ITEM_AREA" class="scroll_area row-3">
58 58
 			  <ul id="ITP_LIST_MCOLLMNG01010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
59 59
 			  <div id="ITP_LIST_MCOLLMNG01010_LIST_ITEM_ROWCOPY" style="display: none;">
60
-				<li class="history_list item-row">
60
+				<li class="history_list7 item-row">
61 61
 				  <div class="">
62 62
 					<div class="left">
63 63
 					  <div class="nomal">
64
-						<label>브랜드명</label>
64
+						<label class="col_6">반품발주상태</label>
65 65
 						<span>:</span>
66
-					    <div class="fnBrandNm"></div>
67
-						<label>발주번호</label>
66
+					    <div class=" fnRtnOdrStNm"></div>
67
+						<label class="col_6">반품발주일자</label>
68 68
 						<span>:</span>
69
-					    <div class="fnPchPodrUnqNo"></div>
69
+					    <div class=" fnRtnOdrRegDt"></div>
70 70
 					  </div>
71 71
 					</div>
72 72
 					<div class="left">
73 73
 					  <div class="nomal">
74
-						<label class="lit">반품발주상태</label>
74
+						<label>브랜드명</label>
75 75
 						<span>:</span>
76
-					    <div class="lit col_6 fnRtnOdrStNm"></div>
77
-						<label class="lit">반품발주일자</label>
76
+					    <div class="fnBrandNm"></div>
77
+						<label>발주번호</label>
78 78
 						<span>:</span>
79
-					    <div class="lit fnRtnOdrRegDt"></div>
79
+					    <div class="fnPchPodrUnqNo"></div>
80 80
 					  </div>
81 81
 					</div>
82 82
 					<div class="left">
83 83
 					  <div class="nomal">
84
-						<label class="col_6">수거요청일</label>
84
+						<label class="">수거요청일</label>
85 85
 						<span>:</span>
86 86
 					    <div class="fnColReqDt"></div>
87 87
 						<label>수거장소</label>
@@ -106,7 +106,7 @@
106 106
 	  </form>
107 107
 	</div>
108 108
 	<div id="ITP_AJAX_MCOLLMNG01010_VIEW_CONTAINER" style="display: none;">
109
-		<form id="ITP_FORM_MCOLLMNG01010_VIEW" class="form-horizontal" onsubmit="return false;">
109
+		<form id="ITP_FORM_MCOLLMNG01010_VIEW" class="put_btn form-horizontal" onsubmit="return false;">
110 110
 		<input type="hidden" id="ITP_FORM_MCOLLMNG01010_VIEW_VIEW_CD" name="viewCd" value="C">
111 111
 		  <div class="content">
112 112
 			 <div class="content_fix">
@@ -160,7 +160,7 @@
160 160
 			<div id="ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA" class="scroll_area row-5">
161 161
 			  <ul id="ITP_LIST_MCOLLMNG01010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
162 162
 			  <div id="ITP_LIST_MCOLLMNG01010_VIEW_ITEM_ROWCOPY" style="display: none;">
163
-				<li class="history_list2 item-row">
163
+				<li class="history_list4 item-row">
164 164
 				  <div>
165 165
 					<div class="left">
166 166
 					  <div class="nomal">
@@ -204,7 +204,7 @@
204 204
 					</div>
205 205
 					<div class="left">
206 206
 					  <div class="nomal">
207
-						<label class="col_6">수거요청일</label>
207
+						<label class="">수거요청일</label>
208 208
 						<span>:</span>
209 209
 					    <div class="fnColReqDt"></div>
210 210
 					  </div>

+ 30 - 30
src/main/webapp/mobile/app/mcollmng/MCOLLMNG02010.html

@@ -1,6 +1,6 @@
1 1
 <section id="ITP_MOBILE_MCOLLMNG02010">
2 2
 	<div id="ITP_AJAX_MCOLLMNG02010_LIST_CONTAINER" style="display: none;">
3
-		<form id="ITP_FORM_MCOLLMNG02010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
3
+		<form id="ITP_FORM_MCOLLMNG02010_LIST_SEARCH" class="put_btn form-horizontal" onsubmit="return false;">
4 4
 			<input type="hidden" id="ITP_FORM_MCOLLMNG02010_SEARCH_BRAND_ID" name="sbrandId" value="">
5 5
 			<input type="hidden" id="ITP_FORM_MCOLLMNG02010_SEARCH_STORE_ID" name="sstoreId" value="">
6 6
 			<input type="hidden" id="ITP_FORM_MCOLLMNG02010_SEARCH_SPPLY_ID" name="sspplyId" value="">
@@ -49,70 +49,70 @@
49 49
 		   <div id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_AREA" class="scroll_area row-2">
50 50
 			  <ul id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
51 51
 			  <div id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWCOPY" style="display: none;">
52
-				<li class="history_list3 item-row">
52
+				<li class="history_list4 item-row">
53 53
 				  <div class="">
54 54
 					<div class="left">
55 55
 					  <div class="nomal">
56
-						<label class="col_0">브랜드명</label>
56
+						<label class="col_6">반품발주항번</label>
57 57
 						<span>:</span>
58
-					    <div class="fnBrandNm"></div>
59
-						<label class="col_0">반품발주번호</label>
58
+					    <div class="text_6 fnColReqDt"></div>
59
+						<label class="col_6">반품발주번호</label>
60 60
 						<span>:</span>
61 61
 					    <div class="fnRtnPodrUnqNo"></div>
62 62
 					  </div>
63 63
 					</div>
64 64
 					<div class="left">
65 65
 					  <div class="nomal">
66
-						<label class="lit col_0">반품발주항번</label>
66
+						<label class="col_4">브랜드명</label>
67 67
 						<span>:</span>
68
-					    <div class="lit col_5 fnColReqDt"></div>
69
-						<label class="lit col_6">수거요청일</label>
68
+					    <div class="fnBrandNm"></div>
69
+						<label class="">수거요청일</label>
70 70
 						<span>:</span>
71
-					    <div class="lit fnColReqDt"></div>
71
+					    <div class="fnColReqDt"></div>
72 72
 					  </div>
73 73
 					</div>
74 74
 					<div class="left">
75 75
 					  <div class="nomal">
76
-						<label class="col_0">수거장소</label>
76
+						<label class="col_4">수거장소</label>
77 77
 						<span>:</span>
78 78
 					    <div class="fnRtnWhsNm"></div>
79
-						<label class="col_0">품목번호</label>
79
+						<label class="col_4">품목번호</label>
80 80
 						<span>:</span>
81 81
 					    <div class="fnItemId"></div>
82 82
 					  </div>
83 83
 					</div>
84 84
 					<div class="left">
85 85
 					  <div class="nomal">
86
-						<label class="col_3">품목명</label>
86
+						<label class="col_4">품목명</label>
87 87
 						<span>:</span>
88 88
 					    <div class="fnItemNm"></div>
89
-						<label class="col_0">수거수량</label>
89
+						<label class="col_4">수거수량</label>
90 90
 						<span>:</span>
91 91
 					    <div class="fnRtnDodrItemQty"></div>
92 92
 					  </div>
93 93
 					</div>
94 94
 					<div class="left">
95 95
 					  <div class="nomal">
96
-						<label class="col_0">단가금액</label>
96
+						<label class="col_4">단가금액</label>
97 97
 						<span>:</span>
98 98
 					    <div class="fnUnitAmt"></div>
99
-						<label class="col_0">수거금액</label>
99
+						<label class="col_4">수거금액</label>
100 100
 						<span>:</span>
101
-					    <div class="fnRtnDodrTotalAmt space0"></div>
101
+					    <div class="fnRtnDodrTotalAmt"></div>
102 102
 					  </div>
103 103
 					</div>
104 104
 				  </div>
105 105
 				</li>
106 106
 			</div>
107 107
 			<div class="button_bar">
108
-			  <button id="ITP_BTN_MCOLLMNG02010_LIST_CREATE" class="ok col_12 btn-primary IVC">수거서생성</button>
108
+			  <button id="ITP_BTN_MCOLLMNG02010_LIST_CREATE" class="ok col_12 btn-m-orange IVC">수거서생성</button>
109 109
 			  <!--<button id="ITP_BTN_MCOLLMNG02010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
110 110
 			</div>
111 111
 		  </div>
112 112
 	  </form>
113 113
 	</div>
114 114
 	<div id="ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER" style="display: none;">
115
-		<form id="ITP_FORM_MCOLLMNG02010_VIEW" class="form-horizontal" onsubmit="return false;">
115
+		<form id="ITP_FORM_MCOLLMNG02010_VIEW" class="put_btn form-horizontal" onsubmit="return false;">
116 116
 		<input type="hidden" id="ITP_FORM_MCOLLMNG02010_VIEW_VIEW_CD" name="viewCd" value="C">
117 117
 		  <div class="content">
118 118
 			  <div class="content_fix">
@@ -177,40 +177,40 @@
177 177
 				  <div>
178 178
 					<div class="left">
179 179
 					  <div class="nomal">
180
-						<label>반품발주항번</label>
180
+						<label class="col_6">반품발주항번</label>
181 181
 						<span>:</span>
182
-						  <div class="col_5 fnRtnPodrDtlNo"></div>
183
-						<label class="col_0">품목아이디</label>
182
+						  <div class="text_6 fnRtnPodrDtlNo"></div>
183
+						<label class="col_6">수거주문수량</label>
184 184
 						<span>:</span>
185
-						  <div class="fnItemId"></div>
185
+						  <div class="fnRtnOdrQty"></div>
186 186
 					  </div>
187 187
 					</div>
188 188
 					<div class="left">
189 189
 					  <div class="nomal">
190
-						<label class="col_3">품목명</label>
190
+						<label class="col_4">품목명</label>
191 191
 						<span>:</span>
192 192
 						  <div class="fnItemNm"></div>
193
-						<label>수거주문수량</label>
193
+						<label class="">품목아이디</label>
194 194
 						<span>:</span>
195
-						  <div class="fnRtnOdrQty"></div>
195
+						  <div class="fnItemId"></div>
196 196
 					  </div>
197 197
 					</div>
198 198
 					<div class="left">
199 199
 					  <div class="nomal">
200
-						<label class="col_3">단가</label>
200
+						<label class="col_4">단가</label>
201 201
 						<span>:</span>
202 202
 						  <div class="fnUnitAmt"></div>
203
-						<label class="col_3">단위</label>
203
+						<label class="col_2">단위</label>
204 204
 						<span>:</span>
205 205
 						  <div class="fnUnit"></div>
206 206
 					  </div>
207 207
 					</div>
208 208
 					<div class="left">
209 209
 					  <div class="nomal">
210
-						<label class="col_3">수거수량</label>
210
+						<label class="col_4">수거수량</label>
211 211
 						<span>:</span>
212 212
 					    <input id="ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY" type="text" name="colQty">
213
-						<label class="col_3">수거구분</label>
213
+						<label class="">수거구분</label>
214 214
 						<span>:</span>
215 215
 						<select name="rtnRsnDvsn" id="ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN_DVSN" data-select-code="RTN_RSN_DVSN">
216 216
 							<option value=""></option>
@@ -219,7 +219,7 @@
219 219
 					</div>
220 220
 					<div class="left">
221 221
 					  <div class="nomal">
222
-						<label class="col_3">비고</label>
222
+						<label class="col_4">비고</label>
223 223
 						<span>:</span>
224 224
 						<input id="ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN" style="top:-4px;" type="text" name="rtnRsn">
225 225
 					  </div>

+ 15 - 87
src/main/webapp/mobile/app/mcollmng/MCOLLMNG03010.html

@@ -54,9 +54,9 @@
54 54
 				  <div class="">
55 55
 					<div class="left">
56 56
 					  <div class="nomal">
57
-						<label class="col_0">브랜드명</label>
57
+						<label class="">브랜드명</label>
58 58
 						<span>:</span>
59
-					    <div class="col_88 fnBrandNm"></div>
59
+					    <div class="fnBrandNm"></div>
60 60
 						<label>수거서번호</label>
61 61
 						<span>:</span>
62 62
 					    <div class="fnColPickUnqNo"></div>
@@ -64,7 +64,7 @@
64 64
 					</div>
65 65
 					<div class="left">
66 66
 					  <div class="nomal">
67
-						<label class="col_6">수거서상태</label>
67
+						<label class="">수거서상태</label>
68 68
 						<span>:</span>
69 69
 					    <div class="fnPickStNm"></div>
70 70
 						<label>수거일자</label>
@@ -84,9 +84,9 @@
84 84
 					</div>
85 85
 					<div class="left">
86 86
 					  <div class="nomal">
87
-						<label class="col_0">품목수량</label>
87
+						<label class="">품목수량</label>
88 88
 						<span>:</span>
89
-					    <div class="col_88 fnColReqQty"></div>
89
+					    <div class="fnColReqQty"></div>
90 90
 						<label>수거총금액</label>
91 91
 						<span>:</span>
92 92
 					  	<div class="fnColReqAmt"></div>
@@ -94,9 +94,9 @@
94 94
 					</div>
95 95
 					<div class="left">
96 96
 					  <div class="nomal">
97
-						<label class="col_0">수거장소</label>
97
+						<label class="">수거장소</label>
98 98
 						<span>:</span>
99
-					    <div class="col_88 fnWhsNm"></div>
99
+					    <div class="fnWhsNm"></div>
100 100
 						<label>수거담당자</label>
101 101
 						<span>:</span>
102 102
 					    <div class="fnPickMgrNm"></div>
@@ -211,9 +211,9 @@
211 211
 				  <div>
212 212
 					<div class="left">
213 213
 					  <div class="nomal">
214
-						<label>수거발주번호</label>
214
+						<label class="col_2">수거발주번호</label>
215 215
 						<span>:</span>
216
-					    <div class="col_5 fnRtnPodrUnqNo"></div>
216
+					    <div class="text_6 fnRtnPodrUnqNo"></div>
217 217
 						<label class="col_0">품목아이디</label>
218 218
 						<span>:</span>
219 219
 					    <div class="fnItemId"></div>
@@ -221,20 +221,20 @@
221 221
 					</div>
222 222
 					<div class="left">
223 223
 					  <div class="nomal">
224
-						<label class="col_3">품목명</label>
224
+						<label class="">품목명</label>
225 225
 						<span>:</span>
226 226
 					    <div class="fnItemNm"></div>
227
-						<label>수거요청수량</label>
227
+						<label class="col_2">수거요청수량</label>
228 228
 						<span>:</span>
229 229
 					    <div class="fnRodrQty"></div>
230 230
 					  </div>
231 231
 					</div>
232 232
 					<div class="left">
233 233
 					  <div class="nomal">
234
-						<label class="col_3">수거수량</label>
234
+						<label class="">수거수량</label>
235 235
 						<span>:</span>
236 236
 					    <div class="fnColReqQty"></div>
237
-						<label>수거사유구분</label>
237
+						<label class="col_2">수거사유구분</label>
238 238
 						<span>:</span>
239 239
 					    <div class="fnRtnRsnDvsnNm"></div>
240 240
 					  </div>
@@ -249,7 +249,7 @@
249 249
 	  </form>
250 250
 	</div>
251 251
 	<div id="ITP_MOBILE_JS"></div>
252
-	<div id="ITP_POP_MCOLLMNG03010_WHS_AREA" class="popup2 mobile-pop-close" style="display: block;">
252
+	<div id="ITP_POP_MCOLLMNG03010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
253 253
 		<div class="pop">
254 254
 			<div class="header">
255 255
 				<div class="header_left">
@@ -272,79 +272,7 @@
272 272
 			</div>
273 273
 			<div id="ITP_LIST_MCOLLMNG03010_POP_WHS_AREA" class="popup_scroll">
274 274
 				<ul id="ITP_LIST_MCOLLMNG03010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
275
-				<div id="ITP_LIST_MCOLLMNG03010_POP_WHS_ROWCOPY" style="display: block;">
276
-					<li class="row_2 item-row">
277
-						<div class="scroll_left">
278
-							<div class="fnWhsNm">브랜드 창고 명A</div>
279
-							<div class="wichi fnLocationNm">(상세위치내용)</div>
280
-						</div>
281
-						<div class="scroll_right">
282
-							<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
283
-						</div>
284
-					</li>
285
-					<li class="row_2 item-row">
286
-						<div class="scroll_left">
287
-							<div class="fnWhsNm">브랜드 창고 명A</div>
288
-							<div class="wichi fnLocationNm">(상세위치내용)</div>
289
-						</div>
290
-						<div class="scroll_right">
291
-							<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
292
-						</div>
293
-					</li>
294
-					<li class="row_2 item-row">
295
-						<div class="scroll_left">
296
-							<div class="fnWhsNm">브랜드 창고 명A</div>
297
-							<div class="wichi fnLocationNm">(상세위치내용)</div>
298
-						</div>
299
-						<div class="scroll_right">
300
-							<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
301
-						</div>
302
-					</li>
303
-					<li class="row_2 item-row">
304
-						<div class="scroll_left">
305
-							<div class="fnWhsNm">브랜드 창고 명A</div>
306
-							<div class="wichi fnLocationNm">(상세위치내용)</div>
307
-						</div>
308
-						<div class="scroll_right">
309
-							<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
310
-						</div>
311
-					</li>
312
-					<li class="row_2 item-row">
313
-						<div class="scroll_left">
314
-							<div class="fnWhsNm">브랜드 창고 명A</div>
315
-							<div class="wichi fnLocationNm">(상세위치내용)</div>
316
-						</div>
317
-						<div class="scroll_right">
318
-							<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
319
-						</div>
320
-					</li>
321
-					<li class="row_2 item-row">
322
-						<div class="scroll_left">
323
-							<div class="fnWhsNm">브랜드 창고 명A</div>
324
-							<div class="wichi fnLocationNm">(상세위치내용)</div>
325
-						</div>
326
-						<div class="scroll_right">
327
-							<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
328
-						</div>
329
-					</li>
330
-					<li class="row_2 item-row">
331
-						<div class="scroll_left">
332
-							<div class="fnWhsNm">브랜드 창고 명A</div>
333
-							<div class="wichi fnLocationNm">(상세위치내용)</div>
334
-						</div>
335
-						<div class="scroll_right">
336
-							<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
337
-						</div>
338
-					</li>
339
-					<li class="row_2 item-row">
340
-						<div class="scroll_left">
341
-							<div class="fnWhsNm">브랜드 창고 명A</div>
342
-							<div class="wichi fnLocationNm">(상세위치내용)</div>
343
-						</div>
344
-						<div class="scroll_right">
345
-							<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
346
-						</div>
347
-					</li>
275
+				<div id="ITP_LIST_MCOLLMNG03010_POP_WHS_ROWCOPY" style="display: none;">
348 276
 					<li class="row_2 item-row">
349 277
 						<div class="scroll_left">
350 278
 							<div class="fnWhsNm">브랜드 창고 명A</div>

+ 17 - 17
src/main/webapp/mobile/app/mordmng/MORDMNG01010.html

@@ -1,6 +1,6 @@
1 1
 <section id="ITP_MOBILE_MORDMNG01010">
2 2
 	<div id="ITP_AJAX_MORDMNG01010_LIST_CONTAINER" style="display: none;">
3
-	  <form id="ITP_FORM_MORDMNG01010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
3
+	  <form id="ITP_FORM_MORDMNG01010_LIST_SEARCH" class="area_full form-horizontal" onsubmit="return false;">
4 4
 		<input type="hidden" id="ITP_FORM_MORDMNG01010_LIST_VIEW_CD" name="viewCd" value="C">
5 5
 		  <input type="hidden" id="ITP_FORM_MORDMNG01010_SEARCH_BRAND_ID" name="sbrandId" value="">
6 6
 		  <input type="hidden" id="ITP_FORM_MORDMNG01010_SEARCH_STORE_ID" name="sstoreId" value="">
@@ -58,12 +58,12 @@
58 58
 		  </div>
59 59
 		  <div id="ITP_LIST_MORDMNG01010_LIST_ITEM_AREA" class="scroll_area row-3">
60 60
 			  <ul id="ITP_LIST_MORDMNG01010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
61
-			  <div id="ITP_LIST_MORDMNG01010_LIST_ITEM_ROWCOPY" style="display: block;">
61
+			  <div id="ITP_LIST_MORDMNG01010_LIST_ITEM_ROWCOPY" style="display: none;">
62 62
 				<li class="history_list list-row">
63 63
 				  <div class="btn_check">
64 64
 					<div class="left">
65 65
 					  <div class="nomal">
66
-						<label>브랜드명</label>
66
+						<label class="col_4">브랜드명</label>
67 67
 						<span>:</span>
68 68
 					    <div class="fnBrandNm"></div>
69 69
 						<label>발주번호</label>
@@ -76,17 +76,17 @@
76 76
 						<label>발주상태</label>
77 77
 						<span>:</span>
78 78
 					    <div class="fnPchOdrStNm"></div>
79
-						<label>발주일자</label>
79
+						<label class="col_4">발주일자</label>
80 80
 						<span>:</span>
81 81
 					    <div class="fnPodrDt"></div>
82 82
 					  </div>
83 83
 					</div>
84 84
 					<div class="left">
85 85
 					  <div class="nomal">
86
-						<label class="col_6">납품요청일</label>
86
+						<label class="">납품요청일</label>
87 87
 						<span>:</span>
88 88
 					    <div class="fnDlvReqDt"></div>
89
-						<label>납품장소</label>
89
+						<label class="col_4">납품장소</label>
90 90
 						<span>:</span>
91 91
 					    <div class="fnWhsNm"></div>
92 92
 					  </div>
@@ -96,9 +96,9 @@
96 96
 						<label>발주금액</label>
97 97
 						<span>:</span>
98 98
 					    <div class="fnPodrTotalAmt"></div>
99
-						<label>품목수</label>
99
+						<label class="col_4">품목수</label>
100 100
 						<span>:</span>
101
-					    <div class="fnPodrItemQty">3개</div>
101
+					    <div class="fnPodrItemQty"></div>
102 102
 					  </div>
103 103
 					</div>
104 104
 				  </div>
@@ -108,7 +108,7 @@
108 108
 	  </form>
109 109
 	</div>
110 110
 	<div id="ITP_AJAX_MORDMNG01010_VIEW_CONTAINER" style="display: none;">
111
-		<form id="ITP_FORM_MORDMNG01010_VIEW" class="form-horizontal" onsubmit="return false;">
111
+		<form id="ITP_FORM_MORDMNG01010_VIEW" class="put_btn form-horizontal" onsubmit="return false;">
112 112
 		<input type="hidden" id="ITP_FORM_MORDMNG01010_VIEW_VIEW_CD" name="viewCd" value="C">
113 113
 		  <div class="content">
114 114
 			  <div class="content_fix">
@@ -171,17 +171,17 @@
171 171
 				<li class="history_list7">
172 172
 					<div class="left">
173 173
 					  <div class="nomal">
174
-						<label class="col_3">순번 </label>
174
+						<label class="col_4">순번 </label>
175 175
 						<span>:</span>
176 176
 					    <div class="fnPchPodrDtlNo"></div>
177
-						<label class="col_0">품목아이디</label>
177
+						<label class="">품목아이디</label>
178 178
 						<span>:</span>
179
-					    <div class="col_9 fnItemId"></div>
179
+					    <div class="fnItemId"></div>
180 180
 					  </div>
181 181
 					</div>
182 182
 					<div class="left">
183 183
 					  <div class="nomal">
184
-						<label class="col_3">품목명</label>
184
+						<label class="col_4">품목명</label>
185 185
 						<span>:</span>
186 186
 					    <div class="fnItemNm"></div>
187 187
 						<label>가격단위</label>
@@ -191,9 +191,9 @@
191 191
 					</div>
192 192
 					<div class="left">
193 193
 					  <div class="nomal">
194
-						<label class="col_3">단가</label>
194
+						<label class="col_4">단가</label>
195 195
 						<span>:</span>
196
-					    <div class="fnUnitAmt"></div>
196
+					    <div class="fnUnitAmt"></div>
197 197
 						<label>단위</label>
198 198
 						<span>:</span>
199 199
 					    <div class="fnUnit"></div>
@@ -201,12 +201,12 @@
201 201
 					</div>
202 202
 					<div class="left">
203 203
 					  <div class="nomal">
204
-						<label class="col_3">발주수량</label>
204
+						<label class="col_4">발주수량</label>
205 205
 						<span>:</span>
206 206
 					    <div class="fnPodrQty"></div>
207 207
 						<label>발주금액</label>
208 208
 						<span>:</span>
209
-					    <div class="col_9 fnPodrAmt"></div>
209
+					    <div class="fnPodrAmt"></div>
210 210
 					  </div>
211 211
 					</div>
212 212
 				</li>

+ 20 - 20
src/main/webapp/mobile/app/mordmng/MORDMNG02010.html

@@ -1,6 +1,6 @@
1 1
 <section id="ITP_MOBILE_MORDMNG02010">
2 2
 	<div id="ITP_AJAX_MORDMNG02010_LIST_CONTAINER" style="display: none;">
3
-		<form id="ITP_FORM_MORDMNG02010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
3
+		<form id="ITP_FORM_MORDMNG02010_LIST_SEARCH" class="put_btn form-horizontal" onsubmit="return false;">
4 4
 			<input type="hidden" id="ITP_FORM_MORDMNG02010_LIST_VIEW_CD" name="viewCd" value="C">
5 5
 			<input type="hidden" id="ITP_FORM_MORDMNG02010_SEARCH_BRAND_ID" name="sbrandId" value="">
6 6
 			<input type="hidden" id="ITP_FORM_MORDMNG02010_SEARCH_STORE_ID" name="sstoreId" value="">
@@ -50,53 +50,53 @@
50 50
 		   <div id="ITP_LIST_MORDMNG02010_LIST_ITEM_AREA" class="scroll_area row-2">
51 51
 			  <ul id="ITP_LIST_MORDMNG02010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
52 52
 			  <div id="ITP_LIST_MORDMNG02010_LIST_ITEM_ROWCOPY" style="display: none;">
53
-				<li class="history_list3 ">
53
+				<li class="history_list4 item-row">
54 54
 					<div class="left">
55 55
 					  <div class="nomal">
56
-						<label class="col_0">브랜드명</label>
56
+						<label class="col_4">브랜드명</label>
57 57
 						<span>:</span>
58 58
 					    <div class=" fnBrandNm"></div>
59
-						<label class="col_0">발주번호</label>
59
+						<label class="col_4">발주번호</label>
60 60
 						<span>:</span>
61 61
 					    <div class="col_9 fnPchPodrUnqNo"></div>
62 62
 					  </div>
63 63
 					</div>
64 64
 					<div class="left">
65 65
 					  <div class="nomal">
66
-						<label class="col_0">발주항번</label>
66
+						<label class="col_4">발주항번</label>
67 67
 						<span>:</span>
68 68
 					    <div class="fnPchPodrDtlNo"></div>
69
-						<label class="col_6">납품요청일</label>
69
+						<label class="">납품요청일</label>
70 70
 						<span>:</span>
71 71
 					    <div class="fnDlvReqDt"></div>
72 72
 					  </div>
73 73
 					</div>
74 74
 					<div class="left">
75 75
 					  <div class="nomal">
76
-						<label class="col_0">납품장소</label>
76
+						<label class="col_4">납품장소</label>
77 77
 						<span>:</span>
78 78
 					    <div class="fnWhsNm"></div>
79
-						<label class="col_0">품목번호</label>
79
+						<label class="col_4">품목번호</label>
80 80
 						<span>:</span>
81 81
 					    <div class="col_9 fnItemId"></div>
82 82
 					  </div>
83 83
 					</div>
84 84
 					<div class="left">
85 85
 					  <div class="nomal">
86
-						<label class="col_3">품목명</label>
86
+						<label class="col_4">품목명</label>
87 87
 						<span>:</span>
88 88
 					    <div class="fnItemNm"></div>
89
-						<label class="col_0">발주수량</label>
89
+						<label class="col_4">발주수량</label>
90 90
 						<span>:</span>
91 91
 					    <div class="col_9 fnPodrQty"></div>
92 92
 					  </div>
93 93
 					</div>
94 94
 					<div class="left">
95 95
 					  <div class="nomal">
96
-						<label class="col_0">단가금액</label>
96
+						<label class="col_4">단가금액</label>
97 97
 						<span>:</span>
98 98
 					    <div class="fnUnitAmt"></div>
99
-						<label class="col_0">발주금액</label>
99
+						<label class="col_4">발주금액</label>
100 100
 						<span>:</span>
101 101
 					    <div class="col_9 fnPodrAmt"></div>
102 102
 					  </div>
@@ -104,14 +104,14 @@
104 104
 				</li>
105 105
 			</div>
106 106
 			<div class="button_bar">
107
-			  <button id="ITP_BTN_MORDMNG02010_LIST_DLV_VIEW" class="ok col_12 btn-primary IVC">납품서생성</button>
107
+			  <button id="ITP_BTN_MORDMNG02010_LIST_DLV_VIEW" class="ok col_12 btn-m-orange IVC">납품서생성</button>
108 108
 			  <!--<button id="ITP_BTN_MORDMNG02010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
109 109
 			</div>
110 110
 		  </div>
111 111
 	  </form>
112 112
 	</div>
113 113
 	<div id="ITP_AJAX_MORDMNG02010_VIEW_CONTAINER" style="display: none;">
114
-		<form id="ITP_FORM_MORDMNG02010_VIEW" class="form-horizontal" onsubmit="return false;">
114
+		<form id="ITP_FORM_MORDMNG02010_VIEW" class="put_btn form-horizontal" onsubmit="return false;">
115 115
 		<input type="hidden" id="ITP_FORM_MORDMNG02010_VIEW_VIEW_CD" name="viewCd" value="C">
116 116
 		  <div class="content">
117 117
 			  <div class="content_fix">
@@ -172,10 +172,10 @@
172 172
 			<div id="ITP_LIST_MORDMNG02010_VIEW_ITEM_AREA" class="scroll_area row-5">
173 173
 			  <ul id="ITP_LIST_MORDMNG02010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
174 174
 			  <div id="ITP_LIST_MORDMNG02010_VIEW_ITEM_ROWCOPY" style="display: none;">
175
-				<li class="history_list2 item-row">
175
+				<li class="history_list4 item-row">
176 176
 					<div class="left">
177 177
 					  <div class="nomal">
178
-						<label class="col_3">발주항번</label>
178
+						<label class="col_4">발주항번</label>
179 179
 						<span>:</span>
180 180
 					    <div class="fnPchPodrDtlNo"></div>
181 181
 						<label class="col_0">품목아이디</label>
@@ -185,7 +185,7 @@
185 185
 					</div>
186 186
 					<div class="left">
187 187
 					  <div class="nomal">
188
-						<label class="col_3">품목명</label>
188
+						<label class="col_4">품목명</label>
189 189
 						<span>:</span>
190 190
 					    <div class="fnItemNm"></div>
191 191
 						<label>가격단위</label>
@@ -195,7 +195,7 @@
195 195
 					</div>
196 196
 					<div class="left">
197 197
 					  <div class="nomal">
198
-						<label class="col_3">단가</label>
198
+						<label class="col_4">단가</label>
199 199
 						<span>:</span>
200 200
 					    <div class="fnUnitAmt"></div>
201 201
 						<label>발주수량</label>
@@ -205,7 +205,7 @@
205 205
 					</div>
206 206
 					<div class="left">
207 207
 					  <div class="nomal">
208
-						<label class="col_3">납품수량</label>
208
+						<label class="col_4">납품수량</label>
209 209
 						<span>:</span>
210 210
 					    <input id="ITP_FORM_MORDMNG02010_VIEW_SHMT_QTY" name="shmtQty" type="text">
211 211
 					    <label>유통기한</label>
@@ -215,7 +215,7 @@
215 215
 					</div>
216 216
 					<div class="left">
217 217
 					  <div class="nomal">
218
-						<label class="col_3">비고</label>
218
+						<label class="col_4">비고</label>
219 219
 						<span>:</span>
220 220
 					    <input id="ITP_FORM_MORDMNG02010_VIEW_DELI_DESC" type="text" name="deliDesc">
221 221
 					  </div>

+ 17 - 17
src/main/webapp/mobile/app/mordmng/MORDMNG03010.html

@@ -1,6 +1,6 @@
1 1
 <section id="ITP_MOBILE_MORDMNG03010">
2 2
 	<div id="ITP_AJAX_MORDMNG03010_LIST_CONTAINER" style="display: none;">
3
-		<form id="ITP_FORM_MORDMNG03010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
3
+		<form id="ITP_FORM_MORDMNG03010_LIST_SEARCH" class="put_btn form-horizontal" onsubmit="return false;">
4 4
 			<input type="hidden" id="ITP_FORM_MORDMNG03010_SEARCH_BRAND_ID" name="sbrandId" value="">
5 5
 			<input type="hidden" id="ITP_FORM_MORDMNG01010_SEARCH_STORE_ID" name="sstoreId" value="">
6 6
 			<input type="hidden" id="ITP_FORM_MORDMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
@@ -33,7 +33,7 @@
33 33
 					<div class="line">
34 34
 						<label>검색명</label>
35 35
 						<div class="float_left">
36
-							<input id="ITP_FORM_MORDMNG03010_LIST_ITEM_NM" name="sitemNm" style="width: 262px;" type="text" placeholder="발주번호/품목명">
36
+							<input id="ITP_FORM_MORDMNG03010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="발주번호/품목명">
37 37
 						</div>
38 38
 					</div>
39 39
 					<div class="line">
@@ -49,10 +49,10 @@
49 49
 			<div id="ITP_LIST_MORDMNG03010_LIST_ITEM_AREA" class="scroll_area row-2">
50 50
 				<ul id="ITP_LIST_MORDMNG03010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
51 51
 				<div id="ITP_LIST_MORDMNG03010_LIST_ITEM_ROWCOPY" style="display: none;">
52
-					<li class="history_list3 item-row">
52
+					<li class="history_list4 item-row">
53 53
 						<div class="left">
54 54
 							<div class="nomal">
55
-								<label class="col_0">브랜드명</label>
55
+								<label class="">브랜드명</label>
56 56
 								<span>:</span>
57 57
 								<div class="fnBrandNm"></div>
58 58
 								<label>납품서번호</label>
@@ -62,12 +62,12 @@
62 62
 						</div>
63 63
 						<div class="left">
64 64
 							<div class="nomal">
65
-								<label class="col_6">납품서상태</label>
65
+								<label class="">납품서상태</label>
66 66
 								<span>:</span>
67 67
 								<div class="fnDlvStNm"></div>
68
-								<label class="col_0">수주일자</label>
68
+								<label class="">수주일자</label>
69 69
 								<span>:</span>
70
-								<div class="col_7 fnPodrRegDt"></div>
70
+								<div class="fnPodrRegDt"></div>
71 71
 							</div>
72 72
 						</div>
73 73
 						<div class="left">
@@ -77,14 +77,14 @@
77 77
 								<div class="fnDlvReqDt"></div>
78 78
 								<label>납품예정일</label>
79 79
 								<span>:</span>
80
-								<div class="col_7 fnDlvSchDt"></div>
80
+								<div class="fnDlvSchDt"></div>
81 81
 							</div>
82 82
 						</div>
83 83
 						<div class="left">
84 84
 							<div class="nomal">
85
-								<label class="col_0">품목수량</label>
85
+								<label class="">품목수량</label>
86 86
 								<span>:</span>
87
-								<div class="fnDlvQty space1"></div>
87
+								<div class="fnDlvQty"></div>
88 88
 								<label>발주총금액</label>
89 89
 								<span>:</span>
90 90
 								<div class="fnPodrAmt"></div>
@@ -92,12 +92,12 @@
92 92
 						</div>
93 93
 						<div class="left">
94 94
 							<div class="nomal">
95
-								<label class="col_0">납품장소</label>
95
+								<label class="">납품장소</label>
96 96
 								<span>:</span>
97
-								<div class="fnWhsNm space1"></div>
97
+								<div class="fnWhsNm"></div>
98 98
 								<label>납품담당자</label>
99 99
 								<span>:</span>
100
-								<div class="fnDlvMgrNm space0"></div>
100
+								<div class="fnDlvMgrNm"></div>
101 101
 							</div>
102 102
 						</div>
103 103
 					</li>
@@ -110,7 +110,7 @@
110 110
 		</form>
111 111
 	</div>
112 112
 	<div id="ITP_AJAX_MORDMNG03010_VIEW_CONTAINER" style="display: none;">
113
-		<form id="ITP_FORM_MORDMNG03010_VIEW" class="form-horizontal" onsubmit="return false;">
113
+		<form id="ITP_FORM_MORDMNG03010_VIEW" class="put_btn form-horizontal" onsubmit="return false;">
114 114
 			<input type="hidden" id="ITP_FORM_MORDMNG03010_VIEW_VIEW_CD" name="viewCd" value="C">
115 115
 			<div class="detail_content">
116 116
 				<div class="detail_content_fix">
@@ -208,7 +208,7 @@
208 208
 						<div>
209 209
 							<div class="left">
210 210
 								<div class="nomal">
211
-									<label class="col_3">발주번호</label>
211
+									<label class="col_4">발주번호</label>
212 212
 									<span>:</span>
213 213
 									<div class="fnPchPodrUnqNo"></div>
214 214
 									<label class="col_0">품목아이디</label>
@@ -218,7 +218,7 @@
218 218
 							</div>
219 219
 							<div class="left">
220 220
 								<div class="nomal">
221
-									<label class="col_3">품목명</label>
221
+									<label class="col_4">품목명</label>
222 222
 									<span>:</span>
223 223
 									<div class="fnItemNm"></div>
224 224
 									<label>유통기한</label>
@@ -228,7 +228,7 @@
228 228
 							</div>
229 229
 							<div class="left">
230 230
 								<div class="nomal">
231
-									<label class="col_3">발주수량</label>
231
+									<label class="col_4">발주수량</label>
232 232
 									<span>:</span>
233 233
 									<div class="fnPodrQty"></div>
234 234
 									<label>납품수량</label>

+ 3 - 3
src/main/webapp/mobile/app/mpomng/MPOMNG01010.html

@@ -66,7 +66,7 @@
66 66
             <div>검색된 데이터가 없습니다.</div>
67 67
          </div>
68 68
         <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display: none;">
69
-          <li class="list-row">
69
+          <li class="list-row item-row">
70 70
             <div class="left_info">
71 71
               <div class="check_box">
72 72
                 <input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
@@ -171,7 +171,7 @@
171 171
             <div id="ITP_LIST_MPOMNG01010_POP_WHS_AREA" class="popup_scroll">
172 172
                 <ul id="ITP_LIST_MPOMNG01010_POP_WHS_ROWS" class="mb_0 itp_nav"></ul>
173 173
                 <div id="ITP_LIST_MPOMNG01010_POP_WHS_ROWCOPY" style="display: none;">
174
-                    <li class="row_2">
174
+                    <li class="row_2 item-row">
175 175
                         <div class="scroll_left">
176 176
                             <div class="con_2 fnWhsNm"></div>
177 177
                             <div class="con_2 wichi fnLocationNm"></div>
@@ -209,7 +209,7 @@
209 209
             <div id="ITP_LIST_MPOMNG01010_POP_ITEM_AREA" class="popup_scroll">
210 210
                 <ul id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWS" class="mb_0 panel-group"></ul>
211 211
                 <div id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWCOPY" style="display: none;">
212
-                     <li class="row_2">
212
+                     <li class="row_2 item-row">
213 213
                         <div class="scroll_left item">
214 214
                             <div class="con_2 fnItemNm"></div>
215 215
                             <div class="mg_0">

+ 85 - 83
src/main/webapp/mobile/app/mpomng/MPOMNG02010.html

@@ -1,10 +1,10 @@
1 1
 <section id="ITP_MOBILE_MPOMNG02010">
2 2
   <div id="ITP_AJAX_MPOMNG02010_LIST_CONTAINER" style="display: none;">
3
-    <div class="content">
4
-	    <div class="content_fix">
5
-	      <form id="ITP_FORM_MPOMNG02010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
6
-	        <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
7
-	        <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
3
+     <form id="ITP_FORM_MPOMNG02010_LIST_SEARCH" class="area_full form-horizontal" onsubmit="return false;">
4
+       <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
5
+       <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
6
+    	<div class="content">
7
+    	  <div class="content_fix">
8 8
 	   	    <div class="line header">
9 9
 				<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">구매요청현황</div>
10 10
 	      	</div>
@@ -45,9 +45,8 @@
45 45
 	      <div class="table_header">
46 46
 	        <h1><구매 요청 내역></h1>
47 47
 	      </div>
48
-        </form>
48
+        </div>
49 49
       </div>
50
-    </div>
51 50
     <div id="ITP_LIST_MPOMNG02010_ITEM_AREA" class="scroll_area row-2">
52 51
       <ul id="ITP_LIST_MPOMNG02010_ITEM_ROWS" class="mb_0 panel-group"></ul>
53 52
       <div id="ITP_LIST_MPOMNG02010_ITEM_ROWCOPY" style="display: none;">
@@ -101,85 +100,88 @@
101 100
           </div>
102 101
         </li>
103 102
       </div>
104
-    </div>
103
+   	  </div>
104
+    </form>
105 105
   </div>
106 106
   <div id="ITP_AJAX_MPOMNG02010_VIEW_CONTAINER" style="display: none;">
107
-    <div class="content">
108
-	    <div class="content_fix">
109
-		  <div class="line header">
110
-			<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">구매요청현황</div>
111
-	   	  </div>
112
-	      <div class="line">
113
-	        <label>납기요청일</label>
114
-	        <div class="line_right">
115
-	          <div class="fnDlvReqDt"></div>
116
-	        </div>      
117
-	      </div>
118
-	      <div class="line">
119
-	        <label>구매요청금액</label>
120
-	        <div class="line_right">
121
-	          <div class="fnPchReqTotalAmt">원</div>
122
-	        </div>
123
-	      </div>
124
-	      <div class="line">
125
-	        <label>납품장소</label>
126
-	        <div class="line_right">
127
-	          <div class="fnLocationNm"></div>
128
-	        </div>
129
-	      </div>
130
-	      <div class="line">
131
-	        <label>요청상태</label>
132
-	        <div class="line_right">
133
-	          <div class="fnPchReqStnm"></div>
134
-	        </div>
135
-	      </div>
136
-	      <div class="line">
137
-	        <label>반려일자</label>
138
-	        <div class="line_right">
139
-	          <div class="fnPchReqRjctDt"></div>
140
-	        </div>
141
-	      </div>
142
-	      <div class="line">
143
-	        <label>반려담당자명</label>
144
-	        <div class="line_right">
145
-	          <div class="fnPchReqMgrNm"></div>
146
-	        </div>
107
+	  <form id="ITP_FORM_MPOMNG02010_VIEW" class="put_btn form-horizontal" onsubmit="return false;">
108
+	    <div class="content">
109
+		    <div class="content_fix">
110
+			  <div class="line header">
111
+				<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">구매요청현황</div>
112
+		   	  </div>
113
+		      <div class="line">
114
+		        <label>납기요청일</label>
115
+		        <div class="line_right">
116
+		          <div class="fnDlvReqDt"></div>
117
+		        </div>      
118
+		      </div>
119
+		      <div class="line">
120
+		        <label>구매요청금액</label>
121
+		        <div class="line_right">
122
+		          <div class="fnPchReqTotalAmt">원</div>
123
+		        </div>
124
+		      </div>
125
+		      <div class="line">
126
+		        <label>납품장소</label>
127
+		        <div class="line_right">
128
+		          <div class="fnLocationNm"></div>
129
+		        </div>
130
+		      </div>
131
+		      <div class="line">
132
+		        <label>요청상태</label>
133
+		        <div class="line_right">
134
+		          <div class="fnPchReqStnm"></div>
135
+		        </div>
136
+		      </div>
137
+		      <div class="line">
138
+		        <label>반려일자</label>
139
+		        <div class="line_right">
140
+		          <div class="fnPchReqRjctDt"></div>
141
+		        </div>
142
+		      </div>
143
+		      <div class="line">
144
+		        <label>반려담당자명</label>
145
+		        <div class="line_right">
146
+		          <div class="fnPchReqMgrNm"></div>
147
+		        </div>
148
+		      </div>
149
+		      <div class="table_header">
150
+		        <h1><구매 품목></h1>
151
+		      </div>
147 152
 	      </div>
148
-	      <div class="table_header">
149
-	        <h1><구매 품목></h1>
153
+	    </div>
154
+	    <div id="ITP_LIST_MPOMNG02010_VIEW_AREA" class="scroll_area row-3">
155
+	      <ul id="ITP_LIST_MPOMNG02010_VIEW_ROWS" class="mb_0 panel-group"></ul>
156
+	      <div id="ITP_LIST_MPOMNG02010_VIEW_ROWCOPY" style="display: none;">
157
+	        <li class="history_list5 item-row">
158
+	          <div class="left">
159
+	            <div class="nomal">
160
+	              	<label class="col_3">품목명</label>
161
+	                <span>:</span>
162
+	                <div class="full fnItemNm"></div>
163
+	              </div>
164
+	           </div>   
165
+	           <div class="left">
166
+	            <div class="nomal">
167
+	              	<label class="col_3">요청수량</label>
168
+	                <span>:</span>
169
+	                <div class="fnPchReqQty"></div>
170
+	                <label class="col_3">요청금액</label>
171
+	                <span>:</span>
172
+	                <div class="col_10 fnPchReqAmt"></div>
173
+	              </div>
174
+	           </div>   
175
+	        </li>
150 176
 	      </div>
151
-      </div>
152
-    </div>
153
-    <div id="ITP_LIST_MPOMNG02010_VIEW_AREA" class="scroll_area row-3">
154
-      <ul id="ITP_LIST_MPOMNG02010_VIEW_ROWS" class="mb_0 panel-group"></ul>
155
-      <div id="ITP_LIST_MPOMNG02010_VIEW_ROWCOPY" style="display: none;">
156
-        <li class="history_list5 item-row">
157
-          <div class="left">
158
-            <div class="nomal">
159
-              	<label class="col_3">품목명</label>
160
-                <span>:</span>
161
-                <div class="full fnItemNm"></div>
162
-              </div>
163
-           </div>   
164
-           <div class="left">
165
-            <div class="nomal">
166
-              	<label class="col_3">요청수량</label>
167
-                <span>:</span>
168
-                <div class="fnPchReqQty"></div>
169
-                <label class="col_3">요청금액</label>
170
-                <span>:</span>
171
-                <div class="col_10 fnPchReqAmt"></div>
172
-              </div>
173
-           </div>   
174
-        </li>
175
-      </div>
176
-    </div>
177
-    <div class="button_bar">
178
-      <button id="ITP_BTN_MPOMNG02010_VIEW_CANCEL_LIST" class="col_12 btn-gray CLB">취소</button>
179
-    </div>
177
+	    </div>
178
+	    <div class="button_bar">
179
+	      <button id="ITP_BTN_MPOMNG02010_VIEW_CANCEL_LIST" class="col_12 btn-gray CLB">취소</button>
180
+	    </div>
181
+    </form>
180 182
   </div>
181 183
   <div id="ITP_AJAX_MPOMNG02010_MODIFY_CONTAINER" style="display: none;">
182
-    <form id="ITP_FORM_MPOMNG02010_MODIFY" class="form-horizontal" onsubmit="return false;">
184
+    <form id="ITP_FORM_MPOMNG02010_MODIFY" class="put_btn form-horizontal" onsubmit="return false;">
183 185
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_VIEW_CD" name="viewCd" value="U">
184 186
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_BRAND_ID" name="brandId" value="">
185 187
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_STORE_ID" name="storeId" value="">
@@ -242,7 +244,7 @@
242 244
         <ul id="ITP_LIST_MPOMNG02010_MODIFY_ROWS" class="mb_0 panel-group"></ul>
243 245
         <div id="ITP_LIST_MPOMNG02010_MODIFY_ROWCOPY" style="display: none;"><!-- display:grid -->
244 246
           <li class="item-row">
245
-            <div class="left_info">
247
+            <div class="left_info item">
246 248
               <div class="check_box">
247 249
                 <input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
248 250
               </div>
@@ -330,7 +332,7 @@
330 332
       <div id="ITP_LIST_MPOMNG02010_POP_WHS_AREA" class="popup_scroll">
331 333
         <ul id="ITP_LIST_MPOMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
332 334
         <div id="ITP_LIST_MPOMNG02010_POP_WHS_ROWCOPY" style="display: none;">
333
-          <li class="row_2">
335
+          <li class="row_2 item-row">
334 336
              <div class="scroll_left">
335 337
                  <div class="con_2 fnWhsNm"></div>
336 338
                  <div class="con_2 wichi fnLocationNm"></div>
@@ -368,7 +370,7 @@
368 370
       <div id="ITP_LIST_MPOMNG02010_POP_ITEM_AREA" class="popup_scroll">
369 371
         <ul id="ITP_LIST_MPOMNG02010_POP_ITEM_ROWS" class="mb_0 panel-group"></ul>
370 372
         <div id="ITP_LIST_MPOMNG02010_POP_ITEM_ROWCOPY" style="display: none;">
371
-           <li class="row_2">
373
+           <li class="row_2 item-row">
372 374
              <div class="scroll_left">
373 375
                  <div class="con_2 fnItemNm">아이템명</div>
374 376
                  <div class="mg_0">

+ 15 - 15
src/main/webapp/mobile/app/mpomng/MPOMNG04010.html

@@ -1,6 +1,6 @@
1 1
 <section id="ITP_MOBILE_MPOMNG04010">
2 2
 	<div id="ITP_AJAX_MPOMNG04010_LIST_CONTAINER" style="display: none;">
3
-		<form id="ITP_FORM_MPOMNG04010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
3
+		<form id="ITP_FORM_MPOMNG04010_LIST_SEARCH" class="area_full form-horizontal" onsubmit="return false;">
4 4
 		  <input type="hidden" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
5 5
 		  <input type="hidden" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
6 6
 		  <input type="hidden" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_IDX" name="sidx" value="0">
@@ -64,18 +64,18 @@
64 64
 		<div id="ITP_LIST_MPOMNG04010_LIST_ITEM_AREA" class="scroll_area row-4">
65 65
 		  <ul id="ITP_LIST_MPOMNG04010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
66 66
 			  <div id="ITP_LIST_MPOMNG04010_LIST_ITEM_ROWCOPY" style="display: none;">
67
-				<li class="list-row2">
67
+				<li class="history_list7 item-row">
68 68
 				  <div class="left">
69 69
 					<div class="nomal">
70
-					  <label class="col_3">발주일자</label>
70
+					  <label class="col_4">발주일자</label>
71 71
 					  <span>:</span>
72
-					  <div class="fnPodrDt"></div>
73
-					  <div class="fnPodrMgrNm">($)</div>
72
+					  <div class="auto fnPodrDt"></div>
73
+					  <div class="fnPodrMgrNm"></div>
74 74
 					</div>
75 75
 				  </div>
76 76
 				  <div class="left">
77 77
 					<div class="nomal">
78
-					  <label class="col_3">발주상태</label>
78
+					  <label class="col_4">발주상태</label>
79 79
 					  <span>:</span>
80 80
 					  <div class="fnPchodrStCd"></div>
81 81
 					  <label>납품장소명</label>
@@ -85,7 +85,7 @@
85 85
 				  </div>
86 86
 				  <div class="left">
87 87
 					<div class="nomal">
88
-					  <label class="col_3">품목수</label>
88
+					  <label class="col_4">품목수</label>
89 89
 					  <span>:</span>
90 90
 					  <div class="fnPodrItemQty"></div>
91 91
 					  <label>금액</label>
@@ -95,7 +95,7 @@
95 95
 				  </div>
96 96
 				  <div class="left">
97 97
 					<div class="nomal">
98
-					  <label class="col_3">공급업체</label>
98
+					  <label class="col_4">공급업체</label>
99 99
 					  <span>:</span>
100 100
 					  <div class="full fnSpplyNm"></div>
101 101
 					</div>
@@ -106,7 +106,7 @@
106 106
 	  </form>
107 107
 	</div>
108 108
 	<div id="ITP_AJAX_MPOMNG04010_VIEW_CONTAINER" style="display: none;">
109
-	   <form id="ITP_FORM_MPOMNG04010_VIEW" class="form-horizontal" onsubmit="return false;">
109
+	   <form id="ITP_FORM_MPOMNG04010_VIEW" class="put_btn form-horizontal" onsubmit="return false;">
110 110
 		<input type="hidden" id="ITP_FORM_MPOMNG04010_VIEW_VIEW_CD" name="viewCd" value="C">
111 111
 		  <div class="content">
112 112
 			  <div class="content_fix">
@@ -151,17 +151,17 @@
151 151
 		<div id="ITP_LIST_MPOMNG04010_VIEW_ITEM_AREA" class="scroll_area row-4-1">
152 152
 		  <ul id="ITP_LIST_MPOMNG04010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
153 153
 			  <div id="ITP_LIST_MPOMNG04010_VIEW_ITEM_ROWCOPY" style="display: none;">
154
-				<li class="history_list8 item-row">
154
+				<li class="history_list10 item-row">
155 155
 				  <div class="left">
156 156
 					<div class="nomal">
157
-					  <label class="col_1">품목명</label>
157
+					  <label class="col_3">품목명</label>
158 158
 					  <span>:</span>
159 159
 					  <div class="full fnItemNm"></div>
160 160
 					</div>
161 161
 				  </div>
162 162
 				  <div class="left">
163 163
 					<div class="nomal">
164
-					  <label class="col_1">수량</label>
164
+					  <label class="col_3">수량</label>
165 165
 					  <span>:</span>
166 166
 					  <div class="fnPodrQty"></div>
167 167
 					  <label class="sub_info">금액</label>
@@ -171,7 +171,7 @@
171 171
 				  </div>
172 172
 				  <div class="left">
173 173
 					<div class="nomal">
174
-					  <label class="col_1">구매가 </label>
174
+					  <label class="col_3">구매가 </label>
175 175
 					  <span>:</span>
176 176
 					  <div class="full fnPodrAmt"></div>
177 177
 					</div>
@@ -209,7 +209,7 @@
209 209
 			<div id="ITP_POP_MPOMNG04010_SPPLY_LIST_AREA" class="popup_scroll">
210 210
 				<ul id="ITP_POP_MPOMNG04010_SPPLY_LIST_ROWS" class="mb_0 panel-group itp_nav"></ul>
211 211
 				<div id="ITP_POP_MPOMNG04010_SPPLY_LIST_ROWCOPY" style="display: none;">
212
-					<li class="row_2">
212
+					<li class="row_2 item-row">
213 213
 						<div class="scroll_left">
214 214
 							<div class="con_2 fnSpplyNm">공급업체 명A</div>
215 215
 							<div class="con_2 wichi fnStNm">($)</div>
@@ -246,7 +246,7 @@
246 246
 			<div id="ITP_LIST_MPOMNG04010_POP_WHS_AREA" class="popup_scroll">
247 247
 				<ul id="ITP_LIST_MPOMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
248 248
 				<div id="ITP_LIST_MPOMNG04010_POP_WHS_ROWCOPY" style="display: none;">
249
-					<li class="row_2">
249
+					<li class="row_2 item-row">
250 250
 						<div class="scroll_left">
251 251
 							<div class="con_2 fnWhsNm"></div>
252 252
 							<div class="con_2 wichi fnLocationNm"></div>

+ 5 - 5
src/main/webapp/mobile/app/mpomng/MPOMNG05010.html

@@ -1,6 +1,6 @@
1 1
 <section id="ITP_MOBILE_MPOMNG05010">
2 2
 	<div id="ITP_AJAX_MPOMNG05010_LIST_CONTAINER" >
3
-		<form id="ITP_FORM_MPOMNG05010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
3
+		<form id="ITP_FORM_MPOMNG05010_LIST_SEARCH" class="area_full form-horizontal" onsubmit="return false;">
4 4
 			<input type="hidden" id="ITP_FORM_MPOMNG0500_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
5 5
 			<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
6 6
 			<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_IDX" name="sidx" value="0">
@@ -76,7 +76,7 @@
76 76
 			<div id="ITP_LIST_MPOMNG05010_LIST_ITEM_AREA" class="scroll_area row-5">
77 77
 				<ul id="ITP_LIST_MPOMNG05010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
78 78
 				<div id="ITP_LIST_MPOMNG05010_LIST_ITEM_ROWCOPY" style="display: none;">
79
-					<li class="history_list2">
79
+					<li class="history_list4 item-row">
80 80
 						<div class="left">
81 81
 							<div class="nomal">
82 82
 								<label>납품번호 </label>
@@ -86,7 +86,7 @@
86 86
 						</div>
87 87
 						<div class="left">
88 88
 							<div class="nomal">
89
-								<label class="col_3">납품예정일</label>
89
+								<label class="">납품예정일</label>
90 90
 								<span>:</span>
91 91
 								<div class="fnDlvReqDt history_info"></div>
92 92
 								<label class="fn sub_info">납품일자</label>
@@ -151,7 +151,7 @@
151 151
 			<div id="ITP_POP_MPOMNG05010_LIST_SPPLY_AREA" class="popup_scroll">
152 152
 				<ul id="ITP_POP_MPOMNG05010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
153 153
 				<div id="ITP_POP_MPOMNG05010_LIST_SPPLY_ROWCOPY" style="display: none;">
154
-					<li class="row_2">
154
+					<li class="row_2 item-row">
155 155
 						<div class="scroll_left">
156 156
 							<div class="con_2 fnSpplyNm">공급업체 명A</div>
157 157
 							<div class="con_2 wichi fnStNm">($)</div>
@@ -188,7 +188,7 @@
188 188
 			<div id="ITP_LIST_MPOMNG05010_POP_WHS_AREA" class="popup_scroll">
189 189
 				<ul id="ITP_LIST_MPOMNG05010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
190 190
 				<div id="ITP_LIST_MPOMNG05010_POP_WHS_ROWCOPY" style="display: none;">
191
-					<li class="row_2">
191
+					<li class="row_2 item-row">
192 192
 						<div class="scroll_left">
193 193
 							<div class="con_2 fnWhsNm"></div>
194 194
 							<div class="con_2 wichi fnLocationNm"></div>

+ 15 - 17
src/main/webapp/mobile/app/mpomng/MPOMNG06010.html

@@ -1,6 +1,6 @@
1 1
 <section id="ITP_MOBILE_MPOMNG06010">
2 2
 	<div id="ITP_AJAX_MPOMNG06010_LIST_CONTAINER" >
3
-		<form id="ITP_FORM_MPOMNG06010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
3
+		<form id="ITP_FORM_MPOMNG06010_LIST_SEARCH" class="put_btn form-horizontal" onsubmit="return false;">
4 4
 			<input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
5 5
 			<input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
6 6
 			<input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_IDX" name="sidx" value="0">
@@ -65,52 +65,50 @@
65 65
 					</div>
66 66
 				</div>
67 67
 			</div>
68
-		</form>
69
-		<form id="ITP_FORM_MPOMNG06010_LIST_MODIFY" class="form-horizontal" onsubmit="return false;">
70 68
 			<div id="ITP_LIST_MPOMNG06010_LIST_ITEM_AREA" class="scroll_area row-6">
71 69
 				<ul id="ITP_LIST_MPOMNG06010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
72 70
 				<div id="ITP_LIST_MPOMNG06010_LIST_ITEM_ROWCOPY" style="display: none;">
73
-					<li class="history_list2 item-row">
71
+					<li class="history_list4 item-row">
74 72
 						<div class="left">
75 73
 							<div class="nomal">
76
-								<label class="col_3">품목명</label>
74
+								<label class="">품목명</label>
77 75
 								<span>:</span>
78 76
 								<div class="full fnItemNm"></div>
79 77
 							</div>
80 78
 						</div>
81 79
 						<div class="left">
82 80
 							<div class="nomal">
83
-								<label class="col_3">납품장소</label>
81
+								<label class="">납품장소</label>
84 82
 								<span>:</span>
85 83
 								<div class="full fnWhsNm"></div>
86 84
 							</div>
87 85
 						</div>
88 86
 						<div class="left">
89 87
 							<div class="nomal">
90
-								<label class="col_3">납품요청일</label>
88
+								<label class="">납품요청일</label>
91 89
 								<span>:</span>
92 90
 								<div class="col_75 fnDlvReqDt"></div>
93
-								<label class="col_3">납품예정일</label>
91
+								<label class="">납품예정일</label>
94 92
 								<span>:</span>
95 93
 								<div class="fnDlvSchDt"></div>
96 94
 							</div>
97 95
 						</div>
98 96
 						<div class="left">
99 97
 							<div class="nomal">
100
-								<label class="col_3">납품단가</label>
98
+								<label class="">납품단가</label>
101 99
 								<span>:</span>
102
-								<div class="col_8 fnUnitAmt"></div>
103
-								<label class="col_3">납품금액</label>
100
+								<div class=" fnUnitAmt"></div>
101
+								<label class="">납품금액</label>
104 102
 								<span>:</span>
105
-								<div class="col_10 fnWhsAmt"></div>
103
+								<div class=" fnWhsAmt"></div>
106 104
 							</div>
107 105
 						</div>
108 106
 						<div class="left">
109 107
 							<div class="nomal">
110
-								<label class="col_3">납품수량</label>
108
+								<label class="">납품수량</label>
111 109
 								<span>:</span>
112
-								<div class="col_8 fnDlvQty"></div>
113
-								<label class="col_3">입고수량</label>
110
+								<div class=" fnDlvQty"></div>
111
+								<label class="">입고수량</label>
114 112
 								<span>:</span>
115 113
 								<input id="ITP_FORM_MPOMNG06010_LIST_WHS_QTY" class="fnWhsQty" name="whsQty" type="text" placeholder="">
116 114
 							</div>
@@ -149,7 +147,7 @@
149 147
 			<div id="ITP_POP_MPOMNG06010_LIST_SPPLY_AREA" class="popup_scroll">
150 148
 				<ul id="ITP_POP_MPOMNG06010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
151 149
 				<div id="ITP_POP_MPOMNG06010_LIST_SPPLY_ROWCOPY" style="display: none;;">
152
-					<li class="row_2">
150
+					<li class="row_2 item-row">
153 151
 						<div class="scroll_left">
154 152
 							<div class="con_2 fnSpplyNm">공급업체 명A</div>
155 153
 							<div class="con_2 wichi fnStNm">($)</div>
@@ -186,7 +184,7 @@
186 184
 			<div id="ITP_LIST_MPOMNG06010_POP_WHS_AREA" class="popup_scroll">
187 185
 				<ul id="ITP_LIST_MPOMNG06010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
188 186
 				<div id="ITP_LIST_MPOMNG06010_POP_WHS_ROWCOPY" style="display: none;">
189
-					<li class="row_2">
187
+					<li class="row_2 item-row">
190 188
 						<div class="scroll_left">
191 189
 						  <div class="con_2 fnWhsNm"></div>
192 190
 						  <div class="con_2 wichi fnLocationNm"></div>

+ 15 - 15
src/main/webapp/mobile/app/mpomng/MPOMNG07010.html

@@ -1,6 +1,6 @@
1 1
 <section id="ITP_MOBILE_MPOMNG07010">
2 2
 	<div id="ITP_AJAX_MPOMNG07010_LIST_CONTAINER" >
3
-		<form id="ITP_FORM_MPOMNG07010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
3
+		<form id="ITP_FORM_MPOMNG07010_LIST_SEARCH" class="area_full form-horizontal" onsubmit="return false;">
4 4
 			<input type="hidden" id="ITP_FORM_MPOMNG07010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
5 5
 			<input type="hidden" id="ITP_FORM_MPOMNG07010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
6 6
 			<input type="hidden" id="ITP_FORM_MPOMNG07010_LIST_SEARCH_IDX" name="sidx" value="0">
@@ -68,17 +68,17 @@
68 68
       <div id="ITP_LIST_MPOMNG07010_LIST_ITEM_AREA" class="scroll_area row-6">
69 69
         <ul id="ITP_LIST_MPOMNG07010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
70 70
         	<div id="ITP_LIST_MPOMNG07010_LIST_ITEM_ROWCOPY" style="display: none;">
71
-		      <li class="history_list2 item-row">
71
+		      <li class="history_list4 item-row">
72 72
 				<div class="left">
73 73
 					<div class="nomal">
74
-						<label class="col_3">품목명</label>
74
+						<label class="">품목명</label>
75 75
 						<span>:</span>
76 76
 						<div class="full fnItemNm"></div>
77 77
 					</div>
78 78
 				</div>
79 79
 				<div class="left">
80 80
 					<div class="nomal">
81
-						<label class="col_3">납품자명</label>
81
+						<label class="">납품자명</label>
82 82
 						<span>:</span>
83 83
 						<div class="fnDlvMgrNm"></div>
84 84
 						<label class="col_3">입고확인자</label>
@@ -88,7 +88,7 @@
88 88
 				</div>
89 89
 				<div class="left">
90 90
 					<div class="nomal">
91
-						<label class="col_3">납품요청일</label>
91
+						<label class="">납품요청일</label>
92 92
 						<span>:</span>
93 93
 						<div class="col_75 fnDlvReqDt"></div>
94 94
 						<label class="col_3">납품완료일</label>
@@ -98,22 +98,22 @@
98 98
 				</div>
99 99
 				<div class="left">
100 100
 					<div class="nomal">
101
-						<label class="col_3">발주수량</label>
101
+						<label class="">발주수량</label>
102 102
 						<span>:</span>
103
-						<div class="col_8 fnPodrQty"></div>
104
-						<label class="col_3">입고금액</label>
103
+						<div class=" fnPodrQty"></div>
104
+						<label class="">입고금액</label>
105 105
 						<span>:</span>
106
-						<div class="col_10 fnWhsAmt"></div>
106
+						<div class=" fnWhsAmt"></div>
107 107
 					</div>
108 108
 				</div>
109 109
 				<div class="left">
110 110
 					<div class="nomal">
111
-						<label class="col_3">납품수량</label>
111
+						<label class="">납품수량</label>
112 112
 						<span>:</span>
113
-						<div class="col_8 fnDlvQty"></div>
114
-						<label class="col_3">입고수량</label>
113
+						<div class=" fnDlvQty"></div>
114
+						<label class="">입고수량</label>
115 115
 						<span>:</span>
116
-						<div class="col_10 fnWhsQty"></div>
116
+						<div class=" fnWhsQty"></div>
117 117
 					</div>
118 118
 				</div>
119 119
 			</li>
@@ -146,7 +146,7 @@
146 146
 			<div id="ITP_POP_MPOMNG07010_LIST_SPPLY_AREA" class="popup_scroll">
147 147
 				<ul id="ITP_POP_MPOMNG07010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
148 148
 				<div id="ITP_POP_MPOMNG07010_LIST_SPPLY_ROWCOPY" style="display: none;">
149
-					<li class="row_2">
149
+					<li class="row_2 item-row">
150 150
 						<div class="scroll_left">
151 151
 							<div class="con_2 fnSpplyNm">공급업체 명A</div>
152 152
 							<div class="con_2 wichi fnStNm">($)</div>
@@ -183,7 +183,7 @@
183 183
 			<div id="ITP_LIST_MPOMNG07010_POP_WHS_AREA" class="popup_scroll">
184 184
 				<ul id="ITP_LIST_MPOMNG07010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
185 185
 				<div id="ITP_LIST_MPOMNG07010_POP_WHS_ROWCOPY" style="display: none;">
186
-					<li class="row_2">
186
+					<li class="row_2 item-row">
187 187
 						<div class="scroll_left">
188 188
 							<div class="con_2 fnWhsNm"></div>
189 189
 							<div class="con_2 wichi fnLocationNm"></div>

+ 50 - 13
src/main/webapp/mobile/app/mrtnmng/MRTNMNG05010.html

@@ -26,27 +26,27 @@
26 26
 					<div class="line">
27 27
 						<label>반품입고장소</label>
28 28
 						<div class="float_left">
29
-							<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="수거창고" class="" name="srtnWhsNm" placeholder="수거창고" readonly />
30
-							<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
29
+							<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="수거창고" class="" name="srtnWhsNm" placeholder="수거창고" readonly />
30
+							<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID" class="" name="srtnWhsId" />
31 31
 							<div class="itp_input_btn">
32
-								<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM"><img src="../img/search.png" alt=""></button>
32
+								<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
33 33
 							</div>
34 34
 						</div>
35 35
 						<div class="float_right_btn">
36
-							<button id="ITP_BTN_MRTNMNG05010_LIST_DELETE_RTN_WHS_NM"><img src="../img/delete.png" alt=""></button>
36
+							<button id="ITP_BTN_MRTNMNG05010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
37 37
 						</div>
38 38
 					</div>
39 39
 					<div class="line">
40
-						<label>반품장소</label>
40
+						<label>공급업체</label>
41 41
 						<div class="float_left">
42
-							<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM" data-check-required="empty" class="" name="swhsNm" placeholder="매장명" readonly />
43
-							<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID" data-check-required="empty" class="" name="swhsId" />
42
+							<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_SPPLY_NM" class="" name="sspplyNm" placeholder="공급업체" readonly />
43
+							<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_SPPLY_ID" class="" name="sspplyId" />
44 44
 							<div class="itp_input_btn">
45
-								<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
45
+								<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH_SPPLY_NM"><img src="../img/search.png" alt=""></button>
46 46
 							</div>
47 47
 						</div>
48 48
 						<div class="float_right_btn">
49
-							<button id="ITP_BTN_MRTNMNG05010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
49
+							<button id="ITP_BTN_MRTNMNG05010_LIST_DELETE_SPPLY_NM"><img src="../img/delete.png" alt=""></button>
50 50
 						</div>
51 51
 					</div>
52 52
 					<div class="line">
@@ -70,7 +70,7 @@
70 70
 			<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_AREA" class="scroll_area row-10">
71 71
 				<ul id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
72 72
 				<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWCOPY" style="display: none;">
73
-					<li class="history_list2">
73
+					<li class="history_list2 item-row">
74 74
 						<div class="left">
75 75
 							<div class="nomal">
76 76
 								<label>반품번호 </label>
@@ -82,7 +82,7 @@
82 82
 							<div class="nomal">
83 83
 								<label class="history_label">반품예정일</label>
84 84
 								<span>:</span>
85
-								<div class="fnRtnSchDt history_info"></div>
85
+								<div class="fnColSchDt history_info"></div>
86 86
 							</div>
87 87
 						</div>
88 88
 						<div class="left">
@@ -106,10 +106,10 @@
106 106
 							<div class="nomal">
107 107
 								<label class="col_0">반품요청수량</label>
108 108
 								<span>:</span>
109
-								<div class=" fnRtnReqQty"></div>
109
+								<div class=" fnColReqQty"></div>
110 110
 								<label class="col_0">반품발주수량</label>
111 111
 								<span>:</span>
112
-								<input class="" id="ITP_FORM_MRTNMNG05010_LIST_RTN_PODR_QTY" type="text" name="rtnPodrQty">
112
+								<input class="" id="ITP_FORM_MRTNMNG05010_LIST_COL_QTY" type="text" name="colQty">
113 113
 							</div>
114 114
 						</div>
115 115
 					</li>
@@ -122,6 +122,43 @@
122 122
 		</form>
123 123
 	</div>
124 124
 	<div id="ITP_MOBILE_JS"></div>
125
+	<div id="ITP_POP_MRTNMNG05010_SPPLY_AREA" class="popup2 mobile-pop-close" style="display: none;">
126
+		<div class="pop">
127
+			<div class="header">
128
+				<div class="header_left">
129
+					<label>공급업체</label>
130
+				</div>
131
+				<div class="header_right">
132
+					<button type="button" id="ITP_BTN_MRTNMNG05010_POP_SPPLY_CLOSE"><img src="../img/close.png"></button>
133
+				</div>
134
+			</div>
135
+			<div class="search_bar">
136
+				<form id="ITP_FORM_MRTNMNG05010_POP_SPPLY_SEARCH" class="form-horizontal" onsubmit="return false;">
137
+					<input type="hidden" id="ITP_FORM_MRTNMNG05010_POP_SPPLY_ITEM_BRAND_ID" name="sbrandId" value="">
138
+					<input type="hidden" id="ITP_FORM_MRTNMNG05010_PO_PSPPLY_ITEM_STORE_ID" name="sstoreId" value="">
139
+					<input id="ITP_FORM_MRTNMNG05010_POP_SPPLY_KEYWORD" type="text" name="sspplyNm" placeholder="공급업체명">
140
+					<button id="ITP_BTN_MRTNMNG05010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
141
+				</form>
142
+			</div>
143
+			<div class="select_btn">
144
+				<button id="ITP_BTN_MRTNMNG05010_POP_SPPLY_NM" class="btn_red">공급업체 <img src="../img/arrow_down.png"></button>
145
+			</div>
146
+			<div id="ITP_POP_MRTNMNG05010_LIST_SPPLY_AREA" class="popup_scroll">
147
+				<ul id="ITP_POP_MRTNMNG05010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
148
+				<div id="ITP_POP_MRTNMNG05010_LIST_SPPLY_ROWCOPY" style="display: none;">
149
+					<li class="row_2">
150
+						<div class="scroll_left">
151
+							<div class="con_2 fnSpplyNm">공급업체 명A</div>
152
+							<div class="con_2 wichi fnStNm">($)</div>
153
+						</div>
154
+						<div class="scroll_right">
155
+							<button id="ITP_BTN_MRTNMNG05010_POP_SPPLY_CHOICE" class="fnSpplyId" data-item-key="">선택</button>
156
+						</div>
157
+					</li>
158
+				</div>
159
+			</div>
160
+		</div>
161
+	</div>
125 162
 	<div id="ITP_POP_MRTNMNG05010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
126 163
 		<div class="pop">
127 164
 			<div class="header">

+ 54 - 18
src/main/webapp/mobile/app/mrtnmng/MRTNMNG06010.html

@@ -3,7 +3,6 @@
3 3
 		<form id="ITP_FORM_MRTNMNG06010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
4 4
 			<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
5 5
 			<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
6
-			<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_SPPLY_ID" name="sspplyId" value="">
7 6
 			<div class="content">
8 7
 				<div class="content_fix">
9 8
 					<div class="line header">
@@ -26,27 +25,27 @@
26 25
 					<div class="line">
27 26
 						<label>반품입고장소</label>
28 27
 						<div class="float_left">
29
-							<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" name="srtnWhsNm" type="text" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="수거창고" placeholder="매장명" readonly>
30
-							<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
28
+							<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="매장/창고" readonly>
29
+							<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
31 30
 							<div class="itp_input_btn">
32
-								<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" data-call-popup="ITP_POP_MRTNMNG06010_WHS_NM"><img src="../img/search.png" alt=""></button>
31
+								<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH_WHS_NM" data-call-popup="ITP_POP_MRTNMNG06010_WHS_NM"><img src="../img/search.png" alt=""></button>
33 32
 							</div>
34 33
 						</div>
35 34
 						<div class="float_right_btn">
36
-							<button id="ITP_BTN_MRTNMNG06010_LIST_DELETE_RTN_WHS_NM"><img src="../img/delete.png" alt=""></button>
35
+							<button id="ITP_BTN_MRTNMNG06010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
37 36
 						</div>
38 37
 					</div>
39 38
 					<div class="line">
40
-						<label>반품장소</label>
39
+						<label>공급업체</label>
41 40
 						<div class="float_left">
42
-							<input type="text" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" readonly />
43
-							<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
41
+							<input type="text" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_SPPLY_NM" class="" name="sspplyNm" placeholder="공급업체" readonly />
42
+							<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_SPPLY_ID" class="" name="sspplyId" />
44 43
 							<div class="itp_input_btn">
45
-								<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
44
+								<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH_SPPLY_NM"><img src="../img/search.png" alt=""></button>
46 45
 							</div>
47 46
 						</div>
48 47
 						<div class="float_right_btn">
49
-							<button id="ITP_BTN_MRTNMNG06010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
48
+							<button id="ITP_BTN_MRTNMNG06010_LIST_DELETE_SPPLY_NM"><img src="../img/delete.png" alt=""></button>
50 49
 						</div>
51 50
 					</div>
52 51
 					<div class="line">
@@ -68,46 +67,46 @@
68 67
 			<div id="ITP_LIST_MRTNMNG06010_LIST_ITEM_AREA" class="scroll_area row-6">
69 68
 				<ul id="ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
70 69
 				<div id="ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWCOPY" style="display: none;">
71
-					<li class="history_list4 ">
70
+					<li class="history_list4 item-row">
72 71
 						<div class="left">
73 72
 							<div class="nomal">
74 73
 								<label>발주번호 </label>
75 74
 								<span>:</span>
76
-								<div class="full fnRtnPodrNo">212121212121112</div>
75
+								<div class="full fnRtnPodrNo"></div>
77 76
 							</div>
78 77
 						</div>
79 78
 						<div class="left">
80 79
 							<div class="nomal">
81 80
 								<label class="history_label">반품예정일</label>
82 81
 								<span>:</span>
83
-								<div class="fn_info fnRtnSchDt">2022.10.10</div>
82
+								<div class="fn_info fnColSchDt"></div>
84 83
 							</div>
85 84
 						</div>
86 85
 						<div class="left">
87 86
 							<div class="nomal">
88 87
 								<label>공급업체</label>
89 88
 								<span>:</span>
90
-								<div class="fnSpplyNm">A공급업체명</div>
89
+								<div class="fnSpplyNm"></div>
91 90
 								<label class="sub_info">납품장소</label>
92 91
 								<span>:</span>
93
-								<div class="fnWhsNm">A매장내</div>
92
+								<div class="fnRtnWhsNm"></div>
94 93
 							</div>
95 94
 						</div>
96 95
 						<div class="left">
97 96
 							<div class="nomal">
98 97
 								<label>품목 </label>
99 98
 								<span>:</span>
100
-								<div class="full fnItemNm">품목명(EA)</div>
99
+								<div class="full fnItemNm"></div>
101 100
 							</div>
102 101
 						</div>
103 102
 						<div class="left">
104 103
 							<div class="nomal">
105 104
 								<label>발주수량</label>
106 105
 								<span>:</span>
107
-								<div class="col_5 fnRtnPodrQty"></div>
106
+								<div class="col_5 fnColReqQty"></div>
108 107
 								<label class="sub_info">입고수량</label>
109 108
 								<span>:</span>
110
-								<div class="fnRtnWhsQty">10</div>
109
+								<div class="fnRodrQty">10</div>
111 110
 							</div>
112 111
 						</div>
113 112
 					</li>
@@ -116,6 +115,43 @@
116 115
 		</form>
117 116
 	</div>
118 117
 	<div id="ITP_MOBILE_JS"></div>
118
+	<div id="ITP_POP_MRTNMNG06010_SPPLY_AREA" class="popup2 mobile-pop-close" style="display: none;">
119
+		<div class="pop">
120
+			<div class="header">
121
+				<div class="header_left">
122
+					<label>공급업체</label>
123
+				</div>
124
+				<div class="header_right">
125
+					<button type="button" id="ITP_BTN_MRTNMNG06010_POP_SPPLY_CLOSE"><img src="../img/close.png"></button>
126
+				</div>
127
+			</div>
128
+			<div class="search_bar">
129
+				<form id="ITP_FORM_MRTNMNG06010_POP_SPPLY_SEARCH" class="form-horizontal" onsubmit="return false;">
130
+					<input type="hidden" id="ITP_FORM_MRTNMNG06010_POP_SPPLY_ITEM_BRAND_ID" name="sbrandId" value="">
131
+					<input type="hidden" id="ITP_FORM_MRTNMNG06010_PO_PSPPLY_ITEM_STORE_ID" name="sstoreId" value="">
132
+					<input id="ITP_FORM_MRTNMNG06010_POP_SPPLY_KEYWORD" type="text" name="sspplyNm" placeholder="공급업체명">
133
+					<button id="ITP_BTN_MRTNMNG06010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
134
+				</form>
135
+			</div>
136
+			<div class="select_btn">
137
+				<button id="ITP_BTN_MRTNMNG06010_POP_SPPLY_NM" class="btn_red">공급업체 <img src="../img/arrow_down.png"></button>
138
+			</div>
139
+			<div id="ITP_POP_MRTNMNG06010_LIST_SPPLY_AREA" class="popup_scroll">
140
+				<ul id="ITP_POP_MRTNMNG06010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
141
+				<div id="ITP_POP_MRTNMNG06010_LIST_SPPLY_ROWCOPY" style="display: none;">
142
+					<li class="row_2">
143
+						<div class="scroll_left">
144
+							<div class="con_2 fnSpplyNm">공급업체 명A</div>
145
+							<div class="con_2 wichi fnStNm">($)</div>
146
+						</div>
147
+						<div class="scroll_right">
148
+							<button id="ITP_BTN_MRTNMNG06010_POP_SPPLY_CHOICE" class="fnSpplyId" data-item-key="">선택</button>
149
+						</div>
150
+					</li>
151
+				</div>
152
+			</div>
153
+		</div>
154
+	</div>
119 155
 	<div id="ITP_POP_MRTNMNG06010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
120 156
 		<div class="pop">
121 157
 			<div class="header">

+ 21 - 32
src/main/webapp/mobile/css/style.css

@@ -453,15 +453,16 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
453 453
 .scroll_area li.list-row2 {height:130px; padding-top:8px;}
454 454
 
455 455
 .scroll_area li .left_info {width: calc(100% - 66px); float:left;}
456
+.scroll_area li .left_info.item {width: calc(100% - 110px); float:left;}
456 457
 .scroll_area li .left_info div {display: inline-block; font-size:14pt;}
457 458
 .scroll_area li .left_info span {font-size: 14pt;}
458
-.scroll_area li .left_info label{font-size: 14pt; font-weight:100; margin-left:10px; margin-top:5px;}
459
+.scroll_area li .left_info label{width:60px; font-size: 14pt; font-weight:100; margin-top:5px;}
459 460
 .scroll_area li .left_info .check_box {padding-top:8px; height:50px; float:left; width:22px;}
460 461
 .scroll_area li .left_info .check_box input[type=checkbox] {width:15px; margin:10px 0 0 7px;}
461 462
 .scroll_area li .left_info .thick {float:left; text-align: left; width: 90%; height:38px; font-weight: 100;}
462
-.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;}
463
+.scroll_area li .left_info .thick .itp_item {color:gray;text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:calc(100% - 81px); top:7px; text-align:left; position:relative;}
463 464
 .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;}
464
-.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;}
465
+.scroll_area li .left_info .thick .itp_amt {color:#b88278; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width: calc(100% - 81px); top: 7px; position:relative; text-align:left;}
465 466
 .scroll_area li .left_info .history {font-weight: 700; font-size: 1.1rem; margin-top:-2px;}
466 467
 .scroll_area li .left_info .history input{width: 150px;}
467 468
 .scroll_area li.history_list {height: 140px; padding-top:8px;}
@@ -506,13 +507,13 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
506 507
 .scroll_area li .detail_right .detail_info div {width: auto; font-size: 14px; font-weight: 100;}
507 508
 .scroll_area li .detail_right .detail_info i {width: auto; font-size: 1rem; margin: 0 20px;}
508 509
 
509
-.scroll_area li .left .nomal  {position:relative; left:50%; transform: translateX(-50%); width: 330px; height:28px; float:left; text-align: left; font-size: 1.2rem;}
510
+.scroll_area li .left .nomal  {position:relative; display:flex; width: 100%; height:28px; float:left; text-align: left; font-size: 1.2rem;}
510 511
 .scroll_area li .left .nomal.btn {width:290px; left:44%; padding:0;}
511 512
 .scroll_area li .left .nomal .half {float:left;}
512 513
 .scroll_area li .left .nomal .half label {min-width:auto;}
513 514
 .scroll_area li .left .nomal .half div {min-width:auto; margin-right:5px; margin-top:0;}
514
-.scroll_area li .left .nomal  input{width: 73px; height:28px; top:-5px; position:relative;}
515
-.scroll_area li .left .nomal  select{width: 73px; height:28px; top:-5px; position:relative;}
515
+.scroll_area li .left .nomal  input{ width:calc(50% - 85px);height:28px; top:-5px; position:relative;}
516
+.scroll_area li .left .nomal  select{ width:calc(50% - 85px); height:28px; top:-5px; position:relative;}
516 517
 
517 518
 .scroll_area li .scroll_btn {width:10%; height:158px; margin-top:-5px; display:inline-flex;}
518 519
 
@@ -520,7 +521,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
520 521
 .scroll_area li .scroll_btn input:checked ~ .scroll_btn {background:#eee;}
521 522
 .scroll_area li .left .nomal .lit{font-size:11pt;}
522 523
 .scroll_area li .left .nomal div.lit {padding-right:2px;}
523
-.scroll_area li .left .nomal span {position:relative; top:-5px; margin:0 2px; font-size:15px; font-weight:700;}
524
+.scroll_area li .left .nomal span {position:relative; width:5px; font-size:15px; font-weight:700;}
524 525
 .scroll_area li .left .nomal span.mg0 {margin:0;}
525 526
 
526 527
 .scroll_area li .left .nomal .btn_bar{position: relative; width: auto; font-size: 2.2rem;}
@@ -532,36 +533,24 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
532 533
 .scroll_area li .left .nomal .m_btn_bar button div{position:relative; width:10px; top:-2px; left:2px;}
533 534
 .scroll_area li .left .nomal .m_btn_bar .col_0{width: 40px; text-align:center; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
534 535
 
535
-.scroll_area li .left .nomal label{position:relative; top:-5px; font-size:12pt; font-weight:100; min-width:75px; text-align:left;}
536
+.scroll_area li .left .nomal label{position:relative; font-size:12pt; font-weight:100; min-width:80px; padding-left:5px; text-align:left;}
536 537
 .scroll_area li .left .nomal label.sub_info{min-width: auto; display: inline-flex;}
537 538
 
538
-.scroll_area li .left .nomal label.col_0{min-width: auto;}
539 539
 .scroll_area li .left .nomal label.col_1{min-width: 45px;}
540
-.scroll_area li .left .nomal label.col_5{min-width: 51px;}
541
-.scroll_area li .left .nomal label.col_3{min-width: 60px;}
542
-.scroll_area li .left .nomal label.col_2{width: 95px;}
540
+.scroll_area li .left .nomal label.col_3{min-width: 50px;}
541
+.scroll_area li .left .nomal label.col_4{min-width: 65px;}
542
+.scroll_area li .left .nomal label.col_6{min-width: 95px;}
543 543
 .scroll_area li .left .nomal.over{text-overflow:ellipsis; overflow:hidden; white-space:nowrap;}
544 544
 .scroll_area li .left .nomal i{width: 50px; text-align: center;}
545
-.scroll_area li .left .nomal div{text-overflow:ellipsis; overflow:hidden; white-space:nowrap; text-align:left; font-weight: 700; font-size: 12pt; width:73px;}
546
-
547
-.scroll_area li .left .nomal .full{width:240px;}
548
-.scroll_area li .left .nomal .full_s{width:200px;}
549
-.scroll_area li .left .nomal .col_0{width:auto;}
550
-.scroll_area li .left .nomal .col_2{width: 25px;}
551
-.scroll_area li .left .nomal div.col_5{width:56px;}
552
-.scroll_area li .left .nomal .col_6{width:60px;}
553
-.scroll_area li .left .nomal .col_64{width:64px;}
554
-.scroll_area li .left .nomal .col_7{width:74px;}
555
-.scroll_area li .left .nomal .col_70{width:70px;}
556
-.scroll_area li .left .nomal .col_75{width:75px;}
557
-.scroll_area li .left .nomal .col_8{width:80px;}
558
-.scroll_area li .left .nomal .col_82{width:82px;}
559
-.scroll_area li .left .nomal .col_88{width:88px;}
560
-.scroll_area li .left .nomal .col_9{width:90px;}
561
-.scroll_area li .left .nomal .col_10{width:100px;}
562
-
563
-
564
-.scroll_area li .right {margin: 22px 10px 22px 0; position: relative; display: flex; height:30px; font-size: 1.4rem; font-weight: 700; float: right;}
545
+.scroll_area li .left .nomal div{text-overflow:ellipsis; overflow:hidden; white-space:nowrap; text-align:left; font-weight: 700; font-size: 12pt; width:calc(50% - 85px);}
546
+.scroll_area li .left .nomal .text_6{width:calc(50% - 108px);}
547
+
548
+.scroll_area li .left .nomal div.full{width:calc(100% - 85px);}
549
+.scroll_area li .left .nomal div.full_s{width:200px;}
550
+.scroll_area li .left .nomal div.auto{width:auto;}
551
+
552
+
553
+.scroll_area li .right {margin: 22px 0px 22px 0; position: relative; display: flex; width:110px; height:30px; font-size: 1.4rem; font-weight: 700; float: right;}
565 554
 .scroll_area li .right .num {padding:2px 22px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB; background:#fff; font-size:14pt;}
566 555
 .scroll_area li .right .fnnum {margin:5px 30px; font-size:14pt;}
567 556
 .scroll_area li .right button {background:#e1cac1; color:#fff; border:1px solid #E0B8AB; padding:0px 7px; font-size: 16px; border-radius: 0px;}

+ 10 - 10
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG06010.js

@@ -53,11 +53,11 @@ let mobPageObj = {
53 53
 				var id = $(this).attr('id');
54 54
 				switch (id) {
55 55
 					case 'ITP_BTN_MPOMNG06010_LIST_SEARCH_SPPLY_NM'		: mobPopObj.popSpply.init(); 	break;
56
-					case 'ITP_BTN_MPOMNG06010_LIST_DELETE_SPPLY_NM'		: mobPopObj.popSpply.delete(); break;
57
-					case 'ITP_BTN_MPOMNG06010_LIST_SEARCH_WHS_NM'		: mobPopObj.popWhsNm.init(); 		break;
56
+					case 'ITP_BTN_MPOMNG06010_LIST_DELETE_SPPLY_NM'		: mobPopObj.popSpply.delete();	break;
57
+					case 'ITP_BTN_MPOMNG06010_LIST_SEARCH_WHS_NM'		: mobPopObj.popWhsNm.init(); 	break;
58 58
 					case 'ITP_BTN_MPOMNG06010_LIST_DELETE_WHS_NM'		: mobPopObj.popWhsNm.delete(); 	break;
59
-					case 'ITP_BTN_MPOMNG06010_LIST_SEARCH'				: mobContentObj.list.search();	break;
60
-					case 'ITP_BTN_MPOMNG06010_LIST_SAVE'				: mobContentObj.list.save();	break;
59
+					case 'ITP_BTN_MPOMNG06010_LIST_SEARCH'				: mobContObj.list.search();		break;
60
+					case 'ITP_BTN_MPOMNG06010_LIST_SAVE'				: mobContObj.list.save();		break;
61 61
 				}
62 62
 				return false;
63 63
 			});
@@ -81,7 +81,7 @@ let mobPageObj = {
81 81
 		this.viewMode = mode;
82 82
 	},
83 83
 	ready: function() {
84
-		mobContentObj.list.init();
84
+		mobContObj.list.init();
85 85
 	}
86 86
 };
87 87
 
@@ -107,7 +107,7 @@ let mobContObj = {
107 107
 		},
108 108
 		pager: function(totPage) {
109 109
 			(this.listPage < totPage) ?
110
-				CommonObj.moreView('#ITP_LIST_MPOMNG06010_LIST_ITEM_AREA', true, mobContentObj.list.load) :
110
+				CommonObj.moreView('#ITP_LIST_MPOMNG06010_LIST_ITEM_AREA', true, mobContObj.list.load) :
111 111
 				CommonObj.moreView('#ITP_LIST_MPOMNG06010_LIST_ITEM_AREA', false);
112 112
 			this.listPage += 1;
113 113
 		},
@@ -115,10 +115,10 @@ let mobContObj = {
115 115
 			var _this = this;
116 116
 			var callbackFn = function(result) {
117 117
 				console.log(result);
118
-				mobContentObj.list.pager(result.gridTotal);
118
+				mobContObj.list.pager(result.gridTotal);
119 119
 				$.each(result.gridRows, function (i, item) {
120 120
 					$('#ITP_LIST_MPOMNG06010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG06010_LIST_ITEM_ROWCOPY').html());
121
-					var $li = $('#ITP_LIST_MPOMNG06010_LIST_ITEM_AREA .panel-group > .history_list2:last');
121
+					var $li = $('#ITP_LIST_MPOMNG06010_LIST_ITEM_AREA .panel-group > .item-row:last');
122 122
 					$li.find('.fnDlvSttmtUnqNo').text(item.dlvSttmtUnqNo);
123 123
 					$li.find('.fnItemNm').text(item.itemNm);
124 124
 					$li.find('.fnWhsNm').text(item.whsNm);
@@ -128,11 +128,11 @@ let mobContObj = {
128 128
 					$li.find('.fnWhsAmt').text(CommonObj.currency.add(item.whsAmt));
129 129
 					$li.find('.fnDlvQty').text(CommonObj.comma.set(item.dlvQty));
130 130
 					$li.find('.fnWhsQty').val(item.whsQty);
131
-					mobContentObj.list.rows.push(item);
131
+					mobContObj.list.rows.push(item);
132 132
 				});
133 133
 			};
134 134
 			const param = $('#ITP_FORM_MPOMNG06010_LIST_SEARCH').serializeObject();
135
-			param.gridPage = mobContentObj.list.listPage;
135
+			param.gridPage = mobContObj.list.listPage;
136 136
 			param.gridSize = mobile_list_size;
137 137
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST');
138 138
 		},

+ 104 - 46
src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG05010.js

@@ -7,8 +7,9 @@ require(['config'], function() {
7 7
 
8 8
 /*API URL*/
9 9
 const API_MOBILE_GRID_LIST 			= '/api/rtnmng/inoutmng/retstock-target-grid-list';	// 목록
10
-const API_MOBILE_SAVE 				= 'api/rtnmng/inoutmng/save-retstock';				// 반품처리
10
+const API_MOBILE_SAVE 				= '/api/rtnmng/inoutmng/save-retstock';				// 반품처리
11 11
 const API_POP_SEARCH_LIST			= '/api/whs/mng/pop-whs-search';
12
+const API_POP_SPPLY_LIST 			= '/api/spply/pop-grid-list';
12 13
 
13 14
 const PAGE_MODE_LIST				= "LIST";
14 15
 const PAGE_MODE_VIEW				= "VIEW";
@@ -36,7 +37,7 @@ let mobPageObj = {
36 37
 			// 조회일자 지정
37 38
 			$('#ITP_MOBILE_MRTNMNG05010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
38 39
 			$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', 0));
39
-			$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 0));
40
+			$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 1));
40 41
 		},
41 42
 		info: function() {
42 43
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -51,16 +52,20 @@ let mobPageObj = {
51 52
 			$('button[id^="ITP_BTN_MRTNMNG05010_LIST"]').on('click', function() {
52 53
 				var id = $(this).attr('id');
53 54
 				switch (id) {
54
-					case 'ITP_BTN_MRTNMNG05010_LIST_SEARCH_WHS_NM'		: mobPopObj.popWhsNm.init('WHS'); 		break;
55
-					case 'ITP_BTN_MRTNMNG05010_LIST_DELETE_WHS_NM'		: mobPopObj.popWhsNm.delete('WHS'); 			break;
56
-					case 'ITP_BTN_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM'	: mobPopObj.popWhsNm.init('RTN_WHS'); 	break;
57
-					case 'ITP_BTN_MRTNMNG05010_LIST_DELETE_RTN_WHS_NM'	: mobPopObj.popWhsNm.delete('RTN_WHS'); 		break;
58
-					case 'ITP_BTN_MRTNMNG05010_LIST_SEARCH'				: mobContObj.list.search();			break;
59
-					case 'ITP_BTN_MRTNMNG05010_LIST_MODIFY'				: mobContObj.list.save();			break;
55
+					case 'ITP_BTN_MRTNMNG05010_LIST_SEARCH_WHS_NM'		: mobPopObj.popWhsNm.init(); 	break;
56
+					case 'ITP_BTN_MRTNMNG05010_LIST_DELETE_WHS_NM'		: mobPopObj.popWhsNm.delete(); 	break;
57
+					case 'ITP_BTN_MRTNMNG05010_LIST_SEARCH_SPPLY_NM'	: mobPopObj.popSpply.init(); 	break;
58
+					case 'ITP_BTN_MRTNMNG05010_LIST_DELETE_SPPLY_NM'	: mobPopObj.popSpply.delete(); 	break;
59
+					case 'ITP_BTN_MRTNMNG05010_LIST_SEARCH'				: mobContObj.list.search();		break;
60
+					case 'ITP_BTN_MRTNMNG05010_LIST_MODIFY'				: mobContObj.list.save();		break;
60 61
 				}
61 62
 				return false;
62 63
 			});
63 64
 
65
+			$(document).on('click', '#ITP_POP_MRTNMNG05010_LIST_SPPLY_ROWS li button', function() {
66
+				mobPopObj.popSpply.choice($(this));
67
+			});
68
+
64 69
 			$(document).on('click', '#ITP_LIST_MRTNMNG05010_POP_WHS_ROWS li button', function() {
65 70
 				mobPopObj.popWhsNm.choice($(this));
66 71
 			});
@@ -114,15 +119,14 @@ let mobContObj = {
114 119
 				mobContObj.list.pager(result.gridTotal);
115 120
 				$.each(result.gridRows, function (i, item) {
116 121
 					$('#ITP_LIST_MRTNMNG05010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWCOPY').html());
117
-					var $li = $('#ITP_LIST_MRTNMNG05010_LIST_ITEM_AREA .panel-group > .list-row:last');
118
-					$li.find('.fnDlvSttmtUnqNo').text(item.dlvSttmtUnqNo);
119
-					$li.find('.fnDlvSchDt').text(item.dlvSchDt);
122
+					var $li = $('#ITP_LIST_MRTNMNG05010_LIST_ITEM_AREA .panel-group > .item-row:last');
123
+					$li.find('.fnRtnPodrUnqNo').text(item.rtnPodrUnqNo);
124
+					$li.find('.fnColSchDt').text(item.colSchDt);
120 125
 					$li.find('.fnSpplyNm').text(item.spplyNm);
121
-					$li.find('.fnWhsNm').text(item.whsNm);
122
-					$li.find('.fnItemNm').text(item.itemNm + '(' + item.podrQty + item.unit + ')');
123
-					$li.find('.fnPodrQty').text(CommonObj.comma.set(item.podrQty));
124
-					$li.find('.fnDlvQty').text(CommonObj.comma.set(item.dlvQty));
125
-					$li.find('.fnWhsQty').val(item.whsQty);
126
+					$li.find('.fnRtnWhsNm').text(item.rtnWhsNm);
127
+					$li.find('.fnItemNm').text(item.itemNm);
128
+					$li.find('.fnColReqQty').text(CommonObj.comma.set(item.colReqQty));
129
+					$li.find('#ITP_FORM_MRTNMNG05010_LIST_COL_QTY').val(item.colQty);
126 130
 					mobContObj.list.rows.push(item);
127 131
 				});
128 132
 			};
@@ -142,29 +146,30 @@ let mobContObj = {
142 146
 			var srtnWhsId = "";
143 147
 			var storeId = "";
144 148
 			$('#ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWS li').each(function(index) {
145
-				var whsQty = $(this).find('input[name="whsQty"]').val();
146
-				if(whsQty !== '') {
147
-					if(Number(whsQty) > _this.rows[index].colReqQty) {
149
+				var row = mobContObj.list.rows[index];
150
+				var colQty = $(this).find('input[name="colQty"]').val();
151
+				if(colQty !== '') {
152
+					if(Number(colQty) > row.colReqQty) {
148 153
 						chkQtyYn1 = false;
149 154
 						return false;
150 155
 					}
151
-					if (swhsId !== "" && swhsId !== _this.rows[index].whsId) {
156
+					if (swhsId !== "" && swhsId !== row.whsId) {
152 157
 						chkQtyYn2 = false;
153 158
 						return false;
154 159
 					}
155
-					if (srtnWhsId !== "" && srtnWhsId !== _this.rows[index].rtnWhsId) {
160
+					if (srtnWhsId !== "" && srtnWhsId !== row.rtnWhsId) {
156 161
 						chkQtyYn3 = false;
157 162
 						return false;
158 163
 					}
159 164
 					var item = {
160
-						'dlvSttmtDtlNo'	: _this.rows[index].dlvSttmtDtlNo,
161
-						'dlvSttmtUnqNo'	: _this.rows[index].dlvSttmtUnqNo,
162
-						'itemId'		: _this.rows[index].itemId,
163
-						'whsQty'		: whsQty
165
+						'colPickDtlNo'	: row.colPickDtlNo,
166
+						'colPickUnqNo'	: row.colPickUnqNo,
167
+						'itemId'		: row.itemId,
168
+						'colQty'		: colQty
164 169
 					};
165
-					swhsId = value.whsId;
166
-					srtnWhsId = value.rtnWhsId;
167
-					storeId = value.storeId;
170
+					swhsId = row.whsId;
171
+					srtnWhsId = row.rtnWhsId;
172
+					storeId = row.storeId;
168 173
 					gridInsertData.push(item);
169 174
 				}
170 175
 			});
@@ -193,12 +198,12 @@ let mobContObj = {
193 198
 					param['viewCd'] = 'C';
194 199
 					param['whsId'] = swhsId;
195 200
 					param['rtnWhsId'] = srtnWhsId;
196
-					param['brandId'] = $('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MPOMNG02010_LIST_SEARCH_BRAND_ID').val();
201
+					param['brandId'] = $('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_BRAND_ID').val();
197 202
 					param['storeId'] = storeId;
198 203
 					param['gridInsertData'] = gridInsertData;
199 204
 					console.log(JSON.stringify(param));
200 205
 					var saveFn = function () {
201
-						_this.search();
206
+						mobContObj.list.search();
202 207
 					};
203 208
 					fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
204 209
 				}
@@ -209,11 +214,74 @@ let mobContObj = {
209 214
 };
210 215
 
211 216
 let mobPopObj = {
217
+	popSpply: {
218
+		popId: 'ITP_POP_MRTNMNG05010_SPPLY_AREA',
219
+		rows: [],
220
+		init: function() {
221
+			this.rows.length = 0;
222
+			mobPopObj.show(this.popId);
223
+			this.search();
224
+			this.action();
225
+		},
226
+		search: function() {
227
+			var _this = this;
228
+			$('#ITP_POP_MRTNMNG05010_LIST_SPPLY_AREA .panel-group').empty();
229
+			var callbackFn = function(result) {
230
+				console.log(result);
231
+				_this.view(result.gridRows);
232
+			};
233
+			let param = $('#ITP_FORM_MRTNMNG05010_POP_SPPLY_SEARCH').serializeObject();
234
+			fn_ajax_call(API_POP_SPPLY_LIST, JSON.stringify(param), callbackFn, 'POST');
235
+		},
236
+		view: function(gridRows) {
237
+			this.rows = gridRows;
238
+			$.each(gridRows, function (i, item) {
239
+				$('#ITP_POP_MRTNMNG05010_LIST_SPPLY_AREA .panel-group').append($('#ITP_POP_MRTNMNG05010_LIST_SPPLY_ROWCOPY').html());
240
+				var $li = $('#ITP_POP_MRTNMNG05010_LIST_SPPLY_AREA .panel-group > .row_2:last');
241
+				$li.find('.fnSpplyNm').text(item.spplyNm);
242
+				$li.find('.fnStNm').text($li.find('.fnStNm').text().replace('$', item.stNm));
243
+				$li.find('.fnSpplyId').data('item-key', item.spplyId);
244
+			});
245
+		},
246
+		choice: function(elem) {
247
+			var _this = this;
248
+			var spplyId = $(elem).data('item-key');
249
+			$.each(this.rows, function (i, item) {
250
+				if(spplyId === item.spplyId) {
251
+					$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_SPPLY_ID').val(item.spplyId);
252
+					$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_SPPLY_NM').val(item.spplyNm);
253
+					_this.close();
254
+					return false;
255
+				}
256
+			});
257
+		},
258
+		action: function() {
259
+			var _this = this;
260
+			$('button[id^="ITP_BTN_MRTNMNG05010_POP_SPPLY"]').off('click').on('click', function() {
261
+				var id = $(this).attr('id');
262
+				switch (id) {
263
+					case 'ITP_BTN_MRTNMNG05010_POP_SPPLY_SEARCH'	: _this.search();			break;
264
+					case 'ITP_BTN_MRTNMNG05010_POP_SPPLY_CHOICE'	: _this.choice($(this));	break;
265
+					case 'ITP_BTN_MRTNMNG05010_POP_SPPLY_CLOSE'	: _this.close(); 			break;
266
+				}
267
+				return false;
268
+			});
269
+		},
270
+		delete: function() {
271
+			$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_SPPLY_ID').val('');
272
+			$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_SPPLY_NM').val('');
273
+		},
274
+		close: function() {
275
+			this.rows.length = 0;
276
+			$('#ITP_POP_MRTNMNG05010_LIST_SPPLY_AREA .panel-group').empty();
277
+			$('#ITP_FORM_MRTNMNG05010_POP_SPPLY_SEARCH #ITP_FORM_MRTNMNG05010_POP_SPPLY_KEYWORD').val('');
278
+			mobPopObj.hide(this.popId);
279
+		}
280
+	},
212 281
 	popWhsNm: {
213 282
 		popId: 'ITP_POP_MRTNMNG05010_WHS_AREA',
214 283
 		rows: [],
215
-		init: function (mode) {
216
-			this.popMode = mode;
284
+		init: function () {
217 285
 			this.rows.length = 0;
218 286
 			mobPopObj.show(this.popId);
219 287
 			this.search();
@@ -245,13 +313,8 @@ let mobPopObj = {
245 313
 			var whsId = $(elem).data('whs-id');
246 314
 			$.each(this.rows, function (i, item) {
247 315
 				if(whsId === item.whsId) {
248
-					if(_this.popMode === 'RTN_WHS') {
249
-						$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_ID').val(item.whsId);
250
-						$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM').val(item.whsNm);
251
-					} else {
252
-						$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID').val(item.whsId);
253
-						$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM').val(item.whsNm);
254
-					}
316
+					$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID').val(item.whsId);
317
+					$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM').val(item.whsNm);
255 318
 					_this.close();
256 319
 					return false;
257 320
 				}
@@ -270,13 +333,8 @@ let mobPopObj = {
270 333
 			});
271 334
 		},
272 335
 		delete: function() {
273
-			if(this.popMode === 'RTN_WHS') {
274
-				$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_ID').val('');
275
-				$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM').val('');
276
-			} else {
277
-				$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID').val('');
278
-				$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM').val('');
279
-			}
336
+			$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID').val('');
337
+			$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM').val('');
280 338
 		},
281 339
 		close: function() {
282 340
 			this.rows.length = 0;

+ 26 - 29
src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG06010.js

@@ -6,7 +6,7 @@ require(['config'], function() {
6 6
 });
7 7
 
8 8
 /*API URL*/
9
-const API_MOBILE_GRID_LIST 			= 'api/rtnmng/inoutmng/retstock-result-grid-list';	// 목록
9
+const API_MOBILE_GRID_LIST 			= '/api/rtnmng/inoutmng/retstock-result-grid-list';	// 목록
10 10
 const API_MOBILE_INFO 				= '/api/rtnmng/po/info-pchOdr';						// 상세
11 11
 const API_POP_SEARCH_LIST			= '/api/whs/mng/pop-whs-search';
12 12
 const API_POP_SPPLY_LIST 			= '/api/spply/pop-grid-list';
@@ -52,18 +52,18 @@ let mobPageObj = {
52 52
 			$('button[id^="ITP_BTN_MRTNMNG06010_LIST"]').on('click', function() {
53 53
 				var id = $(this).attr('id');
54 54
 				switch (id) {
55
-					case 'ITP_BTN_MRTNMNG06010_LIST_SEARCH_WHS_NM'		: mobPopObj.popWhsNm.init('WHS'); 		break;
56
-					case 'ITP_BTN_MRTNMNG06010_LIST_DELETE_WHS_NM'		: mobPopObj.popWhsNm.delete('WHS'); 			break;
57
-					case 'ITP_BTN_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM'	: mobPopObj.popWhsNm.init('RTN_WHS'); 	break;
58
-					case 'ITP_BTN_MRTNMNG06010_LIST_DELETE_RTN_WHS_NM'	: mobPopObj.popWhsNm.delete('RTN_WHS'); 		break;
59
-					case 'ITP_BTN_MRTNMNG06010_LIST_SEARCH'				: mobContentObj.list.search();					break;
55
+					case 'ITP_BTN_MRTNMNG06010_LIST_SEARCH_WHS_NM'		: mobPopObj.popWhsNm.init(); 	break;
56
+					case 'ITP_BTN_MRTNMNG06010_LIST_DELETE_WHS_NM'		: mobPopObj.popWhsNm.delete(); 	break;
57
+					case 'ITP_BTN_MRTNMNG06010_LIST_SEARCH_SPPLY_NM'	: mobPopObj.popSpply.init(); 	break;
58
+					case 'ITP_BTN_MRTNMNG06010_LIST_DELETE_SPPLY_NM'	: mobPopObj.popSpply.delete(); 	break;
59
+					case 'ITP_BTN_MRTNMNG06010_LIST_SEARCH'				: mobContObj.list.search();		break;
60 60
 				}
61 61
 				return false;
62 62
 			});
63 63
 
64 64
 			$(document).on('click', '#ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWS li', function() {
65
-				var item = mobContentObj.list.rows[$(this).index()];
66
-				mobContentObj.view.init(item);
65
+				var item = mobContObj.list.rows[$(this).index()];
66
+				mobContObj.view.init(item);
67 67
 			});
68 68
 
69 69
 			$(document).on('click', '#ITP_POP_MRTNMNG06010_LIST_SPPLY_ROWS li button', function() {
@@ -85,29 +85,26 @@ let mobPageObj = {
85 85
 		this.viewMode = mode;
86 86
 	},
87 87
 	ready: function() {
88
-		mobContentObj.list.init();
88
+		mobContObj.list.init();
89 89
 	}
90 90
 };
91 91
 
92
-let mobContentObj = {
92
+let mobContObj = {
93 93
 	list: {
94 94
 		listPage: 1,
95 95
 		rows: [],
96 96
 		init: function() {
97 97
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
98
-			// this.search();
98
+			this.search();
99 99
 		},
100 100
 		search: function() {
101 101
 			var formId = '#ITP_FORM_MRTNMNG06010_LIST_SEARCH';
102
-			itp_fn_form_clear_validate(null, formId);
103
-			if (itp_fn_form_event.isValid(formId)) {
104
-				this.listPage = 1;
105
-				this.rows.length = 0;
106
-				$('#ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWS').empty();
107
-				setTimeout(function() {
108
-					mobContObj.list.load();
109
-				}, 100);
110
-			}
102
+			this.listPage = 1;
103
+			this.rows.length = 0;
104
+			$('#ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWS').empty();
105
+			setTimeout(function() {
106
+				mobContObj.list.load();
107
+			}, 100);
111 108
 		},
112 109
 		pager: function(totPage) {
113 110
 			(this.listPage < totPage) ?
@@ -122,22 +119,22 @@ let mobContentObj = {
122 119
 				mobContObj.list.pager(result.gridTotal);
123 120
 				$.each(result.gridRows, function (i, item) {
124 121
 					$('#ITP_LIST_MRTNMNG06010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWCOPY').html());
125
-					var $li = $('#ITP_LIST_MRTNMNG06010_LIST_ITEM_AREA .panel-group > .list-row:last');
126
-					$li.find('.fnPchPodrUnqNo').text(item.pchPodrUnqNo);
127
-					$li.find('.fnDlvCmpltDt').text(item.dlvCmpltDt);
128
-					$li.find('.fnDlvSchDt').text(item.dlvSchDt);
122
+					var $li = $('#ITP_LIST_MRTNMNG06010_LIST_ITEM_AREA .panel-group > .item-row:last');
123
+					$li.find('.fnRtnPodrNo').text(item.rtnPodrUnqNo);
124
+					$li.find('.fnColCmpltDt').text(item.colCmpltDt);
125
+					$li.find('.fnColSchDt').text(item.colSchDt);
129 126
 					$li.find('.fnSpplyNm').text(item.spplyNm);
130
-					$li.find('.fnWhsNm').text(item.whsNm);
127
+					$li.find('.fnRtnWhsNm').text(item.rtnWhsNm);
131 128
 					$li.find('.fnItemNm').text(item.itemNm);
132
-					$li.find('.fnPodrQty').text(CommonObj.comma.set(item.podrQty));
133
-					$li.find('.fnDlvQty').text(CommonObj.comma.set(item.dlvQty));
129
+					$li.find('.fnColReqQty').text(CommonObj.comma.set(item.colReqQty));
130
+					$li.find('.fnRodrQty').text(CommonObj.comma.set(item.rodrQty));
134 131
 					mobContObj.list.rows.push(item);
135 132
 				});
136 133
 			};
137 134
 			const param = $('#ITP_FORM_MRTNMNG06010_LIST_SEARCH').serializeObject();
138 135
 			param.gridPage = mobContObj.list.listPage;
139 136
 			param.gridSize = mobile_list_size;
140
-			// console.log(JSON.stringify(param));
137
+			console.log(JSON.stringify(param));
141 138
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST');
142 139
 		}
143 140
 	}
@@ -167,7 +164,7 @@ let mobPopObj = {
167 164
 			this.rows = gridRows;
168 165
 			$.each(gridRows, function (i, item) {
169 166
 				$('#ITP_POP_MRTNMNG06010_LIST_SPPLY_AREA .panel-group').append($('#ITP_POP_MRTNMNG06010_LIST_SPPLY_ROWCOPY').html());
170
-				var $li = $('#ITP_POP_MRTNMNG06010_LIST_SPPLY_AREA .panel-group > .list-row:last');
167
+				var $li = $('#ITP_POP_MRTNMNG06010_LIST_SPPLY_AREA .panel-group > .row_2:last');
171 168
 				$li.find('.fnSpplyNm').text(item.spplyNm);
172 169
 				$li.find('.fnStNm').text($li.find('.fnStNm').text().replace('$', item.stNm));
173 170
 				$li.find('.fnSpplyId').data('item-key', item.spplyId);