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

src/main/webapp/js/app/config.js

@@ -2172,7 +2172,7 @@ function itp_fn_jqgrid_resize(grid_id, parent_id, size) {
 				}
 			}
 		}, 250); 
-	}); 
+	}).resize();  
 };
 
 function itp_fn_make_set_combine(gridId, label, width, cols, hideCols) {

src/main/webapp/js/app/main.js

@@ -360,7 +360,7 @@ var itp_fn_MAIN_NOTICE_search = function() {
 				} 
 				s+=`<tr>
 					<td>${idx}</td><td>${c.brandNm}</td>
-					<td><a href="javascript:clickNotify('${c.nticeNo}')">${title}</a></td>
+					<td style="text-align:left;"><a href="javascript:clickNotify('${c.nticeNo}')">${title}</a></td>
 					<td>${c.nticeStatNm}</td><td>${c.addDt}</td>
 				</tr>`;
 				idx++;

src/main/webapp/js/app/rtnmng/ITP_RTNMNG05010.js

@@ -161,6 +161,13 @@ const gridColModel = {
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
+		{
+			index: 'COL_REQ_DT', name: 'colReqDt',
+			label: '수거요청일', 
+			minwidth: 140,
+			width: '8', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
 		{
 			index: 'COL_SCH_DT', name: 'colSchDt',
 			label: '수거예정일', 

src/main/webapp/main.html

@@ -39,6 +39,7 @@
 	</script>
 
 	<script src="./js/app/properties.js"></script>
+	<script src="./js/cpexcel.js"></script>
 	<script src="./js/require.min.js" data-main="./js/app/config.js"></script>
 
 	<style>
@@ -296,14 +297,21 @@
 
 								<div id="ITP_NOTE_PANEL">
 									<h3>공지사항</h3>
-									<table class="rtable" style="width:100%;">
+									<table class="rtable" style="display:table;width:100%;">
+										<colgroup>
+											<col width="80px">
+											<col width="150px">
+											<col width="*">
+											<col width="80px">
+											<col width="150px">
+										</colgroup>
 										<thead>
 										  <tr>
-											<th style="width:80px;">번호</th>
-											<th style="width:150px;">브랜드</th>
-											<th style="width:65%;">제목</td>
-											<th style="width:80px;">상태</th>
-											<th style="width:150px;">등록일</th>
+											<th>번호</th>
+											<th>브랜드</th>
+											<th>제목</td>
+											<th>상태</th>
+											<th>등록일</th>
 										  </tr>
 										</thead>
 										<tbody>
@@ -837,7 +845,7 @@
 		
 		<aside id="ITP_ASIDE"></aside>	 
 	</div> 
-	<script src="./js/cpexcel.js"></script>
+	
 	<script src="./js/xlsx.js"></script>
 </body>
 </html>

src/main/webapp/mobile/app/main.html

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

src/main/webapp/mobile/app/mrtnmng/MRTNMNG05010.html

@@ -71,41 +71,45 @@
 					<li class="history_list4 item-row">
 						<div class="left">
 							<div class="nomal">
-								<label>반품번호 </label>
+								<label class="">품목명 </label>
 								<span>:</span>
-								<div class="full fnRtnPodrUnqNo"></div>
+								<div class="full fnItemNm"></div>
 							</div>
 						</div>
 						<div class="left">
 							<div class="nomal">
-								<label class="">반품예정일</label>
+								<label>수거장소 </label>
 								<span>:</span>
-								<div class="fnColSchDt history_info"></div>
+								<div class="fnWhsNm"></div>
+								<div class="text_two fnLocationNm"></div>
 							</div>
 						</div>
 						<div class="left">
 							<div class="nomal">
-								<label>공급업체</label>
-								<span>:</span>	
-								<div class="history_info fnSpplyNm"></div>
-								<label class="sub_info">반품장소</label>
+								<label class="">수거요청일</label>
+								<span>:</span>
+								<div class="fnColReqDt"></div>
+								<label class="col_6">수거예정일</label>
 								<span>:</span>
-								<div class="fnRtnWhsNm"></div>
+								<div class="fnColSchDt"></div>
 							</div>
 						</div>
 						<div class="left">
 							<div class="nomal">
-								<label class="">품목 </label>
+								<label>반품단가</label>
+								<span>:</span>	
+								<div class="fnRtnUnit"></div>
+								<label class="col_6">수거요청금액</label>
 								<span>:</span>
-								<div class="full fnItemNm"></div>
+								<div class="fncolReqAmt"></div>
 							</div>
 						</div>
 						<div class="left">
 							<div class="nomal">
-								<label class="col_6">반품요청수량</label>
+								<label class="">반품수량</label>
 								<span>:</span>
-								<div class=" fnColReqQty"></div>
-								<label class="col_6">반품발주수량</label>
+								<div class=" fnRtnQty"></div>
+								<label class="col_6">수거수량</label>
 								<span>:</span>
 								<input class="" id="ITP_FORM_MRTNMNG05010_LIST_COL_QTY" type="text" name="colQty">
 							</div>