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

src/main/webapp/app/oper/OPER01010.html

@@ -233,7 +233,7 @@
 												<div class="col-xs-5 itp_in fnTelNo"></div>
 											</div>
 										</div>
-										<div class="form-group border">
+										<div class="form-group">
 											<label class="col-xs-2 itp_lb">마지막 로그인</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-5 itp_in fnLastLoginDt"></div>
@@ -322,7 +322,7 @@
 												</div>
 											</div>
 										</div>
-										<div class="form-group border">
+										<div class="form-group">
 											<label class="col-xs-2 itp_lb">등록일</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in fnAddDt"></div>

src/main/webapp/app/oper/OPER04010.html

@@ -160,6 +160,18 @@
 											</div>
 										</div>	
 									</div>	
+									<div class="itp_form_in itp_modify_dt">
+										<div class="form-group">
+											<label class="col-xs-2 itp_lb">등록일시</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-5 itp_in fnAddDt"></div>
+											</div>
+											<label class="col-xs-2 itp_lb">최종수정일시</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-5 itp_in fnChgDt"></div>
+											</div>
+										</div>
+									</div>
 									<div class="itp_form_in">
 										<div class="form-group border">
 											<label class="col-xs-2 itp_lb">주소(*)</label>
@@ -188,18 +200,6 @@
 											</div>
 										</div>
 									</div>
-									<div class="itp_form_in itp_modify_dt">
-										<div class="form-group border">
-											<label class="col-xs-2 itp_lb">등록일시</label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-5 itp_in fnAddDt"></div>
-											</div>
-											<label class="col-xs-2 itp_lb">최종수정일시</label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-5 itp_in fnChgDt"></div>
-											</div>
-										</div>
-									</div>
 								</section>								
 							</form>
 						</div>

src/main/webapp/app/oper/OPER06010.html

@@ -225,6 +225,32 @@
 											</div>
 										</div>
 									</div>
+									<div class="itp_form_info">
+										<div class="itp_form_in">
+											<div class="form-group">
+												<label class="col-xs-2 itp_lb">등록자/등록일 </label>
+												<div class="col-xs-4 itp_ip">
+													<div class="col-xs-a itp_in" style="width:auto;">
+														<div class="input-group fnRegId" style="padding:5px;"></div>
+													</div>
+													<label class="col-xs-a" style="margin-top:4px;">/</label>
+													<div class="col-xs-a itp_in">
+														<div class="input-group fnRegDt" style="padding:5px;"></div>
+													</div>
+												</div>
+												<label class="col-xs-2 itp_lb">최종  수정자/수정일</label>
+												<div class="col-xs-4 itp_ip">
+													<div class="col-xs-a itp_in">
+														<div class="input-group fnChgId" style="padding:5px;"></div>
+													</div>
+													<label class="col-xs-a" style="margin-top:4px;">/</label>
+													<div class="col-xs-a itp_in">
+														<div class="input-group fnChgDt" style="padding:5px;"></div>
+													</div>
+												</div>
+											</div>
+										</div>
+									</div>
 									<div class="itp_form_in">
 										<div class="form-group border">
 											<label class="col-xs-2 itp_lb">주소</label>
@@ -253,32 +279,6 @@
 											</div>
 										</div>
 									</div>
-									<div class="itp_form_info">
-										<div class="itp_form_in">
-											<div class="form-group border">
-												<label class="col-xs-2 itp_lb">등록자/등록일 </label>
-												<div class="col-xs-4 itp_ip">
-													<div class="col-xs-a itp_in" style="width:auto;">
-														<div class="input-group fnRegId" style="padding:5px;"></div>
-													</div>
-													<label class="col-xs-a" style="margin-top:4px;">/</label>
-													<div class="col-xs-a itp_in">
-														<div class="input-group fnRegDt" style="padding:5px;"></div>
-													</div>
-												</div>
-												<label class="col-xs-2 itp_lb">최종  수정자/수정일</label>
-												<div class="col-xs-4 itp_ip">
-													<div class="col-xs-a itp_in">
-														<div class="input-group fnChgId" style="padding:5px;"></div>
-													</div>
-													<label class="col-xs-a" style="margin-top:4px;">/</label>
-													<div class="col-xs-a itp_in">
-														<div class="input-group fnChgDt" style="padding:5px;"></div>
-													</div>
-												</div>
-											</div>
-										</div>
-									</div>
 								</section>								
 							</form>
 						</div>

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

@@ -78,8 +78,7 @@
 								<input type="hidden" id="ITP_FORM_STINFO02010_DETAIL_BRAND_ID" name="brandId" value="">
 								<input type="hidden" id="ITP_FORM_STINFO02010_DETAIL_STORE_ID" name="storeId" value="">
 								<section class="itp_form_sec">
-									<h4 class="itp_form_tit">매장정보-신규</h4>
-									<div class="itp_form_in">
+									<div class="itp_form_in border-top">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 											<div class="col-xs-4 itp_ip">
@@ -114,7 +113,7 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">매장명 *</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-9 itp_in">
+												<div class="col-xs-6 itp_in">
 													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_STORE_NM" data-check-required="empty" class="form-control itp_input" name="storeNm" value="">
 												</div>
 											</div>
@@ -216,7 +215,7 @@
 												<div class="col-xs-1 itp_in">
 													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_ZIPNO" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="address" class="form-control itp_input" name="zipNo" value="" maxlength="6" placeholder="우편번호">
 												</div>
-												<div class="col-xs-2 itp_in" style="width:10%;">
+												<div class="col-xs-a itp_in">
 													<button type="button" id="ITP_FORM_STINFO02010_DETAIL_ADRES_SCH" class="btn btn-primary btn-sm SHOW" style="margin: -1px 0px 0px 3px;">&nbsp;&nbsp;주소검색&nbsp;&nbsp;</button>
 												</div>
 												<div class="col-xs-4 itp_in" style="margin:0 5px;">
@@ -229,7 +228,7 @@
 										</div>
 									</div>
 									<div class="itp_form_in">
-										<div class="form-group border">
+										<div class="form-group">
 											<label class="col-xs-2 itp_lb"></label>
 											<div class="col-xs-10 itp_ip">
 												<input type="hidden" id="ITP_FORM_STINFO02010_DETAIL_LOTS_ADDRESS" value="" />
@@ -261,7 +260,7 @@
 											</div>
 										</div>
 										<div class="itp_form_in">
-											<div class="form-group">
+											<div class="form-group border">
 												<label class="col-xs-2 itp_lb">정산타입*</label>
 												<div class="col-xs-4 itp_ip">
 													<div class="col-xs-7 itp_in">
@@ -342,7 +341,7 @@
 											</div>
 										</div>
 										<div class="itp_form_in">
-											<div class="form-group">
+											<div class="form-group border">
 												<label class="col-xs-2 itp_lb">수정일</label>
 												<div class="col-xs-4 itp_ip">
 													<div class="col-xs-12 itp_in fnSysChgDttm"></div>
@@ -366,8 +365,7 @@
 								<input type="hidden" id="ITP_FORM_STINFO02010_VIEW_VIEW_CD" name="viewCd" value="R">
 								<input type="hidden" id="ITP_FORM_STINFO02010_VIEW_STORE_ID" name="storeId" value="">
 								<section class="itp_form_sec">
-									<h4 class="itp_form_tit">매장정보-상세</h4>
-									<div class="itp_form_in">
+									<div class="itp_form_in border-top">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 											<div class="col-xs-4 itp_ip">

src/main/webapp/css/ui.jqgrid-bootstrap.css

@@ -767,6 +767,10 @@ a.g-menu-item, a.soptclass, a.clearsearchclass {
 .ui-jqgrid .ui-jqgrid-view button {
     /*font-size: 11px*/
 }
+.ui-jqgrid .ui-jqgrid-view input,
+.ui-jqgrid .ui-jqgrid-view select {
+	background:#FDFDF5;
+}
 .ui-jqgrid .ui-scroll-popup {
 	width: 100px;
 }

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

@@ -324,7 +324,6 @@ let pageObj = {
 						}
 					});
 					$((pageObj.pageMode === 'MODIFY') ? OPER01010_NEW_GRID_EMPTY : OPER01010_DETAIL_GRID_EMPTY).hide();
-					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //행 추가할때 2번째 마다 색변경
 				};
 				fn_call_popup('comm', 'AUTH_SCH_POPUP', '#ITP_ASIDE', popFn, null, 'S');
 			},
@@ -348,8 +347,6 @@ let pageObj = {
 				url: DOMAIN + API_USERAUTH_GRID_LIST,
 				multiselect: (this.mode !== 'VIEW'),
 				loadComplete: function(data) {
-					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
-
 					console.log(data);
 					itp_fn_grid_load_complete(data, gridId, true, undefined, 'OPER01010_' + this.mode);
 				},
@@ -434,7 +431,6 @@ let listObj = {
 					}
 				},
 				loadComplete: function(data) {
-					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
 					console.log(data);
 					itp_fn_grid_load_complete(data, OPER01010_GRID_ID, true, 'number', 'OPER01010', listObj.itp_OPER01010_search, _this.itp_fn_OPER01010_empty, true, data.gridRecords, true);
 					var ids = $(OPER01010_GRID_ID).getDataIDs();
@@ -677,7 +673,6 @@ let createObj = {
 				data: gridData,
 				multiselect: true,
 				loadComplete: function(data) {
-					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
 					_this.clearData();
 				}
 			};

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

@@ -444,7 +444,6 @@ let listObj = {
 					}
 				},
 				loadComplete: function(data) {
-					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
 					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();

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

@@ -316,7 +316,6 @@ let pageObj = {
 						}
 					});
 					$(OPER03010_DETAIL_GRID_EMPTY).hide();
-					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
 				};
 				fn_call_popup('biz', 'BIZPOP_APPL_SALES_USER_SCH', '#ITP_ASIDE', popFn, null, 'S');
 			},
@@ -332,7 +331,6 @@ let pageObj = {
 				data: gridData,
 				multiselect: (this.mode !== 'VIEW'),
 				loadComplete: function(data) {
-					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
 					$(_this.mode === 'VIEW' ? OPER03010_VIEW_GRID_LIST : OPER03010_DETAIL_GRID_LIST).find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'hidden');
 					data.records === 0 ? _this.clearData() : $(this.mode === 'VIEW' ? OPER03010_VIEW_GRID_EMPTY : OPER03010_DETAIL_GRID_EMPTY).hide();
 				}
@@ -374,13 +372,15 @@ let listObj = {
 	},
 	empty: {
 		init: function() {
-			var _this = this;
+			// ==>dwkim var _this = this;
 			this.push();
+			/*  ==>dwkim 
 			$(OPER03010_GRID_EMPTY).on('click', function() {
 				_this.back();
 				_this.itp_OPER03010_param.gridSize = $.jgrid.defaults.rowNum;
 				$(OPER03010_GRID_ID).setGridParam({'postData': JSON.stringify(_this.itp_OPER03010_param)}).trigger('reloadGrid');
 			});
+			*/
 		},
 		itp_OPER03010_param: {},
 		push: function() {
@@ -400,7 +400,7 @@ let listObj = {
 			listObj.empty.push();
 			itp_fn_jqgrid_resize(OPER03010_GRID_ID, OPER03010_GRID_LIST, 'lg');
 			itp_fn_fire_window_resize();
-			this.reload();
+			// ==>dwkim this.reload();
 			this.search();
 		},
 		colModel: gridColModel.list,
@@ -430,7 +430,6 @@ let listObj = {
 					}
 				},
 				loadComplete: function(data) {
-					$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
 					console.log(data);
 					itp_fn_grid_load_complete(data, OPER03010_GRID_ID, true, 'number', 'OPER03010', pageObj.itp_OPER03010_search, listObj.empty, true, data.gridRecords, true);
 					var ids = $(OPER03010_GRID_ID).getDataIDs();
@@ -441,13 +440,14 @@ let listObj = {
 			};
 			itp_fn_grid_make_remote(option);
 		},
+		/* ==>dwkim
 		reload : function() {
 			var _this = this;
 			$(OPER03010_GRID_EMPTY).off('click').on('click', function() {
 				pageObj.itp_OPER03010_param.gridSize = $.jgrid.defaults.rowNum;
 				$(OPER03010_GRID_ID).setGridParam({'postData': JSON.stringify(pageObj.itp_OPER03010_param)}).trigger('reloadGrid');
 			});
-		},
+		}, */
 		clearData : function() {
 			$(OPER03010_GRID_ID).jqGrid('clearGridData', true);
 			$(OPER03010_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');

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

@@ -248,7 +248,6 @@ let listObj = {
                     }
                 },
                 loadComplete: function(data) {
-                	$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경
                     // console.log(data);
                     itp_fn_grid_load_complete(data, OPER04010_GRID_ID, true, 'number', 'OPER04010', listObj.itp_OPER04010_search, listObj.empty, true, data.gridRecords, true);
                     var ids = $(OPER04010_GRID_ID).getDataIDs();

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

@@ -337,7 +337,6 @@ let listObj = {
                     }
                 },
                 loadComplete: function(data) {
-                	$("tr.jqgrow:odd").css("background", "#EEFFFE"); //2번째 마다 색변경ㄴ
                     console.log(data);
                     itp_fn_grid_load_complete(data, OPER06010_GRID_ID, true, 'number', 'OPER06010', listObj.itp_OPER06010_search, listObj.empty, true, data.gridRecords, true);
                     var ids = $(OPER06010_GRID_ID).getDataIDs();