정산현황 화면 개선

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

@@ -98,6 +98,28 @@
 												</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">
@@ -110,20 +132,10 @@
 													</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>
@@ -136,14 +148,6 @@
 											</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/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);
+		$('#ITP_FORM_SETTMNG02010_DETAIL .fnSttlRjctRsn').text(result.sttlRjctRsn == null ? '' : 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

@@ -483,10 +483,14 @@ let modifyObj = {
 		
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnBrandNm').text(result.brandNm);
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnStoreNm').text(result.storeNm);
-		$('#ITP_FORM_SETTMNG03010_DETAIL_STTL_DT').val(result.sttlDt);  // 정산일자
+		
+		$('#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 .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);