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

src/main/webapp/app/oper/OPER03010.html

@@ -76,7 +76,7 @@
 											<label class="col-xs-2 itp_lb">브랜드그룹 명 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
-													<input type="text" id="ITP_FORM_OPER03010_DETAIL_AFFL_SHOP_NM" data-check-required="empty" class="form-control itp_input" name="afflShopNm" value="">
+													<input type="text" id="ITP_FORM_OPER03010_DETAIL_AFFL_SHOP_NM" data-check-required="empty" class="form-control itp_input" name="afflShopNm" value="" maxlength="40">
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">브랜드그룹 KEY *<br>사용자 계정 추가-3자리</label>
@@ -175,7 +175,7 @@
 											<label class="col-xs-2 itp_lb">이메일 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
-													<input type="text" id="ITP_FORM_OPER03010_DETAIL_EMAL_ADDR" data-check-required="empty" class="form-control itp_input" name="rprstEmai" value="">
+													<input type="text" id="ITP_FORM_OPER03010_DETAIL_EMAL_ADDR" data-check-required="empty" class="form-control itp_input" name="rprstEmai" value="" maxlength="50">
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">업태</label>
@@ -189,7 +189,7 @@
 											<label class="col-xs-2 itp_lb">대표자명 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
-													<input type="text" id="ITP_FORM_OPER03010_DETAIL_OWNER_NM" data-check-required="empty" class="form-control itp_input" name="ownerNm" value="">
+													<input type="text" id="ITP_FORM_OPER03010_DETAIL_OWNER_NM" data-check-required="empty" class="form-control itp_input" name="ownerNm" value="" maxlength="20">
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">업종</label>

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

@@ -51,7 +51,7 @@
 										<span class="fnPickMgrNm"></span>
 									</div>
 								</div>
-								<div class="col-xs-6">
+								<div class="col-xs-6" style="padding:0;">
 									<div class="itp_sign">
 										<div class="itp_sign_header">
 											<label style="padding: 0px;">서    명</label>
@@ -85,25 +85,25 @@
 										<div class="itp_company_type">
 											<label>반품처</label>
 										</div>
-									<div class="col-xs-11" style="padding:0; width:90%;">
+									<div class="col-xs-11" style="padding:0; width:90%; display:contents;"">
 										<label class="col-xs-4">등록번호</label>
 										<div class="col-xs-8 itp_form_it">
 											<div class="col-xs-12 itp_in fnRtnBsnsRegno"></div>
 										</div>
 									</div>	
-									<div class="col-xs-11" style="padding:0; width:90%;">
+									<div class="col-xs-11" style="padding:0; width:90%; display:contents;"">
 										<label class="col-xs-2">상호</label>
 										<div class="col-xs-8 itp_form_it">
 											<div class="col-xs-12 itp_in fnRtnNm"></div>
 										</div>
 									</div>
-									<div class="col-xs-11" style="padding:0; width:90%;">
+									<div class="col-xs-11" style="padding:0; width:90%; display:contents;"">
 										<label class="col-xs-2">성명</label>
 										<div class="col-xs-8 itp_form_it">
 											<div class="col-xs-12 itp_in fnRtnOwnerNm"></div>
 										</div>
 									</div>
-									<div class="col-xs-11" style="padding:0; width:90%;">
+									<div class="col-xs-11" style="padding:0; width:90%; display:contents;"">
 										<label class="col-xs-2">주소</label>
 										<div class="col-xs-8 itp_form_it">
 											<div class="col-xs-12 itp_in fnRtnAddr"></div>
@@ -111,30 +111,30 @@
 									</div>
 								</div>	
 							</div>
-							<div class="col-xs-6 itp_form_inline">
+							<div class="col-xs-6 itp_form_inline"style="right:-16px;">
 								<div class="itp_form_info">
 										<div class="itp_company_type">
 											<label>수거처</label>
 										</div>
-									<div class="col-xs-11" style="padding:0; width:90%;">
+									<div class="col-xs-11" style="padding:0; width:90%; display:contents;"">
 										<label class="col-xs-4">등록번호</label>
 										<div class="col-xs-8 itp_form_it">
 											<div class="col-xs-12 itp_in fnColBsnsRegno"></div>
 										</div>
 									</div>	
-									<div class="col-xs-11" style="padding:0; width:90%;">
+									<div class="col-xs-11" style="padding:0; width:90%; display:contents;"">
 										<label class="col-xs-2">상호</label>
 										<div class="col-xs-8 itp_form_it">
 											<div class="col-xs-12 itp_in fnColNm"></div>
 										</div>
 									</div>
-									<div class="col-xs-11" style="padding:0; width:90%;">
+									<div class="col-xs-11" style="padding:0; width:90%; display:contents;"">
 										<label class="col-xs-2">성명</label>
 										<div class="col-xs-8 itp_form_it">
 											<div class="col-xs-12 itp_in fnColOwnerNm"></div>
 										</div>
 									</div>
-									<div class="col-xs-11" style="padding:0; width:90%;">
+									<div class="col-xs-11" style="padding:0; width:90%; display:contents;"">
 										<label class="col-xs-2">주소</label>
 										<div class="col-xs-8 itp_form_it">
 											<div class="col-xs-12 itp_in fnColAddr"></div>

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

@@ -17,8 +17,11 @@
 						<div class="itp_form fix">
 							<div class="col-xs-12 itp_form_inline">
 								<div class="form-horizontal fix">
-									<div class="col-xs-4 itp_in itp_pr">
-										<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_BIZPOP_DLV_STTMT_PRN_BRAND_LOGO "style="border:none; border-radius: 0; height:85px; width:85px; position:absolute; padding:0;" class="form-control itp_input" name="" >
+									<div class="col-xs-5 itp_in itp_pr">
+										<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_BIZPOP_DLV_STTMT_PRN_BRAND_LOGO "style="border:none; border-radius: 0; height:85px; width:85px; position: relative; padding:0;" class="form-control itp_input" name="" >
+									</div>
+									<div class="col-xs-4">
+										<label style="font-size:24px;">납품확인서</label>
 									</div>
 									<div class="pull-right itp_cicon">
 										<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_DLV_STTMT_PRN_BTN_PRINT" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;출력&nbsp;&nbsp;</button>
@@ -26,13 +29,7 @@
 								</div>
 							</div>
 							<div class="col-xs-12 itp_form_inline">
-								<div class="col-xs-5"></div>
-								<div class="itp_title">
-									<label>납품확인서</label>
-								</div>
-							</div>	
-							<div class="col-xs-12 itp_form_inline">
-								<div class="col-xs-6" >
+								<div class="col-xs-6" style="top:10px;">
 									<div>
 										<label style="width:100px;">발행일</label>
 										<label>:</label>
@@ -54,7 +51,7 @@
 										<span class="fnDlvMgrNm"></span>
 									</div>
 								</div>
-								<div class="col-xs-6">
+								<div class="col-xs-6" style="padding:0;">
 									<div class="itp_sign">
 										<div class="itp_sign_header">
 											<label style="padding: 0px;">서    명</label>
@@ -88,25 +85,25 @@
 										<div class="itp_company_type">
 											<label>공급처</label>
 										</div>
-									<div class="col-xs-11" style="padding:0; width:90%;">
+									<div class="col-xs-11" style="padding:0; width:90%; display:contents;">
 										<label class="col-xs-4">등록번호</label>
 										<div class="col-xs-8 itp_form_it">
 											<div class="col-xs-12 itp_in fnDlvBsnsRegno"></div>
 										</div>
 									</div>	
-									<div class="col-xs-11" style="padding:0; width:90%;">
+									<div class="col-xs-11" style="padding:0; width:90%; display:contents;">
 										<label class="col-xs-2">상호</label>
 										<div class="col-xs-8 itp_form_it">
 											<div class="col-xs-12 itp_in fnDlvNm"></div>
 										</div>
 									</div>
-									<div class="col-xs-11" style="padding:0; width:90%;">
+									<div class="col-xs-11" style="padding:0; width:90%; display:contents;">
 										<label class="col-xs-2">성명</label>
 										<div class="col-xs-8 itp_form_it">
 											<div class="col-xs-12 itp_in fnDlvOwnerNm"></div>
 										</div>
 									</div>
-									<div class="col-xs-11" style="padding:0; width:90%;">
+									<div class="col-xs-11" style="padding:0; width:90%; display:contents;">
 										<label class="col-xs-2">주소</label>
 										<div class="col-xs-8 itp_form_it">
 											<div class="col-xs-12 itp_in fnDlvAddr"></div>
@@ -114,30 +111,30 @@
 									</div>
 								</div>	
 							</div>
-							<div class="col-xs-6 itp_form_inline">
+							<div class="col-xs-6 itp_form_inline" style="right:-16px;">
 								<div class="itp_form_info">
 										<div class="itp_company_type">
 											<label>발주처</label>
 										</div>
-									<div class="col-xs-11" style="padding:0; width:90%;">
+									<div class="col-xs-11" style="padding:0; width:90%; display:contents;">
 										<label class="col-xs-4">등록번호</label>
 										<div class="col-xs-8 itp_form_it">
 											<div class="col-xs-12 itp_in fnPoBsnsRegno"></div>
 										</div>
 									</div>	
-									<div class="col-xs-11" style="padding:0; width:90%;">
+									<div class="col-xs-11" style="padding:0; width:90%; display:contents;">
 										<label class="col-xs-2">상호</label>
 										<div class="col-xs-8 itp_form_it">
 											<div class="col-xs-12 itp_in fnPoNm"></div>
 										</div>
 									</div>
-									<div class="col-xs-11" style="padding:0; width:90%;">
+									<div class="col-xs-11" style="padding:0; width:90%; display:contents;">
 										<label class="col-xs-2">성명</label>
 										<div class="col-xs-8 itp_form_it">
 											<div class="col-xs-12 itp_in fnPoOwnerNm"></div>
 										</div>
 									</div>
-									<div class="col-xs-11" style="padding:0; width:90%;">
+									<div class="col-xs-11" style="padding:0; width:90%; display:contents;">
 										<label class="col-xs-2">주소</label>
 										<div class="col-xs-8 itp_form_it">
 											<div class="col-xs-12 itp_in fnPoAddr"></div>

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

@@ -239,7 +239,7 @@
 											<label class="col-xs-2 itp_lb">바코드</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-6 itp_in">
-													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_BARCODE" class="form-control itp_input" name="barcode" value="">
+													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_BARCODE" class="form-control itp_input" name="barcode" value="" maxlength="100">
 												</div>
 											</div>
 										</div>
@@ -302,7 +302,7 @@
 											<label class="col-xs-2 itp_lb">1Box수량</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-6 itp_in">
-								                	<input type="text" id="ITP_FORM_STINFO04010_DETAIL_ONE_BOX_QTY" class="form-control itp_input" name="oneBoxQty" value="">
+								                	<input type="text" id="ITP_FORM_STINFO04010_DETAIL_ONE_BOX_QTY" class="form-control itp_input" onKeyup="this.value=this.value.replace(/[^0-9]/g,'');" name="oneBoxQty" value="" maxlength="10">
 												</div>
 											</div>
 										</div>

src/main/webapp/css/style.css

@@ -589,7 +589,7 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
 /* ITP_ASIDE */
 #ITP_ASIDE .itp_modal .modal-header {padding:12px 15px 12px 15px; background:#337ab7; cursor:move;}
 #ITP_ASIDE .itp_modal .modal-header .close {color:#fff; opacity:1;}
-#ITP_ASIDE .itp_modal .modal-body label {padding:12px 20px;}
+#ITP_ASIDE .itp_modal .modal-body label {}
 #ITP_ASIDE .itp_modal .modal-title {font-size:16px; color:#fff;}
 #ITP_ASIDE .itp_modal .itp_alert_txt {font-size:15px; padding:15px 0 10px 0;}
 #ITP_ASIDE .itp_modal .itp_form {padding:0 15px 0 15px;}

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

@@ -63,14 +63,14 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.afflShopNm, //브랜드그룹
 			width: '10', fixed: false, align: 'left',
 			minwidth: 150, maxwidth: 250,
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드
 			width: '13', fixed: false, align: 'left',
 			minwidth: 150, maxwidth: 250,
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'AUTH_TP_NM', name: 'authTpNm',
@@ -90,14 +90,14 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.storeNm, //매장명
 			width: '13', fixed: false, align: 'left',
 			minwidth: 150, maxwidth: 250,
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'SPPLY_ID', name: 'spplyId',
 			label: ITP_MSG_LOCALE.label.spplyId, //공급사아이디
 			width: '10', fixed: false, align: 'left',
 			minwidth: 150, maxwidth: 250,
-			sortable: false, hidden: true
+			sortable: false, hidden: true, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'SPPLY_NM', name: 'spplyNm',
@@ -125,14 +125,14 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.userName, //닉네임
 			width: '13', fixed: false, align: 'left',
 			minwidth: 120,
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'EMAIL', name: 'email',
 			label: ITP_MSG_LOCALE.label.idEmail, //아이디(이메일)
 			width: '15', fixed: false, align: 'center',
 			minwidth: 150, maxwidth: 250,
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'TEL_NO', name: 'telNo',

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

@@ -37,7 +37,7 @@ const OPER03010_DETAIL_GRID_EMPTY = '#ITP_OPER03010_DETAIL_jqGridEmpty';
 
 let ITP_FORM_OPER03010_DETAIL_IS_DUPLICATE = false;
 let ITP_FORM_OPER03010_DETAIL_IS_WRITING = false;
-
+console.log(CONN_KEY);
 /*API URL*/
 let API_DETAIL_GRID_LIST = '/api/affl/detail-grid-list';
 let API_DETAIL_INFO = '/api/affl/info-affl';
@@ -60,17 +60,17 @@ const gridColModel = {
 			index: 'AFFL_SHOP_NM', name: 'afflShopNm',
 			label: '브랜드그룹명',
 			width: '10', fixed: false, align: 'left',
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'OWNER_NM', name: 'ownerNm',
 			label: '대표자명',
 			width: '6', fixed: false, align: 'left',
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
-			index: 'CORP_TYPE_NM', name: 'corpTypeNm',
-			label: '기업형태',
+			index: 'BSNS_REG_NO', name: 'bsnsRegNo',
+			label: '사업자번호',
 			width: '6', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
@@ -414,7 +414,7 @@ let listObj = {
 				},
 				loadComplete: function(data) {
 					console.log("loadComplete=======================");
-					console.log(listObj.itp_OPER03010_search);
+					console.log(data);
 					itp_fn_grid_load_complete(data, OPER03010_GRID_ID, true, 'number', 'OPER03010', listObj.itp_OPER03010_search, listObj.empty, true, data.gridRecords, true);
 					var ids = $(OPER03010_GRID_ID).getDataIDs();
 					$.each(ids, function(idx, rowId) {

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

@@ -51,20 +51,20 @@ const gridColModel = {
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, //품목번호
-			width: '9', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'center',
 			sortable: false, hidden: false ,frozen:true
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
 			width: '9', fixed: false, align: 'left',
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'SPPLY_ID_NM', name: 'spplyNm',
 			label: ITP_MSG_LOCALE.label.spplyNm, //공급업체명
 			width: '9', fixed: false, align: 'left',
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'UNIT', name: 'unit',
@@ -106,8 +106,8 @@ const gridColModel = {
 		{
 			index: 'FILE_PATH', name: 'filePath',
 			label: ITP_MSG_LOCALE.label.itemFilePath, //단가계약파일
-			width: '8', fixed: false, align: 'center',
-			sortable: false, hidden: false
+			width: '9', fixed: false, align: 'center',
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'UNIT_ST_NM', name: 'unitStNm',
@@ -118,7 +118,7 @@ const gridColModel = {
 		{
 			index: 'SPPLY_ITEM_ID', name: 'spplyItemId',
 			label: ITP_MSG_LOCALE.label.spplyItemId, //공급사품번
-			width: '9', fixed: false, align: 'right',
+			width: '13', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		}
 	]

src/main/webapp/main.html

@@ -50,7 +50,7 @@
 		<header id="ITP_HEADER">
 			<div class="itp_head bg-orange">
 				<h1 class="text-center itp_tit">
-					<span id="ITP_TXT_MAIN_SHR_AFFL">오더퀸</span>
+					<span id="ITP_TXT_MAIN_SHR_AFFL" style="display: inline-block; width: 200px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">오더퀸</span>
 					<span style="font-size: 18px; margin-top: -3px">|</span>
 					<span style="font-size: 14px">수발주시스템</span>
 				</h1>
@@ -62,7 +62,7 @@
 				<div class="itp_rt">
 					<!--<span class="itp_logo"><img src="/oqpo-view/images/favicon.ico" alt="로고"></span>-->
 					<span class="itp_txt_brand" id="ITP_TXT_MAIN_SHR_TIMEOUT"></span>
-					<span class="itp_txt_brand" id="ITP_TXT_MAIN_SHR_BRAND"></span>
+					<span class="itp_txt_brand" id="ITP_TXT_MAIN_SHR_BRAND" style="display: inline-block; width: 200px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;"></span>
 					<span class="itp_sch_brand"><button type="button" id="ITP_BTN_MAIN_SHR_AFFL" class="btn btn-success btn-sm SEB">브랜드검색</button></span>
 					<span class="itp_out"><a href="javascript:void(0)" class="ITP_BTN_LOGOUT">로그아웃</a></span>
 				</div>

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

@@ -1,6 +1,6 @@
 <section id="ITP_MOBILE_MCOLLMNG03010">
 	<div id="ITP_AJAX_MCOLLMNG03010_LIST_CONTAINER" style="display: none;">
-	  <form id="ITP_FORM_MCOLLMNG03010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
+	  <form id="ITP_FORM_MCOLLMNG03010_LIST_SEARCH" class="put_btn form-horizontal" onsubmit="return false;">
 		<input type="hidden" id="ITP_FORM_MCOLLMNG03010_LIST_VIEW_CD" name="viewCd" value="C">
 		  <input type="hidden" id="ITP_FORM_MCOLLMNG03010_SEARCH_BRAND_ID" name="sbrandId" value="">
 		  <input type="hidden" id="ITP_FORM_MCOLLMNG03010_SEARCH_STORE_ID" name="sstoreId" value="">
@@ -105,15 +105,15 @@
 				  </div>
 				</li>
 			</div>
-			<div class="button_bar">
-			  <button id="ITP_BTN_MCOLLMNG03010_LIST_COL_VIEW" class="ok col_12 btn-m-orange IVDETAIL">수거서보기</button>
-			  <!--<button id="ITP_BTN_MCOLLMNG03010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
-			</div>
 		  </div>
+		<div class="button_bar">
+		  <button id="ITP_BTN_MCOLLMNG03010_LIST_COL_VIEW" class="ok col_12 btn-m-orange IVDETAIL">수거서보기</button>
+		  <!--<button id="ITP_BTN_MCOLLMNG03010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
+		</div>
 	  </form>
 	</div>
 	<div id="ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER" style="display: none;">
-		<form id="ITP_FORM_MCOLLMNG03010_VIEW" class="form-horizontal" onsubmit="return false;">
+		<form id="ITP_FORM_MCOLLMNG03010_VIEW" class="put_btn form-horizontal" onsubmit="return false;">
 		  <input type="hidden" id="ITP_FORM_MCOLLMNG03010_VIEW_VIEW_CD" name="viewCd" value="C">
 		  <div class="detail_content">
 			  <div class="detail_content_fix">
@@ -125,14 +125,14 @@
 				</div>
 				<div class="detail_confirmation">
 				  <div class="detail_col">
-					<label>발행일</label>
+					<label>수거확인번호</label>
 					<i>:</i>
-					<div class="fnColRegDt"></div>
+					<div class="fnColPickUnqNo"></div>
 				  </div>
 				  <div class="detail_col">
-					<label>수거확인번호</label>
+					<label>발행일</label>
 					<i>:</i>
-					<div class="fnColPickUnqNo"></div>
+					<div class="fnColRegDt"></div>
 				  </div>
 				  <div class="detail_col">
 					<label>수거일</label>
@@ -249,7 +249,7 @@
 	  </form>
 	</div>
 	<div id="ITP_MOBILE_JS"></div>
-	<div id="ITP_POP_MCOLLMNG03010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
+	<div id="ITP_POP_MCOLLMNG03010_WHS_AREA" class="popup2 mobile-pop-close" style="display: block;">
 		<div class="pop">
 			<div class="header">
 				<div class="header_left">
@@ -272,7 +272,79 @@
 			</div>
 			<div id="ITP_LIST_MCOLLMNG03010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MCOLLMNG03010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
-				<div id="ITP_LIST_MCOLLMNG03010_POP_WHS_ROWCOPY" style="display: none;">
+				<div id="ITP_LIST_MCOLLMNG03010_POP_WHS_ROWCOPY" style="display: block;">
+					<li class="row_2 item-row">
+						<div class="scroll_left">
+							<div class="fnWhsNm">브랜드 창고 명A</div>
+							<div class="wichi fnLocationNm">(상세위치내용)</div>
+						</div>
+						<div class="scroll_right">
+							<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
+						</div>
+					</li>
+					<li class="row_2 item-row">
+						<div class="scroll_left">
+							<div class="fnWhsNm">브랜드 창고 명A</div>
+							<div class="wichi fnLocationNm">(상세위치내용)</div>
+						</div>
+						<div class="scroll_right">
+							<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
+						</div>
+					</li>
+					<li class="row_2 item-row">
+						<div class="scroll_left">
+							<div class="fnWhsNm">브랜드 창고 명A</div>
+							<div class="wichi fnLocationNm">(상세위치내용)</div>
+						</div>
+						<div class="scroll_right">
+							<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
+						</div>
+					</li>
+					<li class="row_2 item-row">
+						<div class="scroll_left">
+							<div class="fnWhsNm">브랜드 창고 명A</div>
+							<div class="wichi fnLocationNm">(상세위치내용)</div>
+						</div>
+						<div class="scroll_right">
+							<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
+						</div>
+					</li>
+					<li class="row_2 item-row">
+						<div class="scroll_left">
+							<div class="fnWhsNm">브랜드 창고 명A</div>
+							<div class="wichi fnLocationNm">(상세위치내용)</div>
+						</div>
+						<div class="scroll_right">
+							<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
+						</div>
+					</li>
+					<li class="row_2 item-row">
+						<div class="scroll_left">
+							<div class="fnWhsNm">브랜드 창고 명A</div>
+							<div class="wichi fnLocationNm">(상세위치내용)</div>
+						</div>
+						<div class="scroll_right">
+							<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
+						</div>
+					</li>
+					<li class="row_2 item-row">
+						<div class="scroll_left">
+							<div class="fnWhsNm">브랜드 창고 명A</div>
+							<div class="wichi fnLocationNm">(상세위치내용)</div>
+						</div>
+						<div class="scroll_right">
+							<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
+						</div>
+					</li>
+					<li class="row_2 item-row">
+						<div class="scroll_left">
+							<div class="fnWhsNm">브랜드 창고 명A</div>
+							<div class="wichi fnLocationNm">(상세위치내용)</div>
+						</div>
+						<div class="scroll_right">
+							<button id="ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
+						</div>
+					</li>
 					<li class="row_2 item-row">
 						<div class="scroll_left">
 							<div class="fnWhsNm">브랜드 창고 명A</div>

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

@@ -1,6 +1,6 @@
 <section id="ITP_MOBILE_MPOMNG01010">
   <div id="ITP_AJAX_MPOMNG01010_VIEW_CONTAINER">
-    <form id="ITP_FORM_MPOMNG01010_DETAIL" class="form-horizontal" onsubmit="return false;">
+    <form id="ITP_FORM_MPOMNG01010_DETAIL" class="put_btn form-horizontal" onsubmit="return false;">
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_VIEW_CD" name="viewCd" value="C">
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_BRAND_ID" name="brandId" value="">
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_STORE_ID" name="storeId" value="">
@@ -210,22 +210,22 @@
                 <ul id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWS" class="mb_0 panel-group"></ul>
                 <div id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWCOPY" style="display: none;">
                      <li class="row_2">
-                        <div class="scroll_left">
+                        <div class="scroll_left item">
                             <div class="con_2 fnItemNm"></div>
                             <div class="mg_0">
 	                            <div class="sub fnUnitAmt"></div>
 	                            <div class="type_hide">/</div>
 	                            <div class="amt fnOrdAmt"></div>
                             </div>
-                        </div>
-                         <div class="scroll_right">
-                        	<input id="ITP_FORM_MPOMNG01010_POP_ITEM_ADD" type="checkbox">
                         </div>
                         <div class="right">
 			              <button id="ITP_BTN_MPOMNG01010_POP_ITEM_MINUS">-</button>
 			              <div class="num fnPchReqQty">1</div>
 			              <button id="ITP_BTN_MPOMNG01010_POP_ITEM_PLUS">+</button>
 			            </div>
+                         <div class="scroll_right">
+                        	<input id="ITP_FORM_MPOMNG01010_POP_ITEM_ADD" type="checkbox">
+                        </div>
                     </li>
                 </div>
             </div>

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

@@ -175,23 +175,23 @@
 				<ul id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWS" class="mb_0 panel-group"></ul>
 				<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWCOPY" style="display: none;">
 					<li class="row_2">
-						 <div class="scroll_left">
+						 <div class="scroll_left item">
                             <div class="fnItemNm">품목명</div>
                             <div class="mg_0">
 				                 <div class="sub fnKg"></div>
 				                 <div class="type_hide">/</div>
 				                 <div class="amt fnUnitAmt"></div>
 			                 </div>
-                        </div>
-                       <div class="scroll_right">
-                        	<input id="ITP_FORM_MRTNMNG01010_POP_ITEM_ADD" type="checkbox">
-                            <!-- <button id="ITP_BTN_MRTNMNG01010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button> -->
                         </div>
 						<div class="right">
 							<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_MINUS" class="POP_ITEM_MINUS">-</button>
 							<div class="num fnPchReqQty">1</div>
 							<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_PLUS" class="POP_ITEM_PLUS">+</button>
 						</div>
+                       <div class="scroll_right">
+                        	<input id="ITP_FORM_MRTNMNG01010_POP_ITEM_ADD" type="checkbox">
+                            <!-- <button id="ITP_BTN_MRTNMNG01010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button> -->
+                        </div>
 					</li>
 				</div>
 			</div>

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

@@ -10,6 +10,8 @@
 } */
 * {margin: 0; padding: 0;letter-spacing: -1px; box-sizing: border-box; text-align: center; font-family: 'KoPub Dotum', 'serif'; list-style: none;}
 section {}
+form.area_full{display:flex; flex-direction:column; height:calc(100vh - 49px);}
+form.put_btn{display:flex; flex-direction:column; height:calc(100vh - 96px);}
 body{background: #fff; position: relative; width: 100%; height: auto; font-family: 'KoPub Dotum';
 	overflow:scroll-y; 
 	-webkit-overflow-scrolling:touch;}
@@ -81,32 +83,33 @@ section .popup2 .pop .table_tr .table_td div {text-overflow:ellipsis; overflow:h
 section .popup2 .pop .table_tr .table_td .chkItem {margin-top:-5px; width:15px; left:50%; position:relative; transform:translateX(-50%);}
 
 section .popup2 .pop .popup_scroll ul.mb_0 {margin-bottom:0 !important;}
-section .popup2 .pop .popup_scroll {position: relative; top:-25px; width: 100%;height: 75%; overflow: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
+section .popup2 .pop .popup_scroll {position: relative; top:-25px; width: 100%;height: 70%; overflow: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
 section .popup2 .pop .popup_scroll li {list-style: none; width: 100%; height: 50px; border-bottom: 1px solid #E0B8AB;}
-section .popup2 .pop .popup_scroll li.row_2 {height: 70px;}
+section .popup2 .pop .popup_scroll li.row_2 {height: 70px; display:flex;}
 
 section .popup2 .pop .popup_scroll li .left {position: relative; float: left;}
 section .popup2 .pop .popup_scroll li .left .check_box {width:30px; float:left; height:80px; padding-left:5px; padding-top:20px;}
 section .popup2 .pop .popup_scroll li .left div {display: inline-block;}
 section .popup2 .pop .popup_scroll li .left label{font-size: 2.5rem;}
-section .popup2 .pop .popup_scroll li .left .thick {float: left; margin: 12px 0 0 10px; font-size: 1rem; text-align: left; width: 140px; font-weight: 600;}
+section .popup2 .pop .popup_scroll li .left .thick {float: left; margin: 12px 0 0 10px; font-size: 1rem; text-align: left; width: 94px; font-weight: 600;}
 section .popup2 .pop .popup_scroll li .left .nomal {float: left; margin: 15px 0px 0px 15px; font-size: 1.2rem; text-align: left; width: 100%;}
 section .popup2 .pop .popup_scroll li .left .history {font-weight: 700; font-size: 2.4rem; margin-left: 20px;}
 section .popup2 .pop .popup_scroll li .left .history input{width: 150px;}
-section .popup2 .pop .popup_scroll li .scroll_left {float: left; display:grid; width:50%;}
-section .popup2 .pop .popup_scroll li .scroll_left div {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; text-align:left; float: left; font-size: 18px; font-weight: 100; width: 80%; margin:8px 6px -6px 10px;}
+section .popup2 .pop .popup_scroll li .scroll_left {float: left; display:grid; width: calc(100% - 63px);}
+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 .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:40%; margin:0; padding: 8px 2px 0px 2px;}
+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;}
-section .popup2 .pop .popup_scroll li .scroll_left .sub{font-size:14pt; color:gray; width:45px !important;}
+section .popup2 .pop .popup_scroll li .scroll_left .sub{font-size:14pt; color:gray; text-align:right; }
 section .popup2 .pop .popup_scroll li .scroll_left .wichi{font-size:14pt; color:gray;}
 section .popup2 .pop .popup_scroll li .scroll_left .amt{font-size:14pt; color:#b88278;}
-section .popup2 .pop .popup_scroll li .scroll_right {float: right;}
+section .popup2 .pop .popup_scroll li .scroll_right {float: right; width:50px;}
 section .popup2 .pop .popup_scroll li .scroll_right input[type=checkbox]{width:27px; margin:18px 11px 0 11px;}
-section .popup2 .pop .popup_scroll li .scroll_right button {width: 50px; height: 38px; padding: 0; background:#8f9fc6; border:1px solid #cacfe3; color:#eee; border-radius: 10px; font-size: 14px; margin:16px 10px;}
+section .popup2 .pop .popup_scroll li .scroll_right button {width: 50px; height: 38px; padding: 0; background:#8f9fc6; border:1px solid #cacfe3; color:#eee; border-radius: 10px; font-size: 14px; margin:16px 0px;}
 section .popup2 .pop .popup_scroll li .scroll_right button:hover {background:#708cd1;}
-section .popup2 .pop .popup_scroll li .right {position: relative; display: flex; font-size: 1.6rem; font-weight: 700; float: right; top:21px; height:27px;}
+section .popup2 .pop .popup_scroll li .right {position: relative; display: flex; font-size: 1.6rem; font-weight: 700; float: right; top:21px; width:91px; height:27px;}
 section .popup2 .pop .popup_scroll li .right button {padding: 0px; font-size: 17px; width:24px;}
 section .popup2 .pop .popup_scroll li .add button{float: right; width: 60px; height: 55px; margin: 12px 9px; border-radius: 10px; font-size: 1rem; background: rgb(198, 170, 250);}
 section .popup2 .pop .content .line button {width: 35%; height: 35px;font-size: 14px; font-weight:100; padding-top: 7px; margin: 0 10px;}
@@ -432,7 +435,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .button_bar button.col_12 {font-weight:100; width: 100%; height: 47px; font-size: 14pt;}
 
 /* scroll_area 조정 */
-.scroll_area {position: relative; top:0; width: 100%; height: 456px;border-bottom:2px solid #000;overflow: auto; background: #fff;}
+.scroll_area {position: relative; top:0; flex:1; width: 100%; height: 456px;border-bottom:1px solid #aaa;overflow: auto; background: #fff;}
 .scroll_area ul {display:grid;}
 
 
@@ -619,10 +622,12 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 	.detail_content .detail_confirmation .detail_col {width:410px;}
 }
 @media screen and (max-height: 720px) {
+	section .popup2 .pop .popup_scroll {height: 47vh;}
+}
+@media screen and (max-height: 740px) {
 	#ITP_LOGIN {position:fixed; top:80px; max-width: 500px; margin: 0 auto;}
 	.bg_gray {position:relative; top:-90px;}
 	.scroll_area {height: 58vh;}
-	section .popup2 .pop .popup_scroll {height: 65%;}
 	}
 @media screen and (max-height: 550px) {
 	section .popup2 .pop .popup_scroll {height: 50%;}

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

@@ -168,8 +168,8 @@ let mobContObj = {
 			}
 			$(id).find('.fnLimitAmt').text(CommonObj.currency.add(limitAmt));
 			$(id).find('.fnUseYnNm').text(result.useYnNm);
-			$(id).find('.fnPosbLimitAmt').text(CommonObj.currency.add(limitAmt - result.useAmtTotal));
-			$(id).find('.fnTmpRcvAcctTotal').text(CommonObj.currency.add(result.tmpRcvAcctTotal));
+			$(id).find('.fnPosbLimitAmt').text(CommonObj.currency.add(limitAmt + result.acctBal - result.useAmtTotal));
+			$(id).find('.fnTmpRcvAcctTotal').text(CommonObj.currency.add(result.acctBal));
 			$(id).find('.fnUseAmtTotal').text(CommonObj.currency.add(result.useAmtTotal));
 			_this.history.init(result.loanMgntUnqNo);
 		},

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

@@ -80,7 +80,7 @@ let mobContObj = {
 			}
 			$(id).find('.fnLimitAmt').text(CommonObj.currency.add(limitAmt));
 			$(id).find('.fnUseYnNm').text(result.useYnNm);
-			$(id).find('.fnPosbLimitAmt').text(CommonObj.currency.add(limitAmt - result.useAmtTotal));
+			$(id).find('.fnPosbLimitAmt').text(CommonObj.currency.add(limitAmt + result.acctBal - result.useAmtTotal));
 			$(id).find('.fnTmpRcvAcctTotal').text(CommonObj.currency.add(result.tmpRcvAcctTotal));
 			$(id).find('.fnUseAmtTotal').text(CommonObj.currency.add(result.useAmtTotal));