정산현황

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

@@ -17,11 +17,11 @@
 							<div class="col-xs-12">
 								<form id="ITP_FORM_SETTMNG01010_SEARCH" class="form-horizontal">
 									<input type="hidden" id="ITP_FORM_SETTMNG01010_SEARCH_BRAND_ID" name="sbrandId" value="">
-									<input type="hidden" id="ITP_FORM_SETTMNG01010_SEARCH_STORE_ID" name="sstoreId" value="STR221000006">
+									<input type="hidden" id="ITP_FORM_SETTMNG01010_SEARCH_STORE_ID" name="sstoreId" value="">
 								
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_SETTMNG01010_SEARCH_STORE_NM" class="form-control itp_input" name="sstoreNm" placeholder="매장선택" readonly="readonly" value="매장가맹4" />
+											<input type="text" id="ITP_FORM_SETTMNG01010_SEARCH_STORE_NM" class="form-control itp_input" name="sstoreNm" placeholder="매장선택" readonly="readonly" value="" />
 										</div>
 										<div class="col-xs-1 itp_ip itp_noMar">
 											<button type="button" id="ITP_BTN_SETTMNG01010_STORE_SEARCH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>

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

@@ -18,24 +18,26 @@
 								<input type="hidden" id="ITP_FORM_SETTMNG03010_SEARCH_BRAND_ID" name="sbrandId" value="">
 								<input type="hidden" id="ITP_FORM_SETTMNG03010_SEARCH_STORE_ID" name="sstoreId" value="">
 								<input type="hidden" id="ITP_FORM_SETTMNG03010_SEARCH_SPPLY_ID" name="sspplyId" value="">
+								<input type="hidden" id="ITP_FORM_SETTMNG03010_SEARCH_STORE_SPPLY_GUBUN" name="sgubun" value="1">
 								
 									<div class="form-group">
+										<!--  
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<select id="ITP_FORM_SETTMNG03010_SEARCH_STORE_SPPLY_GUBUN" class="form-control itp_input" name="sgubun">
 												<option value="1">매장</option>											
 												<option value="2">공급업체</option>											
 											</select>
 										</div>
+										-->
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_SETTMNG03010_SEARCH_STORE_SPPLY_NM" class="form-control itp_input" placeholder="매장명" />
+											<input type="text" id="ITP_FORM_SETTMNG03010_SEARCH_STORE_SPPLY_NM" class="form-control itp_input" placeholder="매장명" readonly="readonly" />
 										</div>
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
 											<button type="button" id="ITP_BTN_SETTMNG03010_SEARCH_STORE_POP" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
 											<button type="button" id="ITP_BTN_SETTMNG03010_SEARCH_ERASE" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
-									</div>
-									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
-										<div class="col-xs-1 itp_ip itp_noMar" style="top:3px; margin-right: -15px;" >
+						                
+						                <div class="col-xs-1 itp_ip itp_noMar" style="top:3px; margin-right: -15px;" >
 											<label>정산요청일</label>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
@@ -48,10 +50,16 @@
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<select id="ITP_FORM_SETTMNG03010_SEARCH_STTL_ST_CD" data-select-code="STTL_ST_CD" class="form-control itp_input" name="ssttlStCd"></select>
 										</div>
+										<!--  
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_SETTMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목명" />
 										</div>
+										-->						                
+									</div>
+									<!--  
+									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">										
 									</div>
+									-->
 								</form>
 							</div>
 						</div>
@@ -70,6 +78,10 @@
 						<div class="col-xs-12">
 							<form id="ITP_FORM_SETTMNG03010_DETAIL" class="form-horizontal">
 								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_VIEW_CD" name="viewCd" value="C">
+								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_BRAND_ID" name="brandId" value="">
+								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_STORE_ID" name="storeId" value="">
+								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_SPPLY_ID" name="spplyId" value="">
+								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_STTL_MGNT_UNQ_NO" name="sttlMgntUnqNo" value="">
 					
 								<section class="itp_form_sec">
 									<h4 class="itp_form_tit">정산 상세정보</h4>
@@ -89,35 +101,38 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">정산일자</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-6 itp_in">
-													<div class="input-daterange input-group date">
-														<input type="text" id="ITP_FORM_SETTMNG03010_DETAIL_STTL_DT" class="form-control itp_input" name="sttlDt" value="">
-													</div>				
-												</div>							
+												<div class="col-xs-5 itp_in">
+													<div class="input-group date">
+													<input type="text" id="ITP_FORM_SETTMNG03010_DETAIL_STTL_DT" class="form-control itp_input" name="sttlDt" readonly="readonly">
+													<span class="input-group-addon itp_input itp_date_to">
+														<i class="glyphicon glyphicon-calendar"></i>
+													</span>
+													</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 "></div>
+												<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 "></div>
+												<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 "></div>
+												<div class="col-xs-8 itp_in fnAcctBal"></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 fnRegDttm"></div>
+												<div class="col-xs-10 itp_in fnSysRegDttm"></div>
 											</div>
 											<label class="col-xs-2 itp_lb">등록자</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-8 itp_in fnRegId"></div>
+												<div class="col-xs-8 itp_in fnSysRegNm"></div>
 											</div>
 										</div>
 									</div>
@@ -125,7 +140,7 @@
 										<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 fnDsptRjctRsn"></div>
+												<div class="col-xs-10 itp_in"></div>
 											</div>
 										</div>
 									</div>

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

@@ -265,7 +265,7 @@ let pageObj = {
 			LOGIN_AUTH_TYPE_CD = fn_make_user_info.get('authTpCd'); // 권한타입
 			if(LOGIN_AUTH_TYPE_CD == '50') {
 				$('#ITP_FORM_SETTMNG03010_SEARCH_STORE_ID').val(fn_make_user_info.get('storeId'));
-				$('#ITP_FORM_SETTMNG03010_SEARCH_STORE_NM').val(fn_make_user_info.get('storeNm'));	
+				$('#ITP_FORM_SETTMNG03010_SEARCH_STORE_SPPLY_NM').val(fn_make_user_info.get('storeNm'));	
 			}
 			
 		},
@@ -337,11 +337,11 @@ let pageObj = {
 			$('#ITP_BTN_SETTMNG03010_REQUEST').hide();
 			
 			if(LOGIN_AUTH_TYPE_CD == '50') { // 매장관리자
-				$('#ITP_BTN_SETTMNG03010_STORE_SEARCH').hide();
-				$('#ITP_BTN_SETTMNG03010_STORE_ERASE').hide();
+				$('#ITP_BTN_SETTMNG03010_SEARCH_STORE_POP').hide();
+				$('#ITP_BTN_SETTMNG03010_SEARCH_ERASE').hide();
 			} else {
-				$('#ITP_BTN_SETTMNG03010_STORE_SEARCH').show();
-				$('#ITP_BTN_SETTMNG03010_STORE_ERASE').show();
+				$('#ITP_BTN_SETTMNG03010_SEARCH_STORE_POP').show();
+				$('#ITP_BTN_SETTMNG03010_SEARCH_ERASE').show();
 			}
 			
 			fn_show_btn_auth('#ITP_BTN_SETTMNG03010_SRH');
@@ -483,9 +483,9 @@ let modifyObj = {
 		
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnBrandNm').text(result.brandNm);
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnStoreNm').text(result.storeNm);
-		$('#ITP_FORM_SETTMNG03010_DETAIL_STTL_REQ_DT').val(result.sttlReqDt);
+		$('#ITP_FORM_SETTMNG03010_DETAIL_STTL_DT').val(result.sttlDt);  // 정산일자
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlStNm').text(result.sttlStNm);
-		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlReqAmt').text(itp_fn_number_comma(result.sttlReqAmt));
+		$('#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);