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

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

@@ -58,9 +58,6 @@
 					<label>사장님</label>
 					<div id="ITP_LOGIN_USER_ID" class="id"></div>
 				</div>
-				<div class="setting">
-					<button id="ITP_MOBILE_BTN_SETTING"><img src="../img/gear.png"></button>
-				</div>
 			</div>
 			<nav id="ITP_SIDEBAR" class="itp_open_nav">
 				<ul class="panel-group itp_nav"></ul>
@@ -110,21 +107,23 @@
 				<div class="itp_note_header">
 					<h1>> 공지사항</h1>
 				</div>
-				<div id="ITP_MODAL_NOTE_INFO" class="itp_note_popup modal itp_modal" style="display:none">
+				<div id="ITP_MODAL_NOTE_INFO" class="itp_note_popup modal itp_modal" style="display: none">
 					<div class="popup_note">
 						<div class="header">
 							<div class="header_left">
-								<label>매장</label>
+								<label>공지사항</label>
 							</div>
 							<div class="header_right">
 								<button type="button" id="ITP_BTN_MAIN_POP_NOTE_CLOSE"><img src="../img/close.png"></button>
 							</div>
 						</div>
 						<div class="itp_pop_note_area">
-							<div class="itp_note_title">
-								<label>공지제목</label>
-								<span>:</span>
-								<div class="fnNoteNm">fasdddddddddddddddddddddddddddddddddddd</div>
+							<div style="display:flex;">
+								<div class="itp_note_title">
+									<label>공지제목</label>
+									<span>:</span>
+									<div class="fnNoteNm">fasdddddddddddddddddddddddddddddddddddd</div>
+								</div>
 							</div>
 							<div class="itp_pop_note_content">
 								<div class="fnNote">fasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasd</div>
@@ -150,6 +149,18 @@
 									<div class="fnNoteDt">2020.20.20</div>
 								</div>
 							</li>
+							<li>
+								<div class="itp_note_info">
+									<label>공지제목</label>
+									<span>:</span>
+									<div class="under fnNoteTitle">공지제목 테스트 ㅁㄴㅇㄻㄴㅇㄻ</div>
+								</div>
+								<div class="itp_note_info">
+									<label>공지일</label>
+									<span>:</span>
+									<div class="fnNoteDt">2020.20.20</div>
+								</div>
+							</li>
 						</div>
 					</ul>
 				</div>
@@ -287,18 +298,12 @@
 				<div id="ITP_MAIN_DRAW_CHART_CORE" class="itp_graph_area">
 					<div class="itp_graph_header">
 						<label>정 산</label>
-						<select>
-							<option>가나다라마바사아</option>
-						</select>
 					</div>
 					<div id="ITP_STTL_GRAPH"></div>
 				</div>
 				<div id="ITP_MAIN_DRAW_LINE" class="itp_graph_area">
 					<div class="itp_graph_header">
 						<label>안전재고</label>
-						<select>
-							<option>가나다라마바사아</option>
-						</select>
 					</div>
 					<div id="ITP_SAFE_STCK_GRAPH"></div>
 				</div>

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

@@ -14,7 +14,7 @@
 				<div class="line">
 				  <label>납품장소</label>
 				  <div class="float_left">
-					  <input id="ITP_FORM_MORDMNG01010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="A매장명">
+					  <input id="ITP_FORM_MORDMNG01010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="납품장소">
 					  <input type="hidden" id="ITP_FORM_MORDMNG01010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
    					  <div class="itp_input_btn">
 						  <button type="button" id="ITP_BTN_MORDMNG01010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
@@ -59,46 +59,50 @@
 		  <div id="ITP_LIST_MORDMNG01010_LIST_ITEM_AREA" class="scroll_area row-3">
 			  <ul id="ITP_LIST_MORDMNG01010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
 			  <div id="ITP_LIST_MORDMNG01010_LIST_ITEM_ROWCOPY" style="display: none;">
-				<li class="history_list7 item-row ">
+				<li class="history_list4 item-row">
 				  <div class="btn_check">
 					<div class="left">
 					  <div class="nomal">
-						<label class="">브랜드명</label>
+						<label class="col_4">브랜드명</label>
 						<span>:</span>
-					    <div class="fnBrandNm"></div>
-						<label class="col_4">발주번호</label>
-						<span>:</span>
-					    <div class="fnPchPodrUnqNo"></div>
+					    <div class="full fnBrandNm"></div>
 					  </div>
 					</div>
 					<div class="left">
 					  <div class="nomal">
+						<label class="col_4">발주번호</label>
+						<span>:</span>
+					    <div class="fnPchPodrUnqNo"></div>
 						<label>발주상태</label>
 						<span>:</span>
 					    <div class="fnPchOdrStNm"></div>
-						<label class="col_4">발주일자</label>
-						<span>:</span>
-					    <div class="fnPodrDt"></div>
 					  </div>
 					</div>
 					<div class="left">
 					  <div class="nomal">
+						<label class="col_4">발주일자</label>
+						<span>:</span>
+					    <div class="fnPodrDt"></div>
 						<label class="">납품요청일</label>
 						<span>:</span>
 					    <div class="fnDlvReqDt"></div>
+					  </div>
+					</div>
+					<div class="left">
+					  <div class="nomal">
 						<label class="col_4">납품장소</label>
 						<span>:</span>
-					    <div class="fnWhsNm"></div>
+					    <div class="full fnWhsNm"></div>
 					  </div>
 					</div>
 					<div class="left">
 					  <div class="nomal">
+						<label class="col_4">품목수량</label>
+						<span>:</span>
+					    <div class="fnPodrItemQty"></div>
 						<label>발주금액</label>
 						<span>:</span>
 					    <div class="fnPodrTotalAmt"></div>
-						<label class="col_4">품목수</label>
-						<span>:</span>
-					    <div class="fnPodrItemQty"></div>
 					  </div>
 					</div>
 				  </div>
@@ -171,10 +175,10 @@
 				<li class="history_list7">
 					<div class="left">
 					  <div class="nomal">
-						<label class="col_4">순번 </label>
+						<label class="col_4">발주항번 </label>
 						<span>:</span>
 					    <div class="fnPchPodrDtlNo"></div>
-						<label class="">품목아이디</label>
+						<label class="col_4">품목번호</label>
 						<span>:</span>
 					    <div class="fnItemId"></div>
 					  </div>
@@ -183,20 +187,17 @@
 					  <div class="nomal">
 						<label class="col_4">품목명</label>
 						<span>:</span>
-					    <div class="fnItemNm"></div>
-						<label>가격단위</label>
-						<span>:</span>
-					    <div class="fnUPodrQty"></div>
+					    <div class="full fnItemNm"></div>
 					  </div>
 					</div>
 					<div class="left">
 					  <div class="nomal">
+						<label class="col_4">가격단위</label>
+						<span>:</span>
+					    <div class="fnUPodrQty"></div>
 						<label class="col_4">단가</label>
 						<span>:</span>
 					    <div class="fnUnitAmt"></div>
-						<label>단위</label>
-						<span>:</span>
-					    <div class="fnUnit"></div>
 					  </div>
 					</div>
 					<div class="left">
@@ -204,7 +205,7 @@
 						<label class="col_4">발주수량</label>
 						<span>:</span>
 					    <div class="fnPodrQty"></div>
-						<label>발주금액</label>
+						<label class="col_4">발주금액</label>
 						<span>:</span>
 					    <div class="fnPodrAmt"></div>
 					  </div>

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

@@ -13,7 +13,7 @@
 			   <div class="line">
 				  <label>납품장소</label>
 				   <div class="float_left">
-					   <input id="ITP_FORM_MORDMNG02010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="A매장명">
+					   <input id="ITP_FORM_MORDMNG02010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="납품장소">
 					   <input type="hidden" id="ITP_FORM_MORDMNG02010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
 	       			   <div class="itp_input_btn">
 		   			  		<button type="button" id="ITP_BTN_MORDMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
@@ -256,8 +256,8 @@
         <div id="ITP_LIST_MORDMNG02010_POP_WHS_ROWCOPY" style="display: none;">
           <li class="row_2 item-row">
              <div class="scroll_left">
-                 <div class="con_2 fnWhsNm"></div>
-                 <div class="con_2 wichi fnLocationNm"></div>
+                 <div class="con_2 fnWhsNm">납품장소 테스트</div>
+                 <div class="con_2 wichi fnLocationNm">로케이션 이름</div>
              </div>
             <div class="scroll_right">
               <button id="ITP_BTN_MORDMNG02010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

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

@@ -260,8 +260,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 #ITP_WRAPPER header .header_wrap img.brand {float: right; height: 45px; margin: 5px; border-radius: 50%; border: 1px solid #666;}
 #ITP_WRAPPER header .header_wrap label{ margin-top: 15px; width: 50px; height: 25px; font-size: 1rem;float: left; color: #fff;}
 #ITP_WRAPPER header .header_wrap .name_info {width: calc(100% - 120px); height:49px; display:inline-flex;}
-#ITP_WRAPPER header .header_wrap .name_info .bn {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; padding-top:0; text-align:right; width:115%; height:22px; font-size:18px;}
-#ITP_WRAPPER header .header_wrap .name_info div {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; padding-left:3px; padding-top:2px; text-align:left; width: 85%; font-size: 15px; color:#fff; margin-top:14px;}
+#ITP_WRAPPER header .header_wrap .name_info .bn {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; padding-top:0; text-align:right; width:50%; height:22px; font-size:18px;}
+#ITP_WRAPPER header .header_wrap .name_info div {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; padding-left:3px; padding-top:2px; text-align:left; width: 50%; font-size: 15px; color:#fff; margin-top:14px;}
 
 #ITP_WRAPPER header .header_wrap .logout {float: right; width: 40px;}
 #ITP_WRAPPER header .header_wrap .logout button {margin-top: 15px; margin-right:20px; padding:0; width: 20px; height: 20px; border:none; font-size: 0.8rem;background: transparent;}
@@ -654,10 +654,10 @@ button.close {-webkit-appearance: none; padding: 0; cursor: pointer; background:
 
 /* 메인화면 공지사항 추가 */
 #ITP_MAIN_CONTAINER.itp_main_box{position:relative; height:calc(100vh - 49px); overflow:auto;}
-#ITP_MAIN_CONTAINER .itp_note_header {width:100%; height:46px; padding:10px; border-bottom:1px solid #aaa; border-top:1px solid #aaa; background:#dce6f2;}
+#ITP_MAIN_CONTAINER .itp_note_header {width:100%; height:46px; padding:10px; border-bottom:1px solid #aaa; background:#dce6f2;}
 #ITP_MAIN_CONTAINER .itp_note_header h1 {font-size:16pt; text-align:left; margin:0;}
-#ITP_MAIN_CONTAINER .itp_note_bar {height:180px;}
-#ITP_MAIN_CONTAINER .itp_note_bar h1 {position:relative; top:76px; font-weight:700; font-size:14pt; marign:0;}
+#ITP_MAIN_CONTAINER .itp_note_bar {height: auto; max-height:180px;}
+#ITP_MAIN_CONTAINER .itp_note_bar h1 {position:relative; font-weight:700; font-size:14pt; margin:0; height:60px; padding-top:20px; border-bottom:1px solid #aaa;}
 #ITP_MAIN_CONTAINER .itp_note_bar li {border-bottom:1px solid #aaa; padding:5px; height:60px;}
 /* #ITP_MAIN_CONTAINER .itp_note_bar li:first-child  {border-top:none;} */
 #ITP_MAIN_CONTAINER .itp_note_bar li .itp_note_info {display:flex; height:24px;}
@@ -665,15 +665,16 @@ button.close {-webkit-appearance: none; padding: 0; cursor: pointer; background:
 #ITP_MAIN_CONTAINER .itp_note_bar li .itp_note_info span {width:14px;}
 #ITP_MAIN_CONTAINER .itp_note_bar li .itp_note_info div {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; text-align:left; width:calc(100% - 76px);}
 #ITP_MAIN_CONTAINER .itp_note_bar li .itp_note_info .under {text-decoration: underline;}
-#ITP_MAIN_CONTAINER .itp_oper_info_area {border:1px solid #aaa; padding:5px;}
+#ITP_MAIN_CONTAINER .itp_oper_info_area {border-bottom:1px solid #aaa; padding:5px;}
 #ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info {display:flex; height:24px;}
 #ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info label{font-size:12pt; text-align:left; width:90px;}
 #ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info span{width:14px;}
 #ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info div{text-overflow:ellipsis; overflow:hidden; white-space:nowrap; text-align: right; width:calc(100% - 114px);}
 #ITP_MAIN_CONTAINER .itp_graph_area {width:98%; height:300px; border:1px solid #aaa; margin:5px 1%;}
-#ITP_MAIN_CONTAINER .itp_graph_area .itp_graph_header {width:220px; margin:5px;}
-#ITP_MAIN_CONTAINER .itp_graph_area .itp_graph_header label {width:80px; font-size:14pt; text-align:left;}
+#ITP_MAIN_CONTAINER .itp_graph_area .itp_graph_header {width:160px; margin:5px;}
+#ITP_MAIN_CONTAINER .itp_graph_area .itp_graph_header label {width:80px; font-size:14pt; text-align:left; float:left;}
 #ITP_MAIN_CONTAINER .itp_graph_area .itp_graph_header select {}
+#ITP_MAIN_CONTAINER .mb_0 {margin-bottom:0;}
 #ITP_MAIN_CONTAINER #ITP_GRAPH_INFO {height:265px;}
 /* 공지사항 팝업추가 */
 .itp_note_popup {position: absolute; top:46px; width: 100%; height: calc(100vh - 49px); background: rgba(200, 200,200, 0.8); z-index: 11;}
@@ -685,7 +686,7 @@ button.close {-webkit-appearance: none; padding: 0; cursor: pointer; background:
 .itp_note_popup .popup_note .header .header_right button {border: none; background: transparent; margin:3px -5px;}
 .itp_note_popup .popup_note .header .header_right button img {width:22px;}
 .itp_note_popup .popup_note .itp_pop_note_area {background:#fff; height:70vh; border:1px solid #000; border-top:none;}
-.itp_note_popup .popup_note .itp_pop_note_area .itp_note_title { display:flex; padding:10px; width:85%; height:45px;}
+.itp_note_popup .popup_note .itp_pop_note_area .itp_note_title { display:flex; padding:10px; width:110%; height:45px;}
 .itp_note_popup .popup_note .itp_pop_note_area .itp_note_title label {width:60px; font-size:12pt;}
 .itp_note_popup .popup_note .itp_pop_note_area .itp_note_title span {width:10px;}
 .itp_note_popup .popup_note .itp_pop_note_area .itp_note_title div {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; text-align:left; width:calc(100% - 70px);}