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

src/main/webapp/app/stockmng/STOCKMNG04010.html

@@ -201,7 +201,7 @@
 				        </div>
 				    </div>
 				    <div class="itp_table fix">
-					    <div class="itp_table_head fix" style="background:#fff;">
+					    <div class="itp_table_head fix" style="background:#f5f5f5;">
 					        <h4 class="itp_table_tit">로케이션 정보</h4>
 					    </div>
 					    <div id="ITP_STOCKMNG04010_VIEW_jqGrid_list" class="itp_tb_list">

src/main/webapp/app/stockmng/STOCKMNG04011.html

@@ -185,7 +185,6 @@
 					        <h4 class="itp_table_tit">로케이션 정보</h4>
 					    </div>
 					    <div id="ITP_STOCKMNG04011_VIEW_jqGrid_list" class="itp_tb_list">
-					        <div id="ITP_STOCKMNG04011_VIEW_jqGridView" class="itp_views fix"></div>
 					        <table id="ITP_STOCKMNG04011_VIEW_jqGrid"></table>
 					        <div id="ITP_STOCKMNG04011_VIEW_jqGridPager"></div>
 					        <div id="ITP_STOCKMNG04011_VIEW_jqGridEmpty" class="itp_no_data"></div>

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

@@ -375,7 +375,7 @@
 					<div class="itp_notify_row">
 						<label class="noti_label">첨부파일</label>
 						<span>:</span>
-						<table></table>
+						<div class="fnNoteFile noti_text"></div>
 					</div>
 				</div>
 			</div>

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

@@ -74,12 +74,12 @@
 	              <div class="thick">
 	              	<label>품목명</label>
 	                <span>:</span>
-	                <div class="itp_item fnItemNm">품목명</div>
+	                <div class="itp_item fnItemNm"></div>
 	              </div>
 	              <div class="thick">
-                	<div class="itp_gram auto fnUnitAmt">1,000원</div>
+                	<div class="itp_gram auto fnUnitAmt"></div>
                 	<span>/</span>
-                	<div class="itp_amt amt_wd fnOrdAmt">1,000원</div>
+                	<div class="itp_amt amt_wd fnOrdAmt"></div>
 	              </div>
 	            </div>
 				<div class="right" style="width:125px;">

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

@@ -255,9 +255,9 @@
                 <div class="itp_item fnItemNm"></div>
               </div>
               <div class="thick">
-              	<label>구매가</label>
-                <span>:</span>
-                <div class="itp_amt fnUnitAmt"></div>
+               	<div class="itp_gram auto fnUnitAmt"></div>
+               	<span>/</span>
+               	<div class="itp_amt amt_wd fnOrdAmt"></div>
               </div>
             </div>
             <div class="right">

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

@@ -58,9 +58,9 @@
 			                <div class="itp_item fnItemNm">품목명</div>
 			              </div>
 			              <div class="thick">
-			              	<label>구매가</label>
-			                <span>:</span>
-			                <div class="itp_amt fnUnitAmt"></div>
+			               	<div class="itp_gram auto fnUnitAmt"></div>
+			               	<span>/</span>
+			               	<div class="itp_amt amt_wd fnOrdAmt"></div>
 			              </div>
 			            </div>
 						<div class="right" style="width:125px;">

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

@@ -213,11 +213,11 @@
 								<span>:</span>
 								<div class="itp_item fnItemNm"></div>
 							</div>
-							<div class="thick">
-								<label>구매가</label>
-								<span>:</span>
-								<div class="itp_amt fnUnitAmt"></div>
-							</div>
+							 <div class="thick">
+				               	<div class="itp_gram auto fnUnitAmt"></div>
+				               	<span>/</span>
+				               	<div class="itp_amt amt_wd fnOrdAmt"></div>
+				              </div>
 						</div>
 						<div class="right">
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_MINUS" class="DETAIL_ITEM_MINUS">-</button>

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

@@ -87,7 +87,7 @@
 								<label>공급업체</label>
 								<span>:</span>
 								<div class="fnSpplyNm"></div>
-								<label class="">납품장소</label>
+								<label class="">수거창고</label>
 								<span>:</span>
 								<div class="fnRtnWhsNm"></div>
 							</div>

src/main/webapp/mobile/css/style.css

@@ -473,7 +473,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left_info .thick {float:left; text-align: left; width: 90%; height:38px; font-weight: 100;}
 .scroll_area li .left_info .thick .itp_item {color:gray;text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:calc(100% - 81px); top:7px; text-align:left; position:relative;}
 .scroll_area li .left_info .thick .itp_gram {position:relative; top:7px; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; color:#aaa; font-size:14pt; text-align:right; width: 85px;}
-.scroll_area li .left_info .thick .auto {width:auto; float:left; font-size: 12pt;}
+.scroll_area li .left_info .thick .auto {width:auto;}
 .scroll_area li .left_info .thick .itp_amt {color:#b88278; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width: calc(100% - 105px); top: 7px; position:relative; text-align:left;}
 .scroll_area li .left_info .thick .amt_wd {width:calc(100% - 95px);}
 .scroll_area li .left_info .history {font-weight: 700; font-size: 1.1rem; margin-top:-2px;}

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

@@ -300,17 +300,38 @@ let mobPopObj = {
 			mobPopObj.hide(this.popId);
 		},
 		search: function (nticeNo) { 
+			const me=this;
 			fn_ajax_call('/api/ntice/info-ntice', {nticeNo}, function(result) {
 				// 브랜드그룹 셋팅
 				$('#ITP_POP_NOTICE_AREA .fnNoteNm').html(result.nticeTitl);
 				$('#ITP_POP_NOTICE_AREA .fnNote').html(result.nticeDesc);
 				$('#ITP_POP_NOTICE_AREA .fnNoteFromTo').html(result.notiStDay+' ~ '+result.notiEdDay); 
+				me.makeFileDownloadTable($('#ITP_POP_NOTICE_AREA .fnNoteFile'),result.fileNo); 
 				/*
 				$('#ITP_FORM_NOTICE_INFO_POPUP_AFFL_SHOP_NM').html(result.afflShopNm);
 				$('#ITP_FORM_NOTICE_INFO_POPUP_BRAND_NM').html(result.brandNm);
 				*/ 
 			}, 'GET');
 		},
+		makeFileDownloadTable: function (el, fileNo) {
+			var searhFn = function(result) {
+				var html = '';
+				html += '<table class="table fileupload-download">';
+				html += '<tbody>';
+				$.each(result, function (key, value) { 
+					html += '<tr class="fileupload-downloadrow no-thumb row">';	
+					html += '<td class="col-xs-9 itp_file_info" data-file-no="' + value.fileNo + '" data-file-seq="' + value.fileSeq + '">';
+					html += '<a href="' + DOMAIN + '/api/file/download/' + value.fileNo + '/' + value.fileSeq + '">';
+					html += value.fileOrgNm + '</a></td>';
+					html += '<td class="col-xs-3">' + value.fileSize + '</td>'; 
+					html += '</tr>';
+				});
+				html += '</tbody>';
+				html += '</table>';
+				el.html(html);
+			}
+			fn_ajax_call('/api/file/list', {fileNo}, searhFn, 'GET');
+		}
 		
 	},
 	show: function(popId) {