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

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

@@ -214,7 +214,6 @@ let pageObj = {
 				var _this = this;
 				if(AFFL_BRAND.length > 0) {
 					var brandId = 'ITP_FORM_OPER02010_' + (pageObj.pageMode === 'LIST' ? 'SEARCH' : 'DETAIL') + '_BRAND_ID';
-					console.log(brandId);
 					(_this.authTpCd === '30') ?  fn_make_select_brand(AFFL_BRAND, brandId, true, '선택') : fn_make_select_brand(AFFL_BRAND, brandId, false);
 				} else {
 				}
@@ -312,80 +311,7 @@ let pageObj = {
 		} else if(mode === 'VIEW') { // 보기
 			$('#ITP_AJAX_OPER02010_VIEW_CONTAINER').show();
 		}
-	}/*,
-	grid: {
-		init: function(mode) {
-			this.mode = mode;
-			this.gridId = (mode === 'VIEW') ? OPER02010_VIEW_GRID_ID : OPER02010_DETAIL_GRID_ID;
-			this.unload();
-			this.load(mode);
-		},
-		mode: 'DETAIL',
-		gridId: '',
-		button: {
-			addRow: function() {
-				// 팝업
-				var popFn = function(rowDataPop) {
-					console.log(rowDataPop);
-					// 기존등록 사용자ID
-					var exists = '';
-					const rowData = $(OPER02010_DETAIL_GRID_ID).getRowData();
-					$.each(rowData, function(key, value) {
-						exists = exists + value.brandId + ';';
-					});
-
-					$.each(rowDataPop, function(key, value) {
-						// console.log(JSON.stringify(value));
-						if(exists.indexOf(value.brandId) < 0) {
-							value['viewCd'] =  "C";
-							$(OPER02010_DETAIL_GRID_ID).jqGrid('addRowData', value.brandId, value, 'last');
-						}
-					});
-					$(OPER02010_DETAIL_GRID_EMPTY).hide();
-				};
-				var agrs = {'afflShopId': $('#ITP_FORM_OPER02010_DETAIL_SEARCH_AFFL_SHOP_ID').val()};
-				fn_call_popup('biz', 'BIZPOP_AFFL_BRAND', '#ITP_ASIDE', popFn, agrs, 'S');
-			},
-			delRow: function() {
-				itp_fn_grid_del_row(OPER02010_DETAIL_GRID_ID);
-			}
-		},
-		load : function() {
-			let param = $('#ITP_FORM_OPER02010_' + this.mode).serializeObject();
-			param.gridSize = $.jgrid.defaults.rowNum;
-			param.pagingYn = false; // 페이지안함
-
-			var _gridId = this.gridId;
-			var option = {
-				gridId: _gridId,
-				colModel: gridColModel.detail,
-				param: param,
-				url: DOMAIN + NTICE_TARGET_GRID_LIST,
-				multiselect: (this.mode !== 'VIEW'),
-				loadComplete: function(data) {
-					console.log(data);
-					itp_fn_grid_load_complete(data, _gridId, true, undefined, 'OPER02010_' + this.mode);
-				},
-				onSortCol: function(index, columnIndex, sortOrder) {
-					var sortingFn = {
-						callBack: function(args) {
-							$(args).trigger('reloadGrid');
-						}
-					};
-					if (itp_fn_check_grid_is_writing(_gridId)) {
-						itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, sortingFn, _gridId);
-						return 'stop';
-					} else {
-						itp_fn_grid_sorting(_gridId, index, sortOrder);
-					}
-				}
-			};
-			itp_fn_grid_make_not_paging(option);
-		},
-		unload : function() {
-			$.jgrid.gridUnload(this.gridId);
-		}
-	}*/
+	}
 };
 
 /*목록화면 Object*/
@@ -447,7 +373,6 @@ let listObj = {
 					}
 				},
 				loadComplete: function(data) {
-					console.log(data);
 					itp_fn_grid_load_complete(data, OPER02010_GRID_ID, true, 'number', 'OPER02010', listObj.grid.itp_OPER02010_search, _this.itp_fn_OPER02010_empty, true, data.gridRecords, true);
 					var ids = $(OPER02010_GRID_ID).getDataIDs();
 					$.each(ids, function(idx, rowId) {
@@ -511,7 +436,6 @@ let viewObj = {
 		fn_ajax_call(NTICE_INFO_NTICE, param, this.callback, 'GET');
 	},
 	callback: function (result) {
-		console.log(result);
 		pageObj.switchScreen('VIEW');
 		$('#ITP_FORM_OPER02010_VIEW #ITP_FORM_OPER02010_VIEW_NTICE_NO').val(result.nticeNo);
 		$('#ITP_FORM_OPER02010_VIEW #ITP_FORM_OPER02010_VIEW_USER_ID').val(fn_make_user_info.get('userId'));
@@ -551,10 +475,8 @@ let modifyObj = {
 			const userIdVal = $('#ITP_FORM_OPER02010_VIEW_USER_ID').val();
 			const addIdVal = $('#ITP_FORM_OPER02010_VIEW_ADD_ID').val(); 
 			const key = {nticeNo: nticeNoVal, viewCd: 'R'};
-			console.log(111);
-			console.log(addIdVal);
-			console.log(userIdVal);
 			if(addIdVal != userIdVal){
+				itp_fn_modal_alert_ajax(ITP_MSG_LOCALE.message.ajax.diffWrite);
 				return false;
 			}
 			var param = $.param(key);
@@ -565,7 +487,6 @@ let modifyObj = {
 		fn_ajax_call(NTICE_INFO_NTICE, param, this.callback, 'GET');
 	},
 	callback: function (result) {
-		console.log(result);
 		pageObj.switchScreen('MODIFY');
 		$('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_VIEW_CD').val('U');
 		$('#ITP_FORM_OPER02010_DETAIL #ITP_FORM_OPER02010_DETAIL_NTICE_NO').val(result.nticeNo);
@@ -616,42 +537,7 @@ let modifyObj = {
 let createObj = {
 	init: function () {
 		pageObj.fileUpload();
-		// this.form.init();
 	},
-	/*form: {
-		init: function () {
-			this.selectbox();
-			this.checkbox();
-		},
-		selectbox: function () {
-			// 브랜드 selectbox 선택
-			$('#ITP_FORM_OPER02010_DETAIL_BRAND_ID').one('change', function() {
-				if(this.selectedIndex > 0) {
-					$('#ITP_FORM_OPER02010_DETAIL_TARGET_CD option:eq(0)').prop('selected', true);
-					$('#ITP_FORM_OPER02010_DETAIL_TARGET_CD').prop('disabled', true).trigger('change');
-				} else {
-					$('#ITP_FORM_OPER02010_DETAIL_TARGET_CD').prop('disabled', false);
-				}
-			});
-			// 공지대상 selectbox 선택
-			$('#ITP_FORM_OPER02010_DETAIL_TARGET_CD').one('change', function() {
-				if(this.selectedIndex > 0) {
-					$('#ITP_BTN_OPER02010_DETAIL_ADDROW').prop('disabled', false);
-					$('#ITP_BTN_OPER02010_DETAIL_DELROW').prop('disabled', false);
-				} else {
-					$('#ITP_BTN_OPER02010_DETAIL_ADDROW').prop('disabled', true);
-					$('#ITP_BTN_OPER02010_DETAIL_DELROW').prop('disabled', true);
-					$(OPER02010_DETAIL_GRID_ID).jqGrid('clearGridData');
-				}
-			});
-		},
-		checkbox: function () {
-			// 공지대상 checkbox 선택
-			$('#ITP_FORM_OPER02010_TARGET').find('input:checkbox').one('change', function() {
-				$(this).next().val($(this).is(':checked') ? 'Y' : '');
-			});
-		}
-	},*/
 	button: {
 		save: function() {
 			const formId = '#ITP_FORM_OPER02010_DETAIL';
@@ -684,7 +570,6 @@ let createObj = {
 				// param.gridUpdateData = gridUpdateData;
 				// param.gridDeleteData = gridDeleteData;
 				// console.log(JSON.stringify(param));
-
 				var searhFn = function() {
 					ITP_FORM_OPER02010_DETAIL_IS_WRITING = false;
 					listObj.grid.search();
@@ -735,9 +620,7 @@ let afflShopObj = {
 	popup: function (view) {
 		// 팝업
 		var popFn = function(rowDataPop) {
-			console.log(rowDataPop);
 			var id = (view === 'C') ? 'ITP_FORM_OPER02010_DETAIL' : 'ITP_FORM_OPER02010_SEARCH';
-			console.log(id);
 			if(rowDataPop.AFFL_SHOP) {
 				$('#'+ id + '_AFFL_SHOP_ID').val(rowDataPop.AFFL_SHOP.afflShopId);
 				$('#'+ id + '_AFFL_SHOP_NM').val(rowDataPop.AFFL_SHOP.afflShopNm);

src/main/webapp/mobile/app/popup/biz/BIZPOP_PO_PAYMENT.html

@@ -7,11 +7,9 @@
 			</div>
 			<div class="modal-body">
 			
-				<div class="itp_form itp_type1 fix">
-					<div class="col-xs-12">
+				<div class=" ">
+					<div class="col-xs-12" style="padding:10px 15px 30px 15px;">
 					수발주 <b><span id="ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM"></span></b>을 위해 아래 항목을 입력을 한 후에 결제 버튼을 클릭하여 PG사 결제 절차에 따라 결재을 진행해 주시기 바랍니다.
-					<br>
-					<br>
 					</div>
 				</div>
 				
@@ -36,54 +34,56 @@
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_KICC_ACTION_MOBILE_URL" name="kiccActionMobileUrl" value="" />
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_MALL_ID" name="mallId" value="" />
 							
-								<div class="form-group">
-									<label class="col-xs-3 itp_lb">주문번호</label>
-									<div class="col-xs-9 itp_ip fnPoOrdNo"></div>
+								<div class="form-group itp_mg_btm">
+									<label class="col-xs-3 itp_mlb itp_mg_btm">주문번호</label>
+									<div class="col-xs-9 itp_mip fnPoOrdNo">adfasdfafda</div>
 								</div>
-								<div class="form-group">
-									<label class="col-xs-3 itp_lb">구매자명</label>
-									<div class="col-xs-9 itp_ip fnOrdNm"></div>
+								<div class="form-group itp_mg_btm">
+									<label class="col-xs-3 itp_mlb itp_mg_btm">구매자명</label>
+									<div class="col-xs-9 itp_mip fnOrdNm">asdfasdfasdfa</div>
 								</div>
-								<div class="form-group">
-									<label class="col-xs-3 itp_lb">상품명</label>
-									<div class="col-xs-9 itp_ip fnGoodsNm"></div>
+								<div class="form-group itp_mg_btm">
+									<label class="col-xs-3 itp_mlb itp_mg_btm">상품명</label>
+									<div class="col-xs-9 itp_mip fnGoodsNm">adsfasdf</div>
 								</div>
-								<div class="form-group">
-									<label class="col-xs-3 itp_lb">결제금액*</label>
-									<div class="col-xs-9 itp_ip">
+								<div class="form-group itp_mg_btm">
+									<label class="col-xs-3 itp_mlb itp_mg_btm">결제금액*</label>
+									<div class="col-xs-9 itp_mip">
 									<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT" class="form-control itp_input" name="goodsAmt" data-key-up="number" />
 									</div>									
 								</div>
-								<div class="form-group">
-									<label class="col-xs-3 itp_lb">결제방법*</label>
-									<div class="col-xs-9 itp_ip">
-										<div class="col-xs-5 itp_ip">
+								<div class="form-group itp_mg_btm">
+									<label class="col-xs-3 itp_mlb itp_mg_btm">결제방법*</label>
+									<div class="col-xs-9 itp_mip">
+										<div class="col-xs-5 itp_pd_none">
 											<select id="ITP_FORM_PO_PAYMENT_POPUP_PAY_METHOD" class="form-control itp_input" name="payMethod">
 												<option value="11">신용카드</option>
 												<option value="21">계좌이체</option>
 											</select>
 										</div>
-									</div>									
+									</div>	
 								</div>								
-								<div class="form-group">
-									<label class="col-xs-4 itp_lb">휴대폰번호*</label>
-									<div class="col-xs-8 itp_ip">
+								<div class="form-group itp_mg_btm">
+									<label class="col-xs-3 itp_mlb itp_mg_btm">휴대폰번호*</label>
+									<div class="col-xs-9 itp_mip">
 									<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL" class="form-control itp_input" name="ordTel" data-key-up="tel" placeholder="010-0000-0000" maxlength="13" />
 									</div>
 								</div>
-								<div class="form-group">
-									<label class="col-xs-2 itp_lb">이메일</label>
-									<div class="col-xs-3 itp_ip">
-									<input id="ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL" name="ordEmail" class="" type="hidden">
-									<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL_ID" class="form-control itp_input" name="emailId" />
-									</div>
-									<div class="col-xs-1 itp_ip">@</div>
-									<div class="col-xs-3 itp_ip">
-										<input id="ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL_NM" name="emailNm" class="form-control itp_input" type="text" data-check-required="empty">
-									</div>
-									<div class="col-xs-3 itp_ip">
-										<select name="emailCd" id="ITP_FORM_PO_PAYMENT_POPUP_EMAIL_CD" data-select-code="EMAIL_CD" class="form-control itp_input">
-										</select>
+								<div class="form-group itp_mg_btm">
+									<label class="col-xs-3 itp_mlb itp_mg_btm">이메일</label>
+									<div class="col-xs-9 itp_mip">
+										<div class="col-xs-3 itp_pd_none">
+											<input id="ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL" name="ordEmail" class="" type="hidden">
+											<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL_ID" class="form-control itp_input" name="emailId" />
+										</div>
+										<div class="col-xs-a" style="padding:0 5px;">@</div>
+										<div class="col-xs-3 itp_pd_none">
+											<input id="ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL_NM" name="emailNm" class="form-control itp_input" type="text" data-check-required="empty">
+										</div>
+										<div class="col-xs-5">
+											<select name="emailCd" id="ITP_FORM_PO_PAYMENT_POPUP_EMAIL_CD" data-select-code="EMAIL_CD" class="form-control itp_input">
+											</select>
+										</div>
 									</div>
 								</div>								
 							</form>
@@ -304,8 +304,8 @@
 				</div>
 			</div>
 			<div class="modal-footer">
-				<button type="button" id="ITP_BTN_PO_PAYMENT_CLOSE_POP" class="btn btn-danger btn-sm CLB">&nbsp;&nbsp;취소&nbsp;&nbsp;</button>
-				<button type="button" id="ITP_BTN_PO_PAYMENT_CONFIRM_POP" class="btn btn-primary btn-sm SAB" style="display: inline-block;">&nbsp;&nbsp;결제요청&nbsp;&nbsp;</button>
+				<button type="button" id="ITP_BTN_PO_PAYMENT_CLOSE_POP" class="btn btn-danger btn-sm itp_mg_top CLB">&nbsp;&nbsp;취소&nbsp;&nbsp;</button>
+				<button type="button" id="ITP_BTN_PO_PAYMENT_CONFIRM_POP" class="btn btn-primary btn-sm itp_mg_top SAB" style="display: inline-block;">&nbsp;&nbsp;결제요청&nbsp;&nbsp;</button>
 			</div>
 		</div>
 	</div>

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

@@ -438,7 +438,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 #ITP_FOOTER .itp_modal .itp_form .itp_ip_offset {padding-left:15px;}
 #ITP_FOOTER .itp_modal .itp_form .itp_input {height:28px; padding:3px 9px;}
 #ITP_FOOTER .itp_modal .itp_form .itp_check {margin-top:7px;}
-#ITP_FOOTER .itp_modal .itp_form select.itp_input  {padding-left:4px;}
+#ITP_FOOTER .itp_modal .itp_form select.itp_input  {padding-left:4px; margin-top:-2px;}
 #ITP_FOOTER .itp_modal .itp_form .itp_btn {padding:4px 10px; background:#fff;}
 #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;}
@@ -449,3 +449,9 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
   -o-transform:translate(0, calc(50vh - 50%));
   transform:translate(0, 50vh) translate(0, -50%);
 }
+/* 수발주 결제 테이블 css */
+#ITP_FOOTER .itp_modal .itp_mg_btm {margin-bottom:0 !important;}
+#ITP_FOOTER .itp_modal .itp_pd_none {padding:0;} 
+#ITP_FOOTER .itp_modal .itp_mg_top {margin-top: 10px;} 
+#ITP_FOOTER .itp_modal .itp_form .itp_mlb {font-size:13px; height:42px; text-align:left; padding:12px 5px 8px 10px; color:#333; border:1px solid #ccc;}
+#ITP_FOOTER .itp_modal .itp_form .itp_mip {padding: 8px 5px 4px 12px; height:42px; text-align: left; font-size: 16px; border:1px solid #ccc;}