Почетна Преглед Помоћ
Регистрација Пријавите Се
orderqueen
/
oqpo-view
Прати 3
Волим 0
Креирај огранак 0
Files Дискусије 0 Захтеви за спајање 0 Вики
Преглед изворни кода

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

juney пре 2 година
родитељ
20f77d69a8 907357439d
комит
308e053b80
3 измењених фајлова са 69 додато и 54 уклоњено
Подељен поглед Покажи статистику Diff
  1. 1 1
      src/main/webapp/mobile/app/mrtnmng/MRTNMNG01010.html
  2. 42 30
      src/main/webapp/mobile/app/mrtnmng/MRTNMNG02010.html
  3. 26 23
      src/main/webapp/mobile/css/style.css

+ 1 - 1
src/main/webapp/mobile/app/mrtnmng/MRTNMNG01010.html
Прегледај датотеку 

@@ -129,7 +129,7 @@
129 129 
 				</form>
130 130 
 			</div>
131 131 
 			<div class="select_btn">
132 
-				<button id="ITP_BTN_MRTNMNG01010_POP_WHS_NM" class="btn_blue">반품장소 <img src="../img/arrow_down.png"></button>
132 
+				<button id="ITP_BTN_MRTNMNG01010_POP_WHS_NM" class="btn_red">반품장소 <img src="../img/arrow_down.png"></button>
133 133 
 			</div>
134 134 
 			<div id="ITP_LIST_MRTNMNG01010_POP_WHS_AREA" class="popup_scroll">
135 135 
 				<ul id="ITP_LIST_MRTNMNG01010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>

+ 42 - 30
src/main/webapp/mobile/app/mrtnmng/MRTNMNG02010.html
Прегледај датотеку 

@@ -52,35 +52,29 @@
52 52 
 				<li class="history_list5">
53 53 
 					<div class="left">
54 54 
 						<div class="nomal">
55 
-							<label>반품요청일 </label>
55 
+							<label class="col_1">요청일 </label>
56 56 
 							<span>:</span>
57 57 
 							<div class="history">
58 
-								<div class="fnRtnReqDt">asdf</div>
59 
-								(<div class="fnRtnReqMgrNm">asdf</div>)
58 
+								<div class="fnRtnReqDt">2022.10.10 </div>
60 59 
 							</div>
61 
-						</div>
62 
-					</div>
63 
-					<div class="left">
64 
-						<div class="nomal">
65 
-							<label>반품상태</label>
60 
+							<label class="col_1">상태</label>
66 61 
 							<span>:</span>
67 62 
 							<div class="history">
68 
-								<div class="fnRtnReqStNm"></div>
69 
-							</div>
70 
-							<label>수거장소명  :</label>
71 
-							<div class="history">
72 
-								<div class="fnRtnWhsNm"></div>
63 
+								<div class="fnRtnReqStNm">임시저장</div>
73 64 
 							</div>
74 65 
 						</div>
75 66 
 					</div>
76 67 
 					<div class="left">
77 68 
 						<div class="nomal">
78 
-							<label>반품요청 정보</label>
69 
+							<label class="col_1">금액</label>
79 70 
 							<span>:</span>
80 71 
 							<div class="history">
81 
-								<div class="fnRtnReqItemQty"></div>
82 
-								<i>- </i>
83 
-								<div class="fnRtnReqAmt"></div> 원
72 
+								<div class="fnRtnReqAmt">1,000,000</div>
73 
+							</div>
74 
+							<label class="col_1">품목수 </label>
75 
+							<span>:</span>
76 
+							<div class="history">
77 
+								<div class="fnRtnReqItemQty">1,000,000</div>
84 78 
 							</div>
85 79 
 						</div>
86 80 
 					</div>
 
@@ -96,19 +90,37 @@
96 90 
 			<div class="line">
97 91 
 				<label>반품요청일</label>
98 92 
 				<div class="line_right">
99 
-					<div class="fnRtnReqDt"></div>
93 
+					<div class="fnRtnReqDt">2022.10.10</div>
100 94 
 				</div>
101 95 
 			</div>
102 96 
 			<div class="line">
103 97 
 				<label>반품요청금액</label>
104 98 
 				<div class="line_right">
105 
-					<div class="fnRtnReqAmt"></div>
99 
+					<div class="fnRtnReqAmt">1,000,000</div>
106 100 
 				</div>
107 101 
 			</div>
108 102 
 			<div class="line">
109 103 
 				<label>반품장소</label>
110 104 
 				<div class="line_right">
111 
-					<div class="fnRtnWhsNm"></div>
105 
+					<div class="fnRtnWhsNm">누리 테스트 창고이름 어쩌고</div>
106 
+				</div>
107 
+			</div>
108 
+			<div class="line">
109 
+				<label>반려일자</label>
110 
+				<div class="line_right">
111 
+					<div class="fnRjctDt">2022.20.10</div>
112 
+				</div>
113 
+			</div>
114 
+			<div class="line">
115 
+				<label>반려담당자</label>
116 
+				<div class="line_right">
117 
+					<div class="fnRjctMgrNm">홍길동</div>
118 
+				</div>
119 
+			</div>
120 
+			<div class="line">
121 
+				<label>반려사유</label>
122 
+				<div class="line_right">
123 
+					<div class="fnRjctRsn">물이 새고 색이 마음에 안들고</div>
112 124 
 				</div>
113 125 
 			</div>
114 126 
 			<div class="table_header">
 
@@ -123,12 +135,12 @@
123 135 
 						<div class="thick">
124 136 
 			              	<label>품목명</label>
125 137 
 			                <span>:</span>
126 
-			                <div class="itp_item fnItemNm"></div>
138 
+			                <div class="itp_item fnItemNm">테스트용 길다란 품목명 제목</div>
127 139 
 	                	</div>
128 140 
 		                <div class="thick">
129 141 
 		              		<label>구매가</label>
130 142 
 		                	<span>:</span>
131 
-		                	<div class="itp_amt fnRtnAmt"></div>
143 
+		                	<div class="itp_amt fnRtnAmt">10,000,000</div>
132 144 
 		                </div>
133 145 
 					</div>
134 146 
 					<div class="right">
 
@@ -160,8 +172,8 @@
160 172 
 				</div>
161 173 
 				<div class="line">
162 174 
 					<label>반품요청금액</label>
163 
-					<div class="line_right">
164 
-						<div class="fnRtnReqAmtTot">0원</div>
175 
+					<div class="input_text">
176 
+						<div class="fnRtnReqAmt">1,000,000원</div>
165 177 
 					</div>
166 178 
 				</div>
167 179 
 				<div class="line">
 
@@ -200,7 +212,7 @@
200 212 
 			              	<div class="thick">
201 213 
 				              	<label>구매가</label>
202 214 
 				                <span>:</span>
203 
-				                <div class="itp_amt fnUnitAmt"></div>
215 
+				                <div class="itp_amt fnUnitAmt">10,000,000</div>
204 216 
 			             	 </div>
205 217 
 						</div>
206 218 
 						<div class="right">
 
@@ -212,7 +224,7 @@
212 224 
 				</div>
213 225 
 			</div>
214 226 
 			<div class="button_bar">
215 
-				<button id="ITP_BTN_MRTNMNG02010_MODIFY_REQ_ORDER" class="col_3 btn-primary REQ">구매요청</button>
227 
+				<button id="ITP_BTN_MRTNMNG02010_MODIFY_REQ_ORDER" class="col_3 btn-primary REQ">반품요청</button>
216 228 
 				<button id="ITP_BTN_MRTNMNG02010_MODIFY_TEMP_SAVE" class="col_3 btn-gray TSA">임시저장</button>
217 229 
 				<button id="ITP_BTN_MRTNMNG02010_MODIFY_CANCEL" class="col_3 btn-gray CLB">취소</button>
218 230 
 			</div>
 
@@ -270,15 +282,15 @@
270 282 
 				</form>
271 283 
 			</div>
272 284 
 			<div class="select_btn">
273 
-				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_blue">납품장소 <img src="../img/arrow_down.png"></button>
285 
+				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
274 286 
 			</div>
275 287 
 			<div id="ITP_LIST_MRTNMNG02010_POP_WHS_AREA" class="popup_scroll">
276 288 
 				<ul id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
277 289 
 				<div id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWCOPY" style="display: none;">
278 290 
 					<li class="row_2">
279 291 
 						<div class="scroll_left">
280 
-							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>
281 
-							<div class="con_2 sub fnLocationNm">(상세위치내용)</div>
292 
+							<div class="fnWhsNm">브랜드 창고 명A</div>
293 
+							<div class="sub fnLocationNm">(상세위치내용)</div>
282 294 
 						</div>
283 295 
 						<div class="scroll_right">
284 296 
 							<button id="ITP_BTN_MRTNMNG02010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
 
@@ -314,7 +326,7 @@
314 326 
 				<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_ROWCOPY" style="display: none;">
315 327 
 					<li class="row_2">
316 328 
 						 <div class="scroll_left">
317 
-                            <div class="fnItemNm">fdssfd</div>
329 
+                            <div class="fnItemNm"></div>
318 330 
                             <div class="mg_0">
319 331 
 				                 <div class="sub fnKg"></div>
320 332 
 				                 <div class="type_hide">/</div>

+ 26 - 23
src/main/webapp/mobile/css/style.css
Прегледај датотеку 

@@ -99,7 +99,7 @@ section .popup2 .pop .popup_scroll li .scroll_left .con_2 {padding-top:0px;}
99 99 
 section .popup2 .pop .popup_scroll li .scroll_left .mg_0 {margin:0;}
100 100 
 section .popup2 .pop .popup_scroll li .scroll_left .mg_0 div {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:46%; margin:0; padding: 8px 2px 0px 2px;}
101 101 
 section .popup2 .pop .popup_scroll li .scroll_left .mg_0 .type_hide {width:auto;}
102 
-section .popup2 .pop .popup_scroll li .scroll_left .sub{font-size:14pt; color:gray;}
102 
+section .popup2 .pop .popup_scroll li .scroll_left .sub{font-size:14pt; color:gray; width:auto !important;}
103 103 
 section .popup2 .pop .popup_scroll li .scroll_left .amt{font-size:14pt; color:#b88278;}
104 104 
 section .popup2 .pop .popup_scroll li .scroll_right {float: right;}
105 105 
 section .popup2 .pop .popup_scroll li .scroll_right input[type=checkbox]{width:27px; margin:18px 11px 0 11px;}
 
@@ -312,12 +312,14 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
312 312 
 /* 컨텐츠 화면 */
313 313
314 314
315 
-.fix {
315 
+#ITP_CONTAINER.fix {
316 
+  position:fixed;
316 317 
   width: 100%;
317 
-  padding-top: 45px;
318 
+  padding-top: 49px;
318 319 
   font-size: 16px;
319 320 
 }
320 
-.content {position:relative; z-index: 10; width:100%; background: #f5f6f6; border-bottom:1px solid #E0B8AB;}
321 
+.content {position: fixed; z-index: 10; width:100%; background: #f5f6f6; border-bottom:1px solid #E0B8AB;}
322 
+.content .content_inside {background: #f5f6f6; border-bottom:1px solid #E0B8AB;}
321 323 
 .content .header {width:100% !important; margin:0 !important;}
322 324 
 .content .line {position: relative; display: inline-block; width: 332px; margin:0 auto; height: 40px; margin-bottom: -10px;}
323 325 
 .content .line.mt5 {margin-top:5px;}
 
@@ -329,7 +331,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
329 331 
 .content .line .pop_right div {float:right; margin-right:10px; padding-top:8px; text-align:right; font-size:16px;}
330 332 
 .content .line .search_wrap input {float:right; width:50%; margin-right:10px;}
331 333 
 .content .line .search_wrap select {float:right; width:50%; height:27px; margin-right:10px;}
332 
-.content .line div.itp_search_header {height:40px; font-weight:100;padding:11px 10px 5px 10px; text-align: left; color:#b88278;border-bottom: 1px solid #aaa;font-size:14pt;}
334 
+.content .line div.itp_search_header {height:40px; font-weight:100;padding:8px 10px 5px 10px; text-align: left; color:#b88278;border-bottom: 1px solid #aaa;font-size:14pt;}
333 335 
 .content .line div.itp_search_header img{width:14px; top:-2px; position:relative;}
334 336 
 .content .line label {min-width:125px; color:#898989; font-size: 14pt; float: left; text-align: left; margin-top: 7px; font-weight:100;}
335 337 
 .content .line label.pay_label {margin:20px 1%; width:98%;}
 
@@ -349,8 +351,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
349 351 
 .content .line .float_right_btn button {padding:0; width:34px; height:34px; border-radius:5px; border:1px solid #aaa;}
350 352 
 .content .line .float_right_btn button img {width:18px; height:18px;}
351 353 
 .content .line .float_left select {float: left; width: 100%; height: 34px; margin-top:3px; border: 1px solid #aaa; border-radius:5px; font-size: 14pt; font-weight:100;}
352 
-.content .line .line_right {font-size: 2rem; float: left; margin-right: 0%; width:57%}
353 
-.content .line .line_right div {float: right; font-size: 16px; margin-top: 12px; margin-right:3%; color:#555;}
354 
+.content .line .line_right {float: left; margin-right: 0%; width:57%}
355 
+.content .line .line_right div {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:100%; text-align:right; float: right; font-size: 14pt; margin-top: 7px; margin-right:0%; color:#555;}
354 356 
 .content .line .line_right input {position: relative; text-align: right; margin-right: 84px;}
355 357 
 .content .line .line_right input.m9 {margin-right:93px;}
356 358 
 .content .line .line_right input.left {text-align: left;}
 
@@ -410,7 +412,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
410 412 
 } */
411 413
412 414 
 .button_bar {width: 100%; height: 47px; background: #ccc; position: fixed; bottom: 0px; z-index: 10;}
413 
-.button_bar button.col_3{float: left; height: 47px; font-size: 14px; margin: 0; width: 33.3%; font-weight: 100; border: none;}
415 
+.button_bar button.col_3{float: left; height: 47px; font-size: 14px; margin: 0; width: 33.3%; font-weight: 100; border: 1px solid #aaa;}
414 416 
 .button_bar button.btn-gray {border-radius: 0px; background-color: #858076; color: #eee;}
415 417 
 .button_bar button.btn-gray:active {border:3px solid #858076; background-color: #fff; color:#B7B8B8;}
416 418 
 .button_bar button.btn-w-gray{border-radius: 0px; background-color: #b6b8b8; color: #eee;}
 
@@ -420,8 +422,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
420 422 
 .button_bar button.btn_col_3 {width: 35%;}
421 423 
 .button_bar button.btn_col_6 {width: 65%;}
422 424 
 .button_bar button.btn_col_3,
423 
-.button_bar button.btn_col_6 {border: 1px solid #000; float: left; height: 40px; font-size: 15px; font-weight: 100; border-radius: 0px;}
424 
-.button_bar button.col_12 {font-weight:100; width: 100%; height: 40px; font-size: 16px;}
425 
+.button_bar button.btn_col_6 {border: 1px solid #000; float: left; height: 47px; font-size: 14pt; font-weight: 100; border-radius: 0px;}
426 
+.button_bar button.col_12 {font-weight:100; width: 100%; height: 47px; font-size: 14pt;}
425 427
426 428 
 /* scroll_area 조정 */
427 429 
 .scroll_area {position: relative; top:0; width: 100%; height: 456px;border-bottom:2px solid #000; margin-bottom:47px; overflow: auto; background: #fff;}
 
@@ -436,18 +438,19 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
436 438 
 .scroll_area ul.mb_0 {margin-bottom:0 !important;}
437 439 
 .scroll_area .itp_non_data {margin:35% auto;}
438 440
439 
-.scroll_area li {margin:0; list-style: none; width: 100%; height: 85px; border: 1px solid #ccc; background-color: #fff;}
441 
+.scroll_area li {margin:0; list-style: none; width: 100%; height: 85px; border-bottom: 1px solid #ccc; background-color: #fff;}
440 442 
 .scroll_area li.check {background:#f5f6f6;}
441 443 
 .scroll_area li.list-row {display: inline-flex; height:76px;}
442 444 
 .scroll_area li.list-row2 {height:130px; padding-top:8px;}
443 445
444 
-.scroll_area li .left_info {width: calc(100% - 100px); float:left; margin-top:4px;}
446 
+.scroll_area li .left_info {width: calc(100% - 66px); float:left;}
445 447 
 .scroll_area li .left_info div {display: inline-block; font-size:14pt;}
446 448 
 .scroll_area li .left_info span {font-size: 14pt;}
447 449 
 .scroll_area li .left_info label{font-size: 14pt; font-weight:100; margin-left:10px;}
448 450 
 .scroll_area li .left_info .check_box {padding-top:8px; height:50px; float:left; width:22px;}
449 
-.scroll_area li .left_info .thick {float:left; margin-top: 6px; font-size: 18px; text-align: left; width: 200px; height:20px; font-weight: 100;}
450 
-.scroll_area li .left_info .thick .itp_item {color:gray;}
451 
+.scroll_area li .left_info .check_box input[type=checkbox] {width:15px; margin:10px 0 0 7px;}
452 
+.scroll_area li .left_info .thick {float:left; text-align: left; width: 90%; height:36px; font-weight: 100;}
453 
+.scroll_area li .left_info .thick .itp_item {color:gray;text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:60%; top:7px; text-align:left; position:relative;}
451 454 
 .scroll_area li .left_info .thick .itp_gram {color:#aaa; font-size:14pt;}
452 455 
 .scroll_area li .left_info .thick .itp_amt {color:#b88278; margin-top: 4px;}
453 456 
 .scroll_area li .left_info .history {font-weight: 700; font-size: 1.1rem; margin-top:-2px;}
 
@@ -466,7 +469,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
466 469 
 .scroll_area li.history_list3 {height: 160px; padding-top:5px;}
467 470 
 .scroll_area li.history_list3 .btn_check {height:158px; margin-top:-5px; width:90%; float:right; padding-top:7px; }
468 471 
 .scroll_area li.history_list4 {height: 150px;}
469 
-.scroll_area li.history_list5 {height: 100px; padding-top:5px;}
472 
+.scroll_area li.history_list5 {height: 65px; padding-top:5px;}
470 473 
 .scroll_area li.history_list6 {height: 110px; padding-top:5px;}
471 474 
 .scroll_area li.history_list7 {height: 120px; padding-top:5px;}
472 475 
 .scroll_area li .history_info {width: auto;}
 
@@ -489,7 +492,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
489 492 
 .scroll_area li .detail_right .detail_info label {margin: 5px 30px; font-size: 2rem;}
490 493 
 .scroll_area li .detail_right .detail_info div {width: auto; font-size: 14px; font-weight: 100;}
491 494 
 .scroll_area li .detail_right .detail_info i {width: auto; font-size: 1rem; margin: 0 20px;}
492 
-.scroll_area li .left .nomal  {width: 100%; float:left; text-align: left; font-size: 1.2rem;}
495 
+.scroll_area li .left .nomal  {position:relative; left:50%; transform: translateX(-50%); width: auto; float:left; text-align: left; font-size: 1.2rem;}
493 496 
 .scroll_area li .left .nomal .half {float:left;}
494 497 
 .scroll_area li .left .nomal .half label {min-width:auto;}
495 498 
 .scroll_area li .left .nomal .half div {min-width:auto; margin-right:5px; margin-top:0;}
 
@@ -505,20 +508,20 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
505 508 
 .scroll_area li .left .nomal .btn_bar button{width: 25px; height: 30px; font-size: 1rem; padding: 0;}
506 509 
 .scroll_area li .left .nomal .btn_bar .col_0{min-width: auto; margin: 5px 20px;}
507 510
508 
-.scroll_area li .left .nomal label{position:relative; margin-left: 10px; font-size:14px; font-weight:100; min-width:81px; text-align:left;}
511 
+.scroll_area li .left .nomal label{position:relative; margin-left: 10px; font-size:12pt; font-weight:100; min-width:81px; text-align:left;}
509 512 
 .scroll_area li .left .nomal label.sub_info{min-width: auto; display: inline-flex;}
510 513 
 .scroll_area li .left .nomal label.col_0{min-width: auto;}
511 514 
 .scroll_area li .left .nomal label.col_1{min-width: 45px;}
512 
-.scroll_area li .left .nomal label.col_3{min-width: 70px;}
515 
+.scroll_area li .left .nomal label.col_3{min-width: 65px;}
513 516 
 .scroll_area li .left .nomal label.col_2{width: 95px;}
514 517
515 518 
 .scroll_area li .left .nomal i{width: 50px; text-align: center;}
516 
-.scroll_area li .left .nomal div{display: inline-flex; font-weight: 700; font-size: 15px;}
519 
+.scroll_area li .left .nomal div{display: inline-flex; font-weight: 700; font-size: 12pt; min-width:75px;}
517 520 
 .scroll_area li .left .nomal .col_5{min-width:50px;}
518 521
519 522 
 .scroll_area li .right {margin: 22px 10px 22px 0; position: relative; display: flex; height:30px; font-size: 1.4rem; font-weight: 700; float: right;}
520 
-.scroll_area li .right .num {padding:6px 22px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB; background:#fff;}
521 
-.scroll_area li .right .fnnum {margin:10px 30px;}
523 
+.scroll_area li .right .num {padding:2px 22px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB; background:#fff; font-size:14pt;}
524 
+.scroll_area li .right .fnnum {margin:5px 30px; font-size:14pt;}
522 525 
 .scroll_area li .right button {background:#e1cac1; color:#fff; border:1px solid #E0B8AB; padding:0px 7px; font-size: 16px; border-radius: 0px;}
523 526 
 .scroll_area li .right button:hover {background:#FCD5C1;}
524 527 
 
@@ -563,8 +566,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
563 566 
 	.content .line .search_wrap select {width:78%;}
564 567
565 568 
 }
566 
-@media screen and (min-width: 650px) {
567 
-	.content .line {margin:-5px 140px; }
569 
+@media screen and (min-width: 500px) {
570 
+	.content .line {margin:-4px 0px; width:625px;}
568 571 
 }
569 572 
 @media screen and (max-width: 380px) {
570 573 
 	section .popup2 .barcode_area {width: 250px; height: 250px;}