Головна сторінка Огляд Довідка
Реєстрація Увійти
orderqueen
/
oqpo-view
Слідкувати 3
Зірка 0
Відгалуження 0
Файли Проблеми 0 Запити на злиття 0 Wiki
Переглянути джерело

모바일 반품요청 수정

whakdo963 2 роки тому
батько
e6b1bd2415
коміт
57f8c3f7ad
3 змінених файлів з 57 додано та 68 видалено
Розділений вигляд Показати статистику Diff
  1. 20 19
      src/main/webapp/mobile/app/mrtnmng/MRTNMNG01010.html
  2. 32 37
      src/main/webapp/mobile/app/mrtnmng/MRTNMNG02010.html
  3. 5 12
      src/main/webapp/mobile/css/style.css

+ 20 - 19
src/main/webapp/mobile/app/mrtnmng/MRTNMNG01010.html
Переглянути файл 

@@ -34,21 +34,19 @@
34 34 
 						<button id="ITP_BTN_MRTNMNG01010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
35 35 
 					</div>
36 36 
 				</div>
37 
-				<div class="header line">
38 
-					<div class="table_header">
39 
-						<h1><빈품 품목></h1>
40 
-						<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
41 
-						<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MRTNMNG01010_ITEM_AREA">품목추가</button>
42 
-					</div>
37 
+				<div class="table_header">
38 
+					<h1><빈품 품목></h1>
39 
+					<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
40 
+					<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MRTNMNG01010_ITEM_AREA">품목추가</button>
43 41 
 				</div>
44 42 
 			</div>
45 
-			<div id="ITP_LIST_MRTNMNG01010_ITEM_AREA" class="scroll_area row-2-1">
43 
+			<div id="ITP_LIST_MRTNMNG01010_ITEM_AREA" class="scroll_area row-7">
46 44 
 				<ul id="ITP_LIST_MRTNMNG01010_DETAIL_ROWS" class="mb_0 panel-group"></ul>
47 
-				<div id="ITP_LIST_MRTNMNG01010_DETAIL_ROWCOPY" style="display: none;">
45 
+				<div id="ITP_LIST_MRTNMNG01010_DETAIL_ROWCOPY" style="display: grid;"><!-- style="display: grid;" -->
48 46 
 					<li class="list-row">
49 47 
 						<div class="left_info">
50 48 
 			              <div class="check_box">
51 
-			                <input style="width:20px;" type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
49 
+			                <input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
52 50 
 			              </div>
53 51 
 			              <div class="thick">
54 52 
 			              	<label>품목명</label>
 
@@ -129,16 +127,16 @@
129 127 
 				</form>
130 128 
 			</div>
131 129 
 			<div class="select_btn">
132 
-				<button id="ITP_BTN_MRTNMNG01010_POP_WHS_NM" class="btn_blue">반품장소 ▼</button>
130 
+				<button id="ITP_BTN_MRTNMNG01010_POP_WHS_NM" class="btn_blue">반품장소 <img src="../img/arrow_down.png"></button>
133 131 
 			</div>
134 132 
 			<div id="ITP_LIST_MRTNMNG01010_POP_WHS_AREA" class="popup_scroll">
135 133 
 				<ul id="ITP_LIST_MRTNMNG01010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
136 134 
 				<div id="ITP_LIST_MRTNMNG01010_POP_WHS_ROWCOPY" style="display: block;">
137 135 
 					<li class="row_2">
138 136 
 						<div class="scroll_left">
139 
-							<div class="fnWhsNm">브랜드 창고 명A</div>
140 
-							<div class="sub fnLocationNm">(상세위치내용)</div>
141 
-							<div class="sub fnLocationNm">누리자 B/D</div>
137 
+							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>
138 
+							<div class="con_2 sub fnLocationNm">(상세위치내용)</div>
139 
+
142 140 
 						</div>
143 141 
 						<div class="scroll_right">
144 142 
 							<button id="ITP_BTN_MRTNMNG01010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
 
@@ -148,7 +146,7 @@
148 146 
 			</div>
149 147 
 		</div>
150 148 
 	</div>
151 
-	<div id="ITP_POP_MRTNMNG01010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: none;">
149 
+	<div id="ITP_POP_MRTNMNG01010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: block;">
152 150 
 		<div class="pop">
153 151 
 			<div class="header">
154 152 
 				<div class="header_left">
 
@@ -166,17 +164,20 @@
166 164 
 					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
167 165 
 				</div>
168 166 
 				<div class="select_btn">
169 
-					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_NM" class="btn_blue">품목명 ▼</button>
167 
+					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_NM" class="btn_blue">품목명 <img src="../img/arrow_down.png"></button>
170 168 
 				</div>
171 169 
 			</form>
172 170 
 			<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_AREA" class="popup_scroll">
173 171 
 				<ul id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWS" class="mb_0 panel-group"></ul>
174 
-				<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWCOPY" style="display: none;">
172 
+				<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWCOPY" style="display: block;">
175 173 
 					<li class="row_2">
176 174 
 						 <div class="scroll_left">
177 
-                            <div class="fnItemNm"></div>
178 
-                            <div class="sub fnKg"></div>
179 
-                            <div class="amt fnUnitAmt"></div>
175 
+                            <div class="fnItemNm">품목명</div>
176 
+                            <div class="mg_0">
177 
+				                 <div class="sub fnKg">12,000,000</div>
178 
+				                 <div class="type_hide">/</div>
179 
+				                 <div class="amt fnUnitAmt">12,000,000</div>
180 
+			                 </div>
180 181 
                         </div>
181 182 
                         <div class="scroll_right">
182 183 
                             <button id="ITP_BTN_MRTNMNG01010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>

+ 32 - 37
src/main/webapp/mobile/app/mrtnmng/MRTNMNG02010.html
Переглянути файл 

@@ -1,5 +1,5 @@
1 1 
 <section id="ITP_MOBILE_MRTNMNG02010">
2 
-	<div id="ITP_AJAX_MRTNMNG02010_LIST_CONTAINER" style="display: block;">
2 
+	<div id="ITP_AJAX_MRTNMNG02010_LIST_CONTAINER" style="display: none;">
3 3 
 		<div class="content">
4 4 
 			<form id="ITP_FORM_MRTNMNG02010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
5 5 
 				<input type="hidden" id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
 
@@ -46,9 +46,9 @@
46 46 
 				</div>
47 47 
 			</form>
48 48 
 		</div>
49 
-		<div id="ITP_LIST_MRTNMNG02010_LIST_AREA" class="scroll_area row-10">
49 
+		<div id="ITP_LIST_MRTNMNG02010_LIST_AREA" class="scroll_area row-8">
50 50 
 			<ul id="ITP_LIST_MRTNMNG02010_LIST_ROWS" class="mb_0 panel-group"></ul>
51 
-			<div id="ITP_LIST_MRTNMNG02010_LIST_ROWCOPY" style="display: none;">
51 
+			<div id="ITP_LIST_MRTNMNG02010_LIST_ROWCOPY" style="display: block;">
52 52 
 				<li class="history_list5">
53 53 
 					<div class="left">
54 54 
 						<div class="nomal">
 
@@ -62,25 +62,20 @@
62 62 
 					</div>
63 63 
 					<div class="left">
64 64 
 						<div class="nomal">
65 
-							<div class="half">
66 
-								<label>반품상태</label>
67 
-								<span>:</span>
68 
-								<div class="history">
69 
-									<div class="fnRtnReqStNm"></div>
70 
-								</div>
65 
+							<label>반품상태</label>
66 
+							<span>:</span>
67 
+							<div class="history">
68 
+								<div class="fnRtnReqStNm"></div>
71 69 
 							</div>
72 
-							<div class="half">
73 
-								<label>수거장소명 </label>
74 
-								<span>:</span>
75 
-								<div class="history">
76 
-									<div class="fnRtnWhsNm"></div>
77 
-								</div>
70 
+							<label>수거장소명  :</label>
71 
+							<div class="history">
72 
+								<div class="fnRtnWhsNm"></div>
78 73 
 							</div>
79 74 
 						</div>
80 75 
 					</div>
81 76 
 					<div class="left">
82 77 
 						<div class="nomal">
83 
-							<label style="width: 127px;">반품요청 정보</label>
78 
+							<label>반품요청 정보</label>
84 79 
 							<span>:</span>
85 80 
 							<div class="history">
86 81 
 								<div class="fnRtnReqItemQty"></div>
 
@@ -117,12 +112,12 @@
117 112 
 				</div>
118 113 
 			</div>
119 114 
 			<div class="table_header">
120 
-				<h1>> 반품 품목</h1>
115 
+				<h1><반품 품목></h1>
121 116 
 			</div>
122 117 
 		</div>
123 
-		<div id="ITP_LIST_MRTNMNG02010_DETAIL_AREA" class="scroll_area row-11">
118 
+		<div id="ITP_LIST_MRTNMNG02010_DETAIL_AREA" class="scroll_area row-7">
124 119 
 			<ul id="ITP_LIST_MRTNMNG02010_DETAIL_ROWS" class="mb_0 panel-group"></ul>
125 
-			<div id="ITP_LIST_MRTNMNG02010_DETAIL_ROWCOPY" style="display: block;">
120 
+			<div id="ITP_LIST_MRTNMNG02010_DETAIL_ROWCOPY" style="display: grid;"><!-- style="display: grid;" -->
126 121 
 				<li class="list-row">
127 122 
 					<div class="left_info">
128 123 
 						<div class="thick">
 
@@ -146,7 +141,7 @@
146 141 
 			<button id="ITP_BTN_MRTNMNG02010_DETAIL_CANCEL_LIST" class="col_12 btn-gray CLB">취소</button>
147 142 
 		</div>
148 143 
 	</div>
149 
-	<div id="ITP_AJAX_MRTNMNG02010_MODIFY_CONTAINER" style="display: none;">
144 
+	<div id="ITP_AJAX_MRTNMNG02010_MODIFY_CONTAINER" style="display: block;">
150 145 
 		<form id="ITP_FORM_MRTNMNG02010_MODIFY" class="form-horizontal" onsubmit="return false;">
151 146 
 			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_VIEW_CD" name="viewCd" value="U">
152 147 
 			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_BRAND_ID" name="brandId" value="">
 
@@ -183,17 +178,15 @@
183 178 
 						<button id="ITP_BTN_MRTNMNG02010_MODIFY_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
184 179 
 					</div>
185 180 
 				</div>
186 
-				<div class="header line">
187 
-					<div class="table_header">
188 
-						<h1><반품 품목></h1>
189 
-						<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_DEL_ROW" class="btn-primary btn-sm ADB">품목삭제</button>
190 
-						<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_ADD_ROW" class="btn-primary btn-sm ADB">품목추가</button>
191 
-					</div>
181 
+				<div class="table_header">
182 
+					<h1><반품 품목></h1>
183 
+					<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_DEL_ROW" class="btn-primary btn-sm ADB">품목삭제</button>
184 
+					<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_ADD_ROW" class="btn-primary btn-sm ADB">품목추가</button>
192 185 
 				</div>
193 186 
 			</div>
194 
-			<div id="ITP_LIST_MRTNMNG02010_MODIFY_AREA" class="scroll_area row-2-1">
187 
+			<div id="ITP_LIST_MRTNMNG02010_MODIFY_AREA" class="scroll_area row-7">
195 188 
 				<ul id="ITP_LIST_MRTNMNG02010_MODIFY_ROWS" class="mb_0 panel-group"></ul>
196 
-				<div id="ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY" style="display: block;">
189 
+				<div id="ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY" style="display: gird;"><!-- style="display: gird;" -->
197 190 
 					<li class="list-row">
198 191 
 						<div class="left_info">
199 192 
 							<div class="check_box"><!-- class 변경 -->
 
@@ -277,16 +270,15 @@
277 270 
 				</form>
278 271 
 			</div>
279 272 
 			<div class="select_btn">
280 
-				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
273 
+				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_blue">납품장소 <img src="../img/arrow_down.png"></button>
281 274 
 			</div>
282 275 
 			<div id="ITP_LIST_MRTNMNG02010_POP_WHS_AREA" class="popup_scroll">
283 276 
 				<ul id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
284 277 
 				<div id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWCOPY" style="display: block;">
285 278 
 					<li class="row_2">
286 279 
 						<div class="scroll_left">
287 
-							<div class="fnWhsNm">브랜드 창고 명A</div>
288 
-							<div class="sub fnLocationNm">(상세위치내용)</div>
289 
-							<div class="sub fnLocationNm">누리자 B/D</div>
280 
+							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>
281 
+							<div class="con_2 sub fnLocationNm">(상세위치내용)</div>
290 282 
 						</div>
291 283 
 						<div class="scroll_right">
292 284 
 							<button id="ITP_BTN_MRTNMNG02010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
 
@@ -296,7 +288,7 @@
296 288 
 			</div>
297 289 
 		</div>
298 290 
 	</div>
299 
-	<div id="ITP_POP_MRTNMNG02010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: none;">
291 
+	<div id="ITP_POP_MRTNMNG02010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: block;">
300 292 
 		<div class="pop">
301 293 
 			<div class="header">
302 294 
 				<div class="header_left">
 
@@ -314,7 +306,7 @@
314 306 
 					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
315 307 
 				</div>
316 308 
 				<div class="select_btn">
317 
-					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_NM" class="btn_blue">품목명 ▼</button>
309 
+					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_NM" class="btn_blue">품목명 <img src="../img/arrow_down.png"></button>
318 310 
 				</div>
319 311 
 			</form>
320 312 
 			<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_AREA" class="popup_scroll">
 
@@ -322,9 +314,12 @@
322 314 
 				<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_ROWCOPY" style="display: block;">
323 315 
 					<li class="row_2">
324 316 
 						 <div class="scroll_left">
325 
-                            <div class="fnItemNm"></div>
326 
-                            <div class="sub fnKg"></div>
327 
-                            <div class="amt fnUnitAmt"></div>
317 
+                            <div class="fnItemNm">fdssfd</div>
318 
+                            <div class="mg_0">
319 
+				                 <div class="sub fnKg">12,000,000</div>
320 
+				                 <div class="type_hide">/</div>
321 
+				                 <div class="amt fnUnitAmt">12,000,000</div>
322 
+			                 </div>
328 323 
                         </div>
329 324 
                         <div class="scroll_right">
330 325 
                             <button id="ITP_BTN_MPOMNG02010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>

+ 5 - 12
src/main/webapp/mobile/css/style.css
Переглянути файл 

@@ -393,7 +393,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
393 393 
 .button_bar button.btn_col_6 {width: 65%;}
394 394 
 .button_bar button.btn_col_3,
395 395 
 .button_bar button.btn_col_6 {border: 1px solid #000; float: left; height: 60px; font-size: 16px; font-weight: 100; border-radius: 0px;}
396 
-.button_bar button.col_12 {font-weight:100; width: 100%; height: 60px; font-size: 18px;}
396 
+.button_bar button.col_12 {font-weight:100; width: 100%; height: 40px; font-size: 16px;}
397 397
398 398 
 /* scroll_area 조정 */
399 399 
 .scroll_area {position: absolute; width: 100%; height: 456px;border-bottom:2px solid #000; bottom: 30px; overflow: auto; background: #fff;}
 
@@ -405,15 +405,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
405 405 
 .row-4-1{top:253px;}
406 406 
 .row-5{top: 293px;}
407 407 
 .row-6{top: 291px;}
408 
-.row-3-2{top:393px;}
409 
-.row-3-1{top: 355px;}
410 
-
411 
-.row-5-1{top: 391px;}
412 
-
413 
-.row-7{top: 533px;}
414 
-.row-9{top: 383px;}
415 
-.row-10{top: 349px;}
416 
-.row-11{top: 309px;}
408 
+.row-7{top: 200px;}
409 
+.row-8{top: 240px;}
417 410
418 411 
 .col-4{width:35% !important;}
419 412 
 .col-6{width:60% !important;}
 
@@ -430,8 +423,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
430 423 
 .scroll_area li .left_info {width: calc(100% - 100px); float:left; margin-top:4px;}
431 424 
 .scroll_area li .left_info div {display: inline-block; font-size:14px;}
432 425 
 .scroll_area li .left_info span {font-size: 14px;}
433 
-.scroll_area li .left_info label{font-size: 16px; font-weight:100; margin-left:10px;}
434 
-.scroll_area li .left_info .check_box {padding:10px; height:72px; float:left; width:30px;}
426 
+.scroll_area li .left_info label{font-size: 14px; font-weight:100; margin-left:10px;}
427 
+.scroll_area li .left_info .check_box {padding-top:8px; height:50px; float:left; width:22px;}
435 428 
 .scroll_area li .left_info .thick {float:left; margin-top: 2px; font-size: 18px; text-align: left; width: 200px; height:20px; font-weight: 100;}
436 429 
 .scroll_area li .left_info .thick .itp_item {color:gray;}
437 430 
 .scroll_area li .left_info .thick .itp_gram {color:#aaa; font-size:14px;}