Browse Source

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

juney 2 years ago
parent
commit
cab43e0736

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

@@ -31,7 +31,7 @@
31
 										</div>
31
 										</div>
32
 										<div class="col-xs-3 itp_ip itp_noMar">
32
 										<div class="col-xs-3 itp_ip itp_noMar">
33
 											<div class="input-group">
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
 												<span class="input-group-btn">
35
 												<span class="input-group-btn">
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>
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
 													<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>
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
 												</span>
49
 												</span>
50
 											</div>
50
 											</div>
51
 										</div>
51
 										</div>
52
+										<!-- 
52
 										<div class="col-xs-3 itp_ip itp_noMar" style="margin-left: 4px; width: 177px;">
53
 										<div class="col-xs-3 itp_ip itp_noMar" style="margin-left: 4px; width: 177px;">
53
 											<div class="input-group">
54
 											<div class="input-group">
54
 												<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SWHS_NM" class="form-control itp_input" placeholder="반품입고창고" readonly="readonly" />
55
 												<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SWHS_NM" class="form-control itp_input" placeholder="반품입고창고" readonly="readonly" />
@@ -58,9 +59,11 @@
58
 												</span>
59
 												</span>
59
 											</div>
60
 											</div>
60
 										</div>
61
 										</div>
62
+										 -->
61
 										<div class="col-xs-3 itp_ip itp_noMar">
63
 										<div class="col-xs-3 itp_ip itp_noMar">
62
 											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
64
 											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
63
 										</div>
65
 										</div>
66
+										
64
 									</div>
67
 									</div>
65
 								</form>
68
 								</form>
66
 							</div>
69
 							</div>

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

@@ -148,7 +148,7 @@ let pageObj = {
148
 			
148
 			
149
 			$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SRTN_WHS_NM').show();
149
 			$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SRTN_WHS_NM').show();
150
 			$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SSPPLY_NM').show();
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
 			$('#ITP_BTN_RTNMNG06010_EXCEL').show();
153
 			$('#ITP_BTN_RTNMNG06010_EXCEL').show();
154
 			
154
 			
@@ -292,6 +292,7 @@ let listObj = {
292
 		});
292
 		});
293
 		
293
 		
294
 		// 매장/창고 조회 버튼 클릭
294
 		// 매장/창고 조회 버튼 클릭
295
+		/*
295
 		$('#ITP_BTN_RTNMNG06010_SEARCH_POP_SWHS_NM').on('click', function() {
296
 		$('#ITP_BTN_RTNMNG06010_SEARCH_POP_SWHS_NM').on('click', function() {
296
 			_this.popup('whs');
297
 			_this.popup('whs');
297
 		});
298
 		});
@@ -300,6 +301,7 @@ let listObj = {
300
 			$('#ITP_FORM_RTNMNG06010_SEARCH_SWHS_NM').val('');
301
 			$('#ITP_FORM_RTNMNG06010_SEARCH_SWHS_NM').val('');
301
 			$('#ITP_FORM_RTNMNG06010_SEARCH_SWHS_ID').val('');
302
 			$('#ITP_FORM_RTNMNG06010_SEARCH_SWHS_ID').val('');
302
 		});
303
 		});
304
+		*/
303
 		
305
 		
304
 		// 매장/창고 조회 버튼 클릭
306
 		// 매장/창고 조회 버튼 클릭
305
 		$('#ITP_BTN_RTNMNG06010_SEARCH_POP_SRTN_WHS_NM').on('click', function() {
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
 <section id="ITP_MOBILE_MCOLLMNG01010">
1
 <section id="ITP_MOBILE_MCOLLMNG01010">
2
 	<div id="ITP_AJAX_MCOLLMNG01010_LIST_CONTAINER" style="display: none;">
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
 		  <input type="hidden" id="ITP_FORM_MCOLLMNG01010_SEARCH_BRAND_ID" name="sbrandId" value="">
4
 		  <input type="hidden" id="ITP_FORM_MCOLLMNG01010_SEARCH_BRAND_ID" name="sbrandId" value="">
5
 		  <input type="hidden" id="ITP_FORM_MCOLLMNG01010_SEARCH_STORE_ID" name="sstoreId" value="">
5
 		  <input type="hidden" id="ITP_FORM_MCOLLMNG01010_SEARCH_STORE_ID" name="sstoreId" value="">
6
 		  <input type="hidden" id="ITP_FORM_MCOLLMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
6
 		  <input type="hidden" id="ITP_FORM_MCOLLMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
@@ -57,31 +57,31 @@
57
 			<div id="ITP_LIST_MCOLLMNG01010_LIST_ITEM_AREA" class="scroll_area row-3">
57
 			<div id="ITP_LIST_MCOLLMNG01010_LIST_ITEM_AREA" class="scroll_area row-3">
58
 			  <ul id="ITP_LIST_MCOLLMNG01010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
58
 			  <ul id="ITP_LIST_MCOLLMNG01010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
59
 			  <div id="ITP_LIST_MCOLLMNG01010_LIST_ITEM_ROWCOPY" style="display: none;">
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
 				  <div class="">
61
 				  <div class="">
62
 					<div class="left">
62
 					<div class="left">
63
 					  <div class="nomal">
63
 					  <div class="nomal">
64
-						<label>브랜드명</label>
64
+						<label class="col_6">반품발주상태</label>
65
 						<span>:</span>
65
 						<span>:</span>
66
-					    <div class="fnBrandNm"></div>
67
-						<label>발주번호</label>
66
+					    <div class=" fnRtnOdrStNm"></div>
67
+						<label class="col_6">반품발주일자</label>
68
 						<span>:</span>
68
 						<span>:</span>
69
-					    <div class="fnPchPodrUnqNo"></div>
69
+					    <div class=" fnRtnOdrRegDt"></div>
70
 					  </div>
70
 					  </div>
71
 					</div>
71
 					</div>
72
 					<div class="left">
72
 					<div class="left">
73
 					  <div class="nomal">
73
 					  <div class="nomal">
74
-						<label class="lit">반품발주상태</label>
74
+						<label>브랜드명</label>
75
 						<span>:</span>
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
 						<span>:</span>
78
 						<span>:</span>
79
-					    <div class="lit fnRtnOdrRegDt"></div>
79
+					    <div class="fnPchPodrUnqNo"></div>
80
 					  </div>
80
 					  </div>
81
 					</div>
81
 					</div>
82
 					<div class="left">
82
 					<div class="left">
83
 					  <div class="nomal">
83
 					  <div class="nomal">
84
-						<label class="col_6">수거요청일</label>
84
+						<label class="">수거요청일</label>
85
 						<span>:</span>
85
 						<span>:</span>
86
 					    <div class="fnColReqDt"></div>
86
 					    <div class="fnColReqDt"></div>
87
 						<label>수거장소</label>
87
 						<label>수거장소</label>
@@ -106,7 +106,7 @@
106
 	  </form>
106
 	  </form>
107
 	</div>
107
 	</div>
108
 	<div id="ITP_AJAX_MCOLLMNG01010_VIEW_CONTAINER" style="display: none;">
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
 		<input type="hidden" id="ITP_FORM_MCOLLMNG01010_VIEW_VIEW_CD" name="viewCd" value="C">
110
 		<input type="hidden" id="ITP_FORM_MCOLLMNG01010_VIEW_VIEW_CD" name="viewCd" value="C">
111
 		  <div class="content">
111
 		  <div class="content">
112
 			 <div class="content_fix">
112
 			 <div class="content_fix">
@@ -160,7 +160,7 @@
160
 			<div id="ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA" class="scroll_area row-5">
160
 			<div id="ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA" class="scroll_area row-5">
161
 			  <ul id="ITP_LIST_MCOLLMNG01010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
161
 			  <ul id="ITP_LIST_MCOLLMNG01010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
162
 			  <div id="ITP_LIST_MCOLLMNG01010_VIEW_ITEM_ROWCOPY" style="display: none;">
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
 				  <div>
164
 				  <div>
165
 					<div class="left">
165
 					<div class="left">
166
 					  <div class="nomal">
166
 					  <div class="nomal">
@@ -204,7 +204,7 @@
204
 					</div>
204
 					</div>
205
 					<div class="left">
205
 					<div class="left">
206
 					  <div class="nomal">
206
 					  <div class="nomal">
207
-						<label class="col_6">수거요청일</label>
207
+						<label class="">수거요청일</label>
208
 						<span>:</span>
208
 						<span>:</span>
209
 					    <div class="fnColReqDt"></div>
209
 					    <div class="fnColReqDt"></div>
210
 					  </div>
210
 					  </div>

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

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

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

@@ -54,9 +54,9 @@
54
 				  <div class="">
54
 				  <div class="">
55
 					<div class="left">
55
 					<div class="left">
56
 					  <div class="nomal">
56
 					  <div class="nomal">
57
-						<label class="col_0">브랜드명</label>
57
+						<label class="">브랜드명</label>
58
 						<span>:</span>
58
 						<span>:</span>
59
-					    <div class="col_88 fnBrandNm"></div>
59
+					    <div class="fnBrandNm"></div>
60
 						<label>수거서번호</label>
60
 						<label>수거서번호</label>
61
 						<span>:</span>
61
 						<span>:</span>
62
 					    <div class="fnColPickUnqNo"></div>
62
 					    <div class="fnColPickUnqNo"></div>
@@ -64,7 +64,7 @@
64
 					</div>
64
 					</div>
65
 					<div class="left">
65
 					<div class="left">
66
 					  <div class="nomal">
66
 					  <div class="nomal">
67
-						<label class="col_6">수거서상태</label>
67
+						<label class="">수거서상태</label>
68
 						<span>:</span>
68
 						<span>:</span>
69
 					    <div class="fnPickStNm"></div>
69
 					    <div class="fnPickStNm"></div>
70
 						<label>수거일자</label>
70
 						<label>수거일자</label>
@@ -84,9 +84,9 @@
84
 					</div>
84
 					</div>
85
 					<div class="left">
85
 					<div class="left">
86
 					  <div class="nomal">
86
 					  <div class="nomal">
87
-						<label class="col_0">품목수량</label>
87
+						<label class="">품목수량</label>
88
 						<span>:</span>
88
 						<span>:</span>
89
-					    <div class="col_88 fnColReqQty"></div>
89
+					    <div class="fnColReqQty"></div>
90
 						<label>수거총금액</label>
90
 						<label>수거총금액</label>
91
 						<span>:</span>
91
 						<span>:</span>
92
 					  	<div class="fnColReqAmt"></div>
92
 					  	<div class="fnColReqAmt"></div>
@@ -94,9 +94,9 @@
94
 					</div>
94
 					</div>
95
 					<div class="left">
95
 					<div class="left">
96
 					  <div class="nomal">
96
 					  <div class="nomal">
97
-						<label class="col_0">수거장소</label>
97
+						<label class="">수거장소</label>
98
 						<span>:</span>
98
 						<span>:</span>
99
-					    <div class="col_88 fnWhsNm"></div>
99
+					    <div class="fnWhsNm"></div>
100
 						<label>수거담당자</label>
100
 						<label>수거담당자</label>
101
 						<span>:</span>
101
 						<span>:</span>
102
 					    <div class="fnPickMgrNm"></div>
102
 					    <div class="fnPickMgrNm"></div>
@@ -211,9 +211,9 @@
211
 				  <div>
211
 				  <div>
212
 					<div class="left">
212
 					<div class="left">
213
 					  <div class="nomal">
213
 					  <div class="nomal">
214
-						<label>수거발주번호</label>
214
+						<label class="col_2">수거발주번호</label>
215
 						<span>:</span>
215
 						<span>:</span>
216
-					    <div class="col_5 fnRtnPodrUnqNo"></div>
216
+					    <div class="text_6 fnRtnPodrUnqNo"></div>
217
 						<label class="col_0">품목아이디</label>
217
 						<label class="col_0">품목아이디</label>
218
 						<span>:</span>
218
 						<span>:</span>
219
 					    <div class="fnItemId"></div>
219
 					    <div class="fnItemId"></div>
@@ -221,20 +221,20 @@
221
 					</div>
221
 					</div>
222
 					<div class="left">
222
 					<div class="left">
223
 					  <div class="nomal">
223
 					  <div class="nomal">
224
-						<label class="col_3">품목명</label>
224
+						<label class="">품목명</label>
225
 						<span>:</span>
225
 						<span>:</span>
226
 					    <div class="fnItemNm"></div>
226
 					    <div class="fnItemNm"></div>
227
-						<label>수거요청수량</label>
227
+						<label class="col_2">수거요청수량</label>
228
 						<span>:</span>
228
 						<span>:</span>
229
 					    <div class="fnRodrQty"></div>
229
 					    <div class="fnRodrQty"></div>
230
 					  </div>
230
 					  </div>
231
 					</div>
231
 					</div>
232
 					<div class="left">
232
 					<div class="left">
233
 					  <div class="nomal">
233
 					  <div class="nomal">
234
-						<label class="col_3">수거수량</label>
234
+						<label class="">수거수량</label>
235
 						<span>:</span>
235
 						<span>:</span>
236
 					    <div class="fnColReqQty"></div>
236
 					    <div class="fnColReqQty"></div>
237
-						<label>수거사유구분</label>
237
+						<label class="col_2">수거사유구분</label>
238
 						<span>:</span>
238
 						<span>:</span>
239
 					    <div class="fnRtnRsnDvsnNm"></div>
239
 					    <div class="fnRtnRsnDvsnNm"></div>
240
 					  </div>
240
 					  </div>
@@ -249,7 +249,7 @@
249
 	  </form>
249
 	  </form>
250
 	</div>
250
 	</div>
251
 	<div id="ITP_MOBILE_JS"></div>
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
 		<div class="pop">
253
 		<div class="pop">
254
 			<div class="header">
254
 			<div class="header">
255
 				<div class="header_left">
255
 				<div class="header_left">
@@ -272,79 +272,7 @@
272
 			</div>
272
 			</div>
273
 			<div id="ITP_LIST_MCOLLMNG03010_POP_WHS_AREA" class="popup_scroll">
273
 			<div id="ITP_LIST_MCOLLMNG03010_POP_WHS_AREA" class="popup_scroll">
274
 				<ul id="ITP_LIST_MCOLLMNG03010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
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
 					<li class="row_2 item-row">
276
 					<li class="row_2 item-row">
349
 						<div class="scroll_left">
277
 						<div class="scroll_left">
350
 							<div class="fnWhsNm">브랜드 창고 명A</div>
278
 							<div class="fnWhsNm">브랜드 창고 명A</div>

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

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

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

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

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

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

+ 13 - 26
src/main/webapp/mobile/css/style.css

@@ -506,13 +506,13 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
506
 .scroll_area li .detail_right .detail_info div {width: auto; font-size: 14px; font-weight: 100;}
506
 .scroll_area li .detail_right .detail_info div {width: auto; font-size: 14px; font-weight: 100;}
507
 .scroll_area li .detail_right .detail_info i {width: auto; font-size: 1rem; margin: 0 20px;}
507
 .scroll_area li .detail_right .detail_info i {width: auto; font-size: 1rem; margin: 0 20px;}
508
 
508
 
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;}
509
+.scroll_area li .left .nomal  {position:relative; display:flex; width: 100%; height:28px; float:left; text-align: left; font-size: 1.2rem;}
510
 .scroll_area li .left .nomal.btn {width:290px; left:44%; padding:0;}
510
 .scroll_area li .left .nomal.btn {width:290px; left:44%; padding:0;}
511
 .scroll_area li .left .nomal .half {float:left;}
511
 .scroll_area li .left .nomal .half {float:left;}
512
 .scroll_area li .left .nomal .half label {min-width:auto;}
512
 .scroll_area li .left .nomal .half label {min-width:auto;}
513
 .scroll_area li .left .nomal .half div {min-width:auto; margin-right:5px; margin-top:0;}
513
 .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;}
514
+.scroll_area li .left .nomal  input{ width:calc(50% - 85px);height:28px; top:-5px; position:relative;}
515
+.scroll_area li .left .nomal  select{ width:calc(50% - 85px); height:28px; top:-5px; position:relative;}
516
 
516
 
517
 .scroll_area li .scroll_btn {width:10%; height:158px; margin-top:-5px; display:inline-flex;}
517
 .scroll_area li .scroll_btn {width:10%; height:158px; margin-top:-5px; display:inline-flex;}
518
 
518
 
@@ -520,7 +520,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
520
 .scroll_area li .scroll_btn input:checked ~ .scroll_btn {background:#eee;}
520
 .scroll_area li .scroll_btn input:checked ~ .scroll_btn {background:#eee;}
521
 .scroll_area li .left .nomal .lit{font-size:11pt;}
521
 .scroll_area li .left .nomal .lit{font-size:11pt;}
522
 .scroll_area li .left .nomal div.lit {padding-right:2px;}
522
 .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;}
523
+.scroll_area li .left .nomal span {position:relative; width:5px; font-size:15px; font-weight:700;}
524
 .scroll_area li .left .nomal span.mg0 {margin:0;}
524
 .scroll_area li .left .nomal span.mg0 {margin:0;}
525
 
525
 
526
 .scroll_area li .left .nomal .btn_bar{position: relative; width: auto; font-size: 2.2rem;}
526
 .scroll_area li .left .nomal .btn_bar{position: relative; width: auto; font-size: 2.2rem;}
@@ -532,33 +532,20 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
532
 .scroll_area li .left .nomal .m_btn_bar button div{position:relative; width:10px; top:-2px; left:2px;}
532
 .scroll_area li .left .nomal .m_btn_bar button div{position:relative; width:10px; top:-2px; left:2px;}
533
 .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;}
533
 .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
 
534
 
535
-.scroll_area li .left .nomal label{position:relative; top:-5px; font-size:12pt; font-weight:100; min-width:75px; text-align:left;}
535
+.scroll_area li .left .nomal label{position:relative; font-size:12pt; font-weight:100; min-width:80px; padding-left:5px; text-align:left;}
536
 .scroll_area li .left .nomal label.sub_info{min-width: auto; display: inline-flex;}
536
 .scroll_area li .left .nomal label.sub_info{min-width: auto; display: inline-flex;}
537
 
537
 
538
-.scroll_area li .left .nomal label.col_0{min-width: auto;}
539
 .scroll_area li .left .nomal label.col_1{min-width: 45px;}
538
 .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;}
539
+.scroll_area li .left .nomal label.col_3{min-width: 50px;}
540
+.scroll_area li .left .nomal label.col_4{min-width: 65px;}
541
+.scroll_area li .left .nomal label.col_6{min-width: 95px;}
543
 .scroll_area li .left .nomal.over{text-overflow:ellipsis; overflow:hidden; white-space:nowrap;}
542
 .scroll_area li .left .nomal.over{text-overflow:ellipsis; overflow:hidden; white-space:nowrap;}
544
 .scroll_area li .left .nomal i{width: 50px; text-align: center;}
543
 .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;}
544
+.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);}
545
+.scroll_area li .left .nomal .text_6{width:calc(50% - 108px);}
546
+
547
+.scroll_area li .left .nomal div.full{width:240px;}
548
+.scroll_area li .left .nomal div.full_s{width:200px;}
562
 
549
 
563
 
550
 
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;}
551
 .scroll_area li .right {margin: 22px 10px 22px 0; position: relative; display: flex; height:30px; font-size: 1.4rem; font-weight: 700; float: right;}