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

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

@@ -85,7 +85,7 @@
 											</div>
 										</div>
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">브랜드 명* </label>
+											<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_OPER06010_DETAIL_BRAND_NM" data-check-required="empty" class="form-control itp_input" name="brandNm" value="테스트 브랜드" maxlength="40">
@@ -100,7 +100,7 @@
 											</div>
 										</div>
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">사업자번호 *</label>
+											<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_OPER06010_DETAIL_BSNS_REG_NO" data-check-required="empty" data-key-up="regNo" class="form-control itp_input" name="bsnsRegNo" value="" maxlength="12">
@@ -114,7 +114,7 @@
 											</div>
 										</div>
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">대표자명 *</label>
+											<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_OPER06010_DETAIL_OWNER_NM" data-check-required="empty" class="form-control itp_input" name="ownerNm" value="" maxlength="20">
@@ -146,7 +146,7 @@
 									</div>-->
 									<div class="itp_form_in">
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">전화번호 *</label>
+											<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_OPER06010_DETAIL_TEL_NO" data-check-required="empty" data-key-up="tel" class="form-control itp_input" name="telNo" value="" maxlength='13'>
@@ -190,7 +190,7 @@
 											</div>
 										</div>
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">입금계좌정보</label>
+											<label class="col-xs-2 itp_lb">입금계좌정보*</label>
 											<div class="col-xs-4 itp_ip" style="padding:0 0 0 15px;">
 												<div class="col-xs-4 itp_in">
 													<select id="ITP_FORM_OPER06010_DETAIL_DPST_BNK_CD" data-select-code="BNK_CD" data-check-required="empty" class="form-control itp_input" name="bnkCd">
@@ -218,13 +218,12 @@
 													<input type="text" id="ITP_FORM_OPER06010_DETAIL_PG_AFFL_ID" class="form-control itp_input" name="pgAfflId" value="" placeholder="PG 브랜드그룹 id">
 												</div>
 											</div>
-											<label class="col-xs-2 itp_lb">배송/수거 처리구분</label>
+											<label class="col-xs-2 itp_lb">배송/수거 처리구분*</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-8 itp_in">
-													<select id="ITP_FORM_OPER06010_DETAIL_PROC_DVSN" class="form-control itp_input" name="">
-														<option>간소화</option>
-														<option>절차</option>
+													<select id="ITP_FORM_OPER06010_DETAIL_SHMT_COL_PROC_TYPE" data-check-required="empty" data-select-code="SHMT_COL_PROC_TYPE" class="form-control itp_input" name="shmtColProcType">
 													</select>
+													<div class="col-xs-12 itp_in fn fnShmtColProcTypeNm"></div>
 												</div>
 											</div>
 										</div>
@@ -257,7 +256,7 @@
 									</div>
 									<div class="itp_form_in">
 										<div class="form-group border">
-											<label class="col-xs-2 itp_lb">주소</label>
+											<label class="col-xs-2 itp_lb">주소*</label>
 											<div class="col-xs-10 itp_ip">
 												<div class="col-xs-1 itp_in">
 													<input type="text" id="ITP_FORM_OPER06010_DETAIL_ZIPNO" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="address" class="form-control itp_input" name="zipNo" value="" maxlength="6" readonly placeholder="우편번호">
@@ -299,13 +298,13 @@
 								<section class="itp_form_sec">
 									<div class="itp_form_in border-top">
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">브랜드 코드</label>
+											<label class="col-xs-2 itp_lb">브랜드 아이디</label>
 												<div class="col-xs-4 itp_ip fnBrandUnitUnqNo"></div>
 											<label class="col-xs-2 itp_lb">상태*</label>
 											<div class="col-xs-4 itp_ip fnStCd"></div>
 										</div>
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">브랜드 명* </label>
+											<label class="col-xs-2 itp_lb">브랜드명* </label>
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
 											<label class="col-xs-2 itp_lb">브랜드 타입*</label>
 											<div class="col-xs-4 itp_ip fnBrandType"></div>
@@ -323,7 +322,7 @@
 											<div class="col-xs-4 itp_ip fnOqBrandId"></div>
 										</div>										
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">전화번호</label>
+											<label class="col-xs-2 itp_lb">전화번호*</label>
 											<div class="col-xs-4 itp_ip fnTelNo"></div>
 											<label class="col-xs-2 itp_lb"></label>
 											<div class="col-xs-1 itp_ip"></div>
@@ -344,7 +343,7 @@
 									</div>
 									<div class="itp_form_in">	
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">입금계좌정보</label>
+											<label class="col-xs-2 itp_lb">입금계좌정보*</label>
 											<div class="col-xs-4 itp_ip" style="padding:0 0 0 15px;">
 												<select id="ITP_FORM_OPER06010_VIEW_DPST_BNK_CD" data-select-code="BNK_CD" class="form-control itp_input" name="bnkCd" style="display: none;">
 												</select>
@@ -360,15 +359,15 @@
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-12 itp_in fn fnPgAfflId"></div>
 											</div>
-											<label class="col-xs-2 itp_lb">PG가맹점 Key</label>
+											<label class="col-xs-2 itp_lb">배송/수거 처리구분*</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-12 itp_in fn fnPgKey"></div>
+												<div class="col-xs-12 itp_in fn fnShmtColProcTypeNm"></div>
 											</div>
 										</div>
 									</div>
 									<div class="itp_form_in">
 										<div class="form-group ">
-											<label class="col-xs-2 itp_lb">주소 *</label>
+											<label class="col-xs-2 itp_lb">주소*</label>
 											<div class="col-xs-10 itp_ip">
 												<div class="col-xs-10 itp_in">
 													<div class="col-xs-a itp_in fnZipNo"></div>

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

@@ -96,7 +96,7 @@
 											</div>
 										</div>
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">사업자번호 *</label>
+											<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_STINFO01011_DETAIL_BSNS_REG_NO" data-check-required="empty" data-key-up="regNo" class="form-control itp_input" name="bsnsRegNo" value="" maxlength="12">
@@ -110,7 +110,7 @@
 											</div>
 										</div>
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">대표자명 *</label>
+											<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_STINFO01011_DETAIL_OWNER_NM" data-check-required="empty" class="form-control itp_input" name="ownerNm" value="" maxlength="20">
@@ -142,7 +142,7 @@
 									</div>-->
 									<div class="itp_form_in">
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">전화번호 *</label>
+											<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_STINFO01011_DETAIL_TEL_NO" data-check-required="empty" data-key-up="tel" class="form-control itp_input" name="telNo" value="" maxlength='13'>
@@ -213,15 +213,14 @@
 												<div class="col-xs-7 itp_in">
 													<input type="text" id="ITP_FORM_STINFO01011_DETAIL_PG_AFFL_ID" class="form-control itp_input" name="pgAfflId" value="" placeholder="PG 브랜드그룹 id">
 												</div>
-											</div>
-											<!-- 
-											<label class="col-xs-2 itp_lb">PG가맹점 Key</label>
+											</div>										
+											<label class="col-xs-2 itp_lb">배송/수거 처리구분*</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-8 itp_in">
-													<input type="text" id="ITP_FORM_STINFO01011_DETAIL_PG_KEY" class="form-control itp_input" name="pgKey" value="" placeholder="PG 브랜드그룹 key">
+													<select id="ITP_FORM_STINFO01011_DETAIL_SHMT_COL_PROC_TYPE" data-check-required="empty" data-select-code="SHMT_COL_PROC_TYPE" class="form-control itp_input" name="shmtColProcType">
+													</select>
 												</div>
-											</div>
-											 -->
+											</div>											 
 										</div>
 									</div>
 									<div class="itp_form_info">
@@ -294,13 +293,13 @@
 								<section class="itp_form_sec">
 									<div class="itp_form_in border-top">
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">브랜드 코드</label>
+											<label class="col-xs-2 itp_lb">브랜드 아이디</label>
 											<div class="col-xs-4 itp_ip fnBrandUnitUnqNo"></div>
 											<label class="col-xs-2 itp_lb">상태*</label>
 											<div class="col-xs-4 itp_ip fnStCd"></div>
 										</div>
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">브랜드 명* </label>
+											<label class="col-xs-2 itp_lb">브랜드명* </label>
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
 											<label class="col-xs-2 itp_lb">브랜드 타입*</label>
 											<div class="col-xs-4 itp_ip fnBrandType"></div>
@@ -318,7 +317,7 @@
 											<div class="col-xs-4 itp_ip fnOqBrandId"></div>
 										</div>	
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">전화번호</label>
+											<label class="col-xs-2 itp_lb">전화번호*</label>
 											<div class="col-xs-4 itp_ip fnTelNo"></div>
 											<label class="col-xs-2 itp_lb"></label>
 											<div id="ITP_STINFO01011_VIEW_LOGO_FILE" class="col-xs-1 itp_ip"></div>
@@ -344,7 +343,7 @@
 											<div class="col-xs-4 itp_ip" style="padding:0 0 0 15px;">
 												<select id="ITP_FORM_STINFO01011_VIEW_DPST_BNK_CD" data-select-code="BNK_CD" class="form-control itp_input" name="bnkCd" style="display: none;">
 												</select>
-												<div class="col-xs-a itp_in fnBnkCd"></div>
+												<div class="col-xs-a itp_in fnBnkCdNm"></div>
 												<div class="col-xs-a itp_in fnAcctNo"></div>
 												<div class="col-xs-a itp_in fnOwacNm"></div>
 											</div>
@@ -358,9 +357,9 @@
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-12 itp_in fn fnPgAfflId"></div>
 											</div>
-											<label class="col-xs-2 itp_lb">PG가맹점 Key</label>
+											<label class="col-xs-2 itp_lb">배송/수거 처리구분*</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-12 itp_in fn fnPgKey"></div>
+												<div class="col-xs-12 itp_in fn fnShmtColProcType"></div>
 											</div>
 										</div>
 									</div>

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

@@ -365,9 +365,7 @@
 											<label class="col-xs-2 itp_lb">매장 배송구분</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-8 itp_in">
-													<select id="ITP_FORM_OPER06010_DETAIL_DLV_DVSN" class="form-control itp_input" name="">
-														<option>공급사배송</option>
-														<option>본사배송</option>
+													<select id="ITP_FORM_OPER06010_DETAIL_DLV_DVSN" data-select-code="DLV_DVSN" class="form-control itp_input" name="dlvDvsn">
 													</select>
 												</div>
 											</div>
@@ -391,9 +389,9 @@
 									<div class="itp_form_in border-top">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
-											<div class="col-xs-5 itp_ip fnBrandNm"></div>
+											<div class="col-xs-4 itp_ip fnBrandNm"></div>
 											<label class="col-xs-2 itp_lb">상태 *</label>
-											<div class="col-xs-3 itp_ip fnStCd"></div>
+											<div class="col-xs-4 itp_ip fnStCd"></div>
 										</div>
 									</div>
 									<div class="itp_form_in">
@@ -407,40 +405,40 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">품목번호</label>
-											<div class="col-xs-5 itp_ip fnItemClassMgntNo"></div>
+											<div class="col-xs-4 itp_ip fnItemClassMgntNo"></div>
 											<label class="col-xs-2 itp_lb">품목유형 *</label>
-											<div class="col-xs-5 itp_ip fnItemTypeNm"></div>
+											<div class="col-xs-4 itp_ip fnItemTypeNm"></div>
 										</div>
 									</div>
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">품목명 *</label>
-											<div class="col-xs-5 itp_ip fnItemNm"></div>
+											<div class="col-xs-4 itp_ip fnItemNm"></div>
 											<label class="col-xs-2 itp_lb">내외자구분</label>
 											<select id="ITP_FORM_STINFO04010_VIEW_IMP_DVSN" data-select-code="IMP_DVSN" class="form-control itp_input" name="impDvsn" style="display: none;"></select>
-											<div class="col-xs-5 itp_ip fnImpDvsn"></div>
+											<div class="col-xs-4 itp_ip fnImpDvsn"></div>
 										</div>
 									</div>
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">발주여부 *</label>
-											<div class="col-xs-5 itp_ip fnPodrPssblDvsnNm"></div>
+											<div class="col-xs-4 itp_ip fnPodrPssblDvsnNm"></div>
 											<label class="col-xs-2 itp_lb">기본단위 *</label>
-											<div class="col-xs-5 itp_ip fnUnit"></div>
+											<div class="col-xs-4 itp_ip fnUnit"></div>
 										</div>
 									</div>
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">구매품목여부 *</label>
-											<div class="col-xs-5 itp_ip fnPchItemYn"></div>
+											<div class="col-xs-4 itp_ip fnPchItemYn"></div>
 											<label class="col-xs-2 itp_lb">오더퀸 품목코드</label>
-											<div class="col-xs-5 itp_ip fnOqMenuCd"></div>
+											<div class="col-xs-4 itp_ip fnOqMenuCd"></div>
 										</div>
 									</div>
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">판매품목여부 *</label>
-											<div class="col-xs-5 itp_ip fnSaleItemYn"></div>
+											<div class="col-xs-4 itp_ip fnSaleItemYn"></div>
 											<label class="col-xs-2 itp_lb">바코드</label>
 											<div class="col-xs-5 itp_ip fnBarcode"></div>
 										</div>
@@ -448,12 +446,12 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">중량</label>
-											<div class="col-xs-5 itp_ip">
+											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-3 itp_in fnWeight" style="width:auto;"></div>
 												<div class="col-xs-4 itp_in fnWeightUnit"></div>
 											</div>
 											<label class="col-xs-2 itp_lb">부피</label>
-											<div class="col-xs-3 itp_ip">
+											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-3 itp_in fnVolume" style="width:auto;"></div>
 												<div class="col-xs-4 itp_in fnVolumeUnit"></div>
 											</div>
@@ -462,12 +460,12 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">가로</label>
-											<div class="col-xs-5 itp_ip">
+											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-3 itp_in fnWidth" style="width:auto;"></div>
 												<div class="col-xs-4 itp_in fnWidthUnit"></div>
 											</div>
 											<label class="col-xs-2 itp_lb">세로</label>
-											<div class="col-xs-3 itp_ip">
+											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-3 itp_in fnHeight" style="width:auto;"></div>
 												<div class="col-xs-4 itp_in fnHeightUnit"></div>
 											</div>
@@ -476,20 +474,20 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">높이</label>
-											<div class="col-xs-5 itp_ip">
+											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-3 itp_in fnHigh" style="width:auto;"></div>
 												<div class="col-xs-4 itp_in fnHighUnit"></div>
 											</div>
 											<label class="col-xs-2 itp_lb">1Box수량</label>
-											<div class="col-xs-5 itp_ip fnOneBoxQty"></div>
+											<div class="col-xs-4 itp_ip fnOneBoxQty"></div>
 										</div>
 									</div>
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">사용(유통)기한여부 *</label>
-											<div class="col-xs-5 itp_ip fnExpryYn"></div>
+											<div class="col-xs-4 itp_ip fnExpryYn"></div>
 											<label class="col-xs-2 itp_lb">사용(유통)가능기간</label>
-											<div class="col-xs-3 itp_ip">
+											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-5 itp_in fnExpryPeriod" style="width:auto;"></div>
 												<label class="col-xs-2 itp_in">Day(s)</label>
 											</div>
@@ -498,7 +496,7 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">반품가능여부</label>
-											<div class="col-xs-5 itp_ip fnRtnPssblYn"></div>
+											<div class="col-xs-4 itp_ip fnRtnPssblYn"></div>
 											<label class="col-xs-2 itp_lb">반품구분</label>
 											<div class="col-xs-5 itp_ip fnRtnDvsnNm"></div>
 										</div>

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

@@ -84,7 +84,7 @@
 								<label>공급사단가기준</label>
 								<input id="ITP_STINFO06010_UNIT_STDD" style="width:100px;">
 								<span>%</span>
-								<button type="button" id="ITP_BTN_STINFO06010_EXCEL" class="btn btn-warning  btn-sm Excel"><i class="glyphicon "></i>일괄적용</button>
+								<button type="button" id="ITP_BTN_STINFO06010_CALCULATE" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i>일괄적용</button>
 							</div>
 				          <table id="ITP_STINFO06010_DETAIL_jqGrid"></table>
 				          <div id="ITP_STINFO06010_DETAIL_jqGridPager"></div>

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

@@ -247,12 +247,17 @@ let pageObj = {
             $('#ITP_FORM_OPER06010_DETAIL_BRAND_NM').removeAttr('readonly');
             $('#ITP_FORM_OPER06010_DETAIL_BSNS_REG_NO').removeAttr('readonly');
             $('#ITP_FORM_OPER06010_DETAIL_CORP_REG_NO').removeAttr('readonly');
+            $('#ITP_FORM_OPER06010_DETAIL_SHMT_COL_PROC_TYPE').removeAttr('onFocus');
+            $('#ITP_FORM_OPER06010_DETAIL_SHMT_COL_PROC_TYPE').removeAttr('onChange');
             // $('#ITP_FORM_OPER06010_DETAIL_SEARCH_AFFL_SHOP').removeAttr('disabled');
             // $('#ITP_FORM_OPER06010_DETAIL_DELETE_AFFL_SHOP').removeAttr('disabled');
             $('#ITP_FORM_OPER06010_DETAIL_SEARCH_AFFL_SHOP').show();
             $('#ITP_FORM_OPER06010_DETAIL_DELETE_AFFL_SHOP').show();
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_info').hide();
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_change').show();
+			
+			$('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_SHMT_COL_PROC_TYPE').show();
+			$('#ITP_FORM_OPER06010_DETAIL .fnShmtColProcTypeNm').show();
 
             $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_AFFL_SHOP_ID').val(fn_make_user_info.get('afflShopId'));
             $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
@@ -268,6 +273,8 @@ let pageObj = {
             $('#ITP_FORM_OPER06010_DETAIL_BRAND_NM').attr('readonly', true);
             $('#ITP_FORM_OPER06010_DETAIL_BSNS_REG_NO').attr('readonly', true);
             $('#ITP_FORM_OPER06010_DETAIL_CORP_REG_NO').attr('readonly', true);
+            $('#ITP_FORM_OPER06010_DETAIL_SHMT_COL_PROC_TYPE').attr('onFocus', 'this.initialSelect = this.selectedIndex;');
+            $('#ITP_FORM_OPER06010_DETAIL_SHMT_COL_PROC_TYPE').attr('onChange', 'this.selectedIndex = this.initialSelect;');
             // $('#ITP_FORM_OPER06010_DETAIL_SEARCH_AFFL_SHOP').attr('disabled', true);
             // $('#ITP_FORM_OPER06010_DETAIL_DELETE_AFFL_SHOP').attr('disabled', true);
             $('#ITP_FORM_OPER06010_DETAIL_SEARCH_AFFL_SHOP').hide();
@@ -275,6 +282,9 @@ let pageObj = {
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_info').show();
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_change').hide();
 
+			$('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_SHMT_COL_PROC_TYPE').hide();
+			$('#ITP_FORM_OPER06010_DETAIL .fnShmtColProcTypeNm').show();
+
             $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
         } else if(mode == 'VIEW') { // 보기
             $('#ITP_AJAX_OPER06010_VIEW_CONTAINER').show();
@@ -428,8 +438,8 @@ let viewObj = {
 
         $('#ITP_FORM_OPER06010_VIEW .fnPgId').text(result.pgId);
         $('#ITP_FORM_OPER06010_VIEW .fnPgAfflId').text(result.pgAfflId);
-        $('#ITP_FORM_OPER06010_VIEW .fnPgKey').text(result.pgKey);
-
+        $('#ITP_FORM_OPER06010_VIEW .fnShmtColProcTypeNm').text(result.shmtColProcTypeNm);
+        
         pageObj.fileUpload();
         /*
         itp_fn_attach_file.view('ITP_OPER06010_VIEW_LOGO_FILE', result.fileLogNoList
@@ -518,8 +528,9 @@ let modifyObj = {
 
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_PG_ID').val(result.pgId);
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_PG_AFFL_ID').val(result.pgAfflId);
-        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_PG_KEY').val(result.pgKey);
-
+        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_SHMT_COL_PROC_TYPE').val(result.shmtColProcType);
+        $('#ITP_FORM_OPER06010_DETAIL .fnShmtColProcTypeNm').text(result.shmtColProcTypeNm);
+        
 		$('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_OQ_BRAND_ID').val(result.oqBrandId);
 
 		$('#ITP_FORM_OPER06010_DETAIL .fnRegId').text(result.sysRegId);

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

@@ -121,6 +121,8 @@ let pageObj = {
             $('#ITP_FORM_STINFO01011_DETAIL_BRAND_NM').removeAttr('readonly');
             $('#ITP_FORM_STINFO01011_DETAIL_BSNS_REG_NO').removeAttr('readonly');
             $('#ITP_FORM_STINFO01011_DETAIL_CORP_REG_NO').removeAttr('readonly');
+            $('#ITP_FORM_STINFO01011_DETAIL_SHMT_COL_PROC_TYPE').removeAttr('onFocus');
+            $('#ITP_FORM_STINFO01011_DETAIL_SHMT_COL_PROC_TYPE').removeAttr('onChange');
             // $('#ITP_FORM_STINFO01011_DETAIL_SEARCH_AFFL_SHOP').removeAttr('disabled');
             // $('#ITP_FORM_STINFO01011_DETAIL_DELETE_AFFL_SHOP').removeAttr('disabled');
             $('#ITP_FORM_STINFO01011_DETAIL_SEARCH_AFFL_SHOP').show();
@@ -139,6 +141,8 @@ let pageObj = {
             $('#ITP_FORM_STINFO01011_DETAIL_BRAND_NM').attr('readonly', true);
             $('#ITP_FORM_STINFO01011_DETAIL_BSNS_REG_NO').attr('readonly', true);
             $('#ITP_FORM_STINFO01011_DETAIL_CORP_REG_NO').attr('readonly', true);
+            $('#ITP_FORM_STINFO01011_DETAIL_SHMT_COL_PROC_TYPE').attr('onFocus', 'this.initialSelect = this.selectedIndex;');
+            $('#ITP_FORM_STINFO01011_DETAIL_SHMT_COL_PROC_TYPE').attr('onChange', 'this.selectedIndex = this.initialSelect;');
             // $('#ITP_FORM_STINFO01011_DETAIL_SEARCH_AFFL_SHOP').attr('disabled', true);
             // $('#ITP_FORM_STINFO01011_DETAIL_DELETE_AFFL_SHOP').attr('disabled', true);
             $('#ITP_FORM_STINFO01011_DETAIL_SEARCH_AFFL_SHOP').hide();
@@ -180,9 +184,9 @@ let viewObj = {
         $('#ITP_FORM_STINFO01011_VIEW .fnRcvAcctNo').text(result.acctNo);
         $('#ITP_FORM_STINFO01011_VIEW #ITP_FORM_STINFO01011_VIEW_DPST_BNK_CD').val(result.bnkCd);
         let bnkCdNm = $('#ITP_FORM_STINFO01011_VIEW_DPST_BNK_CD option:selected').text();        
-        $('#ITP_FORM_STINFO01011_VIEW .fnBnkCd').text(bnkCdNm);
+        $('#ITP_FORM_STINFO01011_VIEW .fnBnkCdNm').text('(' + bnkCdNm + ')');
         $('#ITP_FORM_STINFO01011_VIEW .fnAcctNo').text(result.acctNo);
-        $('#ITP_FORM_STINFO01011_VIEW .fnOwacNm').text(result.owacNm);
+        $('#ITP_FORM_STINFO01011_VIEW .fnOwacNm').text('(예금주) ' + result.owacNm);
         $('#ITP_FORM_STINFO01011_VIEW .fnZipNo').text(result.zipNo);
         $('#ITP_FORM_STINFO01011_VIEW .fnLoadAddr').text(result.addr1);
         $('#ITP_FORM_STINFO01011_VIEW .fnDtlAddr').text(result.addr2);
@@ -199,7 +203,7 @@ let viewObj = {
 
         $('#ITP_FORM_STINFO01011_VIEW .fnPgId').text(result.pgId);
         $('#ITP_FORM_STINFO01011_VIEW .fnPgAfflId').text(result.pgAfflId);
-        $('#ITP_FORM_STINFO01011_VIEW .fnPgKey').text(result.pgKey);
+        $('#ITP_FORM_STINFO01011_VIEW .fnShmtColProcType').text(result.shmtColProcTypeNm);
 
         pageObj.fileUpload();
         itp_fn_attach_file.view('ITP_STINFO01011_VIEW_LOGO_FILE', result.fileLogNoList
@@ -276,7 +280,7 @@ let modifyObj = {
 
         $('#ITP_FORM_STINFO01011_DETAIL #ITP_FORM_STINFO01011_DETAIL_PG_ID').val(result.pgId);
         $('#ITP_FORM_STINFO01011_DETAIL #ITP_FORM_STINFO01011_DETAIL_PG_AFFL_ID').val(result.pgAfflId);
-        $('#ITP_FORM_STINFO01011_DETAIL #ITP_FORM_STINFO01011_DETAIL_PG_KEY').val(result.pgKey);
+        $('#ITP_FORM_STINFO01011_DETAIL #ITP_FORM_STINFO01011_DETAIL_SHMT_COL_PROC_TYPE').val(result.shmtColProcType);
 
         $('#ITP_FORM_STINFO01011_DETAIL #ITP_FORM_STINFO01011_DETAIL_OQ_BRAND_ID').val(result.oqBrandId);
         

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

@@ -336,7 +336,8 @@ let pageObj = {
 						case 'ITP_BTN_STINFO06010_CANCELLIST'		: listObj.grid.search(); 		break;	// 취소/목록 버튼
 						case 'ITP_BTN_STINFO06010_SAVE'				: createObj.button.save(); 		break;	// 저장 버튼
 						case 'ITP_BTN_STINFO06010_EXCEL'			: pageObj.excelDown(); 			break;	// 엑셀 다운로드 버튼
-						case 'ITP_BTN_STINFO06010_DETAIL_EXCEL'			: pageObj.excelDtlDown(); 			break;	// 엑셀 다운로드 버튼
+						case 'ITP_BTN_STINFO06010_DETAIL_EXCEL'		: pageObj.excelDtlDown(); 		break;	// 엑셀 다운로드 버튼
+						case 'ITP_BTN_STINFO06010_CALCULATE'		: pageObj.calculate();			
 					}
 				});
 			});
@@ -478,7 +479,8 @@ let pageObj = {
 			$('#ITP_FORM_STINFO06010_DETAIL #ITP_FORM_STINFO06010_DETAIL_FROM_DT').datepicker('setDate', new Date());
 			$('#ITP_FORM_STINFO06010_DETAIL #ITP_FORM_STINFO06010_DETAIL_TO_DT').datepicker('setDate', itp_fn_date_add('Y', 1));
 			
-			
+			$('#ITP_BTN_STINFO06010_DETAIL_EXCEL').show();
+			$('#ITP_BTN_STINFO06010_CALCULATE').show();
 			//return itp_fn_date_format(date.setDate(-1), 2);
 		} else if(mode == 'MODIFY') { // 수정
 			$('#ITP_AJAX_STINFO06010_DETAIL_CONTAINER').show();
@@ -491,7 +493,7 @@ let pageObj = {
 			$('#ITP_BTN_STINFO06010_DETAIL_DELETE_STORE').attr('disabled', true);
 			// $('#ITP_BTN_STINFO06010_SRH').show();
 			$('#ITP_BTN_STINFO06010_DETAIL_EXCEL').show();
-
+			$('#ITP_BTN_STINFO06010_CALCULATE').show();
 			// 브랜드그룹 정보 설정
 			$('#ITP_FORM_STINFO06010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
 		} else if(mode == 'VIEW') { // 보기
@@ -525,9 +527,11 @@ let pageObj = {
 			'sheetName': '매장단가상세정보'
 		};
 		itp_fn_remote_to_excel(param);
-	}
-	
-	
+	},
+	calculate: function() {
+		var rowId = $(STINFO06010_DETAIL_GRID_ID).jqGrid("getGridParam","selarrrow");
+		console.log(rowId);
+	}	
 };
 
 /*목록화면 Object*/

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

@@ -151,26 +151,46 @@
 					<h1>주요업무</h1>
 				</div>
 				<div id="ITP_BRAND_ICON_BAR" style="display: none;"><!-- 브랜드 로그인 메인화면 -->
-					<div class="itp_icon_bar">
-						<div class="itp_icon">
-							<button data-menu-id="MPOMNG02010"><img src="../img/main_icon/oder.png"></button>
-						</div>
-						<div class="itp_icon md">
-							<button id="ITP_MAIN_ICON_ODER_PRO" data-menu-id="MPOMNG01010"><img src="../img/main_icon/oder_pro.png"></button>
+					<div style="display:none;">
+						<div class="itp_icon_bar">
+							<div class="itp_icon">
+								<button data-menu-id="MPOMNG02010"><img src="../img/main_icon/oder.png"></button>
+							</div>
+							<div class="itp_icon md">
+								<button id="ITP_MAIN_ICON_ODER_PRO" data-menu-id="MPOMNG01010"><img src="../img/main_icon/oder_pro.png"></button>
+							</div>
+							<div class="itp_icon">
+								<button data-menu-id="MPOMNG06010"><img src="../img/main_icon/whs.png"></button>
+							</div>
 						</div>
-						<div class="itp_icon">
-							<button data-menu-id="MPOMNG06010"><img src="../img/main_icon/whs.png"></button>
+						<div class="itp_icon_bar">
+							<div class="itp_icon">
+								<button data-menu-id="MRTNMNG02010"><img src="../img/main_icon/return.png"></button>
+							</div>
+							<div class="itp_icon md">
+								<button id="ITP_MAIN_ICON_RETURN_PRO" data-menu-id="MRTNMNG01010"><img src="../img/main_icon/return_pro.png"></button>
+							</div>
+							<div class="itp_icon">
+								<button data-menu-id="MRTNMNG05010"><img src="../img/main_icon/return_go.png"></button>
+							</div>
 						</div>
 					</div>
-					<div class="itp_icon_bar">
-						<div class="itp_icon">
-							<button data-menu-id="MRTNMNG02010"><img src="../img/main_icon/return.png"></button>
-						</div>
-						<div class="itp_icon md">
-							<button id="ITP_MAIN_ICON_RETURN_PRO" data-menu-id="MRTNMNG01010"><img src="../img/main_icon/return_pro.png"></button>
+					<div>
+						<div class="itp_icon_bar">
+							<div class="itp_icon w50">
+								<button data-menu-id="MPOMNG02010"><img src="../img/main_icon/oder.png"></button>
+							</div>
+							<div class="itp_icon w50">
+								<button data-menu-id="MPOMNG06010"><img src="../img/main_icon/whs.png"></button>
+							</div>
 						</div>
-						<div class="itp_icon">
-							<button data-menu-id="MRTNMNG05010"><img src="../img/main_icon/return_go.png"></button>
+						<div class="itp_icon_bar">
+							<div class="itp_icon w50">
+								<button data-menu-id="MRTNMNG02010"><img src="../img/main_icon/return.png"></button>
+							</div>
+							<div class="itp_icon w50">
+								<button data-menu-id="MRTNMNG05010"><img src="../img/main_icon/return_go.png"></button>
+							</div>
 						</div>
 					</div>
 					<div class="itp_icon_bar">