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

src/main/webapp/js/app/ordmng/ITP_ORDMNG02010.js

@@ -464,10 +464,8 @@ let modifyObj = {
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDlvRegDt').text(result.dlvReqDt);									// 납품서생성일자
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnWhsNm').text(result.whsNm);											// 발주총금액
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDeliTelNo').text(result.deliTelNo);									// 납품장소연락처
-		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT').val(result.dlvSchDt);			// 납품예정일
+		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT').val(result.dlvReqDt);			// 납품예정일
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDlvRegDt').text(result.dlvReqDt);									// 납품요청일
-		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_MGR_NM').val(result.dlvMgrNm);			// 납품담당자
-		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_MGR_TEL_NO').val(result.dlvMgrTelNo);	// 납품담당자연락처
 
 		shmtQtyValue = function(value, colname) {
 			var selectedIds = $(ORDMNG02010_DETAIL_GRID_ID).getGridParam('selarrrow');

src/main/webapp/js/app/pomng/ITP_POMNG05010.js

@@ -40,7 +40,7 @@ const gridColModel = {
 			index: 'Brand_Nm', name: 'brandNm',			
 			label: ITP_MSG_LOCALE.label.brandNm, 		//브랜드이름
 			width: '20', fixed: false, align: 'left',	
-			minwidth:150,
+			minwidth:140,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
@@ -75,7 +75,7 @@ const gridColModel = {
 			index: 'WHS_NM', name: 'whsNm',				
 			label: '입고처', 			//납품장소
 			width: '20', fixed: false, align: 'left',	
-			minwidth:220,
+			minwidth:170,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
@@ -124,56 +124,52 @@ const gridColModel = {
 			index: 'ITEM_NM', name: 'itemNm',			
 			label: ITP_MSG_LOCALE.label.itemNm, 		//품목명
 			width: '10', fixed: false, align: 'left',	
-			minwidth:180,
+			minwidth:120,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'PODR_QTY', name: 'podrQty',			
 			label: ITP_MSG_LOCALE.label.podrQty, 		//수주수량
-			width: '6', fixed: false, align: 'right',	
-			minwidth:80,
+			width: '24', fixed: false, align: 'right',	
 			sortable: false, hidden: false				
 		},
 		{
 			index: 'DLV_QTY', name: 'dlvQty',			
 			label: ITP_MSG_LOCALE.label.dlvQty, 		//납품수량
-			width: '6', fixed: false, align: 'right',	
-			minwidth:80,
+			width: '24', fixed: false, align: 'right',	
 			sortable: false, hidden: false				
 		},
 		{
 			index: 'UNIT', name: 'unit',				
 			label: ITP_MSG_LOCALE.label.unit, 			//단가
-			width: '6', fixed: false, align: 'right',	
+			width: '16', fixed: false, align: 'right',	
 			sortable: false, hidden: true				
 		},
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',			
 			label: ITP_MSG_LOCALE.label.unitAmt, 		//단가
-			width: '6', fixed: false, align: 'right',	
-			minwidth:80,
+			width: '24', fixed: false, align: 'right',	
 			sortable: false, hidden: false,
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }				
 		},
 		{
 			index: 'DLV_MGR_NM', name: 'dlvMgrNm',		
 			label: ITP_MSG_LOCALE.label.dlvMgrNm, 		//납품담당자
-			width: '8', fixed: false, align: 'left',	
-			minwidth:100,
+			width: '8', fixed: false, align: 'center',	
+			minwidth:80,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'DLV_MGR_TEL_NO', name: 'dlvMgrTelNo',	
 			label: ITP_MSG_LOCALE.label.dlvMgrTelNo, 	//납품담당연락처
-			width: '10', fixed: false, align: 'center',	
-			minwidth:120,
+			width: '25', fixed: false, align: 'center',	
 			sortable: false, hidden: false				
 		},
 		{
 			index: 'WHS_DVSN_NM', name: 'whsDvsnNm',	
 			label: ITP_MSG_LOCALE.label.whsDvsnNm, 	//창고구분
-			width: '10', fixed: false, align: 'center',	
-			minwidth:100,
+			width: '16', fixed: false, align: 'center',
+			minwidth:70,
 			sortable: false, hidden: false				
 		}
 	]

src/main/webapp/js/app/stinfo/ITP_STINFO04010.js

@@ -855,16 +855,16 @@ let modifyObj = {
         //$('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_SALE_UNIT').val(result.saleUnit);
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_BARCODE').val(result.barcode);
         //$('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_STCK_UNIT').val(result.stckUnit);
-        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WEIGHT').val(result.weight);
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WEIGHT').val(result.weight.toFixed(2));
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WEIGHT_UNIT').val(result.weightUnit);
         $('#ITP_FORM_STINFO04010_DETAIL .item_unit').text(result.unit);
-        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_VOLUME').val(result.volume);
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_VOLUME').val(result.volume.toFixed(2));
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_VOLUME_UNIT').val(result.volumeUnit);        
-        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WIDTH').val(result.width);
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WIDTH').val(result.width.toFixed(2));
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WIDTH_UNIT').val(result.widthUnit);
-        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HEIGHT').val(result.height);
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HEIGHT').val(result.height.toFixed(2));
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HEIGHT_UNIT').val(result.heightUnit);
-        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HIGH').val(result.high);
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HIGH').val(result.high.toFixed(2));
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HIGH_UNIT').val(result.highUnit);
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_ONE_BOX_QTY').val(itp_fn_number_comma(result.oneBoxQty));
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_EXPRY_YN').val(result.expryYn);

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

@@ -215,7 +215,7 @@
 					  <div class="nomal">
 						<label class="col_4">비고</label>
 						<span>:</span>
-					    <input id="ITP_FORM_MORDMNG02010_VIEW_DELI_DESC" type="text" name="deliDesc">
+					    <input id="ITP_FORM_MORDMNG02010_VIEW_DELI_DESC" class="full" type="text" name="deliDesc">
 					  </div>
 					</div>
 			  	</li>

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

@@ -50,10 +50,10 @@
 	              <button id="ITP_BTN_MPOMNG01010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 	            </div>
 	        </div>
-	        <div class="table_header line">
+	        <div class="table_btn line">
 	          <div >
 	            <h1><구매품목></h1>
-	            <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
+	            <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_DELROW" class="btn-danger btn-sm ADB">품목삭제</button>
 	            <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MPOMNG01010_ITEM_AREA">품목추가</button>
 	          </div>
 	        </div>

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

@@ -271,7 +271,7 @@
 		<div class="pop">
 			<div class="header">
 				<div class="header_left">
-					<label>납품장소</label>
+					<label>반품장소</label>
 				</div>
 				<div class="header_right">
 					<button type="button" id="ITP_BTN_MRTNMNG02010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
@@ -281,12 +281,12 @@
 				<form id="ITP_FORM_MRTNMNG02010_POP_WHS" class="form-horizontal" onsubmit="return false;">
 					<input type="hidden" id="ITP_FORM_MRTNMNG02010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
 					<input type="hidden" id="ITP_FORM_MRTNMNG02010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
-					<input id="ITP_FORM_MRTNMNG02010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
+					<input id="ITP_FORM_MRTNMNG02010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="창고명">
 					<button id="ITP_BTN_MRTNMNG02010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
+				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_red">반품장소 <img src="../img/arrow_down.png"></button>
 			</div>
 			<div id="ITP_LIST_MRTNMNG02010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>

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

@@ -119,8 +119,7 @@
 				</div>
 			</div>
 			<div class="button_bar">
-				<button id="ITP_BTN_MRTNMNG05010_LIST_MODIFY" class="btn_col_6 btn-m-orange INPS">반품처리</button>
-				<button id="ITP_BTN_MRTNMNG05010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>
+				<button id="ITP_BTN_MRTNMNG05010_LIST_CANCEL" class="col_12 btn-gray CLB">취소</button>
 			</div>
 		</form>
 	</div>

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

@@ -104,7 +104,7 @@
 								<label>발주수량</label>
 								<span>:</span>
 								<div class="fnColReqQty"></div>
-								<label class="sub_info">입고수량</label>
+								<label class="sub_info">수거수량</label>
 								<span>:</span>
 								<div class="fnRodrQty"></div>
 							</div>

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

@@ -102,7 +102,7 @@
 		<div class="pop">
 			<div class="header">
 				<div class="header_left">
-					<label>창고</label>
+					<label>창고정보</label>
 				</div>
 				<div class="header_right">
 					<button type="button" id="ITP_BTN_MSTOCKMNG01010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>

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

@@ -111,7 +111,7 @@
 		<div class="pop">
 			<div class="header">
 				<div class="header_left">
-					<label>납품장소</label>
+					<label>창고정보</label>
 				</div>
 				<div class="header_right">
 					<button type="button" id="ITP_BTN_MSTOCKMNG02010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
@@ -121,12 +121,12 @@
 				<form id="ITP_FORM_MSTOCKMNG02010_POP_WHS" class="form-horizontal" onsubmit="return false;">
 					<input type="hidden" id="ITP_FORM_MSTOCKMNG02010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
 					<input type="hidden" id="ITP_FORM_MSTOCKMNG02010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
-					<input id="ITP_FORM_MSTOCKMNG02010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
+					<input id="ITP_FORM_MSTOCKMNG02010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="창고명">
 					<button id="ITP_BTN_MSTOCKMNG02010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MSTOCKMNG02010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
+				<button id="ITP_BTN_MSTOCKMNG02010_POP_WHS_NM" class="btn_red">창 고 <img src="../img/arrow_down.png"></button>
 			</div>
 			<div id="ITP_LIST_MSTOCKMNG02010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MSTOCKMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>

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

@@ -383,8 +383,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line div.date_to input {font-weight:100; width:47%; height:34px; font-size:11pt; padding:0 24px 0 3px; margin:0;}
 
 .content .line div.date_to div.at {width: 6%;  font-size: 16px; padding-top:12px; float: right;}
-.content .line .search {width: 100%; height: 50px; padding-top:12px;}
-.content .line .search button {width: 40%; height: 27px; font-size: 12px; font-weight:100; padding: 0;}
+.content .line .search {width: 100%; height: 50px; padding-top:6px;}
+.content .line .search button {width: 40%; height: 34px; font-size: 12pt; font-weight:100; padding: 0;}
 .content .line .search button.col_3 {width: 25%; height:30px; margin:0 10px;}
 .content .list_line {width:98%; float:left; height:50px;display: inline-flex; margin:0 1%; font-size:12px;}
 .content .border {border-bottom: 1px solid #000 !important;}
@@ -397,9 +397,11 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .list_line .mail input {width:30%;}
 .content .list_line .mail select {width:30%; height:34px; font-size:14px; border: 1px solid #aaa;border-radius: 5px;}
 .content .list_line .list_info .pay_info {text-align:left; padding-left:17px; font-size:12pt;}
-.content .table_header {margin-top: 6px; width: 100%; height: 36px;}
-.content .table_header h1 {margin-left: 15px; margin-top:16px; margin-bottom:0; font-size: 13px; float: left; color: #000; font-weight: 100;}
-.content .table_header button {float: right; width: 68px; height:26px; font-size: 12px; font-weight: 100; padding:0px; margin: 4px 12px 6px 0; border-radius:15px;}
+.content .table_header {margin-top: 6px; width: 100%; height: 20px;}
+.content .table_btn {margin-top: 6px; width: 100%; height: 38px;}
+.content .table_header h1 {margin-left: 15px; margin-top:0px; margin-bottom:0; font-size: 13px; float: left; color: #000; font-weight: 100;}
+.content .table_btn h1 {margin-left: 15px; margin-top:16px; margin-bottom:0; font-size: 13px; float: left; color: #000; font-weight: 100;}
+.content .table_btn button {float: right; width: 75px; height:34px; font-size: 10pt; font-weight: 100; padding:0px; margin: 0px 12px 6px 0; border-radius:15px;}
 .detail_content {top: 0px; position: fixed; display:contents; z-index: 10; width:100%; background: #fff;}
 .detail_content .detail_content_fix {background: #f5f6f6; border-bottom:1px solid #E0B8AB;}
 .detail_content .detail_header {width: 330px; height: 50px; margin:0; left:50%; position:relative; transform:translateX(-50%);}
@@ -532,6 +534,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal .half label {min-width:auto;}
 .scroll_area li .left .nomal .half div {min-width:auto; margin-right:5px; margin-top:0;}
 .scroll_area li .left .nomal  input{ width:calc(50% - 85px);height:28px; top:-5px; position:relative;}
+.scroll_area li .left .nomal  input.full {width:calc(100% - 90px); margin-top:4px;}
 .scroll_area li .left .nomal  button {width:60px; margin-left:5px; height:26px; padding:0;border-radius:5px;}
 .scroll_area li .left .nomal  select{ width:calc(50% - 85px); height:28px; top:-5px; position:relative;}
 
@@ -700,7 +703,7 @@ button.close {-webkit-appearance: none; padding: 0; cursor: pointer; background:
 #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: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 .itp_graph_area .itp_graph_header select {height:24px;}
 #ITP_MAIN_CONTAINER .mb_0 {margin-bottom:0;}
 #ITP_MAIN_CONTAINER #ITP_GRAPH_INFO {height:265px;}
 /* 공지사항 팝업추가 */