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

src/main/webapp/js/app/collmng/ITP_COLLMNG02010.js

@@ -262,7 +262,7 @@ let pageObj = {
 	popup: function (arg) {
 		var popFn = this.callback.rtnwhs;
 		
-		var whsDvsn = "";
+		var whsDvsn = "W01";
 
 		const key = { brandId: fn_make_user_info.get('brandId'), storeId: fn_make_user_info.get('storeId'), whsDvsn: whsDvsn };
 

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

@@ -20,6 +20,13 @@ const ORDMNG03010_GRID_LIST = '#ITP_ORDMNG03010_jqGrid_list';	//GRID_LIST 선언
 const ORDMNG03010_GRID_PAGER = '#ITP_ORDMNG03010_jqGridPager';	//GRID_PAGER 선언
 const ORDMNG03010_GRID_EMPTY = '#ITP_ORDMNG03010_jqGridEmpty';	//GRID_EMPTY 선언
 
+function formatPhoneNumber(cellvalue, options, rowObject) { 
+    cellvalue=cellvalue.replace(/[^0-9]/g, '') // 숫자를 제외한 모든 문자 제거
+    .replace(/^(\d{2,3})(\d{3,4})(\d{4})$/, `$1-$2-$3`);
+   return cellvalue;
+}
+
+
 /*API URL*/
 let API_DELI_GRID_LIST 	= '/api/pomng/inoutmng/spply-deli-grid-list';// 목록
 let API_INFO_INV 		= '/api/pomng/inoutmng/init-spply-inv';	// 상세
@@ -81,7 +88,7 @@ const gridColModel = {
 		{
 			index: 'ITEM_CLASS_NM', name: 'itemId',		//서버로 전송시 데이터 명 , 데이터명
 			label: ITP_MSG_LOCALE.label.itemId, 		//품목번호
-			minwidth: 180,
+			minwidth: 140,
 			width: '11', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
 			sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
 		},
@@ -93,40 +100,29 @@ const gridColModel = {
 			sortable: false, hidden: false,				//정렬가능 여부,화면표시 여부
 			classes: 'ui-ellipsis'
 		},
-		{
-			index: 'UNIT', name: 'unit',				//서버로 전송시 데이터 명 , 데이터명
-			label: ITP_MSG_LOCALE.label.unit, 			//단위
-			minwidth: 80,
-			width: '6', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
-			sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
-		},
-		{
-			index: 'PCH_ITEM_YN', name: 'unitAmt',		//서버로 전송시 데이터 명 , 데이터명
-			label: ITP_MSG_LOCALE.label.unitAmt, 		//납품단가
-			minwidth: 80,
-			width: '6', fixed: false, align: 'right ',	// cell가로넓이,고정 여부 ,text정렬 
-			sortable: false, hidden: false,				//정렬가능 여부,화면표시 여부
-			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
-		},
 		{
 			index: 'PODR_QTY', name: 'podrQty',			//서버로 전송시 데이터 명 , 데이터명
 			label: ITP_MSG_LOCALE.label.podrQty, 		//수주수량
-			minwidth: 80,
-			width: '6', fixed: false, align: 'right',	// cell가로넓이,고정 여부 ,text정렬 
+			width: '17', fixed: false, align: 'right',	// cell가로넓이,고정 여부 ,text정렬 
 			sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
 		},
 		{
 			index: 'SALE_ITEM_YN', name: 'dlvQty',		//서버로 전송시 데이터 명 , 데이터명
 			label: ITP_MSG_LOCALE.label.dlvQty, 		//납품수량
-			minwidth: 80,
-			width: '6', fixed: false, align: 'right',	// cell가로넓이,고정 여부 ,text정렬 
+			width: '17', fixed: false, align: 'right',	// cell가로넓이,고정 여부 ,text정렬 
 			sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
 		},
 		{
-			index: 'DLV_AMT', name: 'dlvAmt',		//서버로 전송시 데이터 명 , 데이터명
-			label: ITP_MSG_LOCALE.label.dlvAmt, 		//납품단가
+			index: 'UNIT', name: 'unit',				//서버로 전송시 데이터 명 , 데이터명
+			label: ITP_MSG_LOCALE.label.unit, 			//단위
 			minwidth: 80,
-			width: '6', fixed: false, align: 'right ',	// cell가로넓이,고정 여부 ,text정렬 
+			width: '6', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
+			sortable: false, hidden: false				//정렬가능 여부,화면표시 여부
+		},
+		{
+			index: 'PCH_ITEM_YN', name: 'unitAmt',		//서버로 전송시 데이터 명 , 데이터명
+			label: ITP_MSG_LOCALE.label.unitAmt, 		//납품금액
+			width: '17', fixed: false, align: 'right ',	// cell가로넓이,고정 여부 ,text정렬 
 			sortable: false, hidden: false,				//정렬가능 여부,화면표시 여부
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
@@ -151,7 +147,7 @@ const gridColModel = {
 			minwidth: 120,
 			width: '10', fixed: false, align: 'center',	// cell가로넓이,고정 여부 ,text정렬 
 			sortable: false, hidden: false,				//정렬가능 여부,화면표시 여부
-			editable: true, editoptions: {'data-key-up': 'tel', maxlength: 13}
+			formatter: formatPhoneNumber
 		}
 	]
 };
@@ -176,8 +172,7 @@ let pageObj = {
 			$('#ITP_FORM_ORDMNG03010_SEARCH_DLV_REQ_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
 			$('#ITP_FORM_ORDMNG03010_SEARCH_DLV_CMPLT_DT').datepicker('setDate', new Date());
 		}
-	},	
-	
+	},
 	event: {
 		init: function () {
 				this.button(); //button 부르기

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

@@ -1,5 +1,5 @@
 <section id="ITP_MOBILE_MORDMNG02010">
-	<div id="ITP_AJAX_MORDMNG02010_LIST_CONTAINER" style="display: none;">
+	<div id="ITP_AJAX_MORDMNG02010_LIST_CONTAINER" style="display: block;">
 		<form id="ITP_FORM_MORDMNG02010_LIST_SEARCH" class="put_btn form-horizontal" onsubmit="return false;">
 			<input type="hidden" id="ITP_FORM_MORDMNG02010_LIST_VIEW_CD" name="viewCd" value="C">
 			<input type="hidden" id="ITP_FORM_MORDMNG02010_SEARCH_BRAND_ID" name="sbrandId" value="">
@@ -49,53 +49,51 @@
 		  </div>
 		   <div id="ITP_LIST_MORDMNG02010_LIST_ITEM_AREA" class="scroll_area row-2">
 			  <ul id="ITP_LIST_MORDMNG02010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
-			  <div id="ITP_LIST_MORDMNG02010_LIST_ITEM_ROWCOPY" style="display: none;">
-				<li class="history_list4 item-row">
+			  <div id="ITP_LIST_MORDMNG02010_LIST_ITEM_ROWCOPY" style="display: block;">
+				<li class="history_list12 item-row">
 					<div class="left">
 					  <div class="nomal">
 						<label class="col_4">브랜드명</label>
 						<span>:</span>
-					    <div class=" fnBrandNm"></div>
-						<label class="col_4">발주번호</label>
-						<span>:</span>
-					    <div class="col_9 fnPchPodrUnqNo"></div>
+					    <div class="full fnBrandNm"></div>
 					  </div>
 					</div>
 					<div class="left">
 					  <div class="nomal">
+						<label class="col_4">발주번호</label>
+						<span>:</span>
+					    <div class="col_9 fnPchPodrUnqNo"></div>
 						<label class="col_4">발주항번</label>
 						<span>:</span>
 					    <div class="fnPchPodrDtlNo"></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>
-						<label class="col_4">품목번호</label>
-						<span>:</span>
-					    <div class="col_9 fnItemId"></div>
+					    <div class="full fnWhsNm"></div>
 					  </div>
 					</div>
 					<div class="left">
 					  <div class="nomal">
 						<label class="col_4">품목명</label>
 						<span>:</span>
-					    <div class="fnItemNm"></div>
-						<label class="col_4">발주수량</label>
-						<span>:</span>
-					    <div class="col_9 fnPodrQty"></div>
+					    <div class="full fnItemNm"></div>
 					  </div>
 					</div>
 					<div class="left">
 					  <div class="nomal">
+						<label class="col_4">발주수량</label>
+						<span>:</span>
+					    <div class="col_9 fnPodrQty"></div>
 						<label class="col_4">단가금액</label>
 						<span>:</span>
 					    <div class="fnUnitAmt"></div>
+					  </div>
+					</div>
+					<div class="left">
+					  <div class="nomal">
 						<label class="col_4">발주금액</label>
 						<span>:</span>
 					    <div class="col_9 fnPodrAmt"></div>
@@ -256,8 +254,17 @@
         <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="pop_flex">
+              		<label>브랜드명</label>
+              		<span>:</span>
+              		<div class="fnBrandNm"></div>
+                 </div>
+                 <div class="pop_flex">
+					<label>창고명</label>
+              		<span>:</span>
+              		<div class="col_0 fnWhsNm"></div>
+              		<div class="text_2 fnLocationNm"></div>
+           		</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

@@ -99,6 +99,12 @@ section .popup2 .pop .popup_scroll li .scroll_left {float: left; display:grid; w
 section .popup2 .pop .popup_scroll li .scroll_left.item{float: left; display:grid; width: calc(100% - 141px);}
 section .popup2 .pop .popup_scroll li .scroll_left div {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; text-align:left; float: left; font-size: 14pt; font-weight: 100; width: 80%; margin:8px 6px -6px 10px;}
 section .popup2 .pop .popup_scroll li .scroll_left .con_2 {padding-top:0px;}
+section .popup2 .pop .popup_scroll li .scroll_left .pop_flex {display:flex; width:96%;}
+section .popup2 .pop .popup_scroll li .scroll_left .pop_flex label {min-width:70px; text-align:left;}
+section .popup2 .pop .popup_scroll li .scroll_left .pop_flex span {width:10px;}
+section .popup2 .pop .popup_scroll li .scroll_left .pop_flex div {width:calc(100% - 80px); margin:0;}
+section .popup2 .pop .popup_scroll li .scroll_left .pop_flex div.col_0 {width:auto;}
+section .popup2 .pop .popup_scroll li .scroll_left .pop_flex div.text_2 {width:calc(100% - 200px); margin:0;}
 section .popup2 .pop .popup_scroll li .scroll_left .mg_0 {margin:0; width:100%;}
 section .popup2 .pop .popup_scroll li .scroll_left .mg_0 div {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:47%; margin:0; padding: 8px 2px 0px 2px;}
 section .popup2 .pop .popup_scroll li .scroll_left .mg_0 .type_hide {width:auto;}
@@ -487,6 +493,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li.history_list7 {height: 120px; padding-top:5px;}
 .scroll_area li.history_list9 {height: 170px;}
 .scroll_area li.history_list11 {height: 230px; padding-top:5px;}
+.scroll_area li.history_list12 {height: 170px; padding-top:4px;}
 
 .scroll_area li .history_info {width: auto;}
 .scroll_area li .left {width:100%; height:28px; margin-top:0px;}