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

src/main/webapp/app/inoutmng/INOUTMNG01010.html

@@ -21,7 +21,7 @@
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<select id="ITP_FORM_INOUTMNG01010_SEARCH_" class="form-control itp_input" name="serviceDlvReqDt">
-												<option value="A">출하창고</option>											
+												<option value="A">납품요청</option>											
 											</select>
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">

src/main/webapp/app/popup/biz/BIZPOP_PO_REJECT.html

@@ -1,5 +1,5 @@
 <div id="ITP_BIZPOP_PO_REJECT" class="modal itp_modal">
-	<div class="modal-dialog" style="width:600px;">
+	<div class="modal-dialog" style="width:800px;">
 		<div class="modal-content">
 			<form id="ITP_FORM_BIZPOP_PO_REJECT">
 				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_PO_REJECT_STORE_ID" name="storeId" value="">
@@ -23,7 +23,7 @@
 								<label>반려사유</label>
 							</div>	
 							<div class="col-xs-12 itp_form_inline">
-							<textarea  id="ITP_FORM_ITP_BIZPOP_PO_REJECT_REJECT_DSN" name="rejectDsn" value="" style="width:100%; height:100px;"></textarea>
+								<textarea  id="ITP_FORM_ITP_BIZPOP_PO_REJECT_REJECT_DSN" name="rejectDsn" style="width:100%; height:90px;" maxlength="500"></textarea>
 							</div>
 						<div class="col-xs-12 itp_form_inline">
 							<label>반려 품목 내역</label>

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG01010.js

@@ -281,7 +281,7 @@ const gridColModel = {
 		{
 			index: 'EXPRY_DATE', name: 'expryDate',
 			label: ITP_MSG_LOCALE.label.expryDate, //유통일자
-			width: '20', fixed: false, align: 'center',
+			width: '15', fixed: false, align: 'center',
 			sortable: false, hidden: false,
 			editable: true, sorttype: "date",
 			editoptions: { dataInit: function(e) { $(e).datepicker(ITP_DATE_LANGUAGE); } , 'readonly': 'readonly'}
@@ -296,7 +296,7 @@ const gridColModel = {
 		{
 			index: 'DLV_REQ_DT', name: 'dlvReqDt',
 			label: ITP_MSG_LOCALE.label.dlvReqDt, //납품요청일
-			width: '13', fixed: false, align: 'center',
+			width: '15', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
@@ -314,7 +314,7 @@ const gridColModel = {
 		{
 			index: 'SHMT_WHS_NM', name: 'shmtWhsNm',
 			label: ITP_MSG_LOCALE.label.shmtWhsNm, //출고창고명
-			width: '12', fixed: false, align: 'left',
+			width: '14', fixed: false, align: 'left',
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		}
 	]

src/main/webapp/js/app/login.js

@@ -6,7 +6,9 @@ require(['config'], function() {
 		if (sessionStorage.getItem('itp_login_info') !== null) { //Jwt 가 살아있으면 메인으로 보낸다.
 	    	location.replace('./main.html');
 	    }
-
+		if (sessionStorage.getItem('itp_manage_user_info') !== null) { //로그인 사용자 정보가 있다면 제거
+	    	sessionStorage.removeItem('itp_manage_user_info'); 
+	    }  
 		itp_fn_login_init();
 		
 		$('#ITP_LOGIN').on('keyup', 'input, textarea', function() {

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

@@ -409,9 +409,9 @@ let viewObj = {
         $('#ITP_FORM_OPER06010_VIEW .fnRcvAcctNo').text(result.acctNo);
         $('#ITP_FORM_OPER06010_VIEW #ITP_FORM_OPER06010_VIEW_DPST_BNK_CD').val(result.bnkCd);
         let bnkCdNm = $('#ITP_FORM_OPER06010_VIEW_DPST_BNK_CD option:selected').text();
-        $('#ITP_FORM_OPER06010_VIEW .fnBnkCdNm').text(bnkCdNm);
+        $('#ITP_FORM_OPER06010_VIEW .fnBnkCdNm').text('(' + bnkCdNm + ')');
         $('#ITP_FORM_OPER06010_VIEW .fnAcctNo').text(result.acctNo);
-        $('#ITP_FORM_OPER06010_VIEW .fnOwacNm').text(result.owacNm);
+        $('#ITP_FORM_OPER06010_VIEW .fnOwacNm').text('(예금주) ' + result.owacNm);
         $('#ITP_FORM_OPER06010_VIEW .fnZipNo').text(result.zipNo);
         $('#ITP_FORM_OPER06010_VIEW .fnLoadAddr').text(result.addr1);
         $('#ITP_FORM_OPER06010_VIEW .fnDtlAddr').text(result.addr2);

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

@@ -75,7 +75,7 @@ const gridColModel = {
 		{
 			index: 'REQ_TYPE_NM', name: 'reqTypeNm',
 			label: ITP_MSG_LOCALE.label.reqTypeNm, //요청구분
-			width: '10', fixed: false, align: 'center',
+			width: '7', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
@@ -89,7 +89,7 @@ const gridColModel = {
 			index: 'PCH_REQ_NM', name: 'pchReqNm',
 			label: ITP_MSG_LOCALE.label.pchReqNm, //구매요청명
 			width: '13', fixed: false, align: 'left',
-			minwidth: 200,
+			minwidth: 180,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
@@ -101,7 +101,7 @@ const gridColModel = {
 		{
 			index: 'PCH_REQ_ST_NM', name: 'pchReqStNm',
 			label: ITP_MSG_LOCALE.label.pchReqStNm, //구매요청상태명
-			width: '10', fixed: false, align: 'center',
+			width: '9', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
@@ -114,21 +114,21 @@ const gridColModel = {
 		{
 			index: 'PCH_REQ_ITEM_QTY', name: 'pchReqItemQty',
 			label: ITP_MSG_LOCALE.label.pchReqItemQty, //요청품목수
-			width: '10', fixed: false, align: 'right',
+			width: '12', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PCH_REQ_TOTAL_AMT', name: 'pchReqTotalAmt',
 			label: ITP_MSG_LOCALE.label.pchReqTotalAmt, //요청금액
-			width: '10', fixed: false, align: 'right',
+			width: '12', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PCH_REQ_RJCT_DT', name: 'pchReqRjctDt',
 			label: ITP_MSG_LOCALE.label.pchReqRjctDt, //반려일자
-			width: '10', fixed: false, align: 'center',
+			width: '11', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
@@ -140,7 +140,7 @@ const gridColModel = {
 		{
 			index: 'PCH_REQ_MGR_NM', name: 'pchReqMgrNm',
 			label: ITP_MSG_LOCALE.label.pchReqMgrNm, //구매요청자명
-			width: '10', fixed: false, align: 'center',
+			width: '11', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
@@ -154,7 +154,7 @@ const gridColModel = {
 			index: 'WHS_LOCATION_NM', name: 'whsLocationNm',
 			label: ITP_MSG_LOCALE.label.whsLocationNm, //납품창고
 			width: '10', fixed: false, align: 'left',
-			minwidth: 200,
+			minwidth: 180,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		}
 	],

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

@@ -192,10 +192,10 @@ const gridColModel = {
 		},
 		{
 			index: 'LEAD_TIME', name: 'leadTime',
-			label: ITP_MSG_LOCALE.label.leadTime, //리드타임
-			width: '10', fixed: false, align: 'right',
-			minwidth: 100,
-			sortable: false, hidden: false
+			label: '리드타임 Day(s)', //리드타임
+			width: '12', fixed: false, align: 'right',
+			sortable: false, hidden: false,
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		}
 	],
 	detail: [

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

@@ -44,7 +44,7 @@ const gridColModel = {
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
 			width: '10', fixed: false, align: 'left',
-			minwidth: 110,
+			minwidth: 130,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
@@ -71,7 +71,7 @@ const gridColModel = {
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
 			width: '10', fixed: false, align: 'left',
-			minwidth: 120,
+			minwidth: 130,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
@@ -128,7 +128,7 @@ const gridColModel = {
 			index: 'WHS_NM', name: 'whsNm',
 			label: ITP_MSG_LOCALE.label.whsNm, //납품창고명
 			width: '15', fixed: false, align: 'left',
-			minwidth: 200,
+			minwidth: 170,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{

src/main/webapp/js/app/popup/biz/ITP_BIZPOP_PO_REJECT.js

@@ -65,39 +65,39 @@ function itp_fn_BIZPOP_PO_REJECT(parentPopFn, args, returnType) {
 			{
 				index: 'AFFL_SHOP_NM', name: 'itemId',
 				label: '품목번호', //
-				width: '10', fixed: false, align: 'center',
+				width: '12', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
 				index: 'ITEM_NM', name: 'itemNm',
 				label: '품목명', //
-				width: '10', fixed: false, align: 'left',
-				sortable: false, hidden: false
+				width: '9', fixed: false, align: 'left',
+				sortable: false, hidden: false, classes: 'ui-ellipsis'
 			},
 			{
 				index: 'PCH_REQ_QTY', name: 'pchReqQty',
 				label: '구매요청수량', //
-				width: '8', fixed: false, align: 'right',
+				width: '9', fixed: false, align: 'right',
 				sortable: false, hidden: false,
 				formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 			},
 			{
 				index: 'PCH_REQ_AMT', name: 'pchReqAmt',
 				label: '구매요청금액', //
-				width: '10', fixed: false, align: 'right',
+				width: '9', fixed: false, align: 'right',
 				sortable: false, hidden: false,
 				formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 			},
 			{
 				index: 'PCH_REQ_UNQ_NO', name: 'pchReqUnqNo',
 				label: '구매요청번호', //
-				width: '5', fixed: false, align: 'center',
+				width: '12', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
 				index: 'PCH_REQ_DTL_NO', name: 'pchReqDtlNo',
-				label: '구매요청순번', //
-				width: '5', fixed: false, align: 'center',
+				label: '순번', //
+				width: '4', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			}
 		],

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

@@ -133,7 +133,7 @@
 		</div>
 	</div>
 	<div id="ITP_POP_MSTOCKMNG01010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: none;">
-		<div class="pop">
+		<div class="pop" style="height:480px;">
 			<div class="header">
 				<div class="header_left">
 					<label>재고처리</label>
@@ -148,7 +148,7 @@
 				<input type="hidden" id="ITP_FORM_MSTOCKMNG01010_POP_ITEM_ID" name="itemId" value="">
 				<input type="hidden" id="ITP_FORM_MSTOCKMNG01010_POP_SOURCE_LOCATION" name="sourceLocation" value="">
 				<input type="hidden" id="ITP_FORM_MSTOCKMNG01010_POP_SOURCE_WHS_ID" name="sourceWhsId" value="">
-			<div>
+			<div style="position:relative; top:-40px; ">
 				<div class="list_line">
 					<div class="list_label">
 						<label>창고명</label>
@@ -197,7 +197,7 @@
 						<div class="pay_info fnMgntLevel"></div>
 					</div>
 				</div>
-				<div class="list_line" style="margin-top:30px;">
+				<div class="list_line" style="margin-top:10px;">
 				  <div class="info">
 					<label>창고선택</label>
 				</div>

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

@@ -143,7 +143,7 @@ section .popup2 .search .left {width:50%; float:left;}
 section .popup2 .search .right {width:50%; float:right;}
 
 section .popup2 .search .left button,
-section .popup2 .search .right button {width:70px; height:34px; font-size:12pt;}
+section .popup2 .search .right button {width:70px; height:34px; font-size:12pt; margin-top:10px;}
 section .popup2 .content .line .search_wrap input {float:right; width:50%; margin-right:0px; margin-top:0;}
 section .popup2 .content .line.mt_5 {margin-top:5px; width:300px;}
 section .popup2 .content .line.ml_10 {}
@@ -375,7 +375,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line .line_right input.m9 {margin-right:93px;}
 .content .line .line_right input.left {text-align: left;}
 .content .line .line_right input.mg0 {margin-right:10px;}
-.content .line .line_right input.date{width:140px; margin-right:132px; height:35px;} 
+.content .line .line_right input.date{width:194px; margin-right:132px; height:35px; margin-left:3px;} 
 .content .line .line_right select {float: right; width: 180px; height: 30px; margin-top: 7px; border: 1px solid #000; font-size: 1rem; margin-right:93px;}
 .content .line input.date {width: 168px; height: 34px; float: left; text-align:center; font-size:14pt; background: url(../img/calender.png) 95%/18px no-repeat white}
 .content .line input.full {width: 100%;}

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

@@ -2,10 +2,15 @@ require(['config'], function() {
 	require([
 		'jquery', 
 		'crypto' //Crypto 암호화 js - 필요한 페이지만 불러서 쓴다
-	], function($) {
+	], function($) { 
 		if (sessionStorage.getItem('itp_login_info') !== null) { //Jwt 가 살아있으면 메인으로 보낸다.
 	    	location.replace('./main.html');
-	    }
+	    } 
+		 
+		if (sessionStorage.getItem('itp_manage_user_info') !== null) { //로그인 사용자 정보가 있다면 제거
+	    	sessionStorage.removeItem('itp_manage_user_info'); 
+	    }  
+		
 
 		// itp_fn_login_init();