Home Verkennen Help
Registreren Inloggen
orderqueen
/
oqpo-view
Volgen 3
Ster 0
Vork 0
Bestanden Kwesties 0 Pull-aanvragen 0 Wiki
Bladeren bron

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

dwkim 2 jaren geleden
bovenliggende
cae12d6029 dafb1f5a67
commit
1d4cca3657
4 gewijzigde bestanden met toevoegingen van 199 en 217 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 23 30
      src/main/webapp/mobile/app/mcollmng/MCOLLMNG02010.html
  2. 174 186
      src/main/webapp/mobile/app/mcollmng/MCOLLMNG03010.html
  3. 0 1
      src/main/webapp/mobile/app/mordmng/MORDMNG03010.html
  4. 2 0
      src/main/webapp/mobile/css/style.css

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

@@ -111,7 +111,7 @@
111 111 
 		  </div>
112 112 
 	  </form>
113 113 
 	</div>
114 
-	<div id="ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER" style="display: block;">
114 
+	<div id="ITP_AJAX_MCOLLMNG02010_VIEW_CONTAINER" style="display: none;">
115 115 
 		<form id="ITP_FORM_MCOLLMNG02010_VIEW" class="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">
 
@@ -170,65 +170,58 @@
170 170 
 				</div>
171 171 
 			</div>
172 172 
 		  </div>
173 
-		  <!-- 여기부터 -->
174 173 
 			<div id="ITP_LIST_MCOLLMNG02010_VIEW_ITEM_AREA" class="scroll_area row-5">
175 174 
 			  <ul id="ITP_LIST_MCOLLMNG02010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
176 
-			  <div id="ITP_LIST_MCOLLMNG02010_VIEW_ITEM_ROWCOPY" style="display: block;">
175 
+			  <div id="ITP_LIST_MCOLLMNG02010_VIEW_ITEM_ROWCOPY" style="display: none;">
177 176 
 				<li class="history_list2 item-row">
178 177 
 				  <div>
179 178 
 					<div class="left">
180 179 
 					  <div class="nomal">
181 
-						<label>반품발주항번 &nbsp;:</label>
180 
+						<label>반품발주항번</label>
182 181 
 						<span>:</span>
183 182 
 						  <div class="col_5 fnRtnPodrDtlNo"></div>
184 
-						<label class="col_0">품목아이디&nbsp;:</label>
183 
+						<label class="col_0">품목아이디</label>
185 184 
 						<span>:</span>
186 185 
 						  <div class="fnItemId"></div>
187 186 
 					  </div>
188 187 
 					</div>
189 188 
 					<div class="left">
190 189 
 					  <div class="nomal">
191 
-						<label>품목명 &nbsp;:</label>
190 
+						<label class="col_3">품목명</label>
192 191 
 						<span>:</span>
193 192 
 						  <div class="fnItemNm"></div>
194 
-						<label>수거주문수량&nbsp;:</label>
193 
+						<label>수거주문수량</label>
195 194 
 						<span>:</span>
196 195 
 						  <div class="fnRtnOdrQty"></div>
197 196 
 					  </div>
198 197 
 					</div>
199 198 
 					<div class="left">
200 199 
 					  <div class="nomal">
201 
-						<label>단가 &nbsp;:</label>
200 
+						<label class="col_3">단가</label>
202 201 
 						<span>:</span>
203 202 
 						  <div class="fnUnitAmt"></div>
204 
-						<label>단위&nbsp;:</label>
203 
+						<label class="col_3">단위</label>
205 204 
 						<span>:</span>
206 205 
 						  <div class="fnUnit"></div>
207 206 
 					  </div>
208 207 
 					</div>
209 208 
 					<div class="left">
210 209 
 					  <div class="nomal">
211 
-						<label>수거수량 &nbsp;:</label>
210 
+						<label class="col_3">수거수량</label>
212 211 
 						<span>:</span>
213 
-						<div class="">
214 
-						  <input id="ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY" type="text" name="colQty">
215 
-						</div>
216 
-						<label>수거구분&nbsp;:</label>
212 
+					    <input id="ITP_FORM_MCOLLMNG02010_VIEW_COL_QTY" type="text" name="colQty">
213 
+						<label class="col_3">수거구분</label>
217 214 
 						<span>:</span>
218 
-						<div class="">
219 
-							<select style="width:85px" name="rtnRsnDvsn" id="ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN_DVSN" data-select-code="RTN_RSN_DVSN">
220 
-								<option value=""></option>
221 
-							</select>
222 
-						</div>
215 
+						<select name="rtnRsnDvsn" id="ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN_DVSN" data-select-code="RTN_RSN_DVSN">
216 
+							<option value=""></option>
217 
+						</select>
223 218 
 					  </div>
224 219 
 					</div>
225 220 
 					<div class="left">
226 221 
 					  <div class="nomal">
227 
-						<label>비고 &nbsp;:</label>
222 
+						<label class="col_3">비고</label>
228 223 
 						<span>:</span>
229 
-						<div>
230 
-							<input id="ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN" type="text" name="rtnRsn">
231 
-		              	</div>
224 
+						<input id="ITP_FORM_MCOLLMNG02010_VIEW_RTN_RSN" style="top:-4px;" type="text" name="rtnRsn">
232 225 
 					  </div>
233 226 
 					</div>
234 227 
 				  </div>
 
@@ -236,7 +229,7 @@
236 229 
 			</div>
237 230 
 		  </div>
238 231 
 		  <div class="button_bar">
239 
-			<button id="ITP_BTN_MCOLLMNG02010_VIEW_COL_ADD" class="btn_col_6 btn-primary CRT">생성</button>
232 
+			<button id="ITP_BTN_MCOLLMNG02010_VIEW_COL_ADD" class="btn_col_6 btn-m-orange CRT">생성</button>
240 233 
 			<button id="ITP_BTN_MCOLLMNG02010_VIEW_CANCEL_LIST" class="btn_col_3 btn-gray CLB">취소</button>
241 234 
 		  </div>
242 235 
 	  </form>
 
@@ -246,7 +239,7 @@
246 239 
 		<div class="pop">
247 240 
 			<div class="header">
248 241 
 				<div class="header_left">
249 
-					<label>> 납품장소</label>
242 
+					<label>납품장소</label>
250 243 
 				</div>
251 244 
 				<div class="header_right">
252 245 
 					<button type="button" id="ITP_BTN_MCOLLMNG02010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
 
@@ -260,16 +253,16 @@
260 253 
 					<button id="ITP_BTN_MCOLLMNG02010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
261 254 
 				</form>
262 255 
 			</div>
263 
-			<div class="search_bar">
264 
-				<button id="ITP_BTN_MCOLLMNG02010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
256 
+			<div class="select_btn">
257 
+				<button id="ITP_BTN_MCOLLMNG02010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
265 258 
 			</div>
266 259 
 			<div id="ITP_LIST_MCOLLMNG02010_POP_WHS_AREA" class="popup_scroll">
267 
-				<ul id="ITP_LIST_MCOLLMNG02010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
260 
+				<ul id="ITP_LIST_MCOLLMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
268 261 
 				<div id="ITP_LIST_MCOLLMNG02010_POP_WHS_ROWCOPY" style="display:none;">
269 
-					<li class="list-row">
262 
+					<li class="row_2 item-row">
270 263 
 						<div class="scroll_left">
271 264 
 							<div class="fnWhsNm">브랜드 창고 명A</div>
272 
-							<div class="fnLocationNm">(상세위치내용)</div>
265 
+							<div class="wichi fnLocationNm">(상세위치내용)</div>
273 266 
 						</div>
274 267 
 						<div class="scroll_right">
275 268 
 							<button id="ITP_BTN_MCOLLMNG02010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

+ 174 - 186
src/main/webapp/mobile/app/mcollmng/MCOLLMNG03010.html
Bestand weergeven 

@@ -6,115 +6,107 @@
6 6 
 		  <input type="hidden" id="ITP_FORM_MCOLLMNG03010_SEARCH_STORE_ID" name="sstoreId" value="">
7 7 
 		  <input type="hidden" id="ITP_FORM_MCOLLMNG03010_SEARCH_SPPLY_ID" name="sspplyId" value="">
8 8 
 		  <div class="content">
9 
-			<div class="line">
10 
-			  <label>수거장소</label>
11 
-				<div class="search_wrap">
9 
+			  <div class="content_fix">
10 
+			  	<div class="line header">
11 
+					<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">수거서현황</div>
12 
+		      	</div>
13 
+				<div class="line">
14 
+				  <label>수거장소</label>
12 15 
 					<div class="float_left">
13 16 
 						<input id="ITP_FORM_MCOLLMNG03010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="A매장명">
14 17 
 						<input type="hidden" id="ITP_FORM_MCOLLMNG03010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
18 
+						<div class="itp_input_btn">
19 
+							<button type="button" id="ITP_BTN_MCOLLMNG03010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
20 
+						</div>
15 21 
 					</div>
16 
-					<div class="float_left_btn">
17 
-						<button type="button" id="ITP_BTN_MCOLLMNG03010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
22 
+					<div class="float_right_btn">
18 23 
 						<button type="button" id="ITP_BTN_MCOLLMNG03010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
19 24 
 					</div>
20 25 
 				</div>
21 
-			</div>
22 
-			<div class="line">
23 
-			  <label>수거일자</label>
24 
-				<div class="date_to">
25 
-					<input type="text" id="ITP_FORM_MCOLLMNG03010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
26 
-					<div class="at">~</div>
27 
-					<input type="text" id="ITP_FORM_MCOLLMNG03010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date">
26 
+				<div class="line">
27 
+				  <label>수거일자</label>
28 
+					<div class="date_to">
29 
+						<input type="text" id="ITP_FORM_MCOLLMNG03010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
30 
+						<div class="at">~</div>
31 
+						<input type="text" id="ITP_FORM_MCOLLMNG03010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date">
32 
+					</div>
33 
+				</div>
34 
+				<div class="line">
35 
+					<label>검색명</label>
36 
+				  <div class="float_left name">
37 
+					  <input id="ITP_FORM_MCOLLMNG03010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="발주번호/품목명">
38 
+				  </div>
39 
+				</div>
40 
+				<div class="line">
41 
+				  <div class="search">
42 
+					<button id="ITP_BTN_MCOLLMNG03010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
43 
+				  </div>
44 
+				</div>
45 
+				<div class="table_header">
46 
+				  <h1><수주 내역></h1>
28 47 
 				</div>
29 
-			</div>
30 
-			<div class="line">
31 
-				<label>발주번호/품목명</label>
32 
-			  <div class="search_wrap">
33 
-				  <input id="ITP_FORM_MCOLLMNG03010_LIST_ITEM_NM" name="sitemNm" style="width: 262px;" type="text" placeholder="검색어입력">
34 
-			  </div>
35 
-			</div>
36 
-			<div class="line" style="height:45px;">
37 
-			  <div class="search">
38 
-				<button id="ITP_BTN_MCOLLMNG03010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
39 
-			  </div>
40 
-			</div>
41 
-			<div class="table_header">
42 
-			  <h1>> 수주 내역</h1>
43 48 
 			</div>
44 49 
 		  </div>
45 50 
 		  <div id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_AREA" class="scroll_area row-2">
46 
-			  <ul id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWS" class="panel-group"></ul>
51 
+			  <ul id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
47 52 
 			  <div id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_ROWCOPY" style="display: none;">
48 
-				<li class="history_list3 list-row">
49 
-				  <div class="scroll_btn">
50 
-			  		<input type="checkbox" id="ITP_LIST_MCOLLMNG03010_LIST_ITEM_CHECKBOX">
51 
-			  	  </div>
52 
-				  <div class="btn_check">
53 
+				<li class="history_list4 item-row">
54 
+				  <div class="">
53 55 
 					<div class="left">
54 56 
 					  <div class="nomal">
55 
-						<label class="col_0">브랜드명 &nbsp;:</label>
56 
-						<div>
57 
-						  <div class="fnBrandNm space1"></div>
58 
-						</div>
59 
-						<label>수거서번호&nbsp;:</label>
60 
-						<div>
61 
-						  <div class="fnColPickUnqNo"></div>
62 
-						</div>
57 
+						<label class="col_0">브랜드명</label>
58 
+						<span>:</span>
59 
+					    <div class="col_88 fnBrandNm"></div>
60 
+						<label>수거서번호</label>
61 
+						<span>:</span>
62 
+					    <div class="fnColPickUnqNo"></div>
63 63 
 					  </div>
64 64 
 					</div>
65 65 
 					<div class="left">
66 66 
 					  <div class="nomal">
67 
-						<label class="col_6">수거서상태 &nbsp;:</label>
68 
-						<div>
69 
-						  <div class="fnPickStNm"></div>
70 
-						</div>
71 
-						<label class="col_0">수거일자&nbsp;:</label>
72 
-						<div>
73 
-						  <div class="fnColRegDt"></div>
74 
-						</div>
67 
+						<label class="col_6">수거서상태</label>
68 
+						<span>:</span>
69 
+					    <div class="fnPickStNm"></div>
70 
+						<label>수거일자</label>
71 
+						<span>:</span>
72 
+					    <div class="fnColRegDt"></div>
75 73 
 					  </div>
76 74 
 					</div>
77 75 
 					<div class="left">
78 76 
 					  <div class="nomal">
79 
-						<label>수거요청일&nbsp;:</label>
80 
-						<div>
81 
-						  <div class="fnColReqDt"></div>
82 
-						</div>
83 
-						<label>수거예정일&nbsp;:</label>
84 
-						<div>
85 
-						  <div class="fnColSchDt"></div>
86 
-						</div>
77 
+						<label>수거요청일</label>
78 
+						<span>:</span>
79 
+					    <div class="fnColReqDt"></div>
80 
+						<label>수거예정일</label>
81 
+						<span>:</span>
82 
+					    <div class="fnColSchDt"></div>
87 83 
 					  </div>
88 84 
 					</div>
89 85 
 					<div class="left">
90 86 
 					  <div class="nomal">
91 
-						<label class="col_0">품목수량 &nbsp;:</label>
92 
-						<div>
93 
-						  <div class="fnColReqQty space1"></div>
94 
-						</div>
95 
-						<label>수거총금액&nbsp;:</label>
96 
-						<div>
97 
-						  <div class="fnColReqAmt"></div>
98 
-						</div>
87 
+						<label class="col_0">품목수량</label>
88 
+						<span>:</span>
89 
+					    <div class="col_88 fnColReqQty"></div>
90 
+						<label>수거총금액</label>
91 
+						<span>:</span>
92 
+					  	<div class="fnColReqAmt"></div>
99 93 
 					  </div>
100 94 
 					</div>
101 95 
 					<div class="left">
102 96 
 					  <div class="nomal">
103 
-						<label class="col_0">수거장소 &nbsp;:</label>
104 
-						<div>
105 
-						  <div class="fnWhsNm space1"></div>
106 
-						</div>
107 
-						<label>수거담당자&nbsp;:</label>
108 
-						<div>
109 
-						  <div class="fnPickMgrNm space0"></div>
110 
-						</div>
97 
+						<label class="col_0">수거장소</label>
98 
+						<span>:</span>
99 
+					    <div class="col_88 fnWhsNm"></div>
100 
+						<label>수거담당자</label>
101 
+						<span>:</span>
102 
+					    <div class="fnPickMgrNm"></div>
111 103 
 					  </div>
112 104 
 					</div>
113 105 
 				  </div>
114 106 
 				</li>
115 107 
 			</div>
116 108 
 			<div class="button_bar">
117 
-			  <button id="ITP_BTN_MCOLLMNG03010_LIST_COL_VIEW" class="ok col_12 btn-primary IVDETAIL">수거서보기</button>
109 
+			  <button id="ITP_BTN_MCOLLMNG03010_LIST_COL_VIEW" class="ok col_12 btn-m-orange IVDETAIL">수거서보기</button>
118 110 
 			  <!--<button id="ITP_BTN_MCOLLMNG03010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
119 111 
 			</div>
120 112 
 		  </div>
 
@@ -124,131 +116,127 @@
124 116 
 		<form id="ITP_FORM_MCOLLMNG03010_VIEW" class="form-horizontal" onsubmit="return false;">
125 117 
 		  <input type="hidden" id="ITP_FORM_MCOLLMNG03010_VIEW_VIEW_CD" name="viewCd" value="C">
126 118 
 		  <div class="detail_content">
127 
-			<div class="detail_header">
128 
-			  <div class="detail_logo"></div>
129 
-			  <div class="detail_ok">
130 
-				<label>수거 확인서</label>
131 
-			  </div>
132 
-			</div>
133 
-			<div class="detail_confirmation">
134 
-			  <div class="detail_col">
135 
-				<label>발행일</label>
136 
-				<i>:</i>
137 
-				<div class="fnColRegDt"></div>
138 
-			  </div>
139 
-			  <div class="detail_col">
140 
-				<label>수거확인번호</label>
141 
-				<i>:</i>
142 
-				<div class="fnColPickUnqNo"></div>
143 
-			  </div>
144 
-			  <div class="detail_col">
145 
-				<label>수거일</label>
146 
-				<i>:</i>
147 
-				<div class="fnColSchDt"></div>
148 
-			  </div>
149 
-			  <div class="detail_col">
150 
-				<label>수거담당자</label>
151 
-				<i>:</i>
152 
-				<div class="fnPickMgrNm"></div>
153 
-			  </div>
154 
-			  <div class="detail_col">
155 
-				<label>수거장소</label>
156 
-				<i>:</i>
157 
-				<div class="fnWhsAddr"></div>
158 
-			  </div>
159 
-			  <div class="detail_col">
160 
-				<label>전화번호</label>
161 
-				<i>:</i>
162 
-				<div class="fnPndrTelNo"></div>
163 
-			  </div>
164 
-			</div>
165 
-			<div class="detail_company_info">
166 
-			  <div class="info_left">
167 
-				<div class="weight">
168 
-				  <label>반품처</label>
169 
-				</div>
170 
-				<div class="company_info">
171 
-				  <label>등록번호&nbsp;:&nbsp;</label>
172 
-				  <div class="fnRtnBsnsRegno"></div>
173 
-				</div>
174 
-				<div class="company_info">
175 
-				  <label>상호&nbsp;:&nbsp;</label>
176 
-				  <div class="fnRtnNm"></div>
177 
-				</div>
178 
-				<div class="company_info">
179 
-				  <label>성명&nbsp;:&nbsp;</label>
180 
-				  <div class="fnRtnOwnerNm"></div>
181 
-				</div>
182 
-				<div class="company_info">
183 
-				  <label>주소&nbsp;:&nbsp;</label>
184 
-				  <div class="fnRtnAddr"></div>
185 
-				</div>
186 
-			  </div>
187 
-			  <div class="info_left">
188 
-				<div class="weight">
189 
-				  <label>수거처</label>
190 
-				</div>
191 
-				<div class="company_info">
192 
-				  <label>등록번호&nbsp;:&nbsp;</label>
193 
-				  <div class="fnColBsnsRegNo"></div>
119 
+			  <div class="detail_content_fix">
120 
+				<div class="detail_header">
121 
+				  <div class="detail_logo"><img src=""></div>
122 
+				  <div class="detail_ok">
123 
+					<label>수거 확인서</label>
124 
+				  </div>
194 125 
 				</div>
195 
-				<div class="company_info">
196 
-				  <label>상호&nbsp;:&nbsp;</label>
197 
-				  <div class="fnColNm"></div>
126 
+				<div class="detail_confirmation">
127 
+				  <div class="detail_col">
128 
+					<label>발행일</label>
129 
+					<i>:</i>
130 
+					<div class="fnColRegDt"></div>
131 
+				  </div>
132 
+				  <div class="detail_col">
133 
+					<label>수거확인번호</label>
134 
+					<i>:</i>
135 
+					<div class="fnColPickUnqNo"></div>
136 
+				  </div>
137 
+				  <div class="detail_col">
138 
+					<label>수거일</label>
139 
+					<i>:</i>
140 
+					<div class="fnColSchDt"></div>
141 
+				  </div>
142 
+				  <div class="detail_col">
143 
+					<label>수거담당자</label>
144 
+					<i>:</i>
145 
+					<div class="fnPickMgrNm"></div>
146 
+				  </div>
147 
+				  <div class="detail_col">
148 
+					<label>수거장소</label>
149 
+					<i>:</i>
150 
+					<div class="fnWhsAddr"></div>
151 
+				  </div>
152 
+				  <div class="detail_col">
153 
+					<label>전화번호</label>
154 
+					<i>:</i>
155 
+					<div class="fnPndrTelNo"></div>
156 
+				  </div>
198 157 
 				</div>
199 
-				<div class="company_info">
200 
-				  <label>성명&nbsp;:&nbsp;</label>
201 
-				  <div class="fnColOwnerNm"></div>
158 
+				<div class="detail_company_info">
159 
+				  <div class="info_left">
160 
+					<div class="weight">
161 
+					  <label>반품처</label>
162 
+					</div>
163 
+					<div class="company_info">
164 
+					  <label>등록번호&nbsp;:&nbsp;</label>
165 
+					  <div class="fnRtnBsnsRegno"></div>
166 
+					</div>
167 
+					<div class="company_info">
168 
+					  <label>상호&nbsp;:&nbsp;</label>
169 
+					  <div class="fnRtnNm"></div>
170 
+					</div>
171 
+					<div class="company_info">
172 
+					  <label>성명&nbsp;:&nbsp;</label>
173 
+					  <div class="fnRtnOwnerNm"></div>
174 
+					</div>
175 
+					<div class="company_info">
176 
+					  <label>주소&nbsp;:&nbsp;</label>
177 
+					  <div class="fnRtnAddr"></div>
178 
+					</div>
179 
+				  </div>
180 
+				  <div class="info_left">
181 
+					<div class="weight">
182 
+					  <label>수거처</label>
183 
+					</div>
184 
+					<div class="company_info">
185 
+					  <label>등록번호&nbsp;:&nbsp;</label>
186 
+					  <div class="fnColBsnsRegNo"></div>
187 
+					</div>
188 
+					<div class="company_info">
189 
+					  <label>상호&nbsp;:&nbsp;</label>
190 
+					  <div class="fnColNm"></div>
191 
+					</div>
192 
+					<div class="company_info">
193 
+					  <label>성명&nbsp;:&nbsp;</label>
194 
+					  <div class="fnColOwnerNm"></div>
195 
+					</div>
196 
+					<div class="company_info">
197 
+					  <label>주소&nbsp;:&nbsp;</label>
198 
+					  <div class="fnColAddr"></div>
199 
+					</div>
200 
+				  </div>
202 201 
 				</div>
203 
-				<div class="company_info">
204 
-				  <label>주소&nbsp;:&nbsp;</label>
205 
-				  <div class="fnColAddr"></div>
202 
+				<div class="table_header">
203 
+				  <h1><수거 상세 내역></h1>
206 204 
 				</div>
207 
-			  </div>
208 
-			</div>
209 
-			<div class="table_header">
210 
-			  <h1>> 수거 상세 내역</h1>
211 205 
 			</div>
212 206 
 		  </div>
213 207 
 			<div id="ITP_LIST_MCOLLMNG03010_VIEW_ITEM_AREA" class="scroll_area row-7">
214 
-				 <ul id="ITP_LIST_MCOLLMNG03010_VIEW_ITEM_ROWS" class="panel-group"></ul>
208 
+				 <ul id="ITP_LIST_MCOLLMNG03010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
215 209 
 				 <div id="ITP_LIST_MCOLLMNG03010_VIEW_ITEM_ROWCOPY" style="display: none;">
216 
-				<li class="history_list5 list-row">
210 
+				<li class="history_list10 item-row">
217 211 
 				  <div>
218 212 
 					<div class="left">
219 213 
 					  <div class="nomal">
220 
-						<label>수거발주번호 &nbsp;:</label>
221 
-						<div class="col_5">
222 
-						  <div class="col_5 fnRtnPodrUnqNo"></div>
223 
-						</div>
224 
-						<label class="col_0">품목아이디&nbsp;:</label>
225 
-						<div class="space2">
226 
-						  <div class="fnItemId"></div>
227 
-						</div>
214 
+						<label>수거발주번호</label>
215 
+						<span>:</span>
216 
+					    <div class="col_5 fnRtnPodrUnqNo"></div>
217 
+						<label class="col_0">품목아이디</label>
218 
+						<span>:</span>
219 
+					    <div class="fnItemId"></div>
228 220 
 					  </div>
229 221 
 					</div>
230 222 
 					<div class="left">
231 223 
 					  <div class="nomal">
232 
-						<label>품목명 &nbsp;:</label>
233 
-						<div class="space2">
234 
-						  <div class="fnItemNm"></div>
235 
-						</div>
236 
-						<label>수거요청수량&nbsp;:</label>
237 
-						<div class="space2">
238 
-						  <div class="fnRodrQty"></div>
239 
-						</div>
224 
+						<label class="col_3">품목명</label>
225 
+						<span>:</span>
226 
+					    <div class="fnItemNm"></div>
227 
+						<label>수거요청수량</label>
228 
+						<span>:</span>
229 
+					    <div class="fnRodrQty"></div>
240 230 
 					  </div>
241 231 
 					</div>
242 232 
 					<div class="left">
243 233 
 					  <div class="nomal">
244 
-						<label>수거수량 &nbsp;:</label>
245 
-						<div class="space2">
246 
-						  <div class="fnColReqQty"></div>
247 
-						</div>
248 
-						<label>수거사유구분&nbsp;:</label>
249 
-						<div>
250 
-						  <div class="fnRtnRsnDvsnNm"></div>
251 
-						</div>
234 
+						<label class="col_3">수거수량</label>
235 
+						<span>:</span>
236 
+					    <div class="fnColReqQty"></div>
237 
+						<label>수거사유구분</label>
238 
+						<span>:</span>
239 
+					    <div class="fnRtnRsnDvsnNm"></div>
252 240 
 					  </div>
253 241 
 					</div>
254 242 
 				  </div>
 
@@ -265,7 +253,7 @@
265 253 
 		<div class="pop">
266 254 
 			<div class="header">
267 255 
 				<div class="header_left">
268 
-					<label>> 납품장소</label>
256 
+					<label>납품장소</label>
269 257 
 				</div>
270 258 
 				<div class="header_right">
271 259 
 					<button type="button" id="ITP_BTN_MCOLLMNG03010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
 
@@ -279,16 +267,16 @@
279 267 
 					<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
280 268 
 				</form>
281 269 
 			</div>
282 
-			<div class="search_bar">
283 
-				<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
270 
+			<div class="select_btn">
271 
+				<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
284 272 
 			</div>
285 273 
 			<div id="ITP_LIST_MCOLLMNG03010_POP_WHS_AREA" class="popup_scroll">
286 
-				<ul id="ITP_LIST_MCOLLMNG03010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
287 
-				<div id="ITP_LIST_MCOLLMNG03010_POP_WHS_ROWCOPY" style="display:none;">
288 
-					<li class="list-row">
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: none;">
276 
+					<li class="row_2 item-row">
289 277 
 						<div class="scroll_left">
290 278 
 							<div class="fnWhsNm">브랜드 창고 명A</div>
291 
-							<div class="fnLocationNm">(상세위치내용)</div>
279 
+							<div class="wichi fnLocationNm">(상세위치내용)</div>
292 280 
 						</div>
293 281 
 						<div class="scroll_right">
294 282 
 							<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

+ 0 - 1
src/main/webapp/mobile/app/mordmng/MORDMNG03010.html
Bestand weergeven 

@@ -109,7 +109,6 @@
109 109 
 			</div>
110 110 
 		</form>
111 111 
 	</div>
112 
-	<!-- 여기부터 -->
113 112 
 	<div id="ITP_AJAX_MORDMNG03010_VIEW_CONTAINER" style="display: none;">
114 113 
 		<form id="ITP_FORM_MORDMNG03010_VIEW" class="form-horizontal" onsubmit="return false;">
115 114 
 			<input type="hidden" id="ITP_FORM_MORDMNG03010_VIEW_VIEW_CD" name="viewCd" value="C">

+ 2 - 0
src/main/webapp/mobile/css/style.css
Bestand weergeven 

@@ -509,6 +509,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
509 509 
 .scroll_area li .left .nomal .half label {min-width:auto;}
510 510 
 .scroll_area li .left .nomal .half div {min-width:auto; margin-right:5px; margin-top:0;}
511 511 
 .scroll_area li .left .nomal  input{width: 73px; height:28px; top:-5px; position:relative;}
512 
+.scroll_area li .left .nomal  select{width: 73px; height:28px; top:-5px; position:relative;}
512 513
513 514 
 .scroll_area li .scroll_btn {width:10%; height:158px; margin-top:-5px; display:inline-flex;}
514 515 
 
@@ -552,6 +553,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
552 553 
 .scroll_area li .left .nomal .col_75{width:75px;}
553 554 
 .scroll_area li .left .nomal .col_8{width:80px;}
554 555 
 .scroll_area li .left .nomal .col_82{width:82px;}
556 
+.scroll_area li .left .nomal .col_88{width:88px;}
555 557 
 .scroll_area li .left .nomal .col_9{width:90px;}
556 558 
 .scroll_area li .left .nomal .col_10{width:100px;}
557 559