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

# Conflicts:
#	src/main/webapp/js/app/pomng/ITP_POMNG01010.js

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

@@ -27,7 +27,7 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-4 itp_in fnBrandNm"></div>
+												<div class="col-xs-10 itp_in fnBrandNm"></div>
 											</div>
 											<label class="col-xs-2 itp_lb">구매요청번호</label>
 											<div class="col-xs-4 itp_ip ">

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

@@ -1,43 +0,0 @@
-<div id="ITP_BIZPOP_DLV_LMT_PAY" class="modal itp_modal">
-	<div class="modal-dialog" style="width:350px;">
-		<div class="modal-content">
-			<form id="ITP_FORM_BIZPOP_DLV_LMT_PAY">
-				<input type="hidden" id="ITP_FORM_BIZPOP_DLV_LMT_PAY_BRAND_ID" name="sbrandId" value="">
-				<div class="modal-body">
-					<div class="itp_form fix">
-						<div class="col-xs-12 itp_form_inline">
-							<div class="form-horizontal fix">
-								<div style="margin:25px 0;">
-									<div class="itp_div_label">
-										<label>납품요청일</label>
-										<span>:</span>
-										<div class="fnDlvReqDt col_a">2022.09.30</div>
-									</div>
-									<div class="itp_div_label">
-										<label>품목수</label>
-										<span>:</span>
-										<div class="fnPchReqQty col_a">2개</div>
-									</div>
-									<div class="itp_div_label">
-										<label>구매금액</label>
-										<span>:</span>
-										<div class="fnPchReqAmt col_a">424,000원</div>
-									</div>
-								</div>
-								<label style="text-align:left; width:100%;">구매한도가 부족합니다.</label>
-								<label style="text-align:left; width:100%;">선결재를 하신 후에 구매요청을 하시기 바랍니다. 결재 버튼을 누르시면 임시 저장 후 결재가 진행이 됩니다.</label>
-								<label style="text-align:center; width:100%; margin-top:10px;">결재를 하시겠습니까?</label>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="modal-bottom">
-					<button type="button" class="col_3 btn btn-default" id="ITP_MODAL_ALERT_CANCEL" data-dismiss="modal">취소</button>
-					<button type="button" class="col_7 btn btn-primary" id="ITP_MODAL_ALERT_PAYMENT">결제</button>
-				</div>
-			</form>
-		</div>
-	</div>
-
-	<div id="ITP_POPUP_JS"></div>
-</div>

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

@@ -1,40 +0,0 @@
-<div id="ITP_BIZPOP_DLV_PCH_OK" class="modal itp_modal">
-	<div class="modal-dialog" style="width:350px;">
-		<div class="modal-content">
-			<form id="ITP_FORM_BIZPOP_DLV_PCH_OK">
-				<input type="hidden" id="ITP_FORM_BIZPOP_DLV_PCH_OK_BRAND_ID" name="sbrandId" value="">
-				<div class="modal-body">
-					<div class="itp_form fix">
-						<div class="col-xs-12 itp_form_inline">
-							<div class="form-horizontal fix">
-								<div style="margin:25px 0;">
-									<div class="itp_div_label">
-										<label>납품요청일</label>
-										<span>:</span>
-										<div class="fnDlvReqDt col_a">2022.09.30</div>
-									</div>
-									<div class="itp_div_label">
-										<label>품목수</label>
-										<span>:</span>
-										<div class="fnPchReqQty col_a">2개</div>
-									</div>
-									<div class="itp_div_label">
-										<label>구매금액</label>
-										<span>:</span>
-										<div class="fnPchReqAmt col_a">424,000원</div>
-									</div>
-								</div>
-								<label style="text-align:center; width:100%;">구매요청 하시겠습니까?</label>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="modal-bottom">
-					<button type="button" class="col_3 btn btn-default" id="ITP_MODAL_ALERT_CANCEL" data-dismiss="modal">취소</button>
-					<button type="button" class="col_7 btn btn-primary" id="ITP_MODAL_ALERT_CONFIRM">확인</button>
-				</div>
-			</form>
-		</div>
-	</div> 
-	<div id="ITP_POPUP_JS"></div>
-</div>

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

@@ -1,41 +0,0 @@
-<div id="ITP_BIZPOP_DLV_PPAY" class="modal itp_modal">
-	<div class="modal-dialog" style="width:350px;">
-		<div class="modal-content">
-			<form id="ITP_FORM_BIZPOP_DLV_PPAY">
-				<input type="hidden" id="ITP_FORM_BIZPOP_DLV_PPAY_BRAND_ID" name="sbrandId" value="">
-				<div class="modal-body">
-					<div class="itp_form fix">
-						<div class="col-xs-12 itp_form_inline">
-							<div class="form-horizontal fix">
-								<div style="margin:25px 0;">
-									<div class="itp_div_label">
-										<label>납품요청일</label>
-										<span>:</span>
-										<div class="fnDlvReqDt col_a">2022.09.30</div>
-									</div>
-									<div class="itp_div_label">
-										<label>품목수</label>
-										<span>:</span>
-										<div class="fnPchReqQty col_a">2개</div>
-									</div>
-									<div class="itp_div_label">
-										<label>구매금액</label>
-										<span>:</span>
-										<div class="fnPchReqAmt col_a">424,000원</div>
-									</div>
-								</div>
-								<label style="text-align:left; width:100%;">선불매장이므로 결재를 하셔야 구매요청이 진행이 됩니다.</label>
-								<label style="text-align:center; width:100%; margin-top:10px;">결재를 하시겠습니까?</label>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="modal-bottom">
-					<button type="button" class="col_3 btn btn-default" id="ITP_MODAL_ALERT_CANCEL" data-dismiss="modal">취소</button>
-					<button type="button" class="col_7 btn btn-primary" id="ITP_MODAL_ALERT_PAYMENT">결제</button>
-				</div>
-			</form>
-		</div>
-	</div>
-	<div id="ITP_POPUP_JS"></div>
-</div>

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

@@ -175,10 +175,10 @@
 									</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-6 itp_in">
-													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_MBL_NO" data-key-up="tel" class="form-control itp_input" name="mblNo" value="">
+													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_MBL_NO" data-check-required="empty" data-key-up="tel" class="form-control itp_input" name="mblNo" value="">
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">이메일 *</label>
@@ -244,7 +244,7 @@
 									<div class="itp_form_change">
 										<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-12 itp_ip">
 													<div class="col-xs-2 itp_in">
 														<select id="ITP_FORM_STINFO02010_DETAIL_CREATE_BNK_CD" data-select-code="BNK_CD" data-check-required="empty" class="form-control itp_input" name="bnkCd">
@@ -261,7 +261,7 @@
 										</div>
 										<div class="itp_form_in">
 											<div class="form-group border">
-												<label class="col-xs-2 itp_lb">정산타입*</label>
+												<label class="col-xs-2 itp_lb">정산타입 *</label>
 												<div class="col-xs-4 itp_ip">
 													<div class="col-xs-7 itp_in">
 														<select id="ITP_FORM_STINFO02010_DETAIL_CREATE_LOAN_DVSN" data-select-code="LOAN_DVSN" data-check-required="empty" class="form-control itp_input" name="loanDvsn">

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

@@ -2408,39 +2408,42 @@ function itp_fn_modal_confirm(msg, fn, args) {
 		});
 	}
 };
+// 구매요청확인
 function itp_fn_modal_confirm_req1(msg, fn, args) {
-	$('#ITP_MODAL_ALERT_CANCEL').show();
-	$('#ITP_MODAL_ALERT').modal('show');
-	$('#ITP_MODAL_ALERT').find('.itp_alert_txt').html(msg);
+	$('#ITP_MODAL_PR_ALERT_CANCEL').show();
+	$('#ITP_MODAL_PR_ALERT').modal('show');
+	$('#ITP_MODAL_PR_ALERT').find('.itp_alert_txt').html(msg);
 	if (fn !== undefined || typeof fn !== 'undefined') {
-		$('#ITP_MODAL_ALERT_CONFIRM').off('click');
-		$('#ITP_MODAL_ALERT_CONFIRM').on('click', function() {
+		$('#ITP_MODAL_PR_ALERT_CONFIRM').off('click');
+		$('#ITP_MODAL_PR_ALERT_CONFIRM').on('click', function() {
 			fn.callBack(args);
-			$('#ITP_MODAL_ALERT').modal('hide');
+			$('#ITP_MODAL_PR_ALERT').modal('hide');
 		});
 	}
 };
+//선불매장결제확인
 function itp_fn_modal_confirm_req2(msg, fn, args) {
-	$('#ITP_MODAL_ALERT_CANCEL').show();
-	$('#ITP_MODAL_ALERT').modal('show');
-	$('#ITP_MODAL_ALERT').find('.itp_alert_txt').html(msg);
+	$('#ITP_MODAL_ADV_ALERT_CANCEL').show();
+	$('#ITP_MODAL_ADV_ALERT').modal('show');
+	$('#ITP_MODAL_ADV_ALERT').find('.itp_alert_txt').html(msg);
 	if (fn !== undefined || typeof fn !== 'undefined') {
-		$('#ITP_MODAL_ALERT_CONFIRM').off('click');
-		$('#ITP_MODAL_ALERT_CONFIRM').on('click', function() {
+		$('#ITP_MODAL_ADV_ALERT_CONFIRM').off('click');
+		$('#ITP_MODAL_ADV_ALERT_CONFIRM').on('click', function() {
 			fn.callBack(args);
-			$('#ITP_MODAL_ALERT').modal('hide');
+			$('#ITP_MODAL_ADV_ALERT').modal('hide');
 		});
 	}
 };
+//구매한도부족알림
 function itp_fn_modal_confirm_req3(msg, fn, args) {
-	$('#ITP_MODAL_ALERT_CANCEL').show();
-	$('#ITP_MODAL_ALERT').modal('show');
-	$('#ITP_MODAL_ALERT').find('.itp_alert_txt').html(msg);
+	$('#ITP_MODAL_LM_ALERT_CANCEL').show();
+	$('#ITP_MODAL_LM_ALERT').modal('show');
+	$('#ITP_MODAL_LM_ALERT').find('.itp_alert_txt').html(msg);
 	if (fn !== undefined || typeof fn !== 'undefined') {
-		$('#ITP_MODAL_ALERT_CONFIRM').off('click');
-		$('#ITP_MODAL_ALERT_CONFIRM').on('click', function() {
+		$('#ITP_MODAL_LM_ALERT_CONFIRM').off('click');
+		$('#ITP_MODAL_LM_ALERT_CONFIRM').on('click', function() {
 			fn.callBack(args);
-			$('#ITP_MODAL_ALERT').modal('hide');
+			$('#ITP_MODAL_LM_ALERT').modal('hide');
 		});
 	}
 };

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

@@ -70,6 +70,7 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.pchReqQty, //수량
 			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: true, edittype: 'text',
+			classes: 'input_color',
 			editrules: { number:true }, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -483,7 +484,7 @@ let createObj = {
 						fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'S');
 					}
 				};
-				
+			
 			if (apprTypeCd == 'NP') {  // 선불
 				itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.tmpSave, apprFn, null);
 			} else { //후불

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

@@ -1,36 +0,0 @@
-require(['config'], function() {
-	require([
-		'jquery'
-	], function($) {
-
-	});
-});
-
-let API_POP_INV_INFO = '/api/pomng/save-pchReq';
-
-function itp_fn_BIZPOP_DLV_LMT_PAY(parentPopFn, args, returnType) {
-	
-	let pageObj = {
-			init: function() {
-				this.button();
-			},
-			call: function( param) {
-				fn_ajax_call(API_POP_INV_INFO, JSON.stringify(param), this.callback, 'POST');
-				
-			},
-			button: function() {
-				$('#ITP_MODAL_ALERT_CANCEL').on('click', function (){
-					
-				});
-				$('#ITP_MODAL_ALERT_PAYMENT').on('click', function (){
-					
-				});
-			}, 
-			callback: function (result) {
-				console.log(result);
-				$('#ITP_BIZPOP_DLV_LMT_PAY .fnDlvReqDt').text(result.dlvReqDt);
-				$('#ITP_BIZPOP_DLV_LMT_PAY .fnPchReqQty').text(result.pchReqQty);
-				$('#ITP_BIZPOP_DLV_LMT_PAY .fnPchReqAmt').text(result.pchReqAmt);
-			},
-	};
-};

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

@@ -1,36 +0,0 @@
-require(['config'], function() {
-	require([
-		'jquery'
-	], function($) {
-
-	});
-});
-
-let API_POP_INV_INFO = '/api/pomng/save-pchReq';
-
-function itp_fn_BIZPOP_DLV_PCH_OK(parentPopFn, args, returnType) {
-	
-	let pageObj = {
-			init: function() {
-				this.button();
-			},
-			call: function( param) {
-				fn_ajax_call(API_POP_INV_INFO, JSON.stringify(param), this.callback, 'POST');
-				
-			},
-			button: function() {
-				$('#ITP_MODAL_ALERT_CANCEL').on('click', function (){
-					
-				});
-				$('#ITP_MODAL_ALERT_PAYMENT').on('click', function (){
-					
-				});
-			}, 
-			callback: function (result) {
-				console.log(result);
-				$('#ITP_BIZPOP_DLV_PCH_OK .fnDlvReqDt').text(result.dlvReqDt);
-				$('#ITP_BIZPOP_DLV_PCH_OK .fnPchReqQty').text(result.pchReqQty);
-				$('#ITP_BIZPOP_DLV_PCH_OK .fnPchReqAmt').text(result.pchReqAmt);
-			},
-	};
-};

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

@@ -1,36 +0,0 @@
-require(['config'], function() {
-	require([
-		'jquery'
-	], function($) {
-
-	});
-});
-
-let API_POP_INV_INFO = '/api/pomng/save-pchReq';
-
-function itp_fn_BIZPOP_DLV_DLV_PPAY(parentPopFn, args, returnType) {
-	
-	let pageObj = {
-			init: function() {
-				this.button();
-			},
-			call: function( param) {
-				fn_ajax_call(API_POP_INV_INFO, JSON.stringify(param), this.callback, 'POST');
-				
-			},
-			button: function() {
-				$('#ITP_MODAL_ALERT_CANCEL').on('click', function (){
-					
-				});
-				$('#ITP_MODAL_ALERT_PAYMENT').on('click', function (){
-					
-				});
-			}, 
-			callback: function (result) {
-				console.log(result);
-				$('#ITP_BIZPOP_DLV_DLV_PPAY .fnDlvReqDt').text(result.dlvReqDt);
-				$('#ITP_BIZPOP_DLV_DLV_PPAY .fnPchReqQty').text(result.pchReqQty);
-				$('#ITP_BIZPOP_DLV_DLV_PPAY .fnPchReqAmt').text(result.pchReqAmt);
-			},
-	};
-};

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

@@ -127,6 +127,7 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.spplyMgrNm, //담당자명
 			width: '16', fixed: false, align: 'center',
 			sortable: false, editable: true, edittype: 'text',
+			classes: 'input_color',
 			editrules: {required: true}
 		},
 		{
@@ -134,18 +135,21 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.position, //직위
 			width: '10', fixed: false, align: 'center',
 			sortable: true, editable: true, edittype: 'text',
+			classes: 'input_color',
 			editrules: {required: true}
 		},
 		{
 			index: 'RPRST_EMAIL', name: 'rprstEmal',
 			label: ITP_MSG_LOCALE.label.rprstEmal, //이메일
 			width: '20', fixed: false, align: 'center',
+			classes: 'input_color',
 			sortable: false, editable: true, edittype: 'text'
 		},
 		{
 			index: 'RPRST_TEL_NO', name: 'rprstTelNo',
 			label: ITP_MSG_LOCALE.label.rprstMblNo, //핸드폰번호
 			width: '20', fixed: false, align: 'center',
+			classes: 'input_color',
 			sortable: false, editable: true, edittype: 'text'
 		},
 		{
@@ -154,6 +158,7 @@ const gridColModel = {
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_ASSGN_TASK},
+			classes: 'input_color',
 			editrules: {required: false}
 		}/*,
 		{

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

@@ -155,6 +155,7 @@ const gridColModel = {
 			width: '9', fixed: false, align: 'center',
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_CURR},
+			classes: 'input_color',
 			editrules: {required: true}
 		},
 		{
@@ -162,6 +163,7 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
 			width: '10', fixed: false, align: 'right',
 			sortable: true, editable: true, edittype: 'text',
+			classes: 'input_color',
 			editrules: {required: true},
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -169,6 +171,7 @@ const gridColModel = {
 			index: 'UNIT_TARGET_CD', name: 'unitTargetCd',
 			label: ITP_MSG_LOCALE.label.unitTargetCd, //대상여부
 			width: '10', fixed: false, align: 'center',
+			classes: 'input_color',
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_UNIT_TARGET_CD},
 			editrules: {required: true}
@@ -185,7 +188,7 @@ const gridColModel = {
 			index: 'SPPLY_NM', name: 'spplyNm',
 			label: ITP_MSG_LOCALE.label.spplyNm, //공급업체명
 			width: '6', fixed: false, align: 'left',
-			minwidth: 160, maxwidth: 200,
+			minwidth: 240,
 			sortable: false, hidden: false
 		}
 	],

src/main/webapp/main.html

@@ -289,6 +289,7 @@
 		</div>
 
 		<footer id="ITP_FOOTER">
+			<!-- 기존구매요청확인 -->
 			<div id="ITP_MODAL_ALERT" class="modal itp_modal">
 				<div class="modal-dialog modal-sm">
 					<div class="modal-content">
@@ -299,14 +300,56 @@
 						<div class="modal-body">
 							<div class="text-center itp_alert_txt"></div>
 						</div>
-						<div class="modal-footer">
-							<button type="button" class="btn btn-default" id="ITP_MODAL_ALERT_CANCEL" data-dismiss="modal">취소</button>
-							<button type="button" class="btn btn-primary" id="ITP_MODAL_ALERT_CONFIRM">확인</button>
+						<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>
 						</div>
 					</div>
 				</div>
 			</div>
-		
+			<!-- 구매요청확인 -->
+			<div id="ITP_MODAL_PR_ALERT" class="modal itp_modal">
+				<div class="modal-dialog modal-xs">
+					<div class="modal-content">
+						<div class="modal-body">
+							<div class="text-center itp_alert_txt"></div>
+						</div>
+						<div class="modal-bottom">
+							<button type="button" class="btn btn-default col_4" id="ITP_MODAL_PR_ALERT_CANCEL" data-dismiss="modal">취소</button>
+							<button type="button" class="btn btn-primary col_6" id="ITP_MODAL_PR_ALERT_CONFIRM">확인</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			<!-- 선불매장결제확인 -->
+			<div id="ITP_MODAL_ADV_ALERT" class="modal itp_modal">
+				<div class="modal-dialog modal-sm">
+					<div class="modal-content">		
+						<div class="modal-body">
+							<div class="text-center itp_alert_txt"></div>
+						</div>
+						<div class="modal-bottom">
+							<button type="button" class="btn btn-default col_4" id="ITP_MODAL_ALERT_ADV_CANCEL" data-dismiss="modal">취소</button>
+							<button type="button" class="btn btn-primary col_6" id="ITP_MODAL_ALERT_ADV_CONFIRM">결제</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			<!-- 구매한도부족알림 -->
+			<div id="ITP_MODAL_LM_ALERT" class="modal itp_modal">
+				<div class="modal-dialog modal-sm">
+					<div class="modal-content">
+						<div class="modal-body">
+							<div class="text-center itp_alert_txt"></div>
+						</div>
+						<div class="modal-bottom">
+							<button type="button" class="btn btn-default col_4" id="ITP_MODAL_ALERT_LM_CANCEL" data-dismiss="modal">취소</button>
+							<button type="button" class="btn btn-primary col_6" id="ITP_MODAL_ALERT_LM_CONFIRM">결제</button>
+						</div>
+					</div>
+				</div>
+			</div>			
+			<!-- 결제확인 -->
 			<div id="ITP_MODAL_ALERT_AJAX" class="modal itp_modal">
 				<div class="modal-dialog modal-sm">
 					<div class="modal-content">