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

src/main/webapp/css/style.css

@@ -571,9 +571,13 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
 #ITP_FOOTER .itp_modal .itp_form .input-daterange .input-group-addon {padding:3px 5px;}
 #ITP_FOOTER .itp_modal .itp_form .itp_date_to {background:#fff;}
 #ITP_FOOTER .itp_modal .itp_form .itp_lb.itp_required:before {content:'*'; color:#a94442; position:absolute; top:8px; left:8px;}
-#ITP_FOOTER .modal-body .itp_alt_box {display:inline-flex;}
-#ITP_FOOTER .modal-body .itp_alt_box label {text-align:left; min-width:80px;}
-#ITP_FOOTER .modal-body .itp_alt_box div {text-align:right; width:100px;}
+#ITP_FOOTER .modal-body .itp_alt_box {display:inline-flex; border:2px solid #ccc; border-bottom:none;}
+#ITP_FOOTER .modal-body .itp_alt_box.border {border-bottom:1px solid #ccc;}
+#ITP_FOOTER .modal-body .itp_alt_box .itp_label_area {width:100px; height:40px; padding:10px; text-align:left; background:#f5f5f5;}
+#ITP_FOOTER .modal-body .itp_alt_box .itp_label_area label {text-align:left; min-width:80px;}
+#ITP_FOOTER .modal-body .itp_alt_box .itp_info_area {border-left:1px solid #ccc; width:210px;}
+#ITP_FOOTER .modal-body .itp_alt_box .itp_info_area div {text-align: left; width:auto; padding:10px;}
+#ITP_FOOTER .modal-body .error_info {margin-top:15px;}
 #ITP_FOOTER .modal.in .modal-dialog {
     -webkit-transform:translate(0, calc(50vh - 50%));
     -ms-transform:translate(0, 50vh) translate(0, -50%);
@@ -592,7 +596,7 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
 #ITP_ASIDE .itp_modal .itp_form .shot{height:43px !important; border-bottom:1px solid #aaa;}
 #ITP_ASIDE .itp_modal .itp_form .form-group.border {border-bottom:1px solid #ddd;}
 #ITP_ASIDE .itp_modal .itp_form .form-control {font-size:13px; color:#333;}
-#ITP_ASIDE .itp_modal .itp_form .itp_lb {top:0; font-size:13px; margin:0; padding:13px 12px; height:44px; background:#eee; width:100px; min-width:100px; border-right:1px solid #aaa; border-left:1px solid #ccc;}
+#ITP_ASIDE .itp_modal .itp_form .itp_lb {top:0; font-size:13px; margin:0; padding:13px 12px; height:44px; background:#eee; width:125px; min-width:100px; border-right:1px solid #aaa; border-left:1px solid #ccc;}
 #ITP_ASIDE .itp_modal .itp_form .itp_lb.itp_normal {font-weight:normal; padding-left:19px;}
 #ITP_ASIDE .itp_modal .itp_form .itp_ip {padding:9px 10px 0 10px;;}
 #ITP_ASIDE .itp_modal .itp_form .itp_ip.itp_pr {margin-right:0; padding-right:10px;}

src/main/webapp/js/app/config.js

@@ -2456,7 +2456,36 @@ function itp_fn_modal_confirm_req3(param, fn, args) {
 		});
 	}
 };
-
+//선불매장결제확인-임시저장
+function itp_fn_modal_confirm_req4(param, fn, args) {
+	$('#ITP_MODAL_ALERT_SAVE_ADV_CANCEL').show();
+	$('#ITP_MODAL_SAVE_ADV_ALERT').modal('show');
+	$('#ITP_MODAL_SAVE_ADV_ALERT').find('.fnDlvReqDt').html(param.dlvReqDt);
+	$('#ITP_MODAL_SAVE_ADV_ALERT').find('.fnItemcnt').html(param.itemcnt + " 개");
+	$('#ITP_MODAL_SAVE_ADV_ALERT').find('.fnDlvReqAmt').html(param.dlvReqAmt + " 원");
+	if (fn !== undefined || typeof fn !== 'undefined') {
+		$('#ITP_MODAL_ALERT_SAVE_ADV_CONFIRM').off('click');
+		$('#ITP_MODAL_ALERT_SAVE_ADV_CONFIRM').on('click', function() {
+			fn.callBack(args);
+			$('#ITP_MODAL_ADV_ALERT').modal('hide');
+		});
+	}
+};
+//구매한도부족알림-임시저장
+function itp_fn_modal_confirm_req5(param, fn, args) {
+	$('#ITP_MODAL_ALERT_SAVE_LM_CANCEL').show();
+	$('#ITP_MODAL_SAVE_LM_ALERT').modal('show');
+	$('#ITP_MODAL_SAVE_LM_ALERT').find('.fnDlvReqDt').html(param.dlvReqDt);
+	$('#ITP_MODAL_SAVE_LM_ALERT').find('.fnItemcnt').html(param.itemcnt + " 개");
+	$('#ITP_MODAL_SAVE_LM_ALERT').find('.fnDlvReqAmt').html(param.dlvReqAmt + " 원");
+	if (fn !== undefined || typeof fn !== 'undefined') {
+		$('#ITP_MODAL_ALERT_SAVE_LM_CONFIRM').off('click');
+		$('#ITP_MODAL_ALERT_SAVE_LM_CONFIRM').on('click', function() {
+			fn.callBack(args);
+			$('#ITP_MODAL_LM_ALERT').modal('hide');
+		});
+	}
+};
 function itp_fn_form_clear_validate(modal, form) {
 	$(form).find('.itp_ip').removeClass('has-error');
 	$(form).find('.help-block').remove();

src/main/webapp/main.html

@@ -305,33 +305,42 @@
 						</div>
 						<div class="modal-bottom">
 							<button type="button" class="btn btn-default col_4" id="ITP_MODAL_ALERT_CANCEL" data-dismiss="modal">취소</button>
-							<button type="button" class="btn btn-primary col_6" id="ITP_MODAL_ALERT_CONFIRM">확인</button>
+							<button type="button" class="btn btn-primary col_10" id="ITP_MODAL_ALERT_CONFIRM">확인</button>
 						</div>
 					</div>
 				</div>
 			</div>
-			<!-- 구매요청확인 -->
+			<!-- 구매요청확인 --><!-- ITP_MODAL_PR_ALERT -->
 			<div id="ITP_MODAL_PR_ALERT" class="modal itp_modal">
-				<div class="modal-dialog modal-xs">
+				<div class="modal-dialog modal-md">
 					<div class="modal-content">
 						<div class="modal-body">
-							<div class="text-center" style="margin-top:10px;">
+							<div class="text-left" style="margin-top:10px;">
 								<div class="itp_alt_box">
-									<label>납품요청일</label>
-									<span>:</span>
-									<div class="fnDlvReqDt"></div>
+									<div class="itp_label_area">
+										<label>납품요청일</label>
+									</div>
+									<div class="itp_info_area">
+										<div class="fnDlvReqDt"></div>
+									</div>
 								</div>
 								<div class="itp_alt_box">
-									<label>품목수</label>
-									<span>:</span>
-									<div class="fnItemcnt"></div>
+									<div class="itp_label_area">
+										<label>품목수</label>
+									</div>
+									<div class="itp_info_area">
+										<div class="fnItemcnt"></div>
+									</div>
 								</div>
-								<div class="itp_alt_box">
-									<label>구매금액</label>
-									<span>:</span>
-									<div class="fnPchReqAmt"></div>
+								<div class="itp_alt_box border">
+									<div class="itp_label_area">
+										<label>구매금액</label>
+									</div>
+									<div class="itp_info_area">
+										<div class="fnPchReqAmt"></div>
+									</div>
 								</div>
-								<label style="margin:10px 0;">구매요청 하시겠습니까?</label>
+								<label class="error_info">구매요청 하시겠습니까?</label>
 							</div>
 						</div>
 						<div class="modal-bottom">
@@ -341,28 +350,37 @@
 					</div>
 				</div>
 			</div>
-			<!-- 선불매장결제확인 -->
+			<!-- 선불매장결제확인 --><!-- ITP_MODAL_ADV_ALERT -->
 			<div id="ITP_MODAL_ADV_ALERT" class="modal itp_modal">
-				<div class="modal-dialog modal-sm">
+				<div class="modal-dialog modal-md">
 					<div class="modal-content">		
 						<div class="modal-body">
-							<div class="text-center">
+							<div class="text-left">
 								<div class="itp_alt_box">
-									<label>납품요청일</label>
-									<span>:</span>
-									<div class="fnDlvReqDt"></div>
+									<div class="itp_label_area">
+										<label>납품요청일</label>
+									</div>
+									<div class="itp_info_area">
+										<div class="fnDlvReqDt"></div>
+									</div>
 								</div>
 								<div class="itp_alt_box">
-									<label>품목수</label>
-									<span>:</span>
-									<div class="fnItemcnt"></div>
+									<div class="itp_label_area">
+										<label>품목수</label>
+									</div>
+									<div class="itp_info_area">
+										<div class="fnItemcnt"></div>
+									</div>
 								</div>
-								<div class="itp_alt_box">
-									<label>추가결재금액</label>
-									<span>:</span>
-									<div class="fnDlvReqAmt"></div>
+								<div class="itp_alt_box border">
+									<div class="itp_label_area">
+										<label>구매금액</label>
+									</div>
+									<div class="itp_info_area">
+										<div class="fnPchReqAmt"></div>
+									</div>
 								</div>
-								<label style="margin:10px 0;">선불매장이므로 결재를 하셔야 구매요청이 진행이 됩니다.<br>결재를 하시겠습니까?</label>
+								<label class="error_info">선불매장이므로 결재를 하셔야<br> 구매요청이 진행이 됩니다.<br>결재를 하시겠습니까?</label>
 							</div>
 						</div>
 						<div class="modal-bottom">
@@ -372,28 +390,37 @@
 					</div>
 				</div>
 			</div>
-			<!-- 구매한도부족알림 -->
+			<!-- 구매한도부족알림 --><!-- ITP_MODAL_LM_ALERT -->
 			<div id="ITP_MODAL_LM_ALERT" class="modal itp_modal">
-				<div class="modal-dialog modal-sm">
+				<div class="modal-dialog modal-md">
 					<div class="modal-content">
 						<div class="modal-body">
-							<div class="text-center">
+							<div class="text-left">
 								<div class="itp_alt_box">
-									<label>납품요청일</label>
-									<span>:</span>
-									<div class="fnDlvReqDt"></div>
+									<div class="itp_label_area">
+										<label>납품요청일</label>
+									</div>
+									<div class="itp_info_area">
+										<div class="fnDlvReqDt"></div>
+									</div>
 								</div>
 								<div class="itp_alt_box">
-									<label>품목수</label>
-									<span>:</span>
-									<div class="fnItemcnt"></div>
+									<div class="itp_label_area">
+										<label>품목수</label>
+									</div>
+									<div class="itp_info_area">
+										<div class="fnItemcnt"></div>
+									</div>
 								</div>
-								<div class="itp_alt_box">
-									<label>추가결재금액</label>
-									<span>:</span>
-									<div class="fnDlvReqAmt"></div>
+								<div class="itp_alt_box border">
+									<div class="itp_label_area">
+										<label>구매금액</label>
+									</div>
+									<div class="itp_info_area">
+										<div class="fnPchReqAmt"></div>
+									</div>
 								</div>
-								<label style="margin:10px 0; line-height: 1.5;">구매한도가 부족합니다.<br>선결재를 하신 후에 구매요청을 하시기 바랍니다. 결재 버튼을 누르시면 임시 저장 후 결재가 진행이 됩니다. <br>결재를 하시겠습니까?</label>
+								<label class="error_info" style="line-height: 1.5;">구매한도가 부족합니다.<br>선결재를 하신 후에 구매요청을 하시기 바랍니다.<br>결재 버튼을 누르시면 임시 저장 후 결재가 진행이 됩니다.<br>결재를 하시겠습니까?</label>
 							</div>						
 						</div>
 						<div class="modal-bottom">
@@ -402,7 +429,87 @@
 						</div>
 					</div>
 				</div>
-			</div>			
+			</div>		
+			<!-- 임시저장-선불매장결제확인 --><!-- ITP_MODAL_SAVE_ADV_ALERT -->
+			<div id=ITP_MODAL_SAVE_ADV_ALERT class="modal itp_modal">
+				<div class="modal-dialog modal-md">
+					<div class="modal-content">		
+						<div class="modal-body">
+							<div class="text-left">
+								<div class="itp_alt_box">
+									<div class="itp_label_area">
+										<label>납품요청일</label>
+									</div>
+									<div class="itp_info_area">
+										<div class="fnDlvReqDt"></div>
+									</div>
+								</div>
+								<div class="itp_alt_box">
+									<div class="itp_label_area">
+										<label>품목수</label>
+									</div>
+									<div class="itp_info_area">
+										<div class="fnItemcnt"></div>
+									</div>
+								</div>
+								<div class="itp_alt_box border">
+									<div class="itp_label_area">
+										<label>구매금액</label>
+									</div>
+									<div class="itp_info_area">
+										<div class="fnPchReqAmt"></div>
+									</div>
+								</div>
+								<label class="error_info">선불매장이므로 입급을 하시고, 입금등록 후 브랜드에서 승인이 되어야 구매요청을 하실 수 있습니다.</label>
+							</div>
+						</div>
+						<div class="modal-bottom">
+							<button type="button" class="btn btn-default col_4" id="ITP_MODAL_ALERT_SAVE_ADV_CANCEL" data-dismiss="modal">취소</button>
+							<button type="button" class="btn btn-primary col_6" id="ITP_MODAL_ALERT_SAVE_ADV_CONFIRM">임시저장</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			<!-- 임시저장-구매한도부족알림 --><!-- ITP_MODAL_SAVE_LM_ALERT -->
+			<div id="ITP_MODAL_SAVE_LM_ALERT" class="modal itp_modal">
+				<div class="modal-dialog modal-md">
+					<div class="modal-content">
+						<div class="modal-body">
+							<div class="text-left">
+								<div class="itp_alt_box">
+									<div class="itp_label_area">
+										<label>납품요청일</label>
+									</div>
+									<div class="itp_info_area">
+										<div class="fnDlvReqDt"></div>
+									</div>
+								</div>
+								<div class="itp_alt_box">
+									<div class="itp_label_area">
+										<label>품목수</label>
+									</div>
+									<div class="itp_info_area">
+										<div class="fnItemcnt"></div>
+									</div>
+								</div>
+								<div class="itp_alt_box border">
+									<div class="itp_label_area">
+										<label>구매금액</label>
+									</div>
+									<div class="itp_info_area">
+										<div class="fnPchReqAmt"></div>
+									</div>
+								</div>
+								<label class="error_info" style="line-height: 1.5;">구매한도가 부족합니다.<br>선입금을 하시고, 입금등록 후 브랜드에서 승인이 되어야 구매요청을 하실 수 있습니다.</label>
+							</div>						
+						</div>
+						<div class="modal-bottom">
+							<button type="button" class="btn btn-default col_4" id="ITP_MODAL_ALERT_SAVE_LM_CANCEL" data-dismiss="modal">취소</button>
+							<button type="button" class="btn btn-primary col_6" id="ITP_MODAL_ALERT_SAVE_LM_CONFIRM">임시저장</button>
+						</div>
+					</div>
+				</div>
+			</div>
 			<!-- 결제확인 -->
 			<div id="ITP_MODAL_ALERT_AJAX" class="modal itp_modal">
 				<div class="modal-dialog modal-sm">
@@ -414,8 +521,8 @@
 						<div class="modal-body">
 							<div class="text-center itp_alert_txt"></div>
 						</div>
-						<div class="modal-footer">
-							<button type="button" class="btn btn-primary" id="ITP_MODAL_ALERT_AJAX_CONFIRM">확인</button>
+						<div class="modal-bottom">
+							<button type="button" class="btn btn-primary col_10" id="ITP_MODAL_ALERT_AJAX_CONFIRM">확인</button>
 						</div>
 					</div>
 				</div>