소스 검색

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

isna 2 년 전
부모
커밋
4321ce237a
2개의 변경된 파일19개의 추가작업 그리고 15개의 파일을 삭제
  1. 1 1
      src/main/webapp/mobile/app/main.html
  2. 18 14
      src/main/webapp/mobile/app/mrtnmng/MRTNMNG05010.html

+ 1 - 1
src/main/webapp/mobile/app/main.html

@@ -105,7 +105,7 @@
105 105
 
106 106
 	<div id="ITP_CONTAINER" class="fix">
107 107
 		<div class="itp_mobile_contents">
108
-			<div id="ITP_MAIN_CONTAINER">
108
+			<div id="ITP_MAIN_CONTAINER" style="display: none;">
109 109
 				<div class="itp_note_header">
110 110
 					<h1>> 공지사항</h1>
111 111
 				</div>

+ 18 - 14
src/main/webapp/mobile/app/mrtnmng/MRTNMNG05010.html

@@ -71,41 +71,45 @@
71 71
 					<li class="history_list4 item-row">
72 72
 						<div class="left">
73 73
 							<div class="nomal">
74
-								<label>반품번호 </label>
74
+								<label class="">품목명 </label>
75 75
 								<span>:</span>
76
-								<div class="full fnRtnPodrUnqNo"></div>
76
+								<div class="full fnItemNm"></div>
77 77
 							</div>
78 78
 						</div>
79 79
 						<div class="left">
80 80
 							<div class="nomal">
81
-								<label class="">반품예정일</label>
81
+								<label>수거장소 </label>
82 82
 								<span>:</span>
83
-								<div class="fnColSchDt history_info"></div>
83
+								<div class="fnWhsNm"></div>
84
+								<div class="text_two fnLocationNm"></div>
84 85
 							</div>
85 86
 						</div>
86 87
 						<div class="left">
87 88
 							<div class="nomal">
88
-								<label>공급업체</label>
89
-								<span>:</span>	
90
-								<div class="history_info fnSpplyNm"></div>
91
-								<label class="sub_info">반품장소</label>
89
+								<label class="">수거요청일</label>
90
+								<span>:</span>
91
+								<div class="fnColReqDt"></div>
92
+								<label class="">수거예정일</label>
92 93
 								<span>:</span>
93
-								<div class="fnRtnWhsNm"></div>
94
+								<div class="fnColSchDt"></div>
94 95
 							</div>
95 96
 						</div>
96 97
 						<div class="left">
97 98
 							<div class="nomal">
98
-								<label class="">품목 </label>
99
+								<label>반품단가</label>
100
+								<span>:</span>	
101
+								<div class="fnRtnUnit"></div>
102
+								<label class="">수거금액</label>
99 103
 								<span>:</span>
100
-								<div class="full fnItemNm"></div>
104
+								<div class="fncolReqAmt"></div>
101 105
 							</div>
102 106
 						</div>
103 107
 						<div class="left">
104 108
 							<div class="nomal">
105
-								<label class="col_6">반품요청수량</label>
109
+								<label class="">반품수량</label>
106 110
 								<span>:</span>
107
-								<div class=" fnColReqQty"></div>
108
-								<label class="col_6">반품발주수량</label>
111
+								<div class=" fnRtnQty"></div>
112
+								<label class="">수거수량</label>
109 113
 								<span>:</span>
110 114
 								<input class="" id="ITP_FORM_MRTNMNG05010_LIST_COL_QTY" type="text" name="colQty">
111 115
 							</div>