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="계좌번호">
+														<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">
 													</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="예금주명">
+														<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">
 													</div>
 												</div>	
 												<label class="col-xs-2 itp_lb">정산타입*</label>
@@ -461,6 +461,8 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">매장계좌정보</label>
+											<select id="ITP_FORM_STINFO02010_VIEW_BNK_CD" data-select-code="BNK_CD" class="form-control itp_input" name="bnkCd" style="display: none;">
+											</select>
 											<div class="col-xs-4 itp_ip fnStoreAcctInfo"></div>
 											<label class="col-xs-2 itp_lb">정산타입</label>
 											<div class="col-xs-4 itp_ip fnLoanDvsn"></div>

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

@@ -107,13 +107,13 @@
 											<label class="col-xs-2 itp_lb">매장명 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-9 itp_in">
-													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_STORE_NM" data-check-required="empty" class="form-control itp_input" name="storeNm" value="">
+													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_STORE_NM" data-check-required="empty" class="form-control itp_input" name="storeNm" value="" maxlength="40">
 												</div>
 											</div>
 											<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_STINFO02011_DETAIL_BSNS_CNDT" class="form-control itp_input" name="bsnsCndt" value="">
+													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_BSNS_CNDT" class="form-control itp_input" name="bsnsCndt" value="" maxlength="100">
 												</div>
 											</div>
 										</div>
@@ -129,7 +129,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_STINFO02011_DETAIL_CTGR_BSNS" class="form-control itp_input" name="ctgrBsns" value="">
+													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_CTGR_BSNS" class="form-control itp_input" name="ctgrBsns" value="" maxlength="100">
 												</div>
 											</div>
 										</div>
@@ -139,7 +139,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_STINFO02011_DETAIL_CORP_REG_NO" data-key-up="corpNo" class="form-control itp_input" name="corpRegNo" value="">
+													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_CORP_REG_NO" data-key-up="corpNo" class="form-control itp_input" name="corpRegNo" value="" maxlength="14">
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">전화번호 *</label>
@@ -155,7 +155,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_STINFO02011_DETAIL_OWNER_NM" data-check-required="empty" class="form-control itp_input" name="ownerNm" value="">
+													<input type="text" id="ITP_FORM_STINFO02011_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">FAX</label>
@@ -177,7 +177,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_STINFO02011_DETAIL_EMAL_ADDR" data-check-required="empty" class="form-control itp_input" name="emalAddr" value="">
+													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_EMAL_ADDR" data-check-required="empty" class="form-control itp_input" name="emalAddr" value="" maxlength="50">
 												</div>
 											</div>
 										</div>
@@ -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="계좌번호">
+														<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">
 													</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="예금주명">
+														<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">
 													</div>
 												</div>
 											</div>
@@ -284,10 +284,10 @@
 														</select>
 													</div>
 													<div class="col-xs-5 itp_in" style="width:37%;">
-														<input type="text" id="ITP_FORM_STINFO02011_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="계좌번호">
+														<input type="text" id="ITP_FORM_STINFO02011_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">
 													</div>
 													<div class="col-xs-2 itp_in" style="width:22%; margin-right:0;">
-														<input type="text" id="ITP_FORM_STINFO02011_DETAIL_OWAC_NM" data-check-required="empty" class="form-control itp_input" name="owacNm" value="" placeholder="예금주명">
+														<input type="text" id="ITP_FORM_STINFO02011_DETAIL_OWAC_NM" data-check-required="empty" class="form-control itp_input" name="owacNm" value="" placeholder="예금주명" maxlength="20">
 													</div>
 												</div>
 												<label class="col-xs-2 itp_lb">정산타입*</label>
@@ -437,6 +437,8 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">매장계좌정보</label>
+											<select id="ITP_FORM_STINFO02011_VIEW_BNK_CD" data-select-code="BNK_CD" class="form-control itp_input" name="bnkCd" style="display: none;">
+											</select>
 											<div class="col-xs-4 itp_ip fnStoreAcctInfo"></div>
 											<label class="col-xs-2 itp_lb">정산타입</label>
 											<div class="col-xs-4 itp_ip fnLoanDvsn"></div>

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

@@ -111,33 +111,33 @@ const gridColModel = {
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, 			// 단가
-			width: '5', fixed: false, align: 'right',
+			width: '7', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
 		{
 			index: 'UNIT', name: 'unit',
 			label: ITP_MSG_LOCALE.label.unit, 				// 기본단위
-			width: '7', fixed: false, align: 'center',
+			width: '5', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'RTN_ODR_QTY', name: 'rtnOdrQty',
 			label: ITP_MSG_LOCALE.label.rtnOdrQty, 			// 수거수량
-			width: '5', fixed: false, align: 'right',
+			width: '7', fixed: false, align: 'right',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'RTN_ODR_AMT', name: 'rtnOdrAmt',
 			label: ITP_MSG_LOCALE.label.rtnAmt, 			// 수거금액
-			width: '5', fixed: false, align: 'right',
+			width: '7', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
 		{
 			index: 'COL_REQ_DT', name: 'colReqDt',
 			label: ITP_MSG_LOCALE.label.colReqDt, 			// 수거요청일
-			width: '8', fixed: false, align: 'center',
+			width: '6', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		}
 	]

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

@@ -393,7 +393,7 @@ let viewObj = {
 		fn_ajax_call(API_DETAIL_INFO, param, this.callback, 'GET');
 	},
 	callback: function (result) {
-		//console.log(result);
+		console.log(result);
 		pageObj.switchScreen('VIEW');
 		$('#ITP_FORM_STINFO02010_VIEW #ITP_FORM_STINFO02010_VIEW_STORE_ID').val(result.storeId);
 		$('#ITP_FORM_STINFO02010_VIEW .fnBrandNm').text(result.brandNm);
@@ -418,8 +418,15 @@ let viewObj = {
 
 		var cmpyAdres = result.addr1/* + ' ' + result.addr*/;
 		kakaoMap.init('ITP_FORM_STINFO02010_VIEW', cmpyAdres);
-
-		$('#ITP_FORM_STINFO02010_VIEW .fnStoreAcctInfo').text(result.storeBnkNm + ' ' + result.storeAcctNo + ' ' + result.storeOwacNm);
+		
+		$('#ITP_FORM_STINFO02010_VIEW #ITP_FORM_STINFO02010_VIEW_BNK_CD').val(result.storeBnkCd);
+		let storeBnkNm;
+		if (result.storeBnkCd == '') {
+			storeBnkNm = '';
+		} else {
+			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 .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/js/app/stinfo/ITP_STINFO02011.js

@@ -188,7 +188,14 @@ let viewObj = {
 		var cmpyAdres = result.addr1/* + ' ' + result.addr*/;
 		kakaoMap.init('ITP_FORM_STINFO02011_VIEW', cmpyAdres);
 
-		$('#ITP_FORM_STINFO02011_VIEW .fnStoreAcctInfo').text(result.storeBnkNm + ' ' + result.storeAcctNo + ' ' + result.storeOwacNm);
+		$('#ITP_FORM_STINFO02011_VIEW #ITP_FORM_STINFO02011_VIEW_BNK_CD').val(result.storeBnkCd);
+		let storeBnkNm;
+		if (result.storeBnkCd == '') {
+			storeBnkNm = '';
+		} else {
+			storeBnkNm = $('#ITP_FORM_STINFO02011_VIEW_BNK_CD option:selected').text();
+		}
+		$('#ITP_FORM_STINFO02011_VIEW .fnStoreAcctInfo').text(storeBnkNm + ' ' + result.storeAcctNo + ' ' + result.storeOwacNm);
 		$('#ITP_FORM_STINFO02011_VIEW .fnLoanDvsn').text(result.loanDvsnNm + " - (" + itp_fn_number_comma(result.limitAmt) + "원)");
 		$('#ITP_FORM_STINFO02011_VIEW .fnBrandAcctInfo').text(result.brandBnkNm + ' ' + result.brandAcctNo + ' ' + result.brandOwacNm);
 		$('#ITP_FORM_STINFO02011_VIEW .fnAcctBal').text(itp_fn_number_comma(result.acctBal));