21221110 오류사항 수정

bin/src/main/webapp/app/oper/OPER02010.html

@@ -40,8 +40,8 @@
 										<div class="col-xs-3 itp_ip">
 											<div class="input-daterange input-group date">
 												<input type="text" id="ITP_FORM_OPER02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
-												<!-- <span class="input-group-addon itp_date_to">~</span>
-												<input type="text" id="ITP_FORM_OPER02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly> -->
+												<span class="input-group-addon itp_date_to">~</span>
+												<input type="text" id="ITP_FORM_OPER02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
 											</div>
 										</div>
 										<div class="col-xs-5 itp_ip">
@@ -145,13 +145,13 @@
 												</div>
 											</div>
 										</div>
-										<div class="form-group colspan border">
+										<div class="form-group colspan">
 											<label class="col-xs-2 itp_lb">공지대상 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-2 itp_in">
 													<select id="ITP_FORM_OPER02010_DETAIL_TARGET_CD" data-select-code="TARGET_CD" data-check-required="empty" class="form-control itp_input" name="targetCd"></select>
 												</div>
-												<!--<div class="col-xs-7 itp_in" id="ITP_FORM_OPER02010_TARGET">
+												<div class="col-xs-7 itp_in" id="ITP_FORM_OPER02010_TARGET">
 													<label style="margin-left:5px;">포함 대상</label>
 													<input id="ITP_FORM_OPER02010_DETAIL_BRAND" type="checkbox" class="itp_check"> 브랜드 대상
 													<input type="hidden" id="ITP_FORM_OPER02010_DETAIL_BRAND_CHK" name="brandChk" value="">
@@ -159,7 +159,7 @@
 													<input type="hidden" id="ITP_FORM_OPER02010_DETAIL_STORE_CHK" name="storeChk" value="">
 													<input id="ITP_FORM_OPER02010_DETAIL_SPPLY" type="checkbox" class="itp_check"> 공급사 대상
 													<input type="hidden" id="ITP_FORM_OPER02010_DETAIL_SPPLY_CHK" name="spplyChk" value="">
-												</div>-->
+												</div>
 											</div>
 										</div>
 									</div>
@@ -167,7 +167,7 @@
 							</form>
 						</div>
 					</div>
-					<!--<div class="itp_table fix">
+					<div class="itp_table fix">
 						<div class="itp_table_head fix" style="background:#f5f5f5;">
 							<h4 class="itp_table_tit">권한 정보 (* 공지대상이 특정 대상일 경우 추가 버튼 을 통해 사용자 등록 함)</h4>
 							<div class="pull-right itp_cicon">
@@ -181,7 +181,7 @@
 							<div id="ITP_OPER02010_DETAIL_jqGridPager"></div>
 							<div id="ITP_OPER02010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
 						</div>
-					</div>-->
+					</div>
 				</div>
 				<div id="ITP_AJAX_OPER02010_VIEW_CONTAINER">
 					<div class="itp_form itp_type1 fix">
@@ -233,7 +233,7 @@
 						</div>
 					</div>
 
-					<!--<div class="itp_table fix">
+					<div class="itp_table fix">
 						<div class="itp_table_head fix">
 							<h4 class="itp_table_tit">* 공지대상이 특정 대상일 경구 추가 버큰을 통해 사용자  등록 함</h4>
 						</div>
@@ -244,7 +244,7 @@
 							<div id="ITP_OPER02010_VIEW_jqGridPager"></div>
 							<div id="ITP_OPER02010_VIEW_jqGridEmpty" class="itp_no_data"></div>
 						</div>
-					</div>-->
+					</div>
 				</div>
 			</div>
 		</article>

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

@@ -17,19 +17,6 @@
 						<div class="itp_srh_border fix">
 							<div class="col-xs-12">
 								<form id="ITP_FORM_OPER06010_SEARCH" class="form-horizontal">
-									<input type="hidden" id="ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_ID" name="safflShopId" />
-									<div class="form-group">
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="가맹점" />
-										</div>
-										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
-											<button type="button" id="ITP_BTN_OPER06010_SEARCH_AFFL_SHOP" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_OPER06010_DELETE_AFFL_SHOP" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
-										</div>
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_OPER06010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId"></select>
-										</div>
-									</div>
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<select id="ITP_FORM_OPER06010_SERVICE_BRAND_TYPE" data-select-code="BRAND_TYPE" class="form-control itp_input" name="sbrandType">
@@ -65,7 +52,7 @@
 								<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_VIEW_CD" name="viewCd" value="C">
 								<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_AFFL_SHOP_ID" name="afflShopId" value="">
 								<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_BRAND_ID" name="brandId" value="">
-								<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_FILE_NO" name="brandLogoFileNo" value="">
+								<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_FILE_NO" name="fileNo" value="">
 					
 								<section class="itp_form_sec">
 									<h4 class="itp_form_tit">브랜드 정보-신규</h4>
@@ -112,21 +99,8 @@
 												</div>
 											</div>
 										</div>
-									</div>
-									<!-- <div class="itp_form_in">
-											<div class="form-group">
-												<label class="col-xs-2 itp_lb">대표자명</label>
-												<div class="col-xs-10 itp_ip">
-													<div class="col-xs-2 itp_in" style="margin-left:5px;">
-														<input type="text" id="ITP_FORM_OPER06010_DETAIL_OWNER_NM" data-check-required="empty" class="form-control itp_input" name="ownerNm">
-													</div>
-													<div class="col-xs-5 itp_in" style="margin-top:5px;">
-													</div>
-												</div>
-											</div>
-										</div>
-									</div> -->
-									<!--<div class="itp_form_info">
+									</div>	
+									<div class="itp_form_info">	
 										<div class="itp_form_in">
 											<div class="form-group">
 												<label class="col-xs-2 itp_lb">비밀번호</label>
@@ -140,7 +114,7 @@
 												</div>
 											</div>
 										</div>
-									</div>-->
+									</div>
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">전화번호 *</label>
@@ -151,7 +125,8 @@
 												<!-- <button type="button" id="ITP_BTN_OPER06010_RESET_PW" class="btn btn-danger btn-xs PWC" style="margin: 3px 0px 0px 3px;">비밀번호 초기화</button> -->
 											</div>
 											<label class="col-xs-2 itp_lb"></label>
-											<div id="ITP_OPER06010_DETAIL_LOGO_FILE" class="col-xs-1 itp_in">
+											<div class="col-xs-1 itp_in">
+												<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_FORM_OPER06010_DETAIL_BRAND_LOGO "style="border:none; top:12px; left:12px; height:70px; width:85px; position:absolute;" class="form-control itp_input" name="brandLogo" >
 											</div>
 										</div>
 										<div class="form-group">
@@ -202,42 +177,38 @@
 											<label class="col-xs-2 itp_lb">PG사</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-8 itp_in">
-													<select id="ITP_FORM_OPER06010_DETAIL_PG_ID" data-select-code="PG_ID" class="form-control itp_input" name="pgId">
+													<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">
 													</select>
 												</div>
 											</div>
 										</div>
-									</div>
-									<div class="itp_form_pg">
-										<div class="itp_form_in">
-											<div class="form-group">
-												<label class="col-xs-2 itp_lb">PG 가맹점 아이디 </label>
-												<div class="col-xs-4 itp_ip">
-													<div class="col-xs-7 itp_in">
-														<input type="text" id="ITP_FORM_OPER06010_DETAIL_PG_AFFL_ID" class="form-control itp_input" name="pgAfflId" value="" placeholder="PG 가맹점 id">
-													</div>
+										<div class="form-group">
+											<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_OWAC_NM" data-check-required="empty" class="form-control itp_input" name="owacNm" value="" placeholder="가맹점 id">
 												</div>
-												<label class="col-xs-2 itp_lb">PG 가맹점 Key</label>
-												<div class="col-xs-4 itp_ip">
-													<div class="col-xs-8 itp_in">
-														<input type="text" id="ITP_FORM_OPER06010_DETAIL_PG_KEY" class="form-control itp_input" name="pgKey" value="" placeholder="PG 가맹점 key">
-													</div>
+											</div>
+											<label class="col-xs-2 itp_lb">가맹점 Key</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-8 itp_in">
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_OWAC_NM" data-check-required="empty" class="form-control itp_input" name="owacNm" value="" placeholder="가맹점 key">
 												</div>
 											</div>
-										</div>		
+										</div>
 									</div>
 									<div class="itp_form_in">
 										<div class="form-group border">
 											<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="우편번호">
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_ZIPNO" class="form-control itp_input" name="zipNo" value="" maxlength="6" readonly placeholder="우편번호">
 												</div>
 												<div class="col-xs-1 itp_in">
 													<button type="button" id="ITP_FORM_OPER06010_DETAIL_ADRES_SCH" class="btn btn-primary btn-sm SHOW" style="margin: -1px 0px 0px 3px;">&nbsp;&nbsp;주소검색&nbsp;&nbsp;</button>
 												</div>
 												<div class="col-xs-4 itp_in" style="margin-right: 5px; margin-left:20px;">
-													<input type="text" id="ITP_FORM_OPER06010_DETAIL_ADRES" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="address" class="form-control itp_input" name="addr1" value="" readonly placeholder="기본주소">
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_ADRES" class="form-control itp_input" name="addr1" value="" readonly placeholder="기본주소">
 												</div>
 												<div class="col-xs-4 itp_in">
 													<input type="text" id="ITP_FORM_OPER06010_DETAIL_ADRES_DTL" class="form-control itp_input" name="addr2" value="" placeholder="상세주소">
@@ -247,7 +218,7 @@
 												<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_LOTS_ADDRESS" value="" />
 												<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_STREET_ADDRESS" value="" />
 												<input type="hidden" name="latX" id="ITP_FORM_OPER06010_DETAIL_LAT" value="" />
-												<input type="hidden" name="longY" id="ITP_FORM_OPER06010_DETAIL_LNG" value="" />
+												<input type="hidden" name="latY" id="ITP_FORM_OPER06010_DETAIL_LNG" value="" />
 												<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_HJ_DONG" value="" />
 												<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_BJ_DONG" value="" />
 												<div id="ITP_FORM_OPER06010_DETAIL_MAP" style="margin-top:30px; width:700px; height:400px;"></div>
@@ -322,7 +293,9 @@
 												<div class="col-xs-5 itp_in fnTelNo"></div>
 											</div>
 											<label class="col-xs-2 itp_lb"></label>
-											<div id="ITP_OPER06010_VIEW_LOGO_FILE" class="col-xs-1 itp_ip">
+											<div class="col-xs-1 itp_ip">
+												<img src="/oqpo-view/images/naver.png" alt="로고 샘플" style="border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;" class="form-control itp_input" name="fnBrandLogo" >
+												<img src="/oqpo-view/images/naver.png" alt="로고 샘플" style="border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;" class="form-control itp_input" name="fnBrandLogo2" >
 											</div>
 										</div>
 										<div class="form-group">
@@ -354,17 +327,17 @@
 											</div>
 											<label class="col-xs-2 itp_lb">PG사</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-12 itp_in fn fnPgId"></div>
+												<div class="col-xs-12 itp_in fn"></div>
 											</div>
 										</div>	
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">가맹점 아이디 </label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-12 itp_in fn fnPgAfflId"></div>
+												<div class="col-xs-12 itp_in fn"></div>
 											</div>
 											<label class="col-xs-2 itp_lb">가맹점 Key</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"></div>
 											</div>
 										</div>
 									</div>

bin/src/main/webapp/app/ordmng/ORDMNG03010.html

@@ -7,6 +7,11 @@
 					<button type="button" id="ITP_BTN_ORDMNG03010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_ORDMNG03010_POPUP" class="btn btn-primary btn-sm IVP" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;납품서출력&nbsp;&nbsp;</button>
 				</div>
+				<div style="top:0px; text-align:center; font-size:20px;">
+					<span style="text-decoration:underline; font-weight:600;">테스트공급업체</span>
+					<button type="button" id="ITP_BTN_ORDMNG03010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+					<button type="button" id="ITP_BTN_ORDMNG03010_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
+				</div>
 			</div>
 			<div class="itp_det_in">
 				<div id="ITP_AJAX_ORDMNG03010_LIST_CONTAINER">

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

@@ -12,7 +12,7 @@
 							<div class="col-xs-12 itp_form_inline">
 								<div class="form-horizontal fix">
 									<div class="col-xs-4 itp_in itp_pr">
-										<img src="" 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 fnItemImage" name="" >
+										<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>
 									<div class="pull-right itp_cicon">
 										<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_DLV_STTMT_PRN_BTN_SEARCH" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;출력&nbsp;&nbsp;</button>
@@ -23,7 +23,7 @@
 							<div class="col-xs-12 itp_form_inline">
 								<div class="col-xs-5"></div>
 								<div class="itp_title">
-									<label>납품 확인서</label>
+									<label>납품확인서</label>
 								</div>
 							</div>	
 							<div class="col-xs-12 itp_form_inline">
@@ -31,24 +31,23 @@
 									<div>
 										<label style="width:100px;">발행일</label>
 										<label>:</label>
-										<span class="fnDlvRegDt"></span>
+										<span class="fnDlvRegDt">2022.01.01</span>
 									</div>
 									<div>
 										<label style="width:100px;">납품확인번호</label>
 										<label>:</label>
-										<span class="fnDlvSttmtUnqNo"></span>
+										<span class="fnDlvSttmtUnqNo">2211020000002001</span>
 									</div>
 									<div>
 										<label style="width:100px;">납품일</label>
 										<label>:</label>
-										<span class="fnDlvRegDt"></span>
+										<span class="fnDlvRegDt">2022.12.31</span>
 									</div>
 									<div>
 										<label style="width:100px;">납품담당</label>
 										<label>:</label>
-										<span class="fnDlvMgrNm"></span>
-										<!-- js로 ()감싸기 -->
-										<span class="fnDlvMgrTelNo"></span> 
+										<span class="fnDlvMgrNm">홍길동</span>
+										(<span class="fnDlvMgrTelNo">010-2525-2525</span>)
 									</div>
 								</div>
 								<div class="col-xs-6">
@@ -62,7 +61,9 @@
 										<div class="itp_sign_header">
 											<label>납품확인일</label>
 										</div>
-										<div class="itp_sign_area fnDlvCnfmDt"></div>
+										<div class="itp_sign_area fnDlvCnfmDt">
+											2022.01.01
+										</div>
 									</div>
 								</div>
 							</div>	
@@ -71,15 +72,14 @@
 									<div>
 										<label style="width:100px;">납품 장소</label>
 										<label>:</label>
-										<!-- js로 ()감싸기 -->
-										<span style="margin:0px; " class="fnZipNo"></span>
-										<span class="fnLoadAddr"></span>
-										<span class="fnDtlAddr"></span>
+										(<span style="margin:0px; " class="fnZipNo">12345</span>)
+										<span class="fnLoadAddr">서울 송파구 문정동 100 ㅁㄴㄹㅇㅁㄴ</span>
+										<span class="fnDtlAddr">디 매장</span>
 									</div>
 									<div>
 										<label style="width:100px;">전화번호</label>
 										<label>:</label>
-										<span class="fnVndrTelNo"></span>
+										<span class="fnVndrTelNo">02-1234-1547</span>
 									</div>
 								</div>
 							</div>	
@@ -91,25 +91,25 @@
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-4">등록번호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBsnsRegNo"></div>
+											<div class="col-xs-12 itp_in fnBsnsRegNo">215-58-584887</div>
 										</div>
 									</div>	
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">상호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnSpplyNm"></div>
+											<div class="col-xs-12 itp_in fnSpplyNm">등록업체명</div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">성명</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnBrandNm">공길동</div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">주소</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnBrandNm">서울 시송파구 ㄴㄻㄴㄹ</div>
 										</div>
 									</div>
 								</div>	
@@ -122,25 +122,25 @@
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-4">등록번호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnBrandNm">215-58-584887</div>
 										</div>
 									</div>	
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">상호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnBrandNm">등록업체명</div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">성명</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnBrandNm">공길동</div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">주소</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnBrandNm">서울 시송파구 ㄴㄻㄴㄹ</div>
 										</div>
 									</div>
 								</div>	

bin/src/main/webapp/app/popup/biz/BIZPOP_STTL_REJECT_REASON.html

@@ -1,32 +0,0 @@
-<div id="ITP_BIZPOP_STTL_REJECT_REASON" class="modal itp_modal">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-				<h5 class="modal-title">정산반려</h5>
-			</div>
-			<div class="modal-body">
-				<div class="itp_form itp_type1 fix">
-					<div class="col-xs-12">
-						<div class="form-horizontal">
-							<form id="ITP_FORM_STTL_REJECT_REASON_POPUP">
-								<div class="form-group">
-									<label class="col-xs-2 itp_lb">반려사유</label>
-									<div class="col-xs-10 itp_ip">
-									<input type="text" id="ITP_FORM_STTL_REJECT_REASON_POPUP_STTL_RJCT_RSN" class="form-control itp_input" name="sttlRjctRsn" />
-									</div>									
-								</div>								
-							</form>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="modal-footer">
-				<button type="button" id="ITP_BTN_STTL_REJECT_REASON_CLOSE_POP" class="btn btn-danger btn-sm CLB">&nbsp;&nbsp;취소&nbsp;&nbsp;</button>
-				<button type="button" id="ITP_BTN_STTL_REJECT_REASON_CONFIRM_POP" class="btn btn-primary btn-sm SAB" style="display: inline-block;">&nbsp;&nbsp;확인&nbsp;&nbsp;</button>
-			</div>
-		</div>
-	</div>
-
-	<div id="ITP_POPUP_JS"></div>
-</div>

bin/src/main/webapp/css/style.css

@@ -698,7 +698,7 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
 #ITP_POPUP_CONTAINER .itp_form_info .itp_company_type label {width:35px; border:none; padding:10px;}
 #ITP_POPUP_CONTAINER .modal-body span{margin-right:7px;}
 #ITP_POPUP_CONTAINER .itp_form_info label {border:1px solid #000; background:#eee; margin:0; width:120px; height:42px; padding:10px 5px 10px 10px;}
-#ITP_POPUP_CONTAINER .itp_form_it {border:1px solid #000; height:42px; padding:12px 0 0 0;}
+#ITP_POPUP_CONTAINER .itp_form_it {border:1px solid #000; height:42px; padding-top:12px;}
 
 
 

bin/src/main/webapp/js/app/oper/ITP_OPER02010.js

@@ -11,15 +11,15 @@ const OPER02010_GRID_LIST = '#ITP_OPER02010_jqGrid_list';
 const OPER02010_GRID_PAGER = '#ITP_OPER02010_jqGridPager';
 const OPER02010_GRID_EMPTY = '#ITP_OPER02010_jqGridEmpty';
 
-// const OPER02010_VIEW_GRID_ID = '#ITP_OPER02010_VIEW_jqGrid';
-// const OPER02010_VIEW_GRID_LIST = '#ITP_OPER02010_VIEW_jqGrid_list';
-// const OPER02010_VIEW_GRID_PAGER = '#ITP_OPER02010_VIEW_jqGridPager';
-// const OPER02010_VIEW_GRID_EMPTY = '#ITP_OPER02010_VIEW_jqGridEmpty';
-//
-// const OPER02010_DETAIL_GRID_ID = '#ITP_OPER02010_DETAIL_jqGrid';
-// const OPER02010_DETAIL_GRID_LIST = '#ITP_OPER02010_DETAIL_jqGrid_list';
-// const OPER02010_DETAIL_GRID_PAGER = '#ITP_OPER02010_DETAIL_jqGridPager';
-// const OPER02010_DETAIL_GRID_EMPTY = '#ITP_OPER02010_DETAIL_jqGridEmpty';
+const OPER02010_VIEW_GRID_ID = '#ITP_OPER02010_VIEW_jqGrid';
+const OPER02010_VIEW_GRID_LIST = '#ITP_OPER02010_VIEW_jqGrid_list';
+const OPER02010_VIEW_GRID_PAGER = '#ITP_OPER02010_VIEW_jqGridPager';
+const OPER02010_VIEW_GRID_EMPTY = '#ITP_OPER02010_VIEW_jqGridEmpty';
+
+const OPER02010_DETAIL_GRID_ID = '#ITP_OPER02010_DETAIL_jqGrid';
+const OPER02010_DETAIL_GRID_LIST = '#ITP_OPER02010_DETAIL_jqGrid_list';
+const OPER02010_DETAIL_GRID_PAGER = '#ITP_OPER02010_DETAIL_jqGridPager';
+const OPER02010_DETAIL_GRID_EMPTY = '#ITP_OPER02010_DETAIL_jqGridEmpty';
 
 let ITP_FORM_OPER02010_DETAIL_IS_WRITING = false;
 
@@ -81,7 +81,7 @@ const gridColModel = {
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		}
-	]/*,
+	],
 	detail: [
 		{
 			index: 'VIEW_CD', name: 'viewCd',
@@ -127,7 +127,7 @@ const gridColModel = {
 			width: '30', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text'
 		}
-	]*/
+	]
 };
 
 /********************************************************
@@ -146,6 +146,7 @@ let pageObj = {
 	init: function () {
 		this.ui.init();
 		this.event.init();
+		this.fileUpload();
 	},
 	pageMode: '',
 	ui: {
@@ -167,8 +168,8 @@ let pageObj = {
 			// 조회일자 지정
 			var now = new Date();
 			$('#ITP_TAB_OPER02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_OPER02010_SEARCH_FROM_DT').datepicker('setDate', new Date(now));
-			//$('#ITP_FORM_OPER02010_SEARCH_TO_DT').datepicker('setDate', new Date());
+			$('#ITP_FORM_OPER02010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
+			$('#ITP_FORM_OPER02010_SEARCH_TO_DT').datepicker('setDate', new Date());
 		},
 		afflInfo: {
 			init: function() {
@@ -238,8 +239,8 @@ let pageObj = {
 						case 'ITP_BTN_OPER02010_CANCELLIST'			: createObj.button.cancel(); 	break;	// 취소/목록 버튼
 						case 'ITP_BTN_OPER00210_DELETE'				: 								break;	// 삭제 버튼
 						case 'ITP_BTN_OPER02010_SAVE'				: createObj.button.save(); 		break;	// 저장 버튼
-						// case 'ITP_BTN_OPER02010_DETAIL_ADDROW'		: pageObj.grid.button.addRow();	break;	// 상세:추가버튼
-						// case 'ITP_BTN_OPER02010_DETAIL_DELROW'		: pageObj.grid.button.delRow();	break;	// 상세:삭제버튼
+						case 'ITP_BTN_OPER02010_DETAIL_ADDROW'		: pageObj.grid.button.addRow();	break;	// 상세:추가버튼
+						case 'ITP_BTN_OPER02010_DETAIL_DELROW'		: pageObj.grid.button.delRow();	break;	// 상세:삭제버튼
 					}
 				});
 			});
@@ -250,17 +251,13 @@ let pageObj = {
 		//파일업로드(등록/수정화면)
 		var id = 'OPER02010';
 		$('#ITP_' + id + '_DETAIL_UPLOAD').empty();
-		$('#ITP_' + id + '_DETAIL_LOGO_FILE').empty();
-		var removeFn = (param) => {
-			$('#ITP_' + id + '_DETAIL_LOGO_FILE').empty();
-		};
 		const fileArgs = {
 			'fileNo': $('#ITP_FORM_' + id + '_DETAIL_FILE_NO').val(),
 			'viewCd': $('#ITP_FORM_' + id + '_DETAIL_VIEW_CD').val(),
 			'showYn': $('#ITP_' + id + '_DETAIL_UPLOAD').attr('data-show-yn'),
 			'fileId': '#ITP_FORM_' + id + '_DETAIL_FILE_NO' //파일번호를 서버에서 받아서 넣을 파일번호 인풋박스 아이디
 		};
-		itp_fn_set_file_upload('ITP_' + id + '_DETAIL_UPLOAD', 'notice', true, false, id, fileArgs, removeFn);
+		itp_fn_set_file_upload('ITP_' + id + '_DETAIL_UPLOAD', 'notice', true, false, id, fileArgs);
 	},
 	switchScreen: function(mode) {
 		pageObj.pageMode = mode;
@@ -302,7 +299,7 @@ let pageObj = {
 			$('#ITP_AJAX_OPER02010_VIEW_CONTAINER').show();
 			fn_show_btn_auth_array(['#ITP_BTN_OPER02010_MODIFY', '#ITP_BTN_OPER02010_CANCELLIST']);
 		}
-	}/*,
+	},
 	grid: {
 		init: function(mode) {
 			this.mode = mode;
@@ -375,7 +372,7 @@ let pageObj = {
 		unload : function() {
 			$.jgrid.gridUnload(this.gridId);
 		}
-	}*/
+	}
 };
 
 /*목록화면 Object*/
@@ -509,11 +506,16 @@ let viewObj = {
 		$('#ITP_FORM_OPER02010_VIEW .fnTargetNm').text(result.targetNm);
 		$('#ITP_FORM_OPER02010_VIEW_FILE_NO').val(result.fileNo); //파일번호 셋팅
 
-		itp_fn_attach_file.view('ITP_OPER02010_VIEW_UPLOAD', result.fileNoList
-			, 'form-control itp_input', 'border:none; top:0px; left:12px; height:100px; width:125px; position:absolute;');
+		//파일업로드(뷰화면)
+		$('#ITP_OPER02010_VIEW_UPLOAD').empty();
+		const fileArgs = {
+			'fileNo': $('#ITP_FORM_OPER02010_VIEW_FILE_NO').val(),
+			'viewCd': $('#ITP_FORM_OPER02010_VIEW_VIEW_CD').val()
+		};
+		itp_fn_set_file_upload('ITP_OPER02010_VIEW_UPLOAD', 'notice', true, false, 'OPER02010', fileArgs);
 
 		// 권한정보 리스트 조회
-		// pageObj.grid.init('VIEW');
+		pageObj.grid.init('VIEW');
 	}
 };
 
@@ -570,21 +572,27 @@ let modifyObj = {
 		}
 
 		//파일업로드(수정화면)
-		pageObj.fileUpload();
+		$('#ITP_OPER02010_DETAIL_UPLOAD').empty();
+		const fileArgs = {
+			'fileNo': $('#ITP_FORM_OPER02010_DETAIL_FILE_NO').val(),
+			'viewCd': $('#ITP_FORM_OPER02010_DETAIL_VIEW_CD').val(),
+			'showYn': $('#ITP_OPER02010_DETAIL_UPLOAD').attr('data-show-yn'),
+			'fileId': '#ITP_FORM_OPER02010_DETAIL_FILE_NO' //파일번호를 서버에서 받아서 넣을 파일번호 인풋박스 아이디
+		};
+		itp_fn_set_file_upload('ITP_OPER02010_DETAIL_UPLOAD', 'notice', true, false, 'OPERATION02010', fileArgs);
 
 		// 리스트 조회
-		// createObj.form.init();
-		// pageObj.grid.init('DETAIL');
+		createObj.form.init();
+		pageObj.grid.init('DETAIL');
 	}
 };
 
 /*신규화면 Object*/
 let createObj = {
 	init: function () {
-		pageObj.fileUpload();
-		// this.form.init();
+		this.form.init();
 	},
-	/*form: {
+	form: {
 		init: function () {
 			this.selectbox();
 			this.checkbox();
@@ -617,35 +625,38 @@ let createObj = {
 				$(this).next().val($(this).is(':checked') ? 'Y' : '');
 			});
 		}
-	},*/
+	},
 	button: {
 		save: function() {
 			const formId = '#ITP_FORM_OPER02010_DETAIL';
 			itp_fn_form_clear_validate(null, formId);
+			var vali_nticeNo = itp_fn_form_validate(formId, formId + '_NTICE_TITL', ['empty'], undefined);
+			var vali_nticeDesc = itp_fn_form_validate(formId, formId + '_NTICE_DESC', ['empty'], undefined);
+			var vali_targetCd = itp_fn_form_validate(formId, formId + '_TARGET_CD', ['empty'], undefined);
 
-			if (itp_fn_form_event.isValid(formId)) {
-				// let gridInsertData = [];
-				// let gridUpdateData = [];
-				// let gridDeleteData = [];
-				// const rowData = $(OPER02010_DETAIL_GRID_ID).getRowData();
-				// const keyValue = $(formId + '_USER_ID').val();
-				// $.each(rowData, function(key, value) {
-				// 	if (value.viewCd != 'R') {
-				// 		value.nticeNo = keyValue;
-				// 		if (value.viewCd == 'C') {
-				// 			gridInsertData.push(value);
-				// 		} else if (value.viewCd == 'U') {
-				// 			gridUpdateData.push(value);
-				// 		} else if (value.viewCd == 'D') {
-				// 			gridDeleteData.push(value);
-				// 		}
-				// 	}
-				// });
+			if (vali_nticeNo && vali_nticeDesc && vali_targetCd) {
+				let gridInsertData = [];
+				let gridUpdateData = [];
+				let gridDeleteData = [];
+				const rowData = $(OPER02010_DETAIL_GRID_ID).getRowData();
+				const keyValue = $(formId + '_USER_ID').val();
+				$.each(rowData, function(key, value) {
+					if (value.viewCd != 'R') {
+						value.nticeNo = keyValue;
+						if (value.viewCd == 'C') {
+							gridInsertData.push(value);
+						} else if (value.viewCd == 'U') {
+							gridUpdateData.push(value);
+						} else if (value.viewCd == 'D') {
+							gridDeleteData.push(value);
+						}
+					}
+				});
 				$('#ITP_FORM_OPER02010_DETAIL_TARGET_CD').attr('disabled', false);
 				let param = $(formId).serializeObject();
-				// param.gridInsertData = gridInsertData;
-				// param.gridUpdateData = gridUpdateData;
-				// param.gridDeleteData = gridDeleteData;
+				param.gridInsertData = gridInsertData;
+				param.gridUpdateData = gridUpdateData;
+				param.gridDeleteData = gridDeleteData;
 				// console.log(JSON.stringify(param));
 
 				var searhFn = function() {
@@ -689,7 +700,7 @@ let afflShopObj = {
 			$('#ITP_FORM_OPER02010_DETAIL_AFFL_SHOP_NM').val('');
 			$('select#ITP_FORM_OPER02010_DETAIL_BRAND_ID option').remove();
 			$('#ITP_FORM_OPER02010_DETAIL_TARGET_CD option:eq(0)').prop('selected', true);
-			// $('#ITP_FORM_OPER02010_DETAIL_TARGET_CD').trigger('change');
+			$('#ITP_FORM_OPER02010_DETAIL_TARGET_CD').trigger('change');
 		});
 	},
 	make: function() {

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

@@ -36,10 +36,9 @@ const OPER06010_DETAIL_GRID_PAGER = '#ITP_OPER06010_DETAIL_jqGridPager';
 const OPER06010_DETAIL_GRID_EMPTY = '#ITP_OPER06010_DETAIL_jqGridEmpty';
 
 /*API URL*/
-let API_DETAIL_GRID_LIST    = '/api/brand/detail-grid-list';
-let API_DETAIL_INFO         = '/api/brand/info-brand';
-let API_DETAIL_SAVE         = '/api/brand/save-brand';
-let BRAND_POP_GRID_LIST 	= '/api/brand/pop-grid-list';
+let API_DETAIL_GRID_LIST = '/api/brand/detail-grid-list';
+let API_DETAIL_INFO = '/api/brand/info-brand';
+let API_DETAIL_SAVE = '/api/brand/save-brand';
 
 let ITP_FORM_OPER06010_DETAIL_IS_WRITING = false;
 
@@ -103,6 +102,7 @@ let pageObj = {
     init: function () {
         this.ui.init();
         this.event.init();
+        this.fileUpload();
     },
     ui: {
         init: function () {
@@ -120,15 +120,6 @@ let pageObj = {
                     fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
                 }
             });
-
-            itp_fn_form_event.onKeyup('#ITP_FORM_OPER06010_DETAIL');
-
-            // form alert message 주입
-            $('input[data-alert-required="ONLYCHK"]').each(function() {
-                if($(this).data('alert-msg') === 'address') {
-                    $(this).data('alert-msg', ITP_MSG_LOCALE.message.form.emptyAddr);
-                }
-            });
         },
         grid: function() {
             itp_fn_jqgrid_resize(OPER06010_GRID_ID, OPER06010_GRID_LIST, 'lg');
@@ -169,17 +160,13 @@ let pageObj = {
         //파일업로드(수정화면)
         var id = 'OPER06010';
         $('#ITP_' + id + '_DETAIL_UPLOAD').empty();
-        $('#ITP_' + id + '_DETAIL_LOGO_FILE').empty();
-        var removeFn = (param) => {
-            $('#ITP_' + id + '_DETAIL_LOGO_FILE').empty();
-        };
         const fileArgs = {
             'fileNo': $('#ITP_FORM_' + id + '_DETAIL_FILE_NO').val(),
             'viewCd': $('#ITP_FORM_' + id + '_DETAIL_VIEW_CD').val(),
             'showYn': $('#ITP_' + id + '_DETAIL_UPLOAD').attr('data-show-yn'),
             'fileId': '#ITP_FORM_' + id + '_DETAIL_FILE_NO' //파일번호를 서버에서 받아서 넣을 파일번호 인풋박스 아이디
         };
-        itp_fn_set_file_upload('ITP_' + id + '_DETAIL_UPLOAD', 'brand', true, false, id, fileArgs, removeFn);
+        itp_fn_set_file_upload('ITP_' + id + '_DETAIL_UPLOAD', 'notice', true, false, id, fileArgs);
     },
     switchScreen: function(mode) {
         $('.itp_det_head').find('button[id^="ITP_BTN_OPER06010_"]').each(function(i) {
@@ -191,14 +178,10 @@ let pageObj = {
         if(mode == 'LIST') { // 목록
             fn_show_btn_auth_array(['#ITP_BTN_OPER06010_SRH', '#ITP_BTN_OPER06010_NEWREG']);
             $('#ITP_AJAX_OPER06010_LIST_CONTAINER').show();
-            
         } else if(mode == 'ADD') { // 등록
             $('#ITP_AJAX_OPER06010_DETAIL_CONTAINER').show();
-            
-			
             fn_show_btn_auth_array(['#ITP_BTN_OPER06010_CANCELLIST', '#ITP_BTN_OPER06010_SAVE']);
 
-            
             $('#ITP_FORM_OPER06010_DETAIL').find('input, textarea, select, checkbox').each(function(i, elem) {
                 $(this).attr('id') === 'ITP_FORM_OPER06010_DETAIL_VIEW_CD' ? $(this).val('C') : $(this).val('');
                 if(elem.type === 'select') {
@@ -217,23 +200,10 @@ let pageObj = {
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_info').hide();
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_change').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'));
-
             $('.fnBrandId').text('(자동부여)');
-            
-            //pg사아이디 선택시 보이게함
-            $('#ITP_FORM_OPER06010_DETAIL_PG_ID').on('change', function() {
-            	if($(this).val() === '') {
-                	$('#ITP_FORM_OPER06010_DETAIL .itp_form_pg').show();
-            	} else {
-                    $('#ITP_FORM_OPER06010_DETAIL .itp_form_pg').hide();
-            	}
-            });
-			
         } else if(mode == 'MODIFY') { // 수정
             $('#ITP_AJAX_OPER06010_DETAIL_CONTAINER').show();
-            fn_show_btn_auth_array(['#ITP_BTN_OPER06010_CANCELLIST', '#ITP_BTN_OPER06010_SAVE']);
+            fn_show_btn_auth_array(['#ITP_BTN_OPER06010_CANCELLIST', '#ITP_BTN_OPER06010_SAVE', '#ITP_BTN_OPER06010_RESET_PW']);
 
             $('#ITP_FORM_OPER06010_DETAIL_BRAND_ID').attr('readonly', true);
             $('#ITP_FORM_OPER06010_DETAIL_BRAND_NM').attr('readonly', true);
@@ -245,8 +215,10 @@ let pageObj = {
             $('#ITP_FORM_OPER06010_DETAIL_DELETE_AFFL_SHOP').hide();
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_info').show();
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_change').hide();
+			
+			$('#ITP_BTN_OPER06010_RESET_PW').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();
             fn_show_btn_auth_array(['#ITP_BTN_OPER06010_MODIFY', '#ITP_BTN_OPER06010_CANCELLIST']);
@@ -257,7 +229,6 @@ let pageObj = {
 /*목록화면 Object*/
 let listObj = {
     init: function () {
-        afflShopObj.init();
         this.grid.init();
     },
     itp_OPER06010_param: {},
@@ -268,14 +239,9 @@ let listObj = {
             let param = $('#ITP_FORM_OPER06010_SEARCH').serializeObject();
             param.gridSize = $.jgrid.defaults.rowNum;
             param.gridPage = $.jgrid.defaults.page;
-            console.log(JSON.stringify(param));
             $(OPER06010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
         },
         create: function() {
-            if($('#ITP_FORM_OPER06010_DETAIL_AFFL_SHOP_ID').val() === '') {
-                itp_fn_modal_alert('가맹점 정보가 존재하지 않습니다.');
-                return;
-            }
             pageObj.switchScreen('ADD');
             itp_fn_form_clear_validate(null, '#ITP_FORM_OPER06010_DETAIL');
             // 권한정보 리스트 조회
@@ -383,8 +349,6 @@ let viewObj = {
         $('#ITP_FORM_OPER06010_VIEW .fnEmalAddr').text(result.emalAddr);
         $('#ITP_FORM_OPER06010_VIEW .fnDpstBnkCd').text(result.bnkCdNm);
         $('#ITP_FORM_OPER06010_VIEW .fnRcvAcctNo').text(result.acctNo);
-        $('#ITP_FORM_OPER06010_VIEW .fnBnkCd').text(result.bnkCdNm);
-        $('#ITP_FORM_OPER06010_VIEW .fnAcctNo').text(result.acctNo);
         $('#ITP_FORM_OPER06010_VIEW .fnOwacNm').text(result.owacNm);
         $('#ITP_FORM_OPER06010_VIEW .fnZipNo').text(result.zipNo);
         $('#ITP_FORM_OPER06010_VIEW .fnLoadAddr').text(result.addr1);
@@ -395,14 +359,6 @@ let viewObj = {
         $('#ITP_FORM_OPER06010_VIEW .fnChgDt').text(result.sysChgDttm);
         // $('#ITP_FORM_OPER06010_VIEW .fnBrandLogo').text(result.lastLoginDt);
 
-        $('#ITP_FORM_OPER06010_VIEW .fnPgId').text(result.pgId);
-        $('#ITP_FORM_OPER06010_VIEW .fnPgAfflId').text(result.pgAfflId);
-        $('#ITP_FORM_OPER06010_VIEW .fnPgKey').text(result.pgKey);
-
-        pageObj.fileUpload();
-        itp_fn_attach_file.view('ITP_OPER06010_VIEW_LOGO_FILE', result.fileLogNoList
-            , 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
-
         let locate = result.addr1 + ' ' + result.addr2;
         kakaoMap.init('ITP_FORM_OPER06010_VIEW', locate);
 
@@ -447,20 +403,11 @@ let modifyObj = {
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_OWAC_NM').val(result.owacNm);
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_ZIPNO').val(result.zipNo);
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_ADRES').val(result.addr1);
-        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_ADRES_DTL').val(result.addr2);
-
-        $('#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_OPER03010_DETAIL_ADRES_DTL').val(result.addr2);
 
         $('#ITP_FORM_OPER06010_DETAIL .fnAddDt').text(result.sysRegDttm);
         $('#ITP_FORM_OPER06010_DETAIL .fnChgDt').text(result.sysChgDttm);
 
-        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_FILE_NO').val(result.brandLogoFileNo);
-        pageObj.fileUpload();
-        itp_fn_attach_file.view('ITP_OPER06010_DETAIL_LOGO_FILE', result.fileLogNoList
-            , 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
-
         let locate = result.addr1 + ' ' + result.addr2;
         kakaoMap.init('ITP_FORM_OPER06010_DETAIL', locate);
 
@@ -491,12 +438,11 @@ let createObj = {
         },
         save: function() {
             const formId = '#ITP_FORM_OPER06010_DETAIL';
-            itp_fn_form_event.removeChar('#ITP_FORM_OPER06010_DETAIL');
             itp_fn_form_clear_validate(null, formId);
 
-            if (itp_fn_form_event.isValid(formId)) {
+            if (createObj.isValid(formId)) {
                 let param = $(formId).serializeObject();
-                console.log(JSON.stringify(param));
+                // console.log(JSON.stringify(param));
 
                 var searhFn = function() {
                     ITP_FORM_OPER06010_DETAIL_IS_WRITING = false;
@@ -518,64 +464,16 @@ let createObj = {
             }
         };
         fn_call_popup('biz', 'BIZPOP_AFFL_SHOP', '#ITP_ASIDE', popFn, null, 'S');
-    }
-};
-
-/*가맹점 Object*/
-let afflShopObj = {
-    init: function () {
-        this.action();
-        if(fn_make_user_info.get('authTpCd') === '30') {
-            this.afflInfo.setAfflShop();
-        }
-    },
-    action: function () {
-        var _this = this;
-        // 가맹점 조회 버튼 클릭
-        $('#ITP_BTN_OPER06010_SEARCH_AFFL_SHOP').one('click', function() {
-            _this.popup('L');
-        });
-        // 가맹점 텍스트 삭제 버튼 클릭
-        $('#ITP_BTN_OPER06010_DELETE_AFFL_SHOP').one('click', function() {
-            $('#ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_ID').val('');
-            $('#ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_NM').val('');
-            $('select#ITP_FORM_OPER06010_SEARCH_BRAND_ID option').remove();
-        });
-    },
-    afflInfo: {
-        setAfflShop: function() {
-            var _this = this;
-            this.afflShopId 	= fn_make_user_info.get('afflShopId');
-            this.afflShopNm 	= fn_make_user_info.get('afflShopNm');
-            $('#ITP_FORM_OPER06010_DETAIL_AFFL_SHOP_ID').val(_this.afflShopId);
-            $('#ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_ID').val(_this.afflShopId);
-            $('#ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_NM').val(_this.afflShopNm);
-            $('#ITP_BTN_OPER06010_SEARCH_AFFL_SHOP').attr('disabled', true);
-            $('#ITP_BTN_OPER06010_DELETE_AFFL_SHOP').attr('disabled', true);
-
-            var callbackFn = (result) => {
-                var brandList = [];
-                $.each(result.gridRows, function(i, item) {
-                    brandList.push({'brandId': item.brandId, 'brandNm': item.brandNm});
-                });
-                fn_make_select_brand(brandList, 'ITP_FORM_OPER06010_SEARCH_BRAND_ID', true, '선택');
-            };
-            var param = {'afflShopId': _this.afflShopId};
-            fn_ajax_call(BRAND_POP_GRID_LIST, JSON.stringify(param), callbackFn, 'POST');
-        }
     },
-    popup: function (view) {
-        // 팝업
-        var popFn = function(rowDataPop) {
-            // console.log(rowDataPop);
-            if(rowDataPop.AFFL_SHOP) {
-                $('#ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_ID').val(rowDataPop.AFFL_SHOP.afflShopId);
-                $('#ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_NM').val(rowDataPop.AFFL_SHOP.afflShopNm);
-            }
-            if(rowDataPop.AFFL_BRAND) {
-                fn_make_select_brand(rowDataPop.AFFL_BRAND, 'ITP_FORM_OPER06010_SEARCH_BRAND_ID', true, '선택');
+    isValid: function(formId) {
+        var isValid = false;
+        $(formId).find('input, select, checkbox, textarea').each(function(k) {
+            if($(this).data('check-required')) {
+                var arry = $(this).data('check-required').split(',');
+                isValid = itp_fn_form_validate(formId, '#' + $(this).attr('id'), arry, undefined);
+                if(!isValid) return false;
             }
-        };
-        fn_call_popup('biz', 'BIZPOP_AFFL_SHOP', '#ITP_ASIDE', popFn, null, 'S');
+        });
+        return isValid;
     }
 };

bin/src/main/webapp/js/app/popup/biz/ITP_BIZPOP_DLV_STTMT_PRN.js

@@ -138,50 +138,3 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, returnType) {
 	    }
 	}).navGrid(THIS_GIRD_PAGER, ITP_GRID_NAV_DEFAULTS.navGrid);
 };
-let viewObj = {
-		init: function (param) {
-				this.load(param);
-		},
-		load: function(param) {
-				fn_ajax_call(API_INFO_INV, param, this.callback, 'GET');
-		},
-		callback: function (result) {
-				console.log(result);
-				$('#ITP_POPUP_CONTAINER #ITP_POPUP_CONTAINER_ITEM_ID').val(result.itemId);
-				$('#ITP_POPUP_CONTAINER .fnPchPodrUnqNo').text(result.pchPodrUnqNo);
-				$('#ITP_POPUP_CONTAINER .fnItemClassMgntNo').text(result.itemClassMgntNo);
-				$('#ITP_POPUP_CONTAINER .fnItemId').text(result.itemId);
-				$('#ITP_POPUP_CONTAINER .fnItemTypeNm').text(result.itemTypeNm);
-				$('#ITP_POPUP_CONTAINER .fnItemNm').text(result.itemClassNm);
-				$('#ITP_POPUP_CONTAINER .fnImpDvsnNm').text(result.impDvsnNm);
-				$('#ITP_POPUP_CONTAINER .fnPodrPssblDvsn').text(result.podrPssblDvsnNm);
-				$('#ITP_POPUP_CONTAINER .fnUnit').text(result.unit);
-				$('#ITP_POPUP_CONTAINER .fnWeightUnit').text(result.weightUnit);
-				$('#ITP_POPUP_CONTAINER .fnVolumeUnit').text(result.volumeUnit);
-				$('#ITP_POPUP_CONTAINER .fnWidthUnit').text(result.widthUnit);
-				$('#ITP_POPUP_CONTAINER .fnHeightUnit').text(result.heightUnit);
-				$('#ITP_POPUP_CONTAINER .fnHighUnit').text(result.highUnit);
-				
-				$('#ITP_POPUP_CONTAINER .fnPchItemYn').text(result.pchItemYn);
-				$('#ITP_POPUP_CONTAINER .fnViewPchUnit').text(result.pchUnit);
-				$('#ITP_POPUP_CONTAINER .fnSaleItemYn').text(result.saleItemYn);
-				$('#ITP_POPUP_CONTAINER .fnSaleUnit').text(result.saleUnit);
-				$('#ITP_POPUP_CONTAINER .fnAssetInfo').text(result.assetInfo);
-				$('#ITP_POPUP_CONTAINER .fnStckUnit').text(result.stckUnit);
-				$('#ITP_POPUP_CONTAINER .fnWeight').text(result.weight);
-				$('#ITP_POPUP_CONTAINER .fnVolume').text(result.volume);
-				$('#ITP_POPUP_CONTAINER .fnWidth').text(result.width);
-				$('#ITP_POPUP_CONTAINER .fnHeight').text(result.height);
-				$('#ITP_POPUP_CONTAINER .fnHigh').text(result.high);
-				
-				$('#ITP_POPUP_CONTAINER .fnOneBoxQty').text(result.oneBoxQty);
-				$('#ITP_POPUP_CONTAINER .fnExpryYn').text(result.expryYn);
-				$('#ITP_POPUP_CONTAINER .fnExpryPeriod').text(result.expryPeriod);
-				$('#ITP_POPUP_CONTAINER .fnRtnPssblYn').text(result.rtnPssblYn);
-				$('#ITP_POPUP_CONTAINER .fnRtnDvsn').text(result.rtnDvsnNm);
-				// $('#ITP_POPUP_CONTAINER .fnItemImage').text(result.imageFileNoList);
-				$.each(result.imageFileNoList, function(index, item) {
-						$('#ITP_POPUP_CONTAINER .fnItemImage').append('<img src=" + item.filePath +" />');
-				});
-		}
-	};

bin/src/main/webapp/js/app/popup/biz/ITP_BIZPOP_STTL_REJECT_REASON.js

@@ -1,53 +0,0 @@
-require(['config'], function() {
-	require([
-		'jquery'
-	], function($) {
-
-	});
-});
-
-var popPageObj = {
-	init: function () {
-		this.button();
-		this.change();
-	},
-	parentPopFn: null,
-	args: null,
-	returnType: null,
-	button: function() {
-		$('#ITP_BTN_STTL_REJECT_REASON_CLOSE_POP').on('click', function () {
-			$('#ITP_BIZPOP_STTL_REJECT_REASON').modal('hide'); // 팝업닫기
-		});
-		$('#ITP_BTN_STTL_REJECT_REASON_CONFIRM_POP').on('click', function () {
-			popPageObj.fnRjctRsnConfirm();
-		});
-	}, 
-	change: function() {
-	}, 	
-	fnRjctRsnConfirm: function() {
-		const formId = '#ITP_FORM_STTL_REJECT_REASON_POPUP';
-		itp_fn_form_clear_validate(null, formId);
-		
-		var vali_sttlRjctRsn = itp_fn_form_validate(formId, formId + '_STTL_RJCT_RSN', ['empty'], undefined);
-		
-		if (vali_sttlRjctRsn) {		
-			var sttlRjctRsn = $('#ITP_FORM_STTL_REJECT_REASON_POPUP_STTL_RJCT_RSN').val();	
-			
-			popPageObj.parentPopFn(sttlRjctRsn);
-			$('#ITP_BIZPOP_STTL_REJECT_REASON').modal('hide'); // 팝업닫기
-		}
-	} 
-};
-
-function itp_fn_BIZPOP_STTL_REJECT_REASON(parentPopFn, args, returnType) {
-	$('#ITP_BIZPOP_STTL_REJECT_REASON').one('shown.bs.modal', function(e) {
-		itp_fn_fire_window_resize();
-	}).one('hidden.bs.modal', function(e) {
-		$('#ITP_BIZPOP_STTL_REJECT_REASON').remove();
-	}).modal('show');
-
-	popPageObj.parentPopFn = parentPopFn;
-	popPageObj.args = args;
-	popPageObj.returnType = returnType;
-	popPageObj.init();
-}

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

@@ -40,8 +40,8 @@
 										<div class="col-xs-3 itp_ip">
 											<div class="input-daterange input-group date">
 												<input type="text" id="ITP_FORM_OPER02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
-												<!-- <span class="input-group-addon itp_date_to">~</span>
-												<input type="text" id="ITP_FORM_OPER02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly> -->
+												<span class="input-group-addon itp_date_to">~</span>
+												<input type="text" id="ITP_FORM_OPER02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
 											</div>
 										</div>
 										<div class="col-xs-5 itp_ip">

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

@@ -113,7 +113,8 @@
 											</div>
 										</div>
 									</div>
-									<!-- <div class="itp_form_in">
+									<div>
+										<div class="itp_form_in">
 											<div class="form-group">
 												<label class="col-xs-2 itp_lb">대표자명</label>
 												<div class="col-xs-10 itp_ip">
@@ -125,7 +126,7 @@
 												</div>
 											</div>
 										</div>
-									</div> -->
+									</div>
 									<!--<div class="itp_form_info">
 										<div class="itp_form_in">
 											<div class="form-group">
@@ -207,24 +208,20 @@
 												</div>
 											</div>
 										</div>
-									</div>
-									<div class="itp_form_pg">
-										<div class="itp_form_in">
-											<div class="form-group">
-												<label class="col-xs-2 itp_lb">PG 가맹점 아이디 </label>
-												<div class="col-xs-4 itp_ip">
-													<div class="col-xs-7 itp_in">
-														<input type="text" id="ITP_FORM_OPER06010_DETAIL_PG_AFFL_ID" class="form-control itp_input" name="pgAfflId" value="" placeholder="PG 가맹점 id">
-													</div>
+										<div class="form-group">
+											<label class="col-xs-2 itp_lb">PG 가맹점 아이디 </label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-7 itp_in">
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_PG_AFFL_ID" class="form-control itp_input" name="pgAfflId" value="" placeholder="PG 가맹점 id">
 												</div>
-												<label class="col-xs-2 itp_lb">PG 가맹점 Key</label>
-												<div class="col-xs-4 itp_ip">
-													<div class="col-xs-8 itp_in">
-														<input type="text" id="ITP_FORM_OPER06010_DETAIL_PG_KEY" class="form-control itp_input" name="pgKey" value="" placeholder="PG 가맹점 key">
-													</div>
+											</div>
+											<label class="col-xs-2 itp_lb">PG 가맹점 Key</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-8 itp_in">
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_PG_KEY" class="form-control itp_input" name="pgKey" value="" placeholder="PG 가맹점 key">
 												</div>
 											</div>
-										</div>		
+										</div>
 									</div>
 									<div class="itp_form_in">
 										<div class="form-group border">

src/main/webapp/app/ordmng/ORDMNG01010.html

@@ -2,13 +2,12 @@
 	<div class="itp_cont">
 		<article class="itp_detail">
 			<div class="itp_det_head fix">
-				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>반품요청 현황</strong></h2>
+				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>수주 현황</strong></h2>
 				<div class="pull-right itp_cicon">
 					<button type="button" id="ITP_BTN_ORDMNG01010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_ORDMNG01010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i> &nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
 				</div>
 				<div style="top:0px; text-align:center; font-size:20px;">
-					<span style="text-decoration:underline; font-weight:600;">테스트공급업체</span>
 					<button type="button" id="ITP_BTN_ORDMNG01010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
 					<button type="button" id="ITP_BTN_ORDMNG01010_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 				</div>
@@ -19,23 +18,22 @@
 						<div class="itp_srh_border fix">
 							<div class="col-xs-12">
 								<form id="ITP_FORM_ORDMNG01010_SEARCH" class="form-horizontal">
+								<input type="hidden" id="ITP_FORM_ORDMNG01010_SEARCH_BRAND_ID" name="sbrandId" value="">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_ORDMNG01010_SEARCH_" class="form-control itp_input" name="">
-												<option value="A">수주일자*</option>											
-											</select>
+											<label>수주일지</label>
 										</div>											
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
-												<input type="text" id="ITP_FORM_ORDMNG01010_SEARCH_RTN_REQ_DT" class="form-control itp_input" name="rtnReqDt" value="">
+												<input type="text" id="ITP_FORM_ORDMNG01010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
 												<span class="input-group-addon itp_date_to">~</span>
-												<input type="text" id="ITP_FORM_ORDMNG01010_SEARCH_COL_REQ_DT" class="form-control itp_input" name="colReqDt" value="">
+												<input type="text" id="ITP_FORM_ORDMNG01010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
 											</div>
 										</div>
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_ORDMNG01010_SEARCH_ST_CD" class="form-control itp_input" name="sStCd">
+											<select id="ITP_FORM_ORDMNG01010_SEARCH_PCH_ODR_ST_CD" data-select-code="PCH_ODR_ST_CD" class="form-control itp_input" name="spchOdrStCd">
 												<option value="A">수주상태</option>											
 											</select>
 										</div>
@@ -63,11 +61,11 @@
 						</div>
 					</div>
 				</div>
-				<div id="ITP_AJAX_ORDMNG01010_DETAIL_CONTAINER">
+				<div id="ITP_AJAX_ORDMNG01010_VIEW_CONTAINER">
 					<div class="itp_form itp_type1 fix">
 						<div class="col-xs-12">
-							<form id="ITP_FORM_ORDMNG01010_DETAIL" class="form-horizontal">
-								<input type="hidden" id="ITP_FORM_ORDMNG01010_DETAIL_VIEW_CD" name="viewCd" value="C">
+							<form id="ITP_FORM_ORDMNG01010_VIEW" class="form-horizontal">
+								<input type="hidden" id="ITP_FORM_ORDMNG01010_VIEW_VIEW_CD" name="viewCd" value="C">
 					
 								<section class="itp_form_sec">
 									<h4 class="itp_form_tit">구매 발주 상세</h4>
@@ -82,7 +80,7 @@
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">발주일자</label>
-											<div class="col-xs-4 itp_ip "></div>
+											<div class="col-xs-4 itp_ip fnPodrDt"></div>
 											<label class="col-xs-2 itp_lb">발주상태</label>
 											<div class="col-xs-4 itp_ip fnPchOdrStCd"></div>
 										</div>
@@ -100,20 +98,20 @@
 									<div class="itp_form_in">	
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">발주담당자</label>
-											<div class="col-xs-4 itp_ip fnPodrMgrNm"></div>
-											<label class="col-xs-2 itp_lb">발주담당자연락처</label>
-											<div class="col-xs-4 itp_ip fnPodrMgrTelNo"></div>
+											<div class="col-xs-4 itp_ip fnPodrMgrNm fnPodrMgrTelNo"></div>
+											<label class="col-xs-2 itp_lb">납품요청일</label>
+											<div class="col-xs-4 itp_ip fnDlvReqDt"></div>
 										</div>
 									</div>
 									<div class="itp_form_in">
 										<div class="itp_table_head fix" style="background:#f5f5f5;">
 											<h4 class="itp_table_tit">발주 품목</h4>
 										</div>
-										<div id="ITP_ORDMNG01010_DETAIL_jqGrid_list" class="itp_tb_list">
-										  <div id="ITP_ORDMNG01010_DETAIL_jqGridView" class="itp_views fix"></div>
-										  <table id="ITP_ORDMNG01010_DETAIL_jqGrid"></table>
-										  <div id="ITP_ORDMNG01010_DETAIL_jqGridPager"></div>
-										  <div id="ITP_ORDMNG01010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
+										<div id="ITP_ORDMNG01010_VIEW_jqGrid_list" class="itp_tb_list">
+										  <div id="ITP_ORDMNG01010_VIEW_jqGridView" class="itp_views fix"></div>
+										  <table id="ITP_ORDMNG01010_VIEW_jqGrid"></table>
+										  <div id="ITP_ORDMNG01010_VIEW_jqGridPager"></div>
+										  <div id="ITP_ORDMNG01010_VIEW_jqGridEmpty" class="itp_no_data"></div>
 										</div>
 									</div>
 								</section>												

src/main/webapp/app/ordmng/ORDMNG03010.html

@@ -7,6 +7,11 @@
 					<button type="button" id="ITP_BTN_ORDMNG03010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_ORDMNG03010_POPUP" class="btn btn-primary btn-sm IVP" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;납품서출력&nbsp;&nbsp;</button>
 				</div>
+				<div style="top:0px; text-align:center; font-size:20px;">
+					<span style="text-decoration:underline; font-weight:600;">테스트공급업체</span>
+					<button type="button" id="ITP_BTN_ORDMNG03010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+					<button type="button" id="ITP_BTN_ORDMNG03010_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
+				</div>
 			</div>
 			<div class="itp_det_in">
 				<div id="ITP_AJAX_ORDMNG03010_LIST_CONTAINER">

src/main/webapp/app/pomng/POMNG01010.html

@@ -18,8 +18,7 @@
 								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_STORE_ID" name="storeId" value="">
 								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_LOAN_DVSN" name="loanDvsn" value="">
 								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_LOAN_MGNT_UNQ_NO" name="loanMgntUnqNo" value="">
-								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_PCH_REQ_DVSN" name="pchReqDvsn" value="">
-								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_PCH_REQ_ST_CD" name="pchReqStCd" value="">
+								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_pchReqDvsn" name="pchReqDvsn" value="">
 					
 								<section class="itp_form_sec">
 									<h4 class="itp_form_tit">구매요청정보</h4>
@@ -57,22 +56,22 @@
 									</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-4 itp_in">
 														<div class="input-daterange input-group date">
-															<input type="text" id="ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT" data-check-required="empty" class="form-control itp_input" name="dlvReqDt" value="">
+															<input type="text" id="ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT" class="form-control itp_input" name="dlvReqDt" value="">
 														</div>
 													</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-4 itp_in">
-													<input type="text" id="ITP_FORM_POMNG01010_DETAIL_WHS_NM" data-check-required="empty" class="form-control itp_input" name="whsNm" value="" />
+													<input type="text" id="ITP_FORM_POMNG01010_DETAIL_WHS_NM" class="form-control itp_input" name="whsNm" value="" />
 													<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" value="" />
 												</div>
 												<div class="col-xs-4 itp_in">
-													<input type="text" id="ITP_FORM_POMNG01010_DETAIL_LOCATION_NM" data-check-required="empty" class="form-control itp_input" name="locationNm" value="" />
+													<input type="text" id="ITP_FORM_POMNG01010_DETAIL_LOCATION_NM" class="form-control itp_input" name="locationNm" value="" />
 													<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_LOCATION" class="form-control itp_input" name="location" value="" />
 												</div>
 												<div class="col-xs-1 itp_in" style="width:23%; padding:0px;">
@@ -98,7 +97,7 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">비고</label>
 											<div class="col-xs-10 itp_ip">
-												<input type="text" id="ITP_FORM_POMNG01010_DETAIL_NOTE" class="form-control itp_input" name="note" value="" />
+												<input type="text" id="ITP_FORM_POMNG01010_DETAIL_NOTE" class="form-control itp_input" name="fnNote" value="" />
 											</div>
 										</div>
 									</div>

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

@@ -2,10 +2,6 @@
 	<div class="modal-dialog" style="width:1200px;">
 		<div class="modal-content">
 			<form id="ITP_FORM_BIZPOP_DLV_STTMT_PRN">
-				<input type="hidden" id="ITP_FORM_ORDMNG03010_SEARCH_SPPLY_ID" name="sspplyId" value="1">
-				<input type="hidden" id="ITP_FORM_ORDMNG03010_SEARCH_BRAND_ID" name="sBrnadId" value="1">
-				<input type="hidden" id="ITP_FORM_ORDMNG03010_FROM_DT" name="fromDt" value="1">
-				<input type="hidden" id="ITP_FORM_ORDMNG03010_TO_DT" name="toDt" value="1">
 				<div id="ITP_POPUP_CONTAINER">
 					<div class="modal-header">
 						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
@@ -16,7 +12,7 @@
 							<div class="col-xs-12 itp_form_inline">
 								<div class="form-horizontal fix">
 									<div class="col-xs-4 itp_in itp_pr">
-										<img src="" 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 fnItemImage" name="" >
+										<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>
 									<div class="pull-right itp_cicon">
 										<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_DLV_STTMT_PRN_BTN_SEARCH" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;출력&nbsp;&nbsp;</button>
@@ -27,7 +23,7 @@
 							<div class="col-xs-12 itp_form_inline">
 								<div class="col-xs-5"></div>
 								<div class="itp_title">
-									<label>납품 확인서</label>
+									<label>납품확인서</label>
 								</div>
 							</div>	
 							<div class="col-xs-12 itp_form_inline">
@@ -35,24 +31,23 @@
 									<div>
 										<label style="width:100px;">발행일</label>
 										<label>:</label>
-										<span class="fnDlvRegDt"></span>
+										<span class="fnDlvRegDt">2022.01.01</span>
 									</div>
 									<div>
 										<label style="width:100px;">납품확인번호</label>
 										<label>:</label>
-										<span class="fnDlvSttmtUnqNo"></span>
+										<span class="fnDlvSttmtUnqNo">2211020000002001</span>
 									</div>
 									<div>
 										<label style="width:100px;">납품일</label>
 										<label>:</label>
-										<span class="fnDlvRegDt"></span>
+										<span class="fnDlvRegDt">2022.12.31</span>
 									</div>
 									<div>
 										<label style="width:100px;">납품담당</label>
 										<label>:</label>
-										<span class="fnDlvMgrNm"></span>
-										<!-- js로 ()감싸기 -->
-										<span class="fnDlvMgrTelNo"></span> 
+										<span class="fnDlvMgrNm">홍길동</span>
+										(<span class="fnDlvMgrTelNo">010-2525-2525</span>)
 									</div>
 								</div>
 								<div class="col-xs-6">
@@ -66,28 +61,29 @@
 										<div class="itp_sign_header">
 											<label>납품확인일</label>
 										</div>
-										<div class="itp_sign_area fnDlvCnfmDt"></div>
+										<div class="itp_sign_area fnDlvCnfmDt">
+											2022.01.01
+										</div>
 									</div>
 								</div>
 							</div>	
 							<div class="col-xs-12 itp_form_inline">
-								<div class="col-xs-6" style="margin-bottom:30px;">
+								<div class="col-xs-6">
 									<div>
 										<label style="width:100px;">납품 장소</label>
 										<label>:</label>
-										<!-- js로 ()감싸기 -->
-										<span style="margin:0px; " class="fnZipNo"></span>
-										<span class="fnLoadAddr"></span>
-										<span class="fnDtlAddr"></span>
+										(<span style="margin:0px; " class="fnZipNo">12345</span>)
+										<span class="fnLoadAddr">서울 송파구 문정동 100 ㅁㄴㄹㅇㅁㄴ</span>
+										<span class="fnDtlAddr">디 매장</span>
 									</div>
 									<div>
 										<label style="width:100px;">전화번호</label>
 										<label>:</label>
-										<span class="fnVndrTelNo"></span>
+										<span class="fnVndrTelNo">02-1234-1547</span>
 									</div>
 								</div>
 							</div>	
-							<div class="col-xs-6 itp_form_inline" style="padding-left:15px;">
+							<div class="col-xs-6 itp_form_inline">
 								<div class="itp_form_info">
 										<div class="itp_company_type">
 											<label>공급처</label>
@@ -95,25 +91,25 @@
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-4">등록번호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBsnsRegNo"></div>
+											<div class="col-xs-12 itp_in fnBsnsRegNo">215-58-584887</div>
 										</div>
 									</div>	
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">상호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnSpplyNm"></div>
+											<div class="col-xs-12 itp_in fnSpplyNm">등록업체명</div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">성명</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnBrandNm">공길동</div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
-										<label class="col-xs-2 border">주소</label>
-										<div class="col-xs-8 itp_form_it border">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+										<label class="col-xs-2">주소</label>
+										<div class="col-xs-8 itp_form_it">
+											<div class="col-xs-12 itp_in fnBrandNm">서울 시송파구 ㄴㄻㄴㄹ</div>
 										</div>
 									</div>
 								</div>	
@@ -126,33 +122,34 @@
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-4">등록번호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnBrandNm">215-58-584887</div>
 										</div>
 									</div>	
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">상호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnBrandNm">등록업체명</div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">성명</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnBrandNm">공길동</div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
-										<label class="col-xs-2 border">주소</label>
-										<div class="col-xs-8 itp_form_it border">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+										<label class="col-xs-2">주소</label>
+										<div class="col-xs-8 itp_form_it">
+											<div class="col-xs-12 itp_in fnBrandNm">서울 시송파구 ㄴㄻㄴㄹ</div>
 										</div>
 									</div>
 								</div>	
 							</div>
 						</div>
-
 						
-						<div id="ITP_BIZPOP_DLV_STTMT_PRN_jqGrid_list" class="itp_tb_list" data-total-cnt="" style="margin-top:30px;">
+						
+						
+						<div id="ITP_BIZPOP_DLV_STTMT_PRN_jqGrid_list" class="itp_tb_list" data-total-cnt="">
 							<div id="ITP_BIZPOP_DLV_STTMT_PRN_jqGridView" class="itp_views fix"></div>
 							<table id="ITP_BIZPOP_DLV_STTMT_PRN_jqGrid"></table>
 							<div id="ITP_BIZPOP_DLV_STTMT_PRN_jqGridPager"></div>

src/main/webapp/app/settmng/SETTMNG03010.html

@@ -98,28 +98,6 @@
 												</div>
 											</div>
 										</div>
-										<div class="form-group">
-											<label class="col-xs-2 itp_lb">정산상태</label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-8 itp_in fnSttlStNm"></div>
-											</div>
-											<label class="col-xs-2 itp_lb">반려사유</label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-8 itp_in fnSttlRjctRsn"></div>
-											</div>											
-										</div>
-										<div class="form-group">
-											<label class="col-xs-2 itp_lb">정산요청일자</label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-8 itp_in fnSttlReqDt"></div>
-											</div>
-											<label class="col-xs-2 itp_lb">정산요청금액</label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-10 itp_in fnSttlReqAmt"></div>
-											</div>											
-										</div>
-										
-										
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">정산일자</label>
 											<div class="col-xs-4 itp_ip">
@@ -132,10 +110,20 @@
 													</div>
 												</div>
 											</div>
+											<label class="col-xs-2 itp_lb">정산상태</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-8 itp_in fnSttlStNm"></div>
+											</div>
+										</div>
+										<div class="form-group">
 											<label class="col-xs-2 itp_lb">정산금액</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-10 itp_in fnSttlAmt"></div>
 											</div>
+											<label class="col-xs-2 itp_lb">잔금</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-8 itp_in fnAcctBal"></div>
+											</div>
 										</div>
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">등록일</label>
@@ -148,6 +136,14 @@
 											</div>
 										</div>
 									</div>
+									<div class="itp_form_in">
+										<div class="form-group border">
+											<label class="col-xs-2 itp_lb">반려사유</label>
+											<div class="col-xs-10 itp_ip">
+												<div class="col-xs-10 itp_in"></div>
+											</div>
+										</div>
+									</div>
 								</section>								
 							</form>
 						</div>

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

@@ -174,10 +174,10 @@
 													<input type="text" id="ITP_FORM_STINFO03010_DETAIL_MBL_NO" class="form-control itp_input" name="mgrMblNo" value="">
 												</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">
-								                	<input type="text" id="ITP_FORM_STINFO03010_DETAIL_EMAL_ADDR" data-check-required="empty" class="form-control itp_input" name="mgrEmal" value="">
+								                	<input type="text" id="ITP_FORM_STINFO03010_DETAIL_EMAL_ADDR" class="form-control itp_input" name="mgrEmal" value="">
 												</div>
 											</div>
 										</div>

src/main/webapp/app/vendinfo/VENDINFO01010.html

@@ -20,6 +20,8 @@
 								<input type="hidden" id="ITP_FORM_VENDINFO01010_DETAIL_POP_NO" name="popNo" value="">
 								<input type="hidden" id="ITP_FORM_VENDINFO01010_DETAIL_MENU_NO" name="menuNo" value="">
 								<input type="hidden" id="ITP_FORM_VENDINFO01010_DETAIL_FILE_NO" name="popFileNo" value="">
+								<input type="hidden" id="ITP_FORM_VENDINFO01010_DETAIL_CORP_DVSN" name="corpDvsn" value="">
+								<input type="hidden" id="ITP_FORM_VENDINFO01010_DETAIL_MGR_NM" name="mgrNm" value="">								
 								<input type="hidden" id="ITP_FORM_VENDINFO01010_DETAIL_ACCT_FILE_NO" name="bbookCopyFileNo" value="">
 								<input type="hidden" id="ITP_FORM_VENDINFO01010_DETAIL_CORP_FILE_NO" name="bsnsRegFileNo" value="">
 					

src/main/webapp/css/style.css

@@ -697,9 +697,9 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
 #ITP_POPUP_CONTAINER .itp_company_type {float:left; background:#eee; text-align:center; width:55px; height:168px; padding-top:40px; border:1px solid #000;}  
 #ITP_POPUP_CONTAINER .itp_form_info .itp_company_type label {width:35px; border:none; padding:10px;}
 #ITP_POPUP_CONTAINER .modal-body span{margin-right:7px;}
-#ITP_POPUP_CONTAINER .itp_form_info label {border-top:1px solid #000; background:#eee; margin:0; width:120px; height:42px; padding:10px 5px 10px 10px;}
-#ITP_POPUP_CONTAINER .itp_form_it {border:1px solid #000; border-bottom:none; height:42px; padding:12px 0 0 0;}
-#ITP_POPUP_CONTAINER .border {border-bottom:1px solid #000 !important;}
+#ITP_POPUP_CONTAINER .itp_form_info label {border:1px solid #000; background:#eee; margin:0; width:120px; height:42px; padding:10px 5px 10px 10px;}
+#ITP_POPUP_CONTAINER .itp_form_it {border:1px solid #000; height:42px; padding-top:12px;}
+
 
 
 

src/main/webapp/js/app/loanmng/ITP_LOANMNG01010.js

@@ -301,17 +301,11 @@ let listObj = {
 			$(LOANMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
 		},
 		popupStore: function() { // 매장선택 팝업
-			fn_call_popup('biz', 'BIZPOP_BRAND_STORE', '#ITP_ASIDE', function(result) {
-				// alert(JSON.stringify(result));
-				$('#ITP_FORM_LOANMNG01010_SEARCH_STORE_ID').val(result[0].storeId);
-				$('#ITP_FORM_LOANMNG01010_SEARCH_STORE_NM').val(result[0].storeNm);				
-				listObj.button.search();
-			}, null, 'S');
+			
 		}, 
 		eraseStore: function() { // 매장선택 삭제
 			$('#ITP_FORM_LOANMNG01010_SEARCH_STORE_ID').val('');
 			$('#ITP_FORM_LOANMNG01010_SEARCH_STORE_NM').val('');
-			listObj.button.search();
 		}
 	},
 	empty: {

src/main/webapp/js/app/loanmng/ITP_LOANMNG02010.js

@@ -604,17 +604,11 @@ let createObj = {
 			}
 		}, 
 		popupStore: function() { // 매장선택 팝업
-			fn_call_popup('biz', 'BIZPOP_BRAND_STORE', '#ITP_ASIDE', function(result) {
-				// alert(JSON.stringify(result));
-				$('#ITP_FORM_LOANMNG02010_SEARCH_STORE_ID').val(result[0].storeId);
-				$('#ITP_FORM_LOANMNG02010_SEARCH_STORE_NM').val(result[0].storeNm);				
-				listObj.button.search();
-			}, null, 'S');
+			
 		}, 
 		eraseStore: function() { // 매장선택 삭제
-			$('#ITP_FORM_LOANMNG02010_SEARCH_STORE_ID').val('');
-			$('#ITP_FORM_LOANMNG02010_SEARCH_STORE_NM').val('');
-			listObj.button.search();
+			$('#ITP_FORM_LOANMNG02010_DETAIL_STORE_ID').val('');
+			$('#ITP_FORM_LOANMNG02010_DETAIL_STORE_NM').val('');
 		}
 	}
 };

src/main/webapp/js/app/loanmng/ITP_LOANMNG03010.js

@@ -293,8 +293,6 @@ let pageObj = {
 						case 'ITP_BTN_LOANMNG03010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
 						case 'ITP_BTN_LOANMNG03010_CANCELLIST'		: viewObj.button.cancel(); 	break;	// 취소/목록 버튼
 						case 'ITP_BTN_LOANMNG03010_PAYMENT'			: viewObj.button.payment();	break;	// 결제 버튼
-						case 'ITP_BTN_LOANMNG03010_STORE_SEARCH'	: listObj.button.storePop();	break;	// 매장검색 팝업
-						case 'ITP_BTN_LOANMNG03010_STORE_ERASE'		: listObj.button.storeErase();	break;	// 매장 지움
 					}
 				});
 			});
@@ -364,19 +362,6 @@ let listObj = {
 			itp_fn_form_clear_validate(null, '#ITP_FORM_LOANMNG03010_DETAIL');						
 			// 로케이션 리스트 조회
 			createObj.init();
-		}, 
-		storePop: function() {
-			fn_call_popup('biz', 'BIZPOP_BRAND_STORE', '#ITP_ASIDE', function(result) {
-				// alert(JSON.stringify(result));
-				$('#ITP_FORM_LOANMNG03010_SEARCH_STORE_ID').val(result[0].storeId);
-				$('#ITP_FORM_LOANMNG03010_SEARCH_STORE_NM').val(result[0].storeNm);				
-				listObj.button.search();
-			}, null, 'S');
-		}, 
-		storeErase: function() {
-			$('#ITP_FORM_LOANMNG03010_SEARCH_STORE_ID').val('');
-			$('#ITP_FORM_LOANMNG03010_SEARCH_STORE_NM').val('');
-			listObj.button.search();
 		}
 	},
 	empty: {

src/main/webapp/js/app/locales/locale-ko.js

@@ -169,7 +169,22 @@ const ITP_MSG_LOCALE = (function() {
 			"prnSeq": "출력순번",
 			"writeYn": "쓰기여부",
 			"pchReqQty":"요청수량",
-			"pchReqAmt":"요청금액"
+			"pchReqAmt":"요청금액",
+			"pchReqQty": "요청수량",
+			"pchReqAmt": "요청금액",
+			"unitGubun": "단가구분",
+			"pchPodrUnqNo": "발주번호",
+			"pchOdrStCd": "발주상태코드",
+			"pchOdrStNm": "발주상태명",
+			"podrDt": "발주일자",
+			"dlvReqDt": "납품요철일",
+			"whsNm": "납품장소",
+			"podrTotalAmt": "총 발주금액",
+			"podrItemQty": "발주품목수",
+			"podrMgrNm": "발주담당자",
+			"pchPodrDtlNo": "항번",
+			"podrQty": "발주수량",
+			"podrAmt": "발주금액"
 		},
 		"table": {
 			"brandId": "브랜드ID",

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

@@ -168,8 +168,8 @@ let pageObj = {
 			// 조회일자 지정
 			var now = new Date();
 			$('#ITP_TAB_OPER02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_OPER02010_SEARCH_FROM_DT').datepicker('setDate', new Date(now));
-			//$('#ITP_FORM_OPER02010_SEARCH_TO_DT').datepicker('setDate', new Date());
+			$('#ITP_FORM_OPER02010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
+			$('#ITP_FORM_OPER02010_SEARCH_TO_DT').datepicker('setDate', new Date());
 		},
 		afflInfo: {
 			init: function() {

src/main/webapp/js/app/ordmng/ITP_ORDMNG01010.js

@@ -0,0 +1,471 @@
+require(['config'], function() {
+    require([
+    ], function($) {
+        pageObj.init();
+    });
+});
+
+
+// 화면변수
+const ORDMNG01010_GRID_ID = '#ITP_ORDMNG01010_jqGrid';
+const ORDMNG01010_GRID_LIST = '#ITP_ORDMNG01010_jqGrid_list';
+const ORDMNG01010_GRID_PAGER = '#ITP_ORDMNG01010_jqGridPager';
+const ORDMNG01010_GRID_EMPTY = '#ITP_ORDMNG01010_jqGridEmpty';
+
+const ORDMNG01010_VIEW_GRID_ID = '#ITP_ORDMNG01010_VIEW_jqGrid';
+const ORDMNG01010_VIEW_GRID_LIST = '#ITP_ORDMNG01010_VIEW_jqGrid_list';
+const ORDMNG01010_VIEW_GRID_PAGER = '#ITP_ORDMNG01010_VIEW_jqGridPager';
+const ORDMNG01010_VIEW_GRID_EMPTY = '#ITP_ORDMNG01010_VIEW_jqGridEmpty';
+
+let ITP_COMMON_PCH_ODR_ST_CD = fn_make_common_cd_list(CODE_LIST, 'PCH_ODR_ST_CD', true, '발주상태코드');
+
+//API URL
+let API_POMNG_PO_SPPLY_PO_GRID_LIST = '/api/pomng/po/spply-po-grid-list';
+let API_POMNG_PO_INFO_SPPLY_PCHORD = '/api/pomng/po/info-spply-pchOdr';
+
+
+//화면 grid ColModel
+const gridColModel = {
+	list:[
+		{
+			index: 'VIEW_CD', name: 'viewCd',
+			label: ITP_MSG_LOCALE.label.viewCd,
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: true
+		},
+		{
+			index: 'BRAND_ID', name: 'brandId',
+			label: ITP_MSG_LOCALE.label.brandId,
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: true
+		},
+		{
+			index: 'PODR_MGR_NM', name: 'podrMgrNm',
+			label: ITP_MSG_LOCALE.label.podrMgrNm,
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: true
+		},
+		{
+			index: 'BRAND_NM', name: 'brandNm',
+			label: ITP_MSG_LOCALE.label.brandNm, 		// 브랜드명
+			width: '7', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
+			label: ITP_MSG_LOCALE.label.pchPodrUnqNo, 	// 발주번호
+			width: '7', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'PCH_ORD_ST_CD', name: 'pchOdrStCd',
+			label: ITP_MSG_LOCALE.label.pchOdrStNm, 	// 발주상태
+			width: '7', fixed: false, align: 'center',
+			sortable: false, formatter: 'select',
+			editoptions: {value: ITP_COMMON_PCH_ODR_ST_CD}
+		},
+		{
+			index: 'PODR_DT', name: 'podrDt',
+			label: ITP_MSG_LOCALE.label.podrDt, 		// 발주일자
+			width: '8', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'DIV_REQ_DT', name: 'dlvReqDt',
+			label: ITP_MSG_LOCALE.label.dlvReqDt, 		// 납품요청일
+			width: '8', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'WHS_NM', name: 'whsNm',
+			label: ITP_MSG_LOCALE.label.whsNm, 			// 납품장소
+			width: '7', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'PODR_TOTAL_AMT', name: 'podrTotalAmt',
+			label: ITP_MSG_LOCALE.label.podrTotalAmt, 	// 총 발주금액
+			width: '7', fixed: false, align: 'center',
+			sortable: false, hidden: false,
+			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
+		},
+		{
+			index: 'SPPLY_ITME_ID', name: 'podrItemQty',
+			label: ITP_MSG_LOCALE.label.podrItemQty, 	// 발주품목수
+			width: '8', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'PODR_MGR_NM', name: 'podrMgrNm',
+			label: ITP_MSG_LOCALE.label.podrMgrNm, 		// 발주 담당자
+			width: '8', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		}
+	],
+	view: [
+		{
+			index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
+			label: ITP_MSG_LOCALE.label.pchPodrDtlNo, 	// 항번
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'ITEM_ID', name: 'itemId',
+			label: ITP_MSG_LOCALE.label.itemId, 		// 품목번호
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'ITEM_NM', name: 'itemNm',
+			label: ITP_MSG_LOCALE.label.itemNm, 		// 품목명
+			width: '8', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'UNIT_AMT', name: 'unitAmt',
+			label: ITP_MSG_LOCALE.label.unitAmt, 		// 단가
+			width: '8', fixed: false, align: 'center',
+			sortable: false, hidden: false,
+			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
+		},
+		{
+			index: 'UNIT', name: 'unit',
+			label: ITP_MSG_LOCALE.label.unit, 			// 기본단위
+			width: '8', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'PODR_QTY', name: 'podrQty',
+			label: ITP_MSG_LOCALE.label.podrQty, 		// 발주수량
+			width: '8', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'PODR_AMT', name: 'podrAmt',
+			label: ITP_MSG_LOCALE.label.podrAmt, 		// 발주금액
+			width: '8', fixed: false, align: 'center',
+			sortable: false, hidden: false,
+			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
+		}
+	],
+	detail: []
+};
+
+
+/*화면공통 Object*/
+let pageObj = {
+	init: function() {
+		this.ui.init();
+		this.event.init();
+	},
+	ui: {
+		init: function() {
+			this.view();
+			this.grid();
+			this.ready();
+		},
+		view: function() {
+			// 버튼 권한설정
+			fn_proc_btn_auth('ORDMNG01010');
+			// 공통코드 표시
+			$('select').each(function() {
+				if($(this).data('select-code')) {
+					fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
+				}
+			});
+			// 조회일자 지정	
+			var now = new Date();
+			$('#ITP_TAB_ORDMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
+		
+			$('#ITP_FORM_ORDMNG01010_SEARCH_FROM_DT').datepicker('setDate', '2022.10.01');
+			$('#ITP_FORM_ORDMNG01010_SEARCH_TO_DT').datepicker('setDate', '2024.10.01');
+		},
+		grid: function() {
+			itp_fn_jqgrid_resize(ORDMNG01010_GRID_ID, ORDMNG01010_GRID_LIST, 'lg');
+			listObj.empty.init();
+			itp_fn_fire_window_resize();
+		},
+		ready: function() {
+			listObj.init();
+		}
+	},
+	event: {
+		init: function() {
+			this.button();
+		},
+		button: function() {
+			// 버튼 클릭 이벤트
+			$('button').each(function() {
+				var id = $(this).attr('id');
+				$(this).on('click', function() {
+					switch (id) {
+						case 'ITP_BTN_ORDMNG01010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
+						case 'ITP_BTN_ORDMNG01010_NEWREG'			: listObj.button.create(); 		break;	// 신규등록 버튼
+						case 'ITP_BTN_ORDMNG01010_MODIFY'			: modifyObj.button.modify();	break;	// 수정 버튼
+						case 'ITP_BTN_ORDMNG01010_CANCELLIST'		: viewObj.button.cancel(); 		break;	// 취소/목록 버튼
+						case 'ITP_BTN_ORDMNG01010_DELETE'			: 								break;	// 삭제 버튼
+						case 'ITP_BTN_ORDMNG01010_SAVE'				: createObj.button.save(); 		break;	// 저장 버튼
+						case 'ITP_FORM_ORDMNG01010_VIEW_DUP'		: createObj.button.duplicate();	break;	// 중복체크
+						case 'ITP_BTN_ORDMNG01010_RESET_PW'			: createObj.button.resetPass();	break;	// 상세:비밀번호 초기화
+						case 'ITP_BTN_ORDMNG01010_VIEW_ADDROW'		: pageObj.grid.button.addRow();	break;	// 상세:추가버튼
+						case 'ITP_BTN_ORDMNG01010_VIEW_DELROW'		: pageObj.grid.button.delRow();	break;	// 상세:삭제버튼
+					}
+				});
+			});
+		}
+	},
+	switchScreen: function(mode) {
+        $('.itp_det_head').find('button[id^="ITP_BTN_ORDMNG01010_"]').each(function(i) {
+            $(this).hide();
+        });
+        $('#ITP_TAB_ORDMNG01010').find('div[id$="_CONTAINER"]').each(function(i) {
+            $(this).hide();
+        });
+        if(mode == 'LIST') { // 목록
+            fn_show_btn_auth_array(['#ITP_BTN_ORDMNG01010_SRH', '#ITP_BTN_ORDMNG01010_NEWREG']);
+            $('#ITP_AJAX_ORDMNG01010_LIST_CONTAINER').show();
+            $('#ITP_FORM_ORDMNG01010_SEARCH #ITP_FORM_ORDMNG01010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
+        } else if(mode == 'ADD') { // 등록
+            $('#ITP_AJAX_ORDMNG01010_DETAIL_CONTAINER').show();
+            fn_show_btn_auth_array(['#ITP_BTN_ORDMNG01010_CANCELLIST', '#ITP_BTN_ORDMNG01010_SAVE']);
+
+            $('#ITP_FORM_ORDMNG01010_DETAIL').find('input, textarea, select, checkbox').each(function(i, elem) {
+                $(this).attr('id') === 'ITP_FORM_ORDMNG01010_DETAIL_VIEW_CD' ? $(this).val('C') : $(this).val('');
+                if(elem.type === 'select') {
+                    $(this).val('').prop('selected', true);
+                }
+            });
+            $('#ITP_FORM_ORDMNG01010_DETAIL #ITP_FORM_ORDMNG01010_DETAIL_FILE_NO').val('');
+            $('#ITP_FORM_ORDMNG01010_DETAIL_BRAND_ID').removeAttr('readonly');
+            $('#ITP_FORM_ORDMNG01010_DETAIL_BRAND_NM').removeAttr('readonly');
+            $('#ITP_FORM_ORDMNG01010_DETAIL_BSNS_REG_NO').removeAttr('readonly');
+            $('#ITP_FORM_ORDMNG01010_DETAIL_CORP_REG_NO').removeAttr('readonly');
+            // $('#ITP_FORM_ORDMNG01010_DETAIL_SEARCH_AFFL_SHOP').removeAttr('disabled');
+            // $('#ITP_FORM_ORDMNG01010_DETAIL_DELETE_AFFL_SHOP').removeAttr('disabled');
+            $('#ITP_FORM_ORDMNG01010_DETAIL_SEARCH_AFFL_SHOP').show();
+            $('#ITP_FORM_ORDMNG01010_DETAIL_DELETE_AFFL_SHOP').show();
+			$('#ITP_FORM_ORDMNG01010_DETAIL .itp_form_info').hide();
+			$('#ITP_FORM_ORDMNG01010_DETAIL .itp_form_change').show();
+
+            $('#ITP_FORM_ORDMNG01010_DETAIL #ITP_FORM_ORDMNG01010_DETAIL_AFFL_SHOP_ID').val(fn_make_user_info.get('afflShopId'));
+            $('#ITP_FORM_ORDMNG01010_DETAIL #ITP_FORM_ORDMNG01010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
+
+            $('.fnBrandId').text('(자동부여)');
+        } else if(mode == 'MODIFY') { // 수정
+            $('#ITP_AJAX_ORDMNG01010_DETAIL_CONTAINER').show();
+            fn_show_btn_auth_array(['#ITP_BTN_ORDMNG01010_CANCELLIST', '#ITP_BTN_ORDMNG01010_SAVE']);
+
+            $('#ITP_FORM_ORDMNG01010_DETAIL_BRAND_ID').attr('readonly', true);
+            $('#ITP_FORM_ORDMNG01010_DETAIL_BRAND_NM').attr('readonly', true);
+            $('#ITP_FORM_ORDMNG01010_DETAIL_BSNS_REG_NO').attr('readonly', true);
+            $('#ITP_FORM_ORDMNG01010_DETAIL_CORP_REG_NO').attr('readonly', true);
+            // $('#ITP_FORM_ORDMNG01010_DETAIL_SEARCH_AFFL_SHOP').attr('disabled', true);
+            // $('#ITP_FORM_ORDMNG01010_DETAIL_DELETE_AFFL_SHOP').attr('disabled', true);
+            $('#ITP_FORM_ORDMNG01010_DETAIL_SEARCH_AFFL_SHOP').hide();
+            $('#ITP_FORM_ORDMNG01010_DETAIL_DELETE_AFFL_SHOP').hide();
+			$('#ITP_FORM_ORDMNG01010_DETAIL .itp_form_info').show();
+			$('#ITP_FORM_ORDMNG01010_DETAIL .itp_form_change').hide();
+
+            $('#ITP_FORM_ORDMNG01010_DETAIL #ITP_FORM_ORDMNG01010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
+        } else if(mode == 'VIEW') { // 보기
+            $('#ITP_AJAX_ORDMNG01010_VIEW_CONTAINER').show();
+            fn_show_btn_auth_array(['#ITP_BTN_ORDMNG01010_MODIFY', '#ITP_BTN_ORDMNG01010_CANCELLIST']);
+        }
+    }
+};
+
+
+/*목록화면 Object*/
+let listObj = {
+	init: function() {
+		this.grid.init();
+	},
+	itp_ORDMNG01010_param: {},
+	itp_ORDMNG01010_search: false,
+	button: {
+		search: function() {
+			listObj.itp_ORDMNG01010_search = true;
+			let param = $('#ITP_FORM_ORDMNG01010_SEARCH').serializeObject();
+			param.gridSize = $.jgrid.defaults.rowNum;
+            param.gridPage = $.jgrid.defaults.page;
+            param.sspplyId = LOGIN_USER_INFO.spplyId;
+            param.sidx = '0';
+            console.log(JSON.stringify(param));
+            $(ORDMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
+        }
+	},
+	empty: {
+		init: function() {
+            var _this = this;
+            this.push();
+            $(ORDMNG01010_GRID_EMPTY).on('click', function() {
+                _this.back();
+                listObj.itp_ORDMNG01010_param.gridSize = $.jgrid.defaults.rowNum;
+                $(ORDMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(listObj.itp_ORDMNG01010_param)}).trigger('reloadGrid');
+            });
+        },
+        push: function() {
+            let param = $('#ITP_FORM_ORDMNG01010_SEARCH').serializeObject();
+            listObj.itp_ORDMNG01010_param = param;
+        },
+        back: function() {
+            $('#ITP_FORM_ORDMNG01010_SERVICE_BRAND_TYPE').val(listObj.itp_ORDMNG01010_param.brandType);
+            $('#ITP_FORM_ORDMNG01010_SERVICE_ST_CD').val(listObj.itp_ORDMNG01010_param.stCd);
+            $('#ITP_FORM_ORDMNG01010_SEARCH_BRAND_NM').val(listObj.itp_ORDMNG01010_param.brandNm);
+        	console.log('here');
+        	console.log(listObj.itp_ORDMNG01010_param);            
+        }
+	},
+	grid: {
+		init: function() {
+			// 데이터 없을때
+            listObj.empty.push();
+            this.search();
+		},
+		colModel: gridColModel.list,
+		search: function() {
+			pageObj.switchScreen('LIST');
+			this.unload();
+			this.load();
+		},
+		load: function() {
+            let param = $('#ITP_FORM_ORDMNG01010_SEARCH').serializeObject();
+            param.gridSize = $.jgrid.defaults.rowNum;
+            //param.sbrandId = LOGIN_USER_INFO.brandId;
+            param.sspplyId = LOGIN_USER_INFO.spplyId;
+            param.sidx = '0';
+            console.log(JSON.stringify(param));
+            var option = {
+            	gridId: ORDMNG01010_GRID_ID,
+            	colModel: gridColModel.list,
+            	param: param,
+            	url: DOMAIN + API_POMNG_PO_SPPLY_PO_GRID_LIST,
+            	pager: ORDMNG01010_GRID_PAGER,
+            	onCellSelect: function(rowId, cellIdx, cellValue) {
+                    var cm = $(this).jqGrid('getGridParam', 'colModel');
+                    var colNm = cm[cellIdx].name;
+                    if (colNm === 'pchPodrUnqNo') {
+                        const pchPodrUnqNoVal = $(this).jqGrid('getCell', rowId, 'pchPodrUnqNo');
+                        const brandIdVal = $(this).jqGrid('getCell', rowId, 'brandId');
+                        const spplyIdVal = LOGIN_USER_INFO.spplyId;
+                        const key = {pchPodrUnqNo: pchPodrUnqNoVal, brandId: brandIdVal, spplyId: spplyIdVal};
+                        var param = $.param(key);
+                        viewObj.init(param);
+                    }
+				},
+				loadComplete: function(data) {
+					console.log(data);
+                    itp_fn_grid_load_complete(data, ORDMNG01010_GRID_ID, true, 'number', 'ORDMNG01010', listObj.itp_ORDMNG01010_search, listObj.empty, true, data.gridRecords, true);
+                    var ids = $(ORDMNG01010_GRID_ID).getDataIDs();
+                    $.each(ids, function(idx, rowId) {
+                        $(ORDMNG01010_GRID_ID).jqGrid('setCell', rowId, 'pchPodrUnqNo', '', ITP_GRID_COL_STYLE.link);
+                    });
+				},
+				onPaging: function(action) {
+                    itp_fn_grid_paging(ORDMNG01010_GRID_ID, action, param);
+                }
+            };
+            itp_fn_grid_make_remote(option);
+		},
+		clearData: function() {
+			$(ORDMNG01010_GRID_ID).jqGrid('clearGridData', true);
+            $(ORDMNG01010_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
+            $(ORDMNG01010_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
+            $(ORDMNG01010_GRID_EMPTY).show();
+		},
+		unload: function() {
+			$.jgrid.gridUnload(ORDMNG01010_GRID_ID);
+		}
+	}
+};
+
+/*상세화면 Object*/
+let viewObj = {
+	init: function(param) {
+		console.log(param);
+		this.load(param);
+	},
+	itp_ORDMNG01010_param: {},
+	itp_ORDMNG01010_search: false,
+	button: {
+		cancel: function() {
+			listObj.grid.search();
+		}
+	},
+	empty: {
+		init: function() {
+            var _this = this;
+            this.push();
+            $(ORDMNG01010_VIEW_GRID_EMPTY).on('click', function() {
+                _this.back();
+                viewObj.itp_ORDMNG01010_param.gridSize = $.jgrid.defaults.rowNum;
+                $(ORDMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(viewObj.itp_ORDMNG01010_param)}).trigger('reloadGrid');
+            });
+        },
+        push: function() {
+            let param = $('#ITP_FORM_ORDMNG01010_VIEW').serializeObject();
+            viewObj.itp_ORDMNG01010_param = param;
+        },
+        back: function() {
+            $('#ITP_FORM_ORDMNG01010_SERVICE_BRAND_TYPE').val(viewObj.itp_ORDMNG01010_param.brandType);
+            $('#ITP_FORM_ORDMNG01010_SERVICE_ST_CD').val(viewObj.itp_ORDMNG01010_param.stCd);
+            $('#ITP_FORM_ORDMNG01010_SEARCH_BRAND_NM').val(viewObj.itp_ORDMNG01010_param.brandNm);
+        }
+	},
+	load: function(param) {
+		fn_ajax_call(API_POMNG_PO_INFO_SPPLY_PCHORD, param, this.callback, 'GET');
+	},
+	callback: function(result) {
+		console.log(result);
+		
+		function convertTel(value){
+			answer = (value.startsWith('0')) ? value.replace(/[^0-9]/g, "")
+					.replace(/(^02|^0505|^1[0-9]{3}|^0[0-9]{2})([0-9]+)?([0-9]{4})$/,"$1-$2-$3")
+					.replace("--", "-") : '';
+			return answer;
+		}
+		let telNo = convertTel(result.podrMgrTelNo);
+		
+		pageObj.switchScreen('VIEW');
+		$('#ITP_FORM_ORDMNG01010_VIEW #ITP_FORM_ORDMNG01010_VIEW_AFFL_SHOP_ID').val(result.afflShopId);
+		$('#ITP_FORM_ORDMNG01010_VIEW .fnBrandNm').text(result.brandNm);				// 브랜드명
+		$('#ITP_FORM_ORDMNG01010_VIEW .fnPchPodrUnqNo').text(result.pchPodrUnqNo);
+		$('#ITP_FORM_ORDMNG01010_VIEW .fnPodrDt').text(result.podrDt);
+		$('#ITP_FORM_ORDMNG01010_VIEW .fnPchOdrStCd').text(result.pchOdrStNm);
+		$('#ITP_FORM_ORDMNG01010_VIEW .fnPodrTotalAmt').text(result.podrTotalAmt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','));
+		$('#ITP_FORM_ORDMNG01010_VIEW .fnPodrMgrNm').text(result.podrMgrNm + ' (' + telNo + ')');
+		$('#ITP_FORM_ORDMNG01010_VIEW .fnDlvReqDt').text(result.dlvReqDt);
+		
+		viewObj.grid.init('VIEW', result.pchOdrDtlList)
+	},
+	grid: {
+		init: function(mode, gridData) {
+			this.mode = mode;
+			this.gridId = (mode === 'VIEW') ? ORDMNG01010_VIEW_GRID_ID : ORDMNG01010_DETAIL_GRID_ID;
+			this.gridList = (mode === 'VIEW') ? ORDMNG01010_VIEW_GRID_LIST : ORDMNG01010_DETAIL_GRID_LIST;
+			this.gridEmpty = (mode === 'VIEW') ? ORDMNG01010_VIEW_GRID_EMPTY : ORDMNG01010_DETAIL_GRID_EMPTY;
+			this.unload();
+			this.load(mode, gridData);
+		},
+		mode: '',
+		colModel: gridColModel.view,
+		load: function(mode, gridData) {
+			var _this = this;
+			var option = {
+				gridId: _this.gridId,
+				colModel: gridColModel.view,
+				data: gridData,
+				multiselect: true,
+				loadComplete: function(data) {
+					console.log(data);
+					itp_fn_grid_load_complete(data, ORDMNG01010_VIEW_GRID_ID, true, 'number', 'ORDMNG01010', viewObj.itp_ORDMNG01010_search, viewObj.empty, true, data.gridRecords, true);
+				}
+			};
+			itp_fn_grid_make_local(option);
+		},
+		unload: function() {
+			$.jgrid.gridUnload(this.gridId);
+		}
+	}
+	
+};

src/main/webapp/js/app/ordmng/ITP_ORDMNG03010.js

@@ -29,23 +29,24 @@ let ITP_FORM_ORDMNG03010_DETAIL_IS_WRITING = false;
 
 /*API URL*/
 let API_DELI_GRID_LIST 	= '/api/pomng/inoutmng/spply-deli-grid-list';// 목록
-let API_INFO_INV 		= '/api/pomng/inoutmng/init-spply-inv';	// 상세
+let API_INFO_INV 		= '/api/pomng/inoutmng/info-inv';	// 상세
 let API_SAVE_SPPLY_INV 	= '/api/pomng/inoutmng/save-spply-inv';// 저장
 let API_ITEM_CLASS_LEVEL= '/api/item/class-level-list';		//품목분류 level 검색
 
 /*화면 Grid ColModel*/
 const gridColModel = {
 	list: [
+	
 			{
 				index: 'Brand_Nm', name: 'brandNm',
 				label: ITP_MSG_LOCALE.label.brandNm, //브랜드
-				width: '14', fixed: false, align: 'center',
+				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
 				index: 'DLV_STTMT_NO', name: 'dlvSttmtUnqNo',
 				label: ITP_MSG_LOCALE.label.dlvSttmtUnqNo, //납품서번호
-				width: '18', fixed: false, align: 'center',
+				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
@@ -109,8 +110,8 @@ const gridColModel = {
 				sortable: false, hidden: false
 			},
 			{
-				index: 'PCH_ITEM_YN', name: 'pchPodrUnqNo',
-				label: ITP_MSG_LOCALE.label.pchPodrUnqNo, //납품담당연락처
+				index: 'PCH_ITEM_YN', name: 'dlvMgrTelNo',
+				label: ITP_MSG_LOCALE.label.dlvMgrTelNo, //납품담당연락처
 				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},

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

@@ -178,17 +178,20 @@ let pageObj = {
 			});
 
 			// 조회일자 지정
-			//var now = new Date(date.getDate() + 5);
 			var now = new Date();
-			$('#ITP_TAB_POMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT').datepicker('setDate', new Date(now.setDate(now.getDate() + 5)));
-			
-			
+			$('#ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT').datepicker('dlvReqDt', new Date(now.setDate(now.getDate() + 5)));
 			
 			//납품장소 필드 readonly
 			$('#ITP_FORM_POMNG01010_DETAIL_WHS_NM').attr('readonly', true);
 			$('#ITP_FORM_POMNG01010_DETAIL_LOCATION_NM').attr('readonly', true);
-			
+			// form alert message 주입
+			/*
+			$('input[data-alert-required="ONLYCHK"]').each(function() {
+				if($(this).data('alert-msg') === 'address') {
+					$(this).data('alert-msg', ITP_MSG_LOCALE.message.form.emptyAddr);
+				}
+			});
+			*/
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(POMNG01010_DETAIL_GRID_ID, POMNG01010_DETAIL_GRID_LIST, 'lg');
@@ -209,8 +212,8 @@ let pageObj = {
 				var id = $(this).attr('id');
 				$(this).on('click', function() {
 					switch (id) {
-						case 'ITP_BTN_POMNG01010_SRH': createObj.button.save("PR20"); break;	// 구매요청
-						case 'ITP_BTN_POMNG01010_NEWREG': createObj.button.save("PR00"); break;	// 임시저장
+						case 'ITP_BTN_POMNG01010_SRH': modifyObj.button.save(); break;	// 구매요청
+						case 'ITP_BTN_POMNG01010_NEWREG': modifyObj.button.newReg(); break;	// 임시저장
 						case 'ITP_BTN_POMNG01010_DETAIL_ADDROW': pageObj.grid.button.addRow(); break;	// 품목추가
 						case 'ITP_BTN_POMNG01010_DETAIL_DELROW': pageObj.grid.button.delRow(); break;	// 품목삭제
 					}
@@ -241,13 +244,15 @@ let pageObj = {
 					var exists = '';
 					const rowData = $(POMNG01010_DETAIL_GRID_ID).getRowData();
 					$.each(rowData, function(key, value) {
-						exists = exists + value.itemId + ';';
+						//exists = exists + value.itemId + ';';
+						exists = exists + value.brandUnitUnqNo + ';';
 					});
 
 					$.each(rowDataPop, function(key, value) {
-						if (exists.indexOf(value.itemId) < 0 && value.podrPssblDvsn == 'PO01') {
+						// if (exists.indexOf(value.itemId) < 0 && value.podrPssblDvsn == 'PO01') {
+						if (exists.indexOf(value.brandUnitUnqNo) < 0 && value.podrPssblDvsn == 'PO01') {
 							value['viewCd'] = "C";
-							$(POMNG01010_DETAIL_GRID_ID).jqGrid('addRowData', value.itemId, value, 'last');
+							$(POMNG01010_DETAIL_GRID_ID).jqGrid('addRowData', value.brandUnitUnqNo, value, 'last');
 						}
 					});
 					$(POMNG01010_DETAIL_GRID_EMPTY).hide();
@@ -258,7 +263,7 @@ let pageObj = {
 			delRow: function() {
 				itp_fn_grid_del_row(POMNG01010_DETAIL_GRID_ID);
 				// 그리드 포문으로 금액 재계산후 구매요청금액에 넣어줌
-				pageObj.grid.recal();  //==>dwkim 왜 호출이 안될까요
+				this.load.recal();  //==>dwkim 왜 호출이 안될까요
 			}
 		},
 		load: function(gridData) {  // ==>dwkim  오픈시 데이타 가져오는 부분 넣으면 되는건지 여부 gird가 아님
@@ -316,85 +321,56 @@ let createObj = {
 		//let param = 'brandId=' + LOGIN_USER_INFO.brandId + "&spplyId=" + LOGIN_USER_INFO.spplyId;
 		this.load();
 	},
-	newinit: function() {
-		$('#ITP_FORM_POMNG01010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
-		$('#ITP_FORM_POMNG01010_DETAIL_STORE_ID').val(fn_make_user_info.get('storeId'));
-		$('#ITP_FORM_POMNG01010_DETAIL_PCH_REQ_NM').val('');
-		$('#ITP_FORM_POMNG01010_DETAIL_NOTE').val('');
-		var now = new Date();
-		$('#ITP_TAB_POMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-		$('#ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT').datepicker('setDate', new Date(now.setDate(now.getDate() + 5)));
-		
-		
-		this.load();  //==>dwkim 초기화 하여 다시 초기 데이타 가져와 뿌려줌
-		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
-		fn_ajax_call(API_DETAIL_INIT_INFO, key, this.callback, 'GET');
-	},
 	button: {
-		save: function(arg) {
+		save: function() {
 			const formId = '#ITP_FORM_POMNG01010_DETAIL';
 			itp_fn_form_clear_validate(null, formId);
-			$('#ITP_FORM_POMNG01010_DETAIL_PCH_REQ_ST_CD').val(arg);
-			
-			//정산 타입이 무정산이면 스킵
-			var loanDvsn = $('#ITP_FORM_POMNG01010_DETAIL_LOAN_DVSN').val();
-			
-			if (loanDvsn != 'LD03' && arg == 'PR20' ) {
-				var pchActAtm = $('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text();
-				var pchReqAtm = $('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text();
-				
-				if (parseInt(pchActAtm) < parseInt(pchReqAtm)) {
-					alert(ITP_MSG_LOCALE.message.ajax.lackReqAmt);
-					return;
-				}
-			}            
 
+			// if (vali_cmpyCd && vali_cmpyStatCd && vali_cmpyTypeCd && vali_cmpyNm && vali_bossNm && vali_mainTel && vali_mainEmail) {
 			if (itp_fn_form_event.isValid(formId)) {
-				var saveReq = {
-				callBack: function(args) {
-						$(formId).val(arg);
-						let gridInsertData = [];
-						let gridUpdateData = [];
-						let gridDeleteData = [];
-						const rowData = $(POMNG01010_DETAIL_GRID_ID).getRowData();
-						const keyValue = $(formId + '_AFFL_SHOP_ID').val();
-						$.each(rowData, function(key, value) {
-							if (value.viewCd !== 'R') {
-								if (value.viewCd === 'C') {
-									gridInsertData.push(value);
-								} else if (value.viewCd === 'U') {
-									gridUpdateData.push(value);
-								} else if (value.viewCd === 'D') {
-									gridDeleteData.push(value);
-								}
-							}
-						});
-		
-						let param = $(formId).serializeObject();
-						param.gridInsertData = gridInsertData;
-						param.gridUpdateData = gridUpdateData;
-						param.gridDeleteData = gridDeleteData;
-						console.log(JSON.stringify(param));
-						var searhFn = function() {
-							createObj.newinit();
-						};
-						fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');				
-					}
-				};
-				if (arg == 'PR20') {
-					itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.reqSave, saveReq, null);
+
+				// if($('#ITP_FORM_POMNG01010_DETAIL_CMPY_ZIPNO').val() === '' || $('#ITP_FORM_POMNG01010_DETAIL_CMPY_ADRES').val() === '') {
+				// 	itp_fn_modal_alert('주소 검색을 통해 회사 주소를 입력하세요.');
+				// 	return;
+				// }
+
+				if (ITP_FORM_POMNG01010_DETAIL_IS_DUPLICATE) {
+					itp_fn_modal_duplicate('회사코드 중복체크를 해주세요.', formId + '_AFFL_SHOP_ID');
 				} else {
-					itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.tmpSave, saveReq, null);
+					let gridInsertData = [];
+					let gridUpdateData = [];
+					let gridDeleteData = [];
+					const rowData = $(POMNG01010_DETAIL_GRID_ID).getRowData();
+					const keyValue = $(formId + '_AFFL_SHOP_ID').val();
+					$.each(rowData, function(key, value) {
+						if (value.viewCd !== 'R') {
+							value.afflShopId = keyValue;
+							if (value.viewCd === 'C') {
+								gridInsertData.push(value);
+							} else if (value.viewCd === 'U') {
+								gridUpdateData.push(value);
+							} else if (value.viewCd === 'D') {
+								gridDeleteData.push(value);
+							}
+						}
+					});
+
+					let param = $(formId).serializeObject();
+					param.gridInsertData = gridInsertData;
+					param.gridUpdateData = gridUpdateData;
+					param.gridDeleteData = gridDeleteData;
+					console.log(JSON.stringify(param));
+					var searhFn = function() {
+						ITP_FORM_POMNG01010_DETAIL_IS_WRITING = false;
+						viewObj.init();
+					};
+					fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
 				}
-				
-				
-				
 			}
 		}
 	},
 	load: function() {
-		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
-		fn_ajax_call(API_DETAIL_INIT_INFO, key, this.callback, 'GET');
+		fn_ajax_call(API_DETAIL_INIT_INFO, '', this.callback, 'GET');
 	},
 	callback: function(result) {
 		console.log(result);
@@ -406,17 +382,12 @@ let createObj = {
 		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_LOAN_DVSN').val(result.loanDvsn);
 		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_LOAN_MGNT_UNQ_NO').val(result.loanMgntUnqNo);
 		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_PCH_REQ_DVSN').val(result.pchReqDvsn);
-		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_WHS_ID').val(result.whsId);
-		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_WHS_NM').val(result.whsNm);
-		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_LOCATION').val(result.location);
-		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_LOCATION_NM').val(result.locationNm);
 		$('#ITP_FORM_POMNG01010_DETAIL .fnBrandNm').text(result.brandNm);
 		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqDept').text(result.reqDept);
 		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqMgrNm').text(result.userNm);
 		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text("0");
 		$('#ITP_FORM_POMNG01010_DETAIL .fnLoanDvsnNm').text(result.loanDvsnNm);
 		$('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text(result.ordUseAmt);
-		
 
 		pageObj.grid.init();
 	}

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

@@ -39,6 +39,7 @@ function itp_fn_BIZPOP_AFFL_SHOP(parentPopFn, args, returnType) {
 	    	return;
 	    }
 	    const selRow = $(THIS_GIRD_ID).getRowData(rowKey);
+	    console.log(selRow);
 
 		var afflData = {};
 		var callbackFn = function(result) {

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

@@ -7,7 +7,7 @@ require(['config'], function() {
 });
 
 let FRCOMP_POP_GRID_LIST = '/api/pomng/inoutmng/spply-deli-grid-list';
-let API_INFO_INV 		= '/api/pomng/inoutmng/save-spply-inv';	// 상세
+
 function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, returnType) {
 	// 공통코드
 	// fn_make_select(CODE_LIST, 'CMPY_TYPE_CD', 'ITP_FORM_BIZPOP_DLV_STTMT_PRN_CMPY_TYPE_CD', true, '가맹점타입 선택');
@@ -16,12 +16,8 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, returnType) {
 	let itp_BIZPOP_DLV_STTMT_PRN_search = false;
 
 	const THIS_FORM_ID = '#ITP_FORM_BIZPOP_DLV_STTMT_PRN';
-	
 	const THIS_GIRD_ID = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGrid';
-	const THIS_GRID_LIST = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGrid_list';
 	const THIS_GIRD_PAGER = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGridPager';
-	const THIS_GRID_EMPTY = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGridEmpty';
-
 
 	if(args) {
 		$('#ITP_FORM_BIZPOP_DLV_STTMT_PRN_CMPY_NM').val(args.brandNm);
@@ -142,50 +138,3 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, returnType) {
 	    }
 	}).navGrid(THIS_GIRD_PAGER, ITP_GRID_NAV_DEFAULTS.navGrid);
 };
-let viewObj = {
-		init: function (param) {
-				this.load(param);
-		},
-		load: function(param) {
-				fn_ajax_call(API_INFO_INV, param, this.callback, 'GET');
-		},
-		callback: function (result) {
-				console.log(result);
-				$('#ITP_POPUP_CONTAINER #ITP_POPUP_CONTAINER_ITEM_ID').val(result.itemId);
-				$('#ITP_POPUP_CONTAINER .fnPchPodrUnqNo').text(result.pchPodrUnqNo);
-				$('#ITP_POPUP_CONTAINER .fnItemClassMgntNo').text(result.itemClassMgntNo);
-				$('#ITP_POPUP_CONTAINER .fnItemId').text(result.itemId);
-				$('#ITP_POPUP_CONTAINER .fnItemTypeNm').text(result.itemTypeNm);
-				$('#ITP_POPUP_CONTAINER .fnItemNm').text(result.itemClassNm);
-				$('#ITP_POPUP_CONTAINER .fnImpDvsnNm').text(result.impDvsnNm);
-				$('#ITP_POPUP_CONTAINER .fnPodrPssblDvsn').text(result.podrPssblDvsnNm);
-				$('#ITP_POPUP_CONTAINER .fnUnit').text(result.unit);
-				$('#ITP_POPUP_CONTAINER .fnWeightUnit').text(result.weightUnit);
-				$('#ITP_POPUP_CONTAINER .fnVolumeUnit').text(result.volumeUnit);
-				$('#ITP_POPUP_CONTAINER .fnWidthUnit').text(result.widthUnit);
-				$('#ITP_POPUP_CONTAINER .fnHeightUnit').text(result.heightUnit);
-				$('#ITP_POPUP_CONTAINER .fnHighUnit').text(result.highUnit);
-				
-				$('#ITP_POPUP_CONTAINER .fnPchItemYn').text(result.pchItemYn);
-				$('#ITP_POPUP_CONTAINER .fnViewPchUnit').text(result.pchUnit);
-				$('#ITP_POPUP_CONTAINER .fnSaleItemYn').text(result.saleItemYn);
-				$('#ITP_POPUP_CONTAINER .fnSaleUnit').text(result.saleUnit);
-				$('#ITP_POPUP_CONTAINER .fnAssetInfo').text(result.assetInfo);
-				$('#ITP_POPUP_CONTAINER .fnStckUnit').text(result.stckUnit);
-				$('#ITP_POPUP_CONTAINER .fnWeight').text(result.weight);
-				$('#ITP_POPUP_CONTAINER .fnVolume').text(result.volume);
-				$('#ITP_POPUP_CONTAINER .fnWidth').text(result.width);
-				$('#ITP_POPUP_CONTAINER .fnHeight').text(result.height);
-				$('#ITP_POPUP_CONTAINER .fnHigh').text(result.high);
-				
-				$('#ITP_POPUP_CONTAINER .fnOneBoxQty').text(result.oneBoxQty);
-				$('#ITP_POPUP_CONTAINER .fnExpryYn').text(result.expryYn);
-				$('#ITP_POPUP_CONTAINER .fnExpryPeriod').text(result.expryPeriod);
-				$('#ITP_POPUP_CONTAINER .fnRtnPssblYn').text(result.rtnPssblYn);
-				$('#ITP_POPUP_CONTAINER .fnRtnDvsn').text(result.rtnDvsnNm);
-				// $('#ITP_POPUP_CONTAINER .fnItemImage').text(result.imageFileNoList);
-				$.each(result.imageFileNoList, function(index, item) {
-						$('#ITP_POPUP_CONTAINER .fnItemImage').append('<img src=" + item.filePath +" />');
-				});
-		}
-	};

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

@@ -37,16 +37,27 @@ function itp_fn_BIZPOP_WHS_LOCATION(parentPopFn, args, returnType) {
 	});
 	
 	$('#ITP_BIZPOP_WHS_LOCATION_BTN_SELECT').on('click', function() {		
+		
 		const rowKey = $(THIS_GIRD_ID).getGridParam('selrow');
-		if (!rowKey) {
-			return;
+	    if (!rowKey) {
+	    	return;
 	    }
-		const selRow = $(THIS_GIRD_ID).getRowData(rowKey);
-		console.log(selRow);
+
+		var list = [];
+	    var selectedIds = $(THIS_GIRD_ID).getGridParam('selarrrow');
 		
-		parentPopFn(selRow);
-		$('#ITP_BIZPOP_WHS_LOCATION').modal('hide'); // 팝업닫기
+		/*
+		if(selectedIds.length != 1) { // 1개만 선택
+			 itp_fn_modal_alert('하나의 창고만 선택해주세요!');
+			 return;
+		}
+		*/
 		
+	    for (var i=selectedIds.length-1; i>=0; i--) {
+			list.push($(THIS_GIRD_ID).jqGrid('getRowData', selectedIds[i]));	
+		}
+		parentPopFn(list);
+		$('#ITP_BIZPOP_WHS_LOCATION').modal('hide'); // 팝업닫기
 	});
 
 	$('#ITP_BIZPOP_WHS_LOCATION_jqGridEmpty').on('click', function() {
@@ -129,6 +140,7 @@ function itp_fn_BIZPOP_WHS_LOCATION(parentPopFn, args, returnType) {
 		url: DOMAIN + API_POP_GRID_LIST,
 		pager: THIS_GIRD_PAGER,
 		multiselect: false,
+		rownumbers: false,
 		loadComplete: function(data) {
 			console.log(data);
 			itp_fn_grid_load_complete(data, THIS_GIRD_ID, true, undefined, 'BIZPOP_WHS_LOCATION', itp_BIZPOP_WHS_LOCATION_search, itp_fn_BIZPOP_WHS_LOCATION_empty, true, data.gridRecords, false);

src/main/webapp/js/app/settmng/ITP_SETTMNG01010.js

@@ -353,8 +353,6 @@ let pageObj = {
 						case 'ITP_BTN_SETTMNG01010_CANCELLIST'		: modifyObj.button.cancel(); 	break;	// 취소/목록 버튼
 						case 'ITP_BTN_SETTMNG01010_NEWREG'			: listObj.button.reqSttl();	break;	// 정산요청 버튼
 						case 'ITP_BTN_SETTMNG01010_REQUEST'			: modifyObj.button.request();	break;	// 요청 버튼
-						case 'ITP_BTN_SETTMNG01010_STORE_SEARCH'	: listObj.button.storePop();	break;	// 매장검색 팝업
-						case 'ITP_BTN_SETTMNG01010_STORE_ERASE'		: listObj.button.storeErase();	break;	// 매장 지움
 					}
 				});
 			});
@@ -478,19 +476,6 @@ let listObj = {
 			// itp_fn_form_clear_validate(null, '#ITP_FORM_SETTMNG01010_DETAIL');						
 			// 로케이션 리스트 조회
 			// createObj.init();
-		}, 
-		storePop: function() {
-			fn_call_popup('biz', 'BIZPOP_BRAND_STORE', '#ITP_ASIDE', function(result) {
-				// alert(JSON.stringify(result));
-				$('#ITP_FORM_SETTMNG01010_SEARCH_STORE_ID').val(result[0].storeId);
-				$('#ITP_FORM_SETTMNG01010_SEARCH_STORE_NM').val(result[0].storeNm);				
-				listObj.button.search();
-			}, null, 'S');
-		}, 
-		storeErase: function() {
-			$('#ITP_FORM_SETTMNG01010_SEARCH_STORE_ID').val('');
-			$('#ITP_FORM_SETTMNG01010_SEARCH_STORE_NM').val('');
-			listObj.button.search();
 		}
 	},
 	empty: {

src/main/webapp/js/app/settmng/ITP_SETTMNG02010.js

@@ -518,7 +518,7 @@ let modifyObj = {
 		$('#ITP_FORM_SETTMNG02010_DETAIL .fnBrandNm').text(result.brandNm);
 		$('#ITP_FORM_SETTMNG02010_DETAIL .fnSupplyNm').text(result.spplyNm);
 		
-		$('#ITP_FORM_SETTMNG02010_DETAIL .fnSttlRjctRsn').text(result.sttlRjctRsn == null ? '' : result.sttlRjctRsn);
+		$('#ITP_FORM_SETTMNG02010_DETAIL .fnSttlRjctRsn').text(result.sttlRjctRsn);
 		$('#ITP_FORM_SETTMNG02010_DETAIL .fnSttlStNm').text(result.sttlStNm);
 		$('#ITP_FORM_SETTMNG02010_DETAIL .fnSttlReqDt').text(result.sttlReqDt);  // 정산일자
 		$('#ITP_FORM_SETTMNG02010_DETAIL .fnSttlReqAmt').text(itp_fn_number_comma(result.sttlReqAmt));

src/main/webapp/js/app/settmng/ITP_SETTMNG03010.js

@@ -291,8 +291,8 @@ let pageObj = {
 					switch (id) {
 						case 'ITP_BTN_SETTMNG03010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
 						case 'ITP_BTN_SETTMNG03010_CANCELLIST'		: modifyObj.button.cancel(); 	break;	// 취소/목록 버튼
-						case 'ITP_BTN_SETTMNG03010_SEARCH_STORE_POP'	: listObj.button.storePop();	break;	// 매장검색 팝업
-						case 'ITP_BTN_SETTMNG03010_SEARCH_ERASE'		: listObj.button.storeErase();	break;	// 매장 지움
+						// case 'ITP_BTN_SETTMNG03010_NEWREG'			: listObj.button.reqSttl();	break;	// 정산요청 버튼
+						// case 'ITP_BTN_SETTMNG03010_REQUEST'			: modifyObj.button.request();	break;	// 요청 버튼
 					}
 				});
 			});
@@ -377,19 +377,6 @@ let listObj = {
 			param.gridSize = $.jgrid.defaults.rowNum;
 			param.gridPage = $.jgrid.defaults.page;
 			$(SETTMNG03010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
-		}, 
-		storePop: function() {
-			fn_call_popup('biz', 'BIZPOP_BRAND_STORE', '#ITP_ASIDE', function(result) {
-				// alert(JSON.stringify(result));
-				$('#ITP_FORM_SETTMNG03010_SEARCH_STORE_ID').val(result[0].storeId);
-				$('#ITP_FORM_SETTMNG03010_SEARCH_STORE_SPPLY_NM').val(result[0].storeNm);				
-				listObj.button.search();
-			}, null, 'S');
-		}, 
-		storeErase: function() {
-			$('#ITP_FORM_SETTMNG03010_SEARCH_STORE_ID').val('');
-			$('#ITP_FORM_SETTMNG03010_SEARCH_STORE_SPPLY_NM').val('');
-			listObj.button.search();
 		}
 	},
 	empty: {
@@ -496,14 +483,10 @@ let modifyObj = {
 		
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnBrandNm').text(result.brandNm);
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnStoreNm').text(result.storeNm);
-		
-		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlRjctRsn').text(result.sttlRjctRsn == null ? '' : result.sttlRjctRsn);
-		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlStNm').text(result.sttlStNm);
-		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlReqDt').text(result.sttlReqDt);  // 정산일자
-		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlReqAmt').text(itp_fn_number_comma(result.sttlReqAmt));
 		$('#ITP_FORM_SETTMNG03010_DETAIL_STTL_DT').val(result.sttlDt);  // 정산일자
+		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlStNm').text(result.sttlStNm);
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlAmt').text(itp_fn_number_comma(result.sttlAmt));
-		
+		$('#ITP_FORM_SETTMNG03010_DETAIL .fnAcctBal').text(itp_fn_number_comma(result.acctBal));
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSysRegDttm').text(result.sysRegDttm);
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSysRegNm').text(result.sysRegNm);
 

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

@@ -154,6 +154,108 @@ let pageObj = {
     }
 };
 
+/*목록화면 Object*/
+let listObj = {
+    init: function () {
+        afflShopObj.init();
+        this.grid.init();
+    },
+    itp_STINFO01011_param: {},
+    itp_STINFO01011_search: false,
+    button: {
+        search: function() {
+            listObj.itp_STINFO01011_search = true;
+            let param = $('#ITP_FORM_STINFO01011_SEARCH').serializeObject();
+            param.gridSize = $.jgrid.defaults.rowNum;
+            param.gridPage = $.jgrid.defaults.page;
+            console.log(JSON.stringify(param));
+            $(STINFO01011_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
+        },
+        create: function() {
+            pageObj.switchScreen('ADD');
+            itp_fn_form_clear_validate(null, '#ITP_FORM_STINFO01011_DETAIL');
+            // 권한정보 리스트 조회
+            createObj.init();
+        }
+    },
+    empty: {
+        init: function() {
+            var _this = this;
+            this.push();
+            $(STINFO01011_GRID_EMPTY).on('click', function() {
+                _this.back();
+                listObj.itp_STINFO01011_param.gridSize = $.jgrid.defaults.rowNum;
+                $(STINFO01011_GRID_ID).setGridParam({'postData': JSON.stringify(listObj.itp_STINFO01011_param)}).trigger('reloadGrid');
+            });
+        },
+        push: function() {
+            let param = $('#ITP_FORM_STINFO01011_SEARCH').serializeObject();
+            listObj.itp_STINFO01011_param = param;
+        },
+        back: function() {
+            $('#ITP_FORM_STINFO01011_SERVICE_BRAND_TYPE').val(listObj.itp_STINFO01011_param.brandType);
+            $('#ITP_FORM_STINFO01011_SERVICE_ST_CD').val(listObj.itp_STINFO01011_param.stCd);
+            $('#ITP_FORM_STINFO01011_SEARCH_BRAND_NM').val(listObj.itp_STINFO01011_param.brandNm);
+        }
+    },
+    grid: {
+        init: function () {
+            // 데이터 없을때
+            listObj.empty.push();
+            this.search();
+        },
+        colModel: gridColModel.list,
+        search: function() {
+            pageObj.switchScreen('LIST');
+            this.unload();
+            this.load();
+        },
+        load: function() {
+            let param = $('#ITP_FORM_STINFO01011_SEARCH').serializeObject();
+            param.gridSize = $.jgrid.defaults.rowNum;
+
+            var option = {
+                gridId: STINFO01011_GRID_ID,
+                colModel: gridColModel.list,
+                param: param,
+                url: DOMAIN + API_DETAIL_GRID_LIST,
+                pager: STINFO01011_GRID_PAGER,
+                onCellSelect: function(rowId, cellIdx, cellValue) {
+                    var cm = $(this).jqGrid('getGridParam', 'colModel');
+                    var colNm = cm[cellIdx].name;
+                    if (colNm === 'brandId') {
+                        const brandIdVal = $(this).jqGrid('getCell', rowId, 'brandId');
+                        const key = {brandId: brandIdVal, viewCd: 'R'};
+                        var param = $.param(key);
+                        viewObj.init(param);
+                    }
+                },
+                loadComplete: function(data) {
+                    console.log(data);
+                    itp_fn_grid_load_complete(data, STINFO01011_GRID_ID, true, 'number', 'STINFO01011', listObj.itp_STINFO01011_search, listObj.empty, true, data.gridRecords, true);
+                    var ids = $(STINFO01011_GRID_ID).getDataIDs();
+                    $.each(ids, function(idx, rowId) {
+                        $(STINFO01011_GRID_ID).jqGrid('setCell', rowId, 'brandId', '', ITP_GRID_COL_STYLE.link);
+                    });
+                },
+                onPaging: function(action) {
+                    itp_fn_grid_paging(STINFO01011_GRID_ID, action, param);
+                }
+            };
+            itp_fn_grid_make_remote(option);
+        },
+        clearData : function() {
+            $(STINFO01011_GRID_ID).jqGrid('clearGridData', true);
+            $(STINFO01011_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
+            $(STINFO01011_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
+            $(STINFO01011_GRID_EMPTY).show();
+        },
+        unload : function() {
+            $.jgrid.gridUnload(STINFO01011_GRID_ID);
+        }
+    }
+};
+
 /*상세화면 Object*/
 let viewObj = {
     init: function (param) {
@@ -213,28 +315,6 @@ let modifyObj = {
             const key = {brandId: brandIdVal, viewCd: 'R'};
             var param = $.param(key);
             modifyObj.load(param);
-        },
-        address: function() {
-            kakaoMap.address('ITP_FORM_STINFO01011_DETAIL');
-        },
-        save: function() {
-            const formId = '#ITP_FORM_STINFO01011_DETAIL';
-            itp_fn_form_event.removeChar('#ITP_FORM_STINFO01011_DETAIL');
-            itp_fn_form_clear_validate(null, formId);
-
-            if (itp_fn_form_event.isValid(formId)) {
-                let param = $(formId).serializeObject();
-                console.log(JSON.stringify(param));
-
-                var searhFn = function() {
-                    ITP_FORM_STINFO01011_DETAIL_IS_WRITING = false;
-                    viewObj.init();
-                };
-                fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
-            }
-        },
-        cancel: function () {
-            viewObj.init();
         }
     },
     load: function(param) {
@@ -285,6 +365,60 @@ let modifyObj = {
     }
 };
 
+/*신규화면 Object*/
+let createObj = {
+    init: function () {
+        this.button.init();
+        pageObj.fileUpload();
+        kakaoMap.init('ITP_FORM_STINFO01011_DETAIL', '');
+    },
+    button: {
+        init: function() {
+            // 가맹점 조회 버튼 클릭
+            $('#ITP_FORM_STINFO01011_DETAIL_SEARCH_AFFL_SHOP').one('click', function() {
+                createObj.popup();
+            });
+            // 가맹점 텍스트 삭제 버튼 클릭
+            $('#ITP_FORM_STINFO01011_DETAIL_DELETE_AFFL_SHOP').one('click', function() {
+                $('#ITP_FORM_STINFO01011_DETAIL_AFFL_SHOP_ID').val('');
+                $('#ITP_FORM_STINFO01011_DETAIL_AFFL_SHOP_NM').val('');
+            });
+        },
+        address: function() {
+            kakaoMap.address('ITP_FORM_STINFO01011_DETAIL');
+        },
+        save: function() {
+            const formId = '#ITP_FORM_STINFO01011_DETAIL';
+            itp_fn_form_event.removeChar('#ITP_FORM_STINFO01011_DETAIL');
+            itp_fn_form_clear_validate(null, formId);
+
+            if (itp_fn_form_event.isValid(formId)) {
+                let param = $(formId).serializeObject();
+                console.log(JSON.stringify(param));
+
+                var searhFn = function() {
+                    ITP_FORM_STINFO01011_DETAIL_IS_WRITING = false;
+                    listObj.grid.search();
+                };
+                fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
+            }
+        },
+        cancel: function () {
+            listObj.grid.search();
+        }
+    },
+    popup: function() {
+        var popFn = function(rowDataPop) {
+            // console.log(rowDataPop);
+            if(rowDataPop.AFFL_SHOP) {
+                $('#ITP_FORM_STINFO01011_DETAIL_AFFL_SHOP_ID').val(rowDataPop.AFFL_SHOP.afflShopId);
+                $('#ITP_FORM_STINFO01011_DETAIL_AFFL_SHOP_NM').val(rowDataPop.AFFL_SHOP.afflShopNm);
+            }
+        };
+        fn_call_popup('biz', 'BIZPOP_AFFL_SHOP', '#ITP_ASIDE', popFn, null, 'S');
+    }
+};
+
 /*가맹점 Object*/
 let afflShopObj = {
     init: function () {

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

@@ -627,6 +627,7 @@ let createObj = {
 					$(STINFO03010_DETAIL_GRID_ID).jqGrid('saveCell', i+1, 2)
 				}
 				const rowData = $(STINFO03010_DETAIL_GRID_ID).getRowData();
+				console.log(rowData);
 				var gridUpdateData = pageObj.grid.changeRows(rowData);
 				$.each(rowData, function(key, value) {
 					if (value.viewCd !== 'R') {
@@ -650,7 +651,7 @@ let createObj = {
 					ITP_FORM_STINFO03010_DETAIL_IS_WRITING = false;
 					listObj.grid.search();
 				};
-				fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
+				// fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
 			}
 		}
 	}

src/main/webapp/js/app/vendinfo/ITP_VENDINFO01010.js

@@ -242,7 +242,7 @@ let pageObj = {
 			this.load(mode, gridData);
 		},
 		mode: 'DETAIL',
-		ridId: '',
+		gridId: '',
 		gridList: '',
 		gridEmpty: '',
 		load: function(mode, gridData) {

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

@@ -26,23 +26,23 @@
         </div>
         <div class="num_area">
           <div class="input_area">
-            <input type="text" name="bsnsRegNo" id="ITP_FORM_LOGIN_BSNS_REG_NO">
+            <input type="text" name="bsnsRegNo" id="ITP_FORM_LOGIN_BSNS_REG_NO" required>
             <label for="ITP_FORM_LOGIN_BSNS_REG_NO">사업자번호</label>
             <button type="button" id="ITP_BTN_LOGIN_BSNS_REG_NO">연결</button>
           </div>
           <div class="brand_list">
-            <select name="brandId" id="ITP_FORM_LOGIN_BRAND_ID" required>
+            <select name="brandId" id="ITP_FORM_LOGIN_BRAND_ID">
               <option value="">선택</option>
             </select>
           </div>
         </div>
         <div class="login_page">
           <div class="input_area">
-            <input type="text" id="ITP_FORM_LOGIN_USER_ID" required>
+            <input type="text" id="ITP_FORM_LOGIN_USER_ID"  required>
             <label for="ITP_FORM_LOGIN_USER_ID">아이디</label>
           </div>
           <div class="input_area">
-            <input type="password" id="ITP_FORM_LOGIN_USER_PW" required>
+            <input type="password" id="ITP_FORM_LOGIN_USER_PW"  required>
             <label for="ITP_FORM_LOGIN_USER_PW">비밀번호</label>
           </div>
         </div>

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

@@ -135,5 +135,4 @@
       <button id="ITP_BTN_MPOMNG01010" class="col_3 btn-gray CLB">취소</button>
     </div>
   </div>
-</section>
-
+</section>

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

@@ -1,6 +1,6 @@
 <link rel="stylesheet" href="/style.css">
 <section>
-  <div id="ITP_AJAX_MPOMNG02010_VIEW_CONTAINER" style="display: none;">
+  <div id="ITP_AJAX_MPOMNG02010_VIEW_CONTAINER" style="display: block;">
     <div class="content">
         <div class="line">
           <label>구매요청일</label>
@@ -12,7 +12,7 @@
       </div>
       <div class="line">
         <label>구매요청상태</label>
-        <div class="float_left">
+        <div class="line_right">
           <select id="ITP_FORM_MPOMNG02010_VIEW" class="stcd" name="">
             <option value="">상태</option>
           </select>
@@ -20,12 +20,14 @@
       </div>
       <div class="line">
         <label>납품장소</label>
-        <div class="float_left">
-          <input id="ITP_FORM_MPOMNG02010_VIEW" class="" type="text" placeholder="A매장명">
-        </div>
-        <div class="float_left_btn">
-          <button id="ITP_BTN_MPOMNG02010"><img src="/img/search.png" alt=""></button>
-          <button id="ITP_BTN_MPOMNG02010"><img src="/img/delete.png" alt=""></button>
+        <div class="search_wrap">
+	        <div class="float_left">
+	          <input id="ITP_FORM_MPOMNG02010_VIEW" class="" type="text" placeholder="A매장명">
+	        </div>
+	        <div class="float_left_btn">
+	          <button id="ITP_BTN_MPOMNG02010"><img src="../img/search.png" alt=""></button>
+	          <button id="ITP_BTN_MPOMNG02010"><img src="../img/delete.png" alt=""></button>
+	        </div>
         </div>
       </div>
       <div class="line">
@@ -41,28 +43,36 @@
       <li class="history_list">
         <div class="left">
           <div class="nomal">
-            <label>구매요청일 :</label>
+            <label>구매요청일 </label>
+            <span>:</span>
             <div class="history">
-              <div class="fn">2022.10.01</div> 
-              (<div class="fn">홍길동 점주</div>)
+              <div class="fndate">2022.10.01</div> 
+              (<div class="fnOwnerNm">홍길동 점주</div>)
             </div>
           </div>
         </div>
         <div class="left">
           <div class="nomal">
-            <label>구매상태 :</label>
-            <div class="history">
-              <div class="fn">대기</div>
+          	<div class="half">
+	            <label>구매상태</label>
+     		            <span>:</span>
+	            <div class="history">
+	              <div class="fn">대기</div>
+	            </div>
             </div>
-            <label>납품장소명 :</label>
-            <div class="history">
-              <div class="fn">A매장내</div>
+          	<div class="half">
+	            <label>납품장소명 </label>
+	            <span>:</span>
+	            <div class="history">
+	              <div class="fn">A매장내</div>
+	            </div>
             </div>
           </div>
         </div>
         <div class="left">
           <div class="nomal">
-            <label style="width: 300px;">구매요청 정보 :</label>
+            <label style="width: 127px;">구매요청 정보</label>
+            <span>:</span>
             <div class="history">
               <div class="fn">품목수(3)</div> 
               <i>- </i>
@@ -72,7 +82,8 @@
         </div>
         <div class="left">
           <div class="nomal">
-            <label>결재정보 :</label>
+            <label>결재정보 </label>
+            <span>:</span>
             <div class="history">
               <div class="fn">미납</div> 
             </div>
@@ -81,7 +92,7 @@
       </li>
     </div>
   </div>
-  <div id="ITP_AJAX_MPOMNG02010_DETAIL_CONTAINER" style="display: block;">
+  <div id="ITP_AJAX_MPOMNG02010_DETAIL_CONTAINER" style="display: none;">
     <div class="content">
       <div class="line">
         <label>납기요청일</label>

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

@@ -1,14 +1,14 @@
 @font-face { font-family: 'NanumBarunGothic';src: url('../fonts/NanumBarunGothic.eot');src: url('../fonts/NanumBarunGothic.eot') format('embedded-opentype'),url('../fonts/NanumBarunGothic.woff') format('woff');}
 * {margin: 0; padding: 0; box-sizing: border-box; text-align: center; font-family: 'NanumBarunGothic', 'serif'; list-style: none;}
 section {}
-body{background: #fff; position: relative; width: 100%; height: auto;}
+body{background: #fff; position: relative; width: 100%; height: 500px;}
 /* 팝업 */
 section .popup { position: fixed; width: 100%; height: 100%; background: transparent; z-index: 11;}
-section .popup .pop { position: absolute; top: 45%; left: 50%; transform: translate(-50%,-50%); width: 70%; height: 400px; padding-top: 50px; background: #fff; border: 2px solid #000; border-top-left-radius: 20px; border-top-right-radius: 20px;}
-section .popup .pop label.pop_label {margin-top: 50px;font-size: 1.2rem;}
+section .popup .pop { position: absolute; top: 50%; left: 50%; transform: translate(-50%,-50%); width: 70%; height: 550px; padding-top: 80px; background: #fff; border: 2px solid #000; border-top-left-radius: 20px; border-top-right-radius: 20px;}
+section .popup .pop label.pop_label {margin-top: 50px;font-size: 2.2rem;}
 section .popup .pop .pop_line { width: 100%; height: 75px;}
-section .popup .pop .pop_line label { font-size: 1.2rem; margin-left: 70px; float: left; width: 272px; text-align: left; margin-top: -15px;}
-section .popup .pop .pop_line div { margin-top: -15px; text-align: right; float: right; font-size: 1.2rem; margin-right: 80px; width: 250px;}
+section .popup .pop .pop_line label { font-size: 2.6rem; margin-left: 70px; float: left; width: 272px; text-align: left; margin-top: -15px;}
+section .popup .pop .pop_line div { margin-top: -15px; text-align: right; float: right; font-size: 2.6rem; margin-right: 80px; width: 250px;}
 section .popup .pop .popup_btn { position: absolute; background-color: #ccc; bottom: 0; width: 100%; height: 100px; border-top: 2px solid #000;}
 section .popup .pop .popup_btn button { position: relative; float: left; width: 100%; height: 100px; font-size: 2rem; font-weight: 700; border-radius: 0px; border: none;}
 section .popup .pop .popup_btn button.ok { width: 64%; border-left: 2px solid #000;}
@@ -22,22 +22,21 @@ section .popup2 .barcode_area {width: 70%; height: 35%; margin: auto; background
 section .popup2 .barcode h1{text-align: left; width: 85%; font-size: 2.6rem; margin:auto; margin-top: 30%;}
 section .popup2 .btn_barcode {margin-top: 20%;}
 section .popup2 .btn_barcode button {width: 35%; height: 100px; font-size: 2.2rem;}
-section .popup2 .pop { position: absolute; top: 45%; left: 50%; transform: translate(-50%,-50%); width: 90%; height: 85%; background: #fff; border: 2px solid #000;}
-section .popup2 .pop .header {position: relative; height: 50px; background: rgb(204, 225, 240); border-bottom: 1px solid #000;}
-section .popup2 .pop .header .header_left {float: left; padding-top: 5px; padding-left: 15px;}
-section .popup2 .pop .header .header_left label {font-size: 1.4rem;} 
+section .popup2 .pop { position: absolute; top: 50%; left: 50%; transform: translate(-50%,-50%); width: 90%; height: 85%; background: #fff; border: 2px solid #000;}
+section .popup2 .pop .header {position: relative; height: 100px; background: rgb(204, 225, 240); border-bottom: 1px solid #000;}
+section .popup2 .pop .header .header_left {float: left; padding-top: 20px; padding-left: 20px;}
+section .popup2 .pop .header .header_left label {font-size: 2.4rem;} 
 section .popup2 .pop .header .header_right {float: right; padding-right: 10px;}
 section .popup2 .pop .header .header_right button {border: none; background: transparent;}
-section .popup2 .pop .header .header_right button img {width:30px; height:30px;}
-section .popup2 .pop .search_bar {width: 100%; height: 60px; padding: 10px;}
-section .popup2 .pop .search_bar input {width: 80%; height: 40px; float: left;}
-section .popup2 .pop .search_bar button {float: right; border: none; padding-top:3px;}
-section .popup2 .pop .search_bar button img {width: 30px; height: 30px;}
+section .popup2 .pop .search_bar {width: 100%; height: 90px; padding: 10px;}
+section .popup2 .pop .search_bar input {width: 88%; height: 80px; float: left;}
+section .popup2 .pop .search_bar button {width: 80px; height: 80px; float: right; border: none; padding-right: 30px;}
+section .popup2 .pop .search_bar button img {width: 50px; height: 50px;}
 section .popup2 .pop .search_bar button.search {float: none; width: 50%; height: 70px; background:rgb(46, 46, 248); color: #fff; font-size: 2rem; padding: 0; border: 1px solid #000; margin: 0 auto;}
-section .popup2 .pop .search_bar button.btn_blue {float: right; width: 100px; height: 35px; background:rgb(46, 46, 248); color: #fff; font-size: 1rem; padding: 0; border: 1px solid #000;}
+section .popup2 .pop .search_bar button.btn_blue {float: right; width: 200px; height: 70px; background:rgb(46, 46, 248); color: #fff; font-size: 2rem; padding: 0; border: 1px solid #000;}
 
 section .popup2 .pop .popup_scroll {position: relative; width: 100%;height: 720px; overflow: auto;}
-section .popup2 .pop .popup_scroll li {list-style: none; width: 99%; height: 50px; border: 1px solid #000; margin: 0 auto;}
+section .popup2 .pop .popup_scroll li {list-style: none; width: 99%; height: 80px; border: 1px solid #000; margin: 0 auto;}
 section .popup2 .pop .popup_scroll li.row_2 {height: 140px;}
 section .popup2 .pop .popup_scroll li .left {position: relative; float: left;}
 section .popup2 .pop .popup_scroll li .left div {display: inline-block;}
@@ -47,9 +46,9 @@ section .popup2 .pop .popup_scroll li .left .nomal {float: left; margin: 10px 20
 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;}
-section .popup2 .pop .popup_scroll li .scroll_left div {float: left; font-size: 0.8rem; font-weight: 700; width: auto; margin: 15px 10px;}
+section .popup2 .pop .popup_scroll li .scroll_left div {float: left; font-size: 2rem; font-weight: 700; width: auto; margin: 15px 10px;}
 section .popup2 .pop .popup_scroll li .scroll_right {float: right;}
-section .popup2 .pop .popup_scroll li .scroll_right button {width: 60px; height: 40px; padding: 0; background: rgb(198, 170, 250); border-radius: 10px; font-size: 0.8rem; margin:4px 10px;}
+section .popup2 .pop .popup_scroll li .scroll_right button {width: 100px; height: 60px; padding: 0; background: rgb(198, 170, 250); border-radius: 15px; font-size: 1.5rem; margin:10px 10px;}
 section .popup2 .pop .popup_scroll li .right {margin: 40px 0; position: relative; display: flex; font-size: 2rem; font-weight: 700; float: left;}
 section .popup2 .pop .popup_scroll li .right .num {margin: 0 40px; width: auto;}
 section .popup2 .pop .popup_scroll li .right button {margin: -12px; padding: 20px; font-size: 1.5rem; border-radius: 0px;}
@@ -64,9 +63,8 @@ section .popup3 .pop .header .header_left {float: left; padding-top: 20px; paddi
 section .popup3 .pop .header .header_left label {font-size: 2.4rem;} 
 section .popup3 .pop .header .header_right {float: right; padding-right: 10px;}
 section .popup3 .pop .header .header_right button {border: none; background: transparent;}
-
 /* 버튼 */
-button {background-color: #fff; padding: 10px;}
+button {background-color: #fff; padding: 15px;}
 button.btn-primary  {color: #fff; background-color: #337ab7; border: 1px solid #000;font-weight: 700;}
 button.btn-yellow   {color: #fff; background-color: rgb(255, 183, 0); border: 1px solid #000;font-weight: 700;}
 button.btn-gray     {color: #fff; background-color: gray; border: 1px solid #000;font-weight: 700;}
@@ -142,14 +140,14 @@ body.eee {height: 700px; background: #eee;}
 .main .wicon .icon_left {float: left;}
 
 
-input {margin-top: 3px; border: 1px solid #000; margin-top: -2px; height: 36px; font-size: 0.8rem; text-align: left; padding:0 15px;}
-select {margin-top: 3px; border: 1px solid #000; margin-top: -2px; height: 60px; font-size: 1rem; text-align: left; padding:0 15px;}
+input {margin-top: 3px; border: 1px solid #000; margin-top: -2px; height: 60px; font-size: 2rem; text-align: left; padding:0 15px;}
+select {margin-top: 3px; border: 1px solid #000; margin-top: -2px; height: 60px; font-size: 2rem; text-align: left; padding:0 15px;}
 input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 
 /* 공통화면 */
 
-#ITP_WRAPPER header {position: fixed;top: 0;width: 100%;height: 55px;background-color:#92c7f6;align-items: center;border-bottom: 1px solid #000;z-index: 11;}
-#ITP_WRAPPER header .header_wrap {width: 100%; height: 55px; margin: 0 auto;}
+#ITP_WRAPPER header {position: fixed;top: 0;width: 100%;height: 55px;background-color:#92c7f6;align-items: center;margin-bottom: 50px;border-bottom: 1px solid #000;z-index: 10;}
+#ITP_WRAPPER header .header_wrap {width: 100%; height: 45px; margin: 0 auto;}
 #ITP_WRAPPER header .header_wrap .menu_logo button {width: 40px; height: 40px; float: left; padding: 0; background: transparent; border: none; margin-top: 7px; margin-left: 7px;}
 #ITP_WRAPPER header .header_wrap .menu_logo button img {width: 35px; height: 35px; margin: 0; border-radius: 0; border: none;}
 #ITP_WRAPPER header .header_wrap img.brand {float: right; height: 45px; margin: 5px; border-radius: 50%; border: 1px solid #666;}
@@ -191,39 +189,49 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
   padding-top: 50px;
   font-size: 2rem;
 }
-.content {top: 55px; position: fixed; z-index: 10; width:100%; background: #fff;}
-.content .line {position: relative; display: inline-block; width: 100%; height: 50px; margin-bottom: 0px;}
+.content {padding-top: 5%; top: 0px; position: fixed; z-index: 10; width:100%; background: #fff;}
+.content .line {position: relative; display: inline-block; width: 100%; height: 50px; margin-bottom: 50px;}
 .content .line div {font-weight: 700;}
-.content .line label {font-size: 1rem; margin-left: 20px; float: left; text-align: left; margin-top: 15px;}
+<<<<<<< HEAD
+.content .line label {font-size: 1.2rem; margin-left: 10px; float: left; text-align: left; margin-top: 15px;}
+=======
+.content .line label {font-size: 3rem; margin-left: 20px; float: left; width: 320px; text-align: left; margin-top: -15px;}
+>>>>>>> fcba4c6a3bd00921b19895c7e4fb2f7431cf05ab
 .content .line label.col_6{width: 404px;}
-.content .line select.label {border: 1px solid #000; font-size: 1.2rem;margin: 0 10px; float: left; width: 300px; height: 60px; text-align: left; margin-top: 15px;}
+.content .line select.label {border: 1px solid #000; font-size: 2.5rem;margin: 0 10px; float: left; width: 300px; height: 60px; text-align: left; margin-top: -8px;}
 .content .line .search_nm {float: right; margin-right: 2%;}
 .content .line .float_left {float: left;}
 .content .line .float_left.note {width: 100%; padding: 10px;}
 .content .line .float_left.note textarea {width: 100%; height: 300px; border: 1px solid #000; text-align: left;}
 .content .line .float_left div {font-size: 2.4rem; margin-top: -8px;}
-.content .line .float_left_btn {float: left; margin-top: 5px; margin-left: 5px;}
-.content .line .float_left_btn button {padding:0; width:36px; height:36px; border-radius:5px;}
-.content .line .float_left_btn button img {width:20px; height:20px;}
+.content .line .float_left_btn {float: left; margin-top: -1px; margin-left: 5px;}
 .content .line .float_left select {float: left; width: 440px; height: 60px; margin-top: -3px; border: 1px solid #000; font-size: 2rem;}
 .content .line .line_right {font-size: 2rem; float: right; margin-right: 0%;}
-.content .line .line_right div {float: right; font-size: 1.2rem; margin-top: 10px; margin-right: 30px;}
+.content .line .line_right div {float: right; font-size: 2.4rem; margin-top: -10px; margin-right: 30px;}
 .content .line .line_right input {position: relative; text-align: right; margin-right: 30px;}
 .content .line .line_right input.left {text-align: left;}
-.content .line input.date {width: 40%; margin: 10px; height: 40px; float: right; margin-right: 3%;}
+.content .line input.date {width: 40%; margin: -10px; height: 80px; float: right; margin-right: 3%;}
 .content .line input.date2 {width: 350px; height: 60px;}
+<<<<<<< HEAD
+.content .line div.date_to {float: right; margin-right:10px;}
+.content .line div.date_to input.year {width: 120px; height: 30px;}
+.content .line div.date_to div.at {width: 3%;  font-size: 1rem; float: right; display: contents;}
+.content .line .search {width: 100%; height: 50px;}
+.content .line .search button {width: 50%; height: 35px; font-size: 1rem; padding: 0;}
+=======
 .content .line div.date_to {float: left;}
 .content .line div.date_to input.year {width: 300px; margin-top: -10px; height: 60px;}
 .content .line div.date_to div.at {width: 3%;  font-size: 2rem; float: right; display: contents;}
 .content .line .search {width: 100%; height: 150px;}
 .content .line .search button {width: 50%; height: 75px; font-size: 2.4rem; padding: 0;}
+>>>>>>> fcba4c6a3bd00921b19895c7e4fb2f7431cf05ab
 .content .line .search button.col_3 {width: 35%; margin: 0 20px; float: left;}
 .content .line .search button.col_5 {width: 55%; margin: 0 20px; float: right;}
-.content .table_header {margin: 0 auto; width: 100%; height: 50px; background-color: #92c7f6; position: fixed; z-index: 10; border-bottom: 1px solid #000; border-top: 1px solid #000;}
-.content .table_header h1 {margin-top: 12px; margin-left: 10px; font-size: 1.2rem; float: left; color: #fff; font-weight: 100;}
-.content .table_header button {float: right; width: 111px; font-size: 1rem; padding: 5px 20px; margin: 8px;}
+.content .table_header {margin: 0 auto; width: 100%; height: 100px; background-color: #92c7f6; position: fixed; z-index: 10; border-bottom: 1px solid #000; border-top: 1px solid #000;}
+.content .table_header h1 {margin-top: 20px; margin-left: 15px; font-size: 2.2rem; float: left; color: #fff; font-weight: 100;}
+.content .table_header button {float: right; width: 200px; font-size: 2rem; padding: 5px 20px; margin: 20px;}
 
-.detail_content {top: 0px; position: fixed; z-index: 10; width:100%; background: #fff;}
+.detail_content {padding-top: 5%; top: 0px; position: fixed; z-index: 10; width:100%; background: #fff;}
 .detail_content .detail_header {width: 100%; height: 80px;}
 .detail_content .detail_header .detail_logo {float: left;}
 .detail_content .detail_header .detail_logo img {width: 150px; margin-left: 50px;}
@@ -252,8 +260,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
   font-size: 1.8rem;
 } */
 
-.button_bar {width: 100%; height: 60px; background: #ccc; position: fixed; bottom: 0px; border-top: 1px solid #000; border-bottom: 1px solid #000; z-index: 10;}
-.button_bar button.col_3{float: left; height: 60px; font-size: 1.4rem; margin: 0; width: 33.3%; font-weight: 700; border: 1px solid #000; border-radius: 0;}
+.button_bar {width: 100%; height: 120px; background: #ccc; position: fixed; bottom: 0px; border-top: 1px solid #000; border-bottom: 1px solid #000; z-index: 10;}
+.button_bar button.col_3{float: left; height: 120; font-size: 3rem; margin: 0; width: 33.3%; font-weight: 700; border: 1px solid #000; border-radius: 0;}
 .button_bar button.btn-gray {border-radius: 0px; background-color: #666; color: #eee;}
 .button_bar button.btn {height: 120px;}
 .button_bar button.btn_col_3 {width: 35%;}
@@ -264,8 +272,13 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 
 /* scroll_area 조정 */
 .scroll_area {position: absolute; width: 100%; height: 1090px; bottom: 30px; overflow: auto; background: #fff;}
+<<<<<<< HEAD
 .row-1{top: 290px;}
+.row-2{top: 345px;}
+=======
+.row-1{top: 450px;}
 .row-2{top: 550px;}
+>>>>>>> fcba4c6a3bd00921b19895c7e4fb2f7431cf05ab
 .row-3{top: 650px;}
 .row-4{top: 750px;}
 .row-5{top: 850px;}
@@ -274,19 +287,32 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 
 
 
+<<<<<<< HEAD
 .scroll_area li {margin: 5px 3px; list-style: none; width: 99%; height: 100px; border: 1px solid #000; background-color: #fff;}
+.scroll_area li.history_list {height: 180px; }
+=======
+.scroll_area li {margin: 5px; list-style: none; width: 99%; height: 140px; border: 1px solid #000; background-color: #fff;}
 .scroll_area li.history_list {height: 300px; }
+>>>>>>> fcba4c6a3bd00921b19895c7e4fb2f7431cf05ab
 .scroll_area li.history_list .button_right {float: right; display: grid;}
 .scroll_area li.history_list .button_right button {width: 124px; height: 149px; font-size: 2rem; margin: 0; border-radius: 0;}
 .scroll_area li.history_list1 {height: 230px; }
 .scroll_area li.history_list2 {height: 380px;}
 .scroll_area li.history_list3 {height: 330px;}
 .scroll_area li .history_info {width: 240px;}
-.scroll_area li .left {position: relative; float: left; width:50%;}
+<<<<<<< HEAD
+.scroll_area li .left {width:100%; height:30px; margin-top:12px;}
 .scroll_area li .left div {display: inline-block;}
-.scroll_area li .left label{font-size: 1.3rem;}
+.scroll_area li .left label{font-size: 1.1rem;}
 .scroll_area li .left .thick {float:left;  margin: 8px 20px; font-size: 1rem; text-align: left; width: 70%; font-weight: 600;}
-.scroll_area li .left .history {font-weight: 700; font-size: 1.1rem; margin-left: 20px;}
+.scroll_area li .left .history {font-weight: 700; font-size: 1.1rem; margin-top:-2px;}
+=======
+.scroll_area li .left {position: relative; float: left;}
+.scroll_area li .left div {display: inline-block;}
+.scroll_area li .left label{font-size: 2.5rem;}
+.scroll_area li .left .thick {margin: 10px 20px; font-size: 2.2rem; text-align: left; width: 100%; font-weight: 600;}
+.scroll_area li .left .history {font-weight: 700; font-size: 2.4rem; margin-left: 20px;}
+>>>>>>> fcba4c6a3bd00921b19895c7e4fb2f7431cf05ab
 .scroll_area li .left .history input{width: 150px;}
 
 .scroll_area li div {padding: 1px;}
@@ -303,20 +329,32 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .detail_right .detail_info label {margin: 5px 30px; font-size: 2rem;}
 .scroll_area li .detail_right .detail_info div {width: auto; font-size: 2.2rem; font-weight: 700;}
 .scroll_area li .detail_right .detail_info i {width: auto; font-size: 2.2rem; margin: 0 20px;}
-.scroll_area li .left .nomal  {width: 100%; float:left; text-align: left; font-size: 2.2rem;}
+<<<<<<< HEAD
+.scroll_area li .left .nomal  {width: 100%; float:left; text-align: left; font-size: 1.2rem;}
+.scroll_area li .left .nomal .half {width:50%; float:left;}
+.scroll_area li .left .nomal .half label {font-weight:100;}
+=======
+.scroll_area li .left .nomal  {width: 100%; text-align: left; font-size: 2.2rem;}
+>>>>>>> fcba4c6a3bd00921b19895c7e4fb2f7431cf05ab
 .scroll_area li .left .nomal  input{width: 200px;}
 .scroll_area li .left .nomal .scroll_btn {margin-bottom: 10px; min-width: 0;}
 .scroll_area li .left .nomal .scroll_btn button{position: absolute; top: -10px; width: 100px; height: 70px; font-size: 1.8rem; padding: 0; border-radius: 15px; background: rgb(198, 170, 250);}
 
+.scroll_area li .left .nomal span {margin:0 10px;}
+
 .scroll_area li .left .nomal .btn_bar{position: relative; width: auto; font-size: 2.2rem;}
 .scroll_area li .left .nomal .btn_bar button{width: 50px; height: 70px; font-size: 2rem; padding: 0;}
 .scroll_area li .left .nomal .btn_bar .col_0{min-width: auto; margin: 0 50px;}
 
-.scroll_area li .left .nomal .space{ margin-left: 30px; min-width: 100px;}
-.scroll_area li .left .nomal .space0{ margin-left: 30px; width: auto;}
+.scroll_area li .left .nomal .space{ margin-left: 40px; min-width: 100px;}
+.scroll_area li .left .nomal .space0{ margin-left: 40px; width: auto;}
 .scroll_area li .left .nomal .space1{ margin-left: 0px; width: 200px;}
 .scroll_area li .left .nomal .space2 {width: 120px; display: inline-flex; font-size: 2.4rem; margin-right: 30px; font-weight: 700;}
+<<<<<<< HEAD
+.scroll_area li .left .nomal label{position:relative; margin-left: 10px;}
+=======
 .scroll_area li .left .nomal label{margin-left: 10px; width: 230px; display: inline-flex;}
+>>>>>>> fcba4c6a3bd00921b19895c7e4fb2f7431cf05ab
 .scroll_area li .left .nomal label.sub_info{width: 168px; display: inline-flex;}
 .scroll_area li .left .nomal label.col_0{width: auto;}
 .scroll_area li .left .nomal label.col_1{width: 180px;}
@@ -324,7 +362,14 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal label.col_6{width: 250px;}
 .scroll_area li .left .nomal label.col_7{width: 280px;}
 .scroll_area li .left .nomal i{width: 50px; text-align: center;}
-.scroll_area li .left .nomal div{display: inline-flex; font-weight: 700; font-size: 1.2rem;}
+<<<<<<< HEAD
+.scroll_area li .left .nomal div{display: inline-flex; font-weight: 700; font-size: 1.1rem;}
 .scroll_area li .right {margin: 30px 20px 0 0; position: relative; display: flex; font-size: 1.4rem; font-weight: 700; float: right;}
 .scroll_area li .right .num {margin: 0 25px; width: auto;}
 .scroll_area li .right button {margin: -6px; padding:0px 7px; font-size: 1.5rem; border-radius: 0px;}
+=======
+.scroll_area li .left .nomal div{min-width: 168px; display: inline-flex; font-weight: 700; font-size: 2.4rem;}
+.scroll_area li .right {margin: 40px; position: relative; display: flex; font-size: 2rem; font-weight: 700; float: right;}
+.scroll_area li .right .num {margin: 0 40px; width: auto;}
+.scroll_area li .right button {margin: -12px; padding: 20px; font-size: 1.5rem; border-radius: 0px;}
+>>>>>>> fcba4c6a3bd00921b19895c7e4fb2f7431cf05ab

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

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

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

@@ -1,14 +1,198 @@
+
+const MAIN_NOTICE_GRID_ID = '#ITP_MAIN_NOTICE_jqGrid';
+const MAIN_NOTICE_GRID_LIST = '#ITP_MAIN_NOTICE_jqGrid_list';
+const MAIN_NOTICE_GRID_PAGER = '#ITP_MAIN_NOTICE_jqGridPager';
+const MAIN_NOTICE_GRID_EMPTY = '#ITP_MAIN_NOTICE_jqGridEmpty';
+
+let NTICE_DETAIL_GRID_LIST = '/api/ntice/detail-grid-list';
+
 require(['config'], function() {
 	require([
 		'jquery'
 	], function($) {
-
+		
 		setTimeout(function() {
-		}, 100);
+			// // 시간지정
+			// $('#ITP_FORM_MAIN_NOTICE_SEARCH_SCH_DT').val(itp_fn_date_format(new Date(), 2));
+			// $('#ITP_FORM_MAIN_NOTICE_SEARCH_USER_ID').val(USER_ID);
+			//
+	    	// // Barcode
+			// itp_fn_barcode.init();
 
+		}, 100);
+				
 	});
 });
 
+var itp_fn_mobile_MAIN_MENU = {
+	init: function() {
+		this.topMenuMake();
+		this.button();
+	},
+	button: function() {
+		var _this = this;
+		$(document).on('click', '.manage_btn_bar button', function() {
+			$('#ITP_CONTAINER').empty();
+			_this.subMenuMake($(this).data('top-menu'));
+		});
+		$(document).on('click', '#ITP_CONTAINER button', function() {
+			console.log('===> ' + $(this).data('sub-menu'));
+		});
+	},
+	topMenuMake: function() {
+		var _this = this;
+		var topMenuCnt = 0;
+		$.each(AUTH_MENU_LIST, function(key, value) {
+			if(value.topMenuNo === 200) {
+				topMenuCnt++;
+			}
+		});
+		console.log(topMenuCnt);
+		$.each(AUTH_MENU_LIST, function(key, value) {
+			if(value.topMenuNo === 200) {
+				var menuDIV = 	'<div class="manage col_' + topMenuCnt + '">' +
+								'	<button data-top-menu="' + value.menuNo + '">' + value.menuNm + '</button>' +
+								'</div>';
+				$('.manage_btn_bar').append(menuDIV);
+				if(key === 0) {
+					_this.subMenuMake(value.menuNo);
+				}
+			}
+		});
+	},
+	subMenuMake: function(topMenuNo) {
+		var seq = 0;
+		var pos = 'icon_left';
+		var menuDIV = '<div class="wicon">\n';
+		$.each(AUTH_MENU_LIST, function(key, value) {
+			if(value.topMenuNo === topMenuNo) {
+				if(seq > 0 && seq % 2 === 0) {
+					menuDIV += '</div>\n';
+					menuDIV += '<div class="wicon">\n';
+					pos = 'icon_left';
+				}
+				menuDIV += 	'	<div class="' + pos + '">\n' +
+							'		<button data-sub-menu="' + value.menuNo + '">\n' +
+							'			<label>ICON<br>' + value.menuNm + '</label>\n' +
+							'		</button>\n' +
+							'	</div>\n';
+				seq++;
+				pos = 'icon_right';
+			}
+		});
+		menuDIV += '</div>';
+		$('#ITP_CONTAINER').append(menuDIV);
+	}
+};
+
+var itp_fn_MAIN_NOTICE_grid = {
+	init: function() {
+		// 데이터 없을때
+		itp_fn_MAIN_NOTICE_empty.push();
+		$(MAIN_NOTICE_GRID_EMPTY).on('click', function() {
+			itp_fn_MAIN_NOTICE_empty.back();
+			itp_MAIN_NOTICE_param.gridSize = $.jgrid.defaults.rowNum;
+			$(MAIN_NOTICE_GRID_ID).setGridParam({'postData': JSON.stringify(itp_MAIN_NOTICE_param)}).trigger('reloadGrid');
+		});
+	},
+	callBack: function() {
+		let param = $('#ITP_FORM_MAIN_NOTICE_SEARCH').serializeObject();
+		param.gridSize = $.jgrid.defaults.rowNum;
+		$(MAIN_NOTICE_GRID_ID).jqGrid({
+			colModel: [
+				{
+					index: 'NTICE_NO', name: 'nticeNo',
+					label: ITP_MSG_LOCALE.label.notiNo, //공지번호
+					width: '10', fixed: false, align: 'center',
+					sortable: false, hidden: false
+				},
+				{
+					index: 'NTICE_TITL', name: 'nticeTitl',
+					label: '공지사항', //공지제목
+					width: '15', fixed: false, align: 'center',
+					sortable: false, hidden: false
+				},
+				{
+					index: 'ADD_DT', name: 'addDt',
+					label: ITP_MSG_LOCALE.label.regDt, //등록일
+					width: '10', fixed: false, align: 'center',
+					sortable: false, hidden: false
+				}
+			],
+			loadBeforeSend: function(jqXHR) {
+			    jqXHR.setRequestHeader('X-AUTH-TOKEN', CONN_KEY);
+			},
+			postData: JSON.stringify(param),
+			url: DOMAIN + NTICE_DETAIL_GRID_LIST,
+			pager: MAIN_NOTICE_GRID_PAGER,
+			multiselect: false,
+			rownumbers: true,
+			onCellSelect: function(rowId, cellIdx, cellValue) {
+				var cm = $(this).jqGrid('getGridParam', 'colModel');
+				var colNm = cm[cellIdx].name;
+				if (colNm == 'nticeTitl') {
+					const nticeNoVal = $(this).jqGrid('getCell', rowId, 'nticeNo');
+					const key = {nticeNo: nticeNoVal, viewCd: 'R'};
+					var param = $.param(key);
+					// itp_fn_MAIN_NOTICE_view(param);
+					
+					fn_call_popup('comm', 'NOTICE_INFO_POPUP', '#ITP_ASIDE', function() {
+												
+					}, param, 'S');
+					$('#ITP_NOTICE_INFO_POPUP > div.modal-dialog').width('500px');
+				}
+		   	},
+			loadComplete: function(data) {
+				//console.log(JSON.stringify(data));
+				itp_fn_grid_load_complete(data, MAIN_NOTICE_GRID_ID, true, 'number', 'MAIN_NOTICE', itp_MAIN_NOTICE_search, itp_fn_MAIN_NOTICE_empty, false, data.gridRecords, false);
+				var ids = $(MAIN_NOTICE_GRID_ID).getDataIDs();
+				$.each(ids, function(idx, rowId) {
+					$(MAIN_NOTICE_GRID_ID).jqGrid('setCell', rowId, 'nticeTitl', '', ITP_GRID_COL_STYLE.link);
+				});
+
+				if ($('#ITP_CONTAINER').data('openYn') == 'Y') {
+					$('#ITP_CONTAINER').data('openYn', 'N');
+					const keyNew = {nticeNo: $('#ITP_CONTAINER').data('nticeNo'), viewCd: 'R'};
+					var paramNew = $.param(keyNew);
+					itp_fn_MAIN_NOTICE_view(paramNew);
+				}
+		    },
+		    loadError: function(jqXHR, textStatus, errorThrown) {
+		    	itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);
+		    },
+		    onPaging: function(action) {
+		    	itp_fn_grid_paging(MAIN_NOTICE_GRID_ID, action, param);
+		    }
+		}).navGrid(MAIN_NOTICE_GRID_PAGER, ITP_GRID_NAV_DEFAULTS.navGrid);
+	},
+	clearData : function() {
+		$(MAIN_NOTICE_GRID_ID).jqGrid('clearGridData', true);
+		$(MAIN_NOTICE_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
+		$(MAIN_NOTICE_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
+		$(MAIN_NOTICE_GRID_EMPTY).show();
+	},
+	unload : function() {
+		$.jgrid.gridUnload(MAIN_NOTICE_GRID_ID);
+	}
+};
+
+var itp_fn_MAIN_NOTICE_search = function() {
+	itp_fn_MAIN_NOTICE_grid.unload();
+	itp_fn_MAIN_NOTICE_grid.callBack();
+};
+
+let itp_MAIN_NOTICE_param = {};
+let itp_MAIN_NOTICE_search = false;
+var itp_fn_MAIN_NOTICE_empty = {
+	push: function() {		
+		let param = $('#ITP_FORM_MAIN_NOTICE_SEARCH').serializeObject();
+		itp_MAIN_NOTICE_param = param;
+	},
+	back: function() {
+		
+	}
+};
+
 var itp_fn_barcode = {
 	init: function () {
 		this.event();