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

src/main/webapp/app/stinfo/STINFO04010.html

@@ -249,7 +249,7 @@
 											<label class="col-xs-2 itp_lb">중량</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-3 itp_in">
-													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_WEIGHT" onKeyup="this.value=this.value.replace(/[^0-9]/g,'');" class="form-control itp_input" name="weight" value="">
+													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_WEIGHT" onkeypress="return checkNumberPoint(event)" class="form-control itp_input" name="weight" value="">
 												</div>
 												<div class="col-xs-4 itp_in">
 	              									<select id="ITP_FORM_STINFO04010_DETAIL_WEIGHT_UNIT" data-select-code="WEIGHT_UNIT" class="form-control itp_input detail_item_unit" name="weightUnit"></select>
@@ -258,7 +258,7 @@
 											<label class="col-xs-2 itp_lb">부피</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-3 itp_in">
-													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_VOLUME" onKeyup="this.value=this.value.replace(/[^0-9]/g,'');" class="form-control itp_input" name="volume" value="">
+													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_VOLUME" onkeypress="return checkNumberPoint(event)" class="form-control itp_input" name="volume" value="">
 												</div>
 												<div class="col-xs-4 itp_in">
 	              									<select id="ITP_FORM_STINFO04010_DETAIL_VOLUME_UNIT" data-select-code="VOLUME_UNIT" class="form-control itp_input detail_item_unit" name="volumeUnit"></select>
@@ -271,7 +271,7 @@
 											<label class="col-xs-2 itp_lb">가로</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-3 itp_in">
-													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_WIDTH" onKeyup="this.value=this.value.replace(/[^0-9]/g,'');" class="form-control itp_input" name="width" value="">
+													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_WIDTH" onkeypress="return checkNumberPoint(event)" class="form-control itp_input" name="width" value="">
 												</div>
 												<div class="col-xs-4 itp_in">
 	              									<select id="ITP_FORM_STINFO04010_DETAIL_WIDTH_UNIT" data-select-code="WIDTH_UNIT" class="form-control itp_input detail_item_unit" name="widthUnit"></select>
@@ -280,7 +280,7 @@
 											<label class="col-xs-2 itp_lb">세로</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-3 itp_in">
-													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_HEIGHT" onKeyup="this.value=this.value.replace(/[^0-9]/g,'');" class="form-control itp_input" name="height" value="">
+													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_HEIGHT" onkeypress="return checkNumberPoint(event)" class="form-control itp_input" name="height" value="">
 												</div>
 												<div class="col-xs-4 itp_in">
 	              									<select id="ITP_FORM_STINFO04010_DETAIL_HEIGHT_UNIT" data-select-code="HEIGHT_UNIT" class="form-control itp_input detail_item_unit" name="heightUnit"></select>
@@ -293,7 +293,7 @@
 											<label class="col-xs-2 itp_lb">높이</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-3 itp_in">
-													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_HIGH" onKeyup="this.value=this.value.replace(/[^0-9]/g,'');" class="form-control itp_input" name="high" value="">
+													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_HIGH" onkeypress="return checkNumberPoint(event)" class="form-control itp_input" name="high" value="">
 												</div>
 												<div class="col-xs-4 itp_in">
 	              									<select id="ITP_FORM_STINFO04010_DETAIL_HIGH_UNIT" data-select-code="HIGH_UNIT" class="form-control itp_input detail_item_unit" name="highUnit"></select>

src/main/webapp/js/app/oper/ITP_OPER03010.js

@@ -241,7 +241,7 @@ let pageObj = {
 			'showYn': $('#ITP_' + id + '_DETAIL_UPLOAD').attr('data-show-yn'),
 			'fileId': '#ITP_FORM_' + id + '_DETAIL_FILE_NO' //파일번호를 서버에서 받아서 넣을 파일번호 인풋박스 아이디
 		};
-		itp_fn_set_file_upload('ITP_' + id + '_DETAIL_UPLOAD', 'affl', true, false, id, fileArgs, removeFn);
+		itp_fn_set_file_upload('ITP_' + id + '_DETAIL_UPLOAD', 'affl', false, false, id, fileArgs, removeFn);
 	},
 	switchScreen: function(mode) {
 		$('.itp_det_head').find('button[id^="ITP_BTN_OPER03010_"]').each(function(i) {

src/main/webapp/js/app/oper/ITP_OPER06010.js

@@ -215,7 +215,7 @@ let pageObj = {
             'showYn': $('#ITP_' + id + '_DETAIL_UPLOAD').attr('data-show-yn'),
             'fileId': '#ITP_FORM_' + id + '_DETAIL_FILE_NO' //파일번호를 서버에서 받아서 넣을 파일번호 인풋박스 아이디
         };
-        itp_fn_set_file_upload('ITP_' + id + '_DETAIL_UPLOAD', 'brand', true, false, id, fileArgs, removeFn);
+        itp_fn_set_file_upload('ITP_' + id + '_DETAIL_UPLOAD', 'brand', false, false, id, fileArgs, removeFn);
     },
     switchScreen: function(mode) {
         $('.itp_det_head').find('button[id^="ITP_BTN_OPER06010_"]').each(function(i) {

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

@@ -55,6 +55,15 @@ let API_GET_KEY			 	= '/api/session/get-key';
 
 let SCREEN_MODE;
 
+function checkNumberPoint(event) {
+    if(event.key === '.' 
+       || event.key === '-'
+       || event.key >= 0 && event.key <= 9) {
+      return true;
+    }
+    return false;
+  }
+
 /*화면 Grid ColModel*/
 const gridColModel = {
     list: [

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

@@ -31,7 +31,7 @@
 		}
 		.itp_notify_row {
 			display: flex;
-			margin-top: 16px;
+			margin-top: 10px;
 		}
 		.noti_label  {
 			width: 65px;
@@ -46,14 +46,15 @@
 			margin-left: 10px;
 		}
 		.noti_content  {
-			width: calc(100vw - 70px);
+			width: 98%;
 			overflow: auto;
-			height: 100px; 
+			padding:5px;
+			height: 170px; 
 			text-align: left;
-			margin-left: 10px;
+			word-break:break-all;
+			margin:0 1%;
+			border:1px solid #aaa;
 		}
-		
-
 	</style>
 </head>
 <body>
@@ -347,7 +348,7 @@
 	<aside id="ITP_ASIDE"></aside>
 	<section>
 		<div id="ITP_POP_NOTICE" class="popup2 mobile-pop-close" style="display: none;">
-			<div class="pop" style="height:330px;">
+			<div class="pop" style="height:400px;">
 				<div class="header">
 					<div class="header_left">
 						<label>공지내용</label>
@@ -356,7 +357,6 @@
 						<button type="button" class="btn-pop-close"><img src="../img/close.png"></button>
 					</div>
 				</div>
-		
 				<div id="ITP_POP_NOTICE_AREA" class="popup_scroll">
 					<div class="itp_notify_row">
 						<span class="noti_label">공지제목</span>
@@ -364,8 +364,6 @@
 						<div class="fnNoteNm noti_text"></div>
 					</div> 
 					<div class="itp_notify_row">
-						<span class="noti_label">공지내용</span>
-						<span>:</span>
 						<div class="fnNote noti_content"></div>
 					</div>
 					<div class="itp_notify_row">
@@ -373,10 +371,13 @@
 						<span>:</span>
 						<div class="fnNoteFromTo noti_text"></div>
 					</div>
+					<div class="itp_notify_row">
+						<span class="noti_label">첨부파일</span>
+						<table></table>
+					</div>
 				</div>
 			</div>
 		</div>
 	</section>
-	
 </body>
 </html>

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

@@ -12,7 +12,7 @@
 				<div class="line">
 				  <label>수거장소</label>
 				  <div class="float_left">
-					<input id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH_COL_PLACE" name="sDlvPlace" type="text" placeholder="수거장소">
+					<input id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH_COL_PLACE" name="sDlvPlace" type="text" placeholder="">
 					<input type="hidden" id="ITP_FORM_MCOLLMNG01010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
 					<div class="itp_input_btn">
 						<button id="ITP_BTN_MCOLLMNG01010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>

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

@@ -12,7 +12,7 @@
 			   <div class="line">
 				  <label>수거장소</label>
 				   <div class="float_left">
-					   <input id="ITP_FORM_MCOLLMNG02010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="수거장소">
+					   <input id="ITP_FORM_MCOLLMNG02010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="">
 					   <input type="hidden" id="ITP_FORM_MCOLLMNG02010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="srtnWhsId"/>
 					   <div class="itp_input_btn">
 					   		<button type="button" id="ITP_BTN_MCOLLMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>

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

@@ -13,7 +13,7 @@
 				<div class="line">
 				  <label>수거장소</label>
 					<div class="float_left">
-						<input id="ITP_FORM_MCOLLMNG03010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="수거장소">
+						<input id="ITP_FORM_MCOLLMNG03010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="">
 						<input type="hidden" id="ITP_FORM_MCOLLMNG03010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
 						<div class="itp_input_btn">
 							<button type="button" id="ITP_BTN_MCOLLMNG03010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>

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="납품장소">
+					  <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>

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="납품장소">
+					   <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>
@@ -96,7 +96,7 @@
 					  <div class="nomal">
 						<label class="col_4">발주금액</label>
 						<span>:</span>
-					    <div class="col_9 fnPodrAmt"></div>
+					    <div class="full fnPodrAmt"></div>
 					  </div>
 					</div>
 				</li>

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

@@ -12,7 +12,7 @@
 					<div class="line">
 						<label>납품장소</label>
 						<div class="float_left">
-							<input id="ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="납품장소">
+							<input id="ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="">
 							<input type="hidden" id="ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
 							<div class="itp_input_btn">
 								<button type="button" id="ITP_BTN_MORDMNG03010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>

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

@@ -355,7 +355,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line .float_left.name {width:62%;}
 .content .line .float_left button {float:right; left:-2px; top:-2px; position:relative; background:transparent; border:none; width:34px; height:34px; padding:0;} 
 .content .line .float_left button img {width:18px;}
-.content .line .float_left input {width:100%; font-size:14pt; text-overflow:ellipsis; padding-right:22px;}
+.content .line .float_left input {width:100%; font-size:12pt; text-overflow:ellipsis; padding-right:22px;}
+.content .line .float_left input::placeholder {color:#bbb; font-size:10pt;}
 .content .line .float_left.note {width: 100%; padding: 10px;}
 .content .line .float_left.note textarea {width: 100%; height: 100px; border: 1px solid #aaa; text-align: left; font-size:14px;}
 .content .line .float_left div {font-size: 14pt; margin-top: 4px; margin-right:8px; text-align:right; font-weight:100;}

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

@@ -4,7 +4,7 @@ require(['config'], function() {
 	], function($) {
 
 		setTimeout(function() {
-			mobMainObj.init();
+			// mobMainObj.init();
 		}, 100);
 
 	});
@@ -299,3 +299,15 @@ let mobPopObj = {
 		$('#' + popId).closest('.mobile-pop-close').hide();
 	}
 };
+
+function appCallFnConnKey(connKey) {
+	if(connKey) {
+		sessionStorage.setItem('itp_login_info', JSON.stringify({
+			timestamp: new Date(),
+			connKey: connKey
+		}));
+		itp_fn_session_data(connKey);
+	} else {
+		location.replace('app:logout');
+	}
+}

src/main/webapp/mobile/js/config.js

@@ -64,30 +64,46 @@ require([
 
 	// 로그아웃 버튼
 	$('#ITP_MOBILE_BTN_LOGOUT').click(function() {
-		fnLogout();
+		CommonObj.isApp ? location.replace('app:logout') : fnLogout();
 	});
 
 	if(VIEW_PAGE !== 'LOGIN' && VIEW_PAGE !== 'PAY') {
 		var data = JSON.parse(sessionStorage.getItem('itp_login_info'));
-		CONN_KEY = data.connKey; //로그인 했을때 넣었던 키를 가져옴
+		if(CommonObj.isApp) {
+			if(data && data.connKey) {
+				console.log("data 1 : ");
+				itp_fn_session_data(data.connKey);
+			} else {
+				console.log("data 2 : ");
+				location.replace('app:connKey');
+			}
+		} else {
+			itp_fn_session_data(data.connKey);
+		}
+	}
 
-		var callbackFn = function(result) {
-			console.log(result);
-			CODE_LIST = result.codeList;
-			AUTH_MENU_LIST = result.authMenuList;
-			ACT_LIST = result.actList;
-			LOGIN_USER_INFO = result.userInfo;
+});
 
-			// 사용자 정보 만들기
-			fn_make_user_info.init();
+var itp_fn_session_data = function(connKey) {
+	CONN_KEY = connKey; //로그인 했을때 넣었던 키를 가져옴
 
-			// 왼쪽 메뉴 만들기
-			fn_make_slide_menu.init();
-		};
-		fn_ajax_call('/api/session/data-app', null, callbackFn, 'GET');
-	}
+	var callbackFn = function(result) {
+		console.log(result);
+		CODE_LIST = result.codeList;
+		AUTH_MENU_LIST = result.authMenuList;
+		ACT_LIST = result.actList;
+		LOGIN_USER_INFO = result.userInfo;
 
-});
+		// 사용자 정보 만들기
+		fn_make_user_info.init();
+
+		// 왼쪽 메뉴 만들기
+		fn_make_slide_menu.init();
+
+		mobMainObj.init();
+	};
+	fn_ajax_call('/api/session/data-app', null, callbackFn, 'GET');
+};
 
 var itp_fn_logined_check = function(user_nm_update, fn) {
 	var now, expiration, data = false;
@@ -353,7 +369,7 @@ function fnLogout() { //로그아웃
 	var callbackFn = function(result) {
 		sessionStorage.removeItem('itp_login_info'); //Jwt 키 제거
 		sessionStorage.removeItem('itp_manage_user_info'); //로그인 사용자 정보 제거
-		$(location).attr('href', MOBILE_CONTEXTPATH + '/app/login.html');
+		$(location).attr('href', CommonObj.isApp ? 'app:logout' : MOBILE_CONTEXTPATH + '/app/login.html');
 	};
 	fn_ajax_call('/api/member/sign-out', null, callbackFn, 'PATCH');
 }
@@ -361,7 +377,8 @@ function fnLogout() { //로그아웃
 function fnSessionOut() { //1시간 동안 아무것도 안할때 또는 강제 만료시킬때 사용
 	var callbackFn = function(result) {
 		sessionStorage.removeItem('itp_login_info'); //Jwt 키 제거
-		$(location).attr('href', MOBILE_CONTEXTPATH + '/app/login.html');
+		sessionStorage.removeItem('itp_manage_user_info'); //로그인 사용자 정보 제거
+		$(location).attr('href', CommonObj.isApp ? 'app:logout' : MOBILE_CONTEXTPATH + '/app/login.html');
 	};
 	fn_ajax_call('/api/session/expire', null, callbackFn, 'PATCH');
 }