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

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

@@ -292,10 +292,10 @@
 														</select>
 													</div>
 													<div class="col-xs-5 itp_in" style="width:37%;">
-														<input type="text" id="ITP_FORM_STINFO02010_DETAIL_ACCT_NO" data-check-required="empty" onKeyup="this.value=this.value.replace(/[^-0-9]/g,'');" class="form-control itp_input" name="acctNo" value="" placeholder="계좌번호" maxlength="20">
+														<input type="text" id="ITP_FORM_STINFO02010_DETAIL_ACCT_NO" data-check-required="empty" onKeyup="this.value=this.value.replace(/[^-0-9]/g,'');" class="form-control itp_input" name="acctNo" value="" placeholder="계좌번호">
 													</div>
 													<div class="col-xs-2 itp_in" style="width:22%; margin-right:0;">
-														<input type="text" id="ITP_FORM_STINFO02010_DETAIL_OWAC_NM" data-check-required="empty" class="form-control itp_input" name="owacNm" value="" placeholder="예금주명" maxlength="20">
+														<input type="text" id="ITP_FORM_STINFO02010_DETAIL_OWAC_NM" data-check-required="empty" class="form-control itp_input" name="owacNm" value="" placeholder="예금주명">
 													</div>
 												</div>	
 												<label class="col-xs-2 itp_lb">정산타입*</label>
@@ -462,8 +462,6 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">매장계좌정보</label>
 											<div class="col-xs-4 itp_ip fnStoreAcctInfo"></div>
-											<select id="ITP_FORM_STINFO02010_VIEW_BNK_CD" data-select-code="BNK_CD" class="form-control itp_input" name="bnkCd" style="display: none;">
-											</select>
 											<label class="col-xs-2 itp_lb">정산타입</label>
 											<div class="col-xs-4 itp_ip fnLoanDvsn"></div>
 										</div>

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

@@ -244,10 +244,10 @@
 														</select>
 													</div>
 													<div class="col-xs-4 itp_in">
-														<input type="text" id="ITP_FORM_STINFO02011_DETAIL_CREATE_ACCT_NO" data-check-required="empty" onKeyup="this.value=this.value.replace(/[^-0-9]/g,'');" class="form-control itp_input" name="acctNo" value="" placeholder="계좌번호" maxlength="20">
+														<input type="text" id="ITP_FORM_STINFO02011_DETAIL_CREATE_ACCT_NO" data-check-required="empty" onKeyup="this.value=this.value.replace(/[^-0-9]/g,'');" class="form-control itp_input" name="acctNo" value="" placeholder="계좌번호">
 													</div>
 													<div class="col-xs-2 itp_in">
-														<input type="text" id="ITP_FORM_STINFO02011_DETAIL_CREATE_OWAC_NM" data-check-required="empty" class="form-control itp_input" name="owacNm" value="" placeholder="예금주명" maxlength="20">
+														<input type="text" id="ITP_FORM_STINFO02011_DETAIL_CREATE_OWAC_NM" data-check-required="empty" class="form-control itp_input" name="owacNm" value="" placeholder="예금주명">
 													</div>
 												</div>
 											</div>

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

@@ -58,7 +58,7 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.storeNm, //매장명
 			width: '13', fixed: false, align: 'left',
 			minwidth: 120,
-			sortable: false, hidden: false, classes: 'ui-ellipsis'
+			sortable: false, hidden: false
 		},
 		{
 			index: 'BRAND_ID', name: 'brandId',
@@ -69,8 +69,8 @@ const gridColModel = {
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
-			width: '10', fixed: false, align: 'left',
-			sortable: false, hidden: false, classes: 'ui-ellipsis'
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
 		},
 		{
 			index: 'BSNS_REG_NO', name: 'bsnsRegNo',
@@ -418,10 +418,8 @@ let viewObj = {
 
 		var cmpyAdres = result.addr1/* + ' ' + result.addr*/;
 		kakaoMap.init('ITP_FORM_STINFO02010_VIEW', cmpyAdres);
-		
-		$('#ITP_FORM_STINFO02010_VIEW #ITP_FORM_STINFO02010_VIEW_BNK_CD').val(result.storeBnkCd);
-		let storeBnkNm = ($('#ITP_FORM_STINFO02010_VIEW_BNK_CD option:selected').text());
-		$('#ITP_FORM_STINFO02010_VIEW .fnStoreAcctInfo').text('(' + storeBnkNm + ') ' + result.storeAcctNo + ' (예금주) ' + result.storeOwacNm);
+
+		$('#ITP_FORM_STINFO02010_VIEW .fnStoreAcctInfo').text(result.storeBnkNm + ' ' + result.storeAcctNo + ' ' + result.storeOwacNm);
 		$('#ITP_FORM_STINFO02010_VIEW .fnLoanDvsn').text(result.loanDvsnNm + " - (" + itp_fn_number_comma(result.limitAmt) + "원)");
 		$('#ITP_FORM_STINFO02010_VIEW .fnBrandAcctInfo').text('(' + result.brandBnkNm + ') ' + result.brandAcctNo + ' (예금주) ' + result.brandOwacNm);
 		$('#ITP_FORM_STINFO02010_VIEW .fnAcctBal').text(itp_fn_number_comma(result.acctBal) + "원");

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

@@ -133,7 +133,7 @@
 
 	<div id="ITP_CONTAINER" class="fix">
 		<div class="itp_mobile_contents"> 
-			<div id="ITP_MAIN_CONTAINER" class="itp_main_box" style="display: block;">
+			<div id="ITP_MAIN_CONTAINER" class="itp_main_box" style="display: none;">
 				<div class="itp_note_header">
 					<h1>> 공지사항</h1>
 				</div>				
@@ -287,6 +287,7 @@
 				</div>
 			</div>
 		</div>
+		
 		<script src="../js/app/main.js"></script>
 	</div>
 	<footer id="ITP_FOOTER">

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="A매장명">
+					   <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>
@@ -49,24 +49,21 @@
 		   <div id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_AREA" class="scroll_area row-2">
 			  <ul id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
 			  <div id="ITP_LIST_MCOLLMNG02010_LIST_ITEM_ROWCOPY" style="display: none;">
-				<li class="history_list4 item-row">
+				<li class="history_list12 item-row">
 				  <div class="">
 					<div class="left">
 					  <div class="nomal">
-						<label class="col_6">반품발주항번</label>
-						<span>:</span>
-					    <div class="text_6 fnColReqDt"></div>
-						<label class="col_6">반품발주번호</label>
+						<label class="col_4">브랜드명</label>
 						<span>:</span>
-					    <div class="fnRtnPodrUnqNo"></div>
-					  </div>
-					</div>
-					<div class="left">
+					    <div class="full fnBrandNm"></div>
+				      </div>
+				    </div>
+				    <div class="left">
 					  <div class="nomal">
-						<label class="col_4">브랜드명</label>
+						<label class="col_4">발주번호</label>
 						<span>:</span>
-					    <div class="fnBrandNm"></div>
-						<label class="">수거요청일</label>
+					    <div class="fnRtnPodrUnqNo"></div>
+						<label class="col_4">발주항번</label>
 						<span>:</span>
 					    <div class="fnColReqDt"></div>
 					  </div>
@@ -75,30 +72,31 @@
 					  <div class="nomal">
 						<label class="col_4">수거장소</label>
 						<span>:</span>
-					    <div class="fnRtnWhsNm"></div>
-						<label class="">품목번호</label>
+					    <div class="full fnRtnWhsNm"></div>
+				      </div>
+				    </div>
+				    <div class="left">
+					  <div class="nomal">  
+						<label class="col_4">품목명</label>
 						<span>:</span>
-					    <div class="fnItemId"></div>
+					    <div class="fuill fnItemNm"></div>
 					  </div>
 					</div>
 					<div class="left">
 					  <div class="nomal">
-						<label class="col_4">품목명</label>
-						<span>:</span>
-					    <div class="fnItemNm"></div>
-						<label class="">수거수량</label>
+						<label class="col_4">수거수량</label>
 						<span>:</span>
 					    <div class="fnRtnDodrItemQty"></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="fnUnitAmt"></div>
-						<label class="">수거금액</label>
+						<label class="col_4">수거금액</label>
 						<span>:</span>
-					    <div class="fnRtnDodrTotalAmt"></div>
+					    <div class="full fnRtnDodrTotalAmt"></div>
 					  </div>
 					</div>
 				  </div>

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

@@ -114,7 +114,8 @@ function itp_fn_login_proc() {
 	    	$(location).attr('href', MOBILE_CONTEXTPATH + '/app/main.html');
 		};
 		var params = $('#ITP_FORM_MOBILE_LOGIN').serializeObject();
-		var url = CommonObj.isApp ? '/api/member/sign-in-app' : '/api/member/sign-in';
+		var url = '/api/member/sign-in';
+		// var url = CommonObj.isApp ? '/api/member/sign-in-app' : '/api/member/sign-in';
 		fn_ajax_call(url, JSON.stringify(params), loginFn, 'POST'); //암호화 해서 보내는 경우 먼저 해시키를 가져와서 암호화해서 보낸다
 	};
 	fn_ajax_call('/api/session/hashed', null, callbackFn, 'GET'); //Crypto 암호화를 위한 해쉬키.. 로그인 후에는 Jwt 포함인 /api/session/hashedKey 이걸로 호출해서 사용한다.