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

src/main/webapp/app/loanmng/LOANMNG04010.html

@@ -0,0 +1,126 @@
+<section id="ITP_TAB_LOANMNG04010" class="tab-pane active itp_sec">
+	<div class="itp_cont">
+		<article class="itp_detail">
+			<div class="itp_det_head fix">
+				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i><strong>여신현황</strong></h2>
+				<div class="pull-right itp_cicon">
+					<button type="button" id="ITP_BTN_LOANMNG04010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_LOANMNG04010_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon"></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_LOANMNG04010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon"></i>&nbsp;&nbsp;목록&nbsp;&nbsp;</button>
+				</div>				
+			</div>
+			<div class="itp_det_in">
+				<div id="ITP_AJAX_LOANMNG04010_VIEW_CONTAINER">
+					<div class="itp_form itp_type1 fix">
+						<div class="col-xs-12">
+							<form id="ITP_FORM_LOANMNG04010_VIEW" class="form-horizontal">
+								<input type="hidden" id="ITP_FORM_LOANMNG04010_VIEW_VIEW_CD" name="viewCd" value="R">
+								<input type="hidden" id="ITP_FORM_LOANMNG04010_VIEW_BRAND_ID" name="brandId" value="">
+								<input type="hidden" id="ITP_FORM_LOANMNG04010_VIEW_STORE_ID" name="storeId" value="">
+								<input type="hidden" id="ITP_FORM_LOANMNG04010_VIEW_LOAN_MGNT_UNQ_NO" name="loanMgntUnqNo" value="">
+					
+								<section class="itp_form_sec">
+									<h4 class="itp_form_tit">여신정보</h4>
+									<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-9 itp_in fnBrandNm"></div>												
+												</div>
+											<label class="col-xs-2 itp_lb">매장*</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-10 itp_in fnStoreNm"></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 fnLoanDvsn"></div>
+											</div>
+											<label class="col-xs-2 itp_lb">한도금액</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-8 itp_in fnCredtLimitAmt"></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 fnContDt"></div>
+											</div>
+											<label class="col-xs-2 itp_lb">사용여부</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-8 itp_in fnUseYn"></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 fnPosbLimitAmt"></div>
+											</div>
+											<label class="col-xs-2 itp_lb">가수금</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-8 itp_in fnTmpRcvAcctTotal"></div>
+											</div>
+										</div>
+										<div class="form-group border">
+											<label class="col-xs-2 itp_lb">사용금액</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-10 itp_in fnUseAmtTotal"></div>
+											</div>
+											<label class="col-xs-2 itp_lb">최종 수정자/일시</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-10 itp_in fnLastModify"></div>
+											</div>
+										</div>
+									</div>
+								</section>								
+							</form>
+							<div class="itp_det_head fix" style="background:#fff; margin-top: 12px;">
+								<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i><strong>여신이력</strong></h2>
+							</div>
+							<div id="ITP_AJAX_LOANMNG04010_VIEW_LIST_CONTAINER">
+								<div class="itp_lg_form itp_type1 fix" style="padding-left: 0px; padding-right: 0px; margin-top: -11px;">
+									<div class="itp_srh_border fix">
+										<div class="col-xs-12">
+											<form id="ITP_FORM_LOANMNG04010_VIEW_SEARCH" class="form-horizontal">
+												<input type="hidden" id="ITP_FORM_LOANMNG04010_VIEW_SEARCH_LOAN_MGNT_UNQ_NO" name="sloanMgntUnqNo" value="">
+											
+												<div class="col-xs-1 itp_ip itp_noMar" style="top:2px">
+													<label class="itp_in">거래일자</label>
+												</div>
+												<div class="col-xs-2 itp_ip itp_noMar">
+													<div class="input-daterange input-group date">
+														<input type="text" id="ITP_FORM_LOANMNG04010_SEARCH_FROM" class="form-control itp_input" name="fromDt" value="">
+														<span class="input-group-addon itp_date_to">~</span>
+														<input type="text" id="ITP_FORM_LOANMNG04010_SEARCH_TO" class="form-control itp_input" name="toDt" value="">
+													</div>
+												</div>
+												<div class="col-xs-2 itp_in itp_noMar">
+													<select id="ITP_FORM_LOANMNG04010_SEARCH_DPST_PAY_DVSN" data-select-code="DPST_PAY_DVSN" class="form-control itp_input" name="sdpstPayDvsn">
+														<option value="">입금/지급</option>
+													</select>
+												</div>
+												<div class="col-xs-2 itp_ip itp_noMar">
+													<button type="button" id="ITP_BTN_LOANMNG04010_VIEW_SEARCH_SRH" class="btn btn-primary btn-sm HIST" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;이력조회&nbsp;&nbsp;</button>
+												</div>
+											</form>
+										</div>
+									</div>
+								</div>
+								<div class="itp_table fix" style="padding-left: 0px; padding-right: 0px;">
+									<div id="ITP_LOANMNG04010_VIEW_jqGrid_list" class="itp_tb_list">
+								        <div id="ITP_LOANMNG04010_VIEW_jqGridView" class="itp_views fix"></div>
+								        <table id="ITP_LOANMNG04010_VIEW_jqGrid"></table>
+								        <div id="ITP_LOANMNG04010_VIEW_jqGridPager"></div>
+								        <div id="ITP_LOANMNG04010_VIEW_jqGridEmpty" class="itp_no_data"></div>
+								    </div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</article>
+	</div>
+	<div id="ITP_TAP_JS"></div>	
+</section>

src/main/webapp/app/stockmng/STOCKMNG06010.html

@@ -1,77 +0,0 @@
-<section id="ITP_TAB_STOCKMNG06010" class="tab-pane active itp_sec">
-	<div class="itp_cont">
-		<article class="itp_detail">
-			<div class="itp_det_head fix">
-				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>수요에측현황</strong></h2>
-				<div class="pull-right itp_cicon">
-				    <button type="button" id="ITP_BTN_STOCKMNG06010_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon "></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
-				    <button type="button" id="ITP_BTN_STOCKMNG06010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
-				</div>				
-			</div>
-			<div class="itp_det_in">
-				<div id="ITP_AJAX_STOCKMNG06010_DETAIL_CONTAINER">
-				    <div class="itp_form itp_type1 fix">
-				        <div class="col-xs-12">
-				            <form id="ITP_FORM_STOCKMNG06010_DETAIL" class="form-horizontal">
-				                <input type="hidden" id="ITP_FORM_STOCKMNG06010_DETAIL_VIEW_CD" name="viewCd" value="C">
-				                <input type="hidden" id="ITP_FORM_STOCKMNG06010_DETAIL_BRAND_ID" name="brandId" value="">
-				                <input type="hidden" id="ITP_FORM_STOCKMNG06010_DETAIL_STORE_ID" name="storeId" value="">
-				                <input type="hidden" id="ITP_FORM_STOCKMNG06010_DETAIL_WHS_ID" name="whsId" value="">
-				    
-				                <section class="itp_form_sec">
-				                    <h4 class="itp_form_tit">수요예측 조건 정보</h4>
-			                         <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-8 itp_in">
-													<select id="ITP_FORM_STOCKMNG06010_DETAIL_BRAND_NM" data-select-code="BRAND_NM" class="form-control itp_input" name="brandNm">
-														<option>브랜드</option>
-													</select>												
-												</div>
-											</div>
-											<label class="col-xs-2 itp_lb">기간선택</label>
-			                                <div class="col-xs-4 itp_ip">
-												<div class="col-xs-8 itp_in">
-													<select id="ITP_FORM_STOCKMNG06010_DETAIL_" data-select-code="" class="form-control itp_input" name="">
-														<option>기간선택</option>
-													</select>												
-												</div>
-											</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-3 itp_in">
-														<input type="text" id="ITP_FORM_STOCKMNG06010_DETAIL_SCH_ITEM_ID" class="form-control itp_input" value="" maxlength="100" readonly>
-									                </div>
-									                <div class="col-xs-3 itp_in">
-														<div class="input-group">
-															<input type="text" id="ITP_FORM_STOCKMNG06010_DETAIL_SCH_ITEM_NM" class="form-control itp_input" value="" maxlength="100" readonly>
-															<span class="input-group-btn">
-																<button id="ITP_BTN_STOCKMNG06010_DETAIL_ITEM_DELETE" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-erase"></i></button>
-															</span>
-														</div>
-													</div>
-													<div class="col-xs-2 itp_in" style="padding-left: 5px;">
-														<button type="button" id="ITP_BTN_STOCKMNG06010_DETAIL_ITEM_SRH_" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-									                </div>
-												</div>
-				                        </div>
-			                         </div>	
-				                </section>	
-				                <div class="itp_caption">
-				                	<label>※ 수요예측은 조회하는 일자의 월 포함 3개월에 대한 조회입니다.</label>
-				                </div>
-				            </form>
-				        </div>
-				    </div>
-				</div>
-								
-			</div>
-		</article>
-	</div>
-	<div id="ITP_TAP_JS"></div>	
-</section>

src/main/webapp/app/stockmng/STOCKMNG07010.html

@@ -0,0 +1,81 @@
+<section id="ITP_TAB_STOCKMNG07010" class="tab-pane active itp_sec">
+	<div class="itp_cont">
+		<article class="itp_detail">
+			<div class="itp_det_head fix">
+				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>수요에측현황</strong></h2>
+				<div class="pull-right itp_cicon">
+				    <button type="button" id="ITP_BTN_STOCKMNG07010_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon "></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
+				    <button type="button" id="ITP_BTN_STOCKMNG07010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
+				</div>				
+			</div>
+			<div class="itp_det_in">
+				<div id="ITP_AJAX_STOCKMNG07010_DETAIL_CONTAINER">
+				    <div class="itp_form itp_type1 fix">
+				        <div class="col-xs-12">
+				            <form id="ITP_FORM_STOCKMNG07010_DETAIL" class="form-horizontal">
+				                <input type="hidden" id="ITP_FORM_STOCKMNG07010_DETAIL_VIEW_CD" name="viewCd" value="C">
+				                <input type="hidden" id="ITP_FORM_STOCKMNG07010_DETAIL_BRAND_ID" name="brandId" value="">
+				                <input type="hidden" id="ITP_FORM_STOCKMNG07010_DETAIL_STORE_ID" name="storeId" value="">
+				                <input type="hidden" id="ITP_FORM_STOCKMNG07010_DETAIL_WHS_ID" name="whsId" value="">
+				    
+				                <section class="itp_form_sec">
+				                    <h4 class="itp_form_tit">수요예측 조건 정보</h4>
+			                         <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-8 itp_in">
+													<select id="ITP_FORM_STOCKMNG07010_DETAIL_BRAND_NM" data-select-code="BRAND_NM" class="form-control itp_input" name="brandNm">
+														<option>브랜드</option>
+													</select>												
+												</div>
+											</div>
+											<label class="col-xs-2 itp_lb">기간선택</label>
+			                                <div class="col-xs-4 itp_ip">
+												<div class="col-xs-8 itp_in">
+													<select id="ITP_FORM_STOCKMNG07010_DETAIL_" data-select-code="" class="form-control itp_input" name="">
+														<option>기간선택</option>
+													</select>												
+												</div>
+											</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-3 itp_in">
+														<input type="text" id="ITP_FORM_STOCKMNG07010_DETAIL_SCH_ITEM_ID" class="form-control itp_input" value="" maxlength="100" readonly>
+									                </div>
+									                <div class="col-xs-3 itp_in">
+														<div class="input-group">
+															<input type="text" id="ITP_FORM_STOCKMNG07010_DETAIL_SCH_ITEM_NM" class="form-control itp_input" value="" maxlength="100" readonly>
+															<span class="input-group-btn">
+																<button id="ITP_BTN_STOCKMNG07010_DETAIL_ITEM_DELETE" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-erase"></i></button>
+															</span>
+														</div>
+													</div>
+													<div class="col-xs-2 itp_in" style="padding-left: 5px;">
+														<button type="button" id="ITP_BTN_STOCKMNG07010_DETAIL_ITEM_SRH_" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+									                </div>
+												</div>
+				                        </div>
+			                         </div>	
+				                </section>	
+				                <div class="itp_caption">
+				                	<label>※ 수요예측은 조회하는 일자의 월 포함 3개월에 대한 조회입니다.</label>
+				                </div>
+				                <div id="ITP_CONTAINER_GRAPH_AREA">
+									<div id="ITP_PCH_STDD" class="itp_graph_area"></div>
+									<div id="ITP_PCH_NEW_STDD" class="itp_graph_area"></div>
+								</div>
+				            </form>
+				        </div>
+				    </div>
+				</div>
+								
+			</div>
+		</article>
+	</div>
+	<div id="ITP_TAP_JS"></div>	
+</section>

src/main/webapp/css/style.css

@@ -197,6 +197,8 @@ a, button {outline:none !important; text-decoration:none !important;}
 #ITP_SIDEBAR .itp_nav .itp_svgs li a .itp_tt {float:left;}
 
 /* ITP_CONTAINER */
+#ITP_CONTAINER_GRAPH_AREA {width:100%; height:450px;}
+#ITP_CONTAINER_GRAPH_AREA .itp_graph_area {border:1px solid #000; width:49.8%; height:450px; display:inline-block;}
 #ITP_CONTAINER {height:calc(100vh - 100px); padding:5px 8px; transition:all .25s ease; float:left; width:calc(100% - 240px);background:#fff;}
 #ITP_CONTAINER.itp_open_conts {padding-left:8px; width:99.9%;}
 #ITP_CONTAINER .itp_contents {background:#fff; height:100%;}

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

@@ -1802,8 +1802,7 @@ function itp_fn_grid_load_complete(data, gridId, paging, rn, menuId, isSrh, empt
 			$('#ITP_' + menuId + '_jqGridEmpty').addClass('itp_noSrh');
 		} else {
 			$('#ITP_' + menuId + '_jqGridEmpty').removeClass('itp_noSrh');
-		}
-
+		} 
 		if (rowCnt == 0) {
 			$(gridId + '_list').find('.ui-jqgrid-bdiv').css('min-height', '100px');
 			$('#ITP_' + menuId + '_jqGridEmpty').html(emptyMsg);
@@ -1818,8 +1817,7 @@ function itp_fn_grid_load_complete(data, gridId, paging, rn, menuId, isSrh, empt
 			$(gridId + '_list').find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'auto');
 		} else {
 			$(gridId + '_list').find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'auto');
-		}
-
+		} 
 		if (paging) {
 			$(gridId + 'Pager_center').show();
 			if (!totPage) {
@@ -2118,19 +2116,50 @@ function itp_fn_check_grid_is_writing(gridId) {
 	return isWriting;
 };
 
-function itp_fn_jqgrid_resize(grid_id, parent_id, size) {
+function itp_fn_jqgrid_resize(grid_id, parent_id, size) { 
+	var leftDist=0, prevWidth=0;
+	const setGridCellWidth=function(cellIndex, cellWidth) {
+		var idx=0;
+		$(parent_id+' table').each(function() {
+			if(idx++==0)
+				$(this).find('th:eq('+cellIndex+')').each(function(){$(this).css('width',cellWidth);});
+			else
+				$(this).find('td:eq('+cellIndex+')').each(function(){$(this).css('width',cellWidth);});
+		}); 
+	}
+	
 	$(window).on('resize', function(e) {
-		//window.resizeEvt;
-		//clearTimeout(window.resizeEvt);
-		window.resizeEvt = setTimeout(function() {
-			$(grid_id).setGridWidth(782);
+		/*na 그리드 수평스크롤 체크 */ 
+		setTimeout(function() {
 			var outerwidth = $(parent_id).width();
 			if ($(window).width() < 1301 && size == 'sm') {
 				outerwidth = 782;
 			}
-			$(grid_id).setGridWidth(outerwidth);
-		}, 250);
-	});
+			if(outerwidth==100) return;
+			if(leftDist==0) {
+				leftDist= $(window).width() - outerwidth;
+			}
+			if( leftDist>0 && outerwidth>($(window).width()- leftDist) ) {
+				outerwidth=$(window).width() - leftDist;
+			}
+			if(size && outerwidth < 780 ) outerwidth=782;
+			$(grid_id).setGridWidth(outerwidth, true); 
+			var cols = $(grid_id).getGridParam('colModel');
+
+			if( Array.isArray(cols) && cols.length>1 ) {
+				var idx=0, last=cols.length-1;
+				for(var idx=0;idx<cols.length; idx++  ) {
+					var c=cols[idx];
+					if(c.hidden) continue;
+					if(c.minwidth && c.minwidth>c.width ) {
+						setGridCellWidth(idx, c.minwidth);
+					} else if(last==idx) {
+						setGridCellWidth(idx, c.width-2);
+					}
+				}
+			}
+		}, 250); 
+	}); 
 };
 
 function itp_fn_make_set_combine(gridId, label, width, cols, hideCols) {

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

@@ -18,10 +18,9 @@ require(['config'], function() {
 			//$('#ITP_FORM_MAIN_NOTICE_SEARCH_USER_ID').val(fn_make_user_info.get('userId'));
 			
 			// 그리드
-			itp_fn_jqgrid_resize(MAIN_NOTICE_GRID_ID, MAIN_NOTICE_GRID_LIST, 'lg');
 			itp_fn_MAIN_NOTICE_grid.init();
 	    	itp_fn_fire_window_resize();
-	
+			
 			// 조회
 	    	itp_fn_MAIN_NOTICE_search();
 
@@ -125,6 +124,8 @@ var itp_fn_MAIN_NOTICE_grid = {
 			itp_MAIN_NOTICE_param.gridSize = $.jgrid.defaults.rowNum;
 			$(MAIN_NOTICE_GRID_ID).setGridParam({'postData': JSON.stringify(itp_MAIN_NOTICE_param)}).trigger('reloadGrid');
 		});
+		console.log("grid init", MAIN_NOTICE_GRID_LIST);
+		itp_fn_jqgrid_resize(MAIN_NOTICE_GRID_ID, MAIN_NOTICE_GRID_LIST, 'lg');
 	},
 	callBack: function() {
 		let param = $('#ITP_FORM_MAIN_NOTICE_SEARCH').serializeObject();

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

@@ -333,9 +333,8 @@ let pageObj = {
 			
 		},
 		grid: function() {
-			itp_fn_jqgrid_resize(POMNG03010_GRID_ID, POMNG03010_GRID_LIST, 'lg');
 			listObj.empty.init();
-			itp_fn_fire_window_resize();
+			itp_fn_jqgrid_resize(POMNG03010_GRID_ID, POMNG03010_GRID_LIST, 'lg');
 		},
 		ready: function() {
 			listObj.init();

src/main/webapp/js/app/rtnmng/ITP_RTNMNG06010.js

@@ -205,7 +205,6 @@ let listObj = {
 			let param = $('#ITP_FORM_RTNMNG06010_SEARCH').serializeObject();
 			param.gridSize = $.jgrid.defaults.rowNum;
             param.gridPage = $.jgrid.defaults.page;
-            console.log(JSON.stringify(param));
             $(RTNMNG06010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
         }
 	},
@@ -234,7 +233,6 @@ let listObj = {
 		load: function() {
             let param = $('#ITP_FORM_RTNMNG06010_SEARCH').serializeObject();
             param.gridSize = $.jgrid.defaults.rowNum;
-            console.log(JSON.stringify(param));
             var option = {
             	gridId: RTNMNG06010_GRID_ID,
             	colModel: gridColModel.list,
@@ -243,7 +241,6 @@ let listObj = {
             	pager: RTNMNG06010_GRID_PAGER,
             	rownumbers: false,
 				loadComplete: function(data) {
-					console.log(data);
                     itp_fn_grid_load_complete(data, RTNMNG06010_GRID_ID, true, 'number', 'RTNMNG06010', listObj.itp_RTNMNG06010_search, listObj.empty, true, data.gridRecords, true);
                     var ids = $(RTNMNG06010_GRID_ID).getDataIDs();
                     $.each(ids, function(idx, rowId) {
@@ -328,4 +325,3 @@ let listObj = {
 		}
 	}
 }
-console.log(CONN_KEY);

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

@@ -49,12 +49,14 @@ const gridColModel = {
 			index: 'STORE_ID', name: 'storeId',
 			label: ITP_MSG_LOCALE.label.storeId, //매장번호
 			width: '10', fixed: false, align: 'center',
+			minwidth: 400, maxwidth: 500,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'STORE_NM', name: 'storeNm',
 			label: ITP_MSG_LOCALE.label.storeNm, //매장명
 			width: '13', fixed: false, align: 'center',
+			minwidth: 400, maxwidth: 500,
 			sortable: false, hidden: false
 		},
 		{

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

@@ -41,9 +41,6 @@ let API_DETAIL_INFO 		= '/api/itemunit/info-storeitemunit';		// 상세
 let API_DETAIL_NEW	 		= '/api/itemunit/new-info-storeitemunit';	// 신규
 let API_DETAIL_SAVE 		= '/api/itemunit/save-store-itemunit';		// 저장
 
-
-let ITP_FORM_STINFO06010_DETAIL_IS_VIEW = false;
-
 /*화면 Grid ColModel*/
 const gridColModel = {
 	list: [
@@ -180,7 +177,7 @@ const gridColModel = {
 			index: 'SPPLY_UNIT_AMT', name: 'spplyUnitAmt',
 			label: ITP_MSG_LOCALE.label.spplyUnitAmt, //공급단가
 			width: '6', fixed: false, align: 'center',
-			sortable: false,
+			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 			
 		},
@@ -188,7 +185,7 @@ const gridColModel = {
 			index: 'SPPLY_NM', name: 'spplyNm',
 			label: ITP_MSG_LOCALE.label.spplyNm, //공급단가
 			width: '6', fixed: false, align: 'left',
-			sortable: false
+			sortable: false, hidden: false
 		},
 		{
 			index: 'SPPLY_ID', name: 'spplyId',
@@ -196,6 +193,90 @@ const gridColModel = {
 			width: '6', fixed: false, align: 'center',
 			sortable: false, hidden: true
 		}
+	],
+	sdetail: [
+		{
+			index: 'VIEW_CD', name: 'viewCd',
+			label: ITP_MSG_LOCALE.label.viewCd, //공급단가
+			width: '6', fixed: false, align: 'center',
+			sortable: false, hidden: true
+		},
+		{
+			index: 'VIEW_NM', name: 'viewNm',
+			label: ITP_MSG_LOCALE.label.viewNm, //공급단가
+			width: '6', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'BRAND_ID', name: 'brandId',
+			label: ITP_MSG_LOCALE.label.brandId, //브랜드ID
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: true
+		},
+		{
+			index: 'BRAND_UNIT_UNQ_NO', name: 'brandUnitUnqNo',
+			label: ITP_MSG_LOCALE.label.brandId, //브랜드ID
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: true
+		},
+		{
+			index: 'STORE_UNIT_UNQ_NO', name: 'storeUnitUnqNo',
+			label: ITP_MSG_LOCALE.label.storeId, //브랜드ID
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: true
+		},
+		{
+			index: 'ITEM_ID', name: 'itemId',
+			label: ITP_MSG_LOCALE.label.itemId, //품목번호
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'ITEM_NM', name: 'itemNm',
+			label: ITP_MSG_LOCALE.label.itemNm, //품목명
+			width: '13', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'CONT_STT_DT', name: 'contSttDt',
+			label: ITP_MSG_LOCALE.label.contSttDt, //계약시작일
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'CONT_END_DT', name: 'contEndDt',
+			label: ITP_MSG_LOCALE.label.contEndDt, //계약종료일
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'UNIT', name: 'unit',
+			label: ITP_MSG_LOCALE.label.unit, //기본단위
+			width: '9', fixed: false, align: 'center',
+			sortable: false, editable: false, formatter: 'select', edittype: 'select',
+			editoptions: {value: ITP_COMMON_CD_DSTRBT_COST_UNIT}
+		},
+		{
+			index: 'CURR', name: 'curr',
+			label: ITP_MSG_LOCALE.label.curr, //통화
+			width: '9', fixed: false, align: 'center',
+			sortable: false, editable: false, formatter: 'select', edittype: 'select',
+			editoptions: {value: ITP_COMMON_CD_CURR}
+		},
+		{
+			index: 'UNIT_AMT', name: 'unitAmt',
+			label: ITP_MSG_LOCALE.label.unitAmt, //단가
+			width: '10', fixed: false, align: 'center',
+			sortable: true, editable: false, edittype: 'text',
+			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
+		},
+		{
+			index: 'UNIT_TARGET_CD', name: 'unitTargetCd',
+			label: ITP_MSG_LOCALE.label.unitTargetCd, //대상여부
+			width: '10', fixed: false, align: 'center',
+			sortable: false, editable: false, formatter: 'select', edittype: 'select',
+			editoptions: {value: ITP_COMMON_CD_UNIT_TARGET_CD}
+		}
 	]
 };
 
@@ -381,25 +462,8 @@ let pageObj = {
 		} else if(mode == 'MODIFY') { // 수정
 			$('#ITP_AJAX_STINFO06010_DETAIL_CONTAINER').show();
 			if(fn_make_user_info.get('authTpCd') === '50') {
-				//console.log("1111111111111111111111111111");
 				fn_show_btn_auth_array(['#ITP_BTN_STINFO06010_CANCELLIST']);
-				//$('#ITP_STINFO06010_DETAIL_jqGrid_list').jqGrid('hideCol',["spplyNm","spplyUnitAmt"]);
-				
-				//$('#ITP_STINFO06010_DETAIL_jqGrid_list').jqGrid('showCol',["spplyNm","spplyUnitAmt"])
-				
-				//$('#ITP_STINFO06010_DETAIL_jqGrid').jqGrid('hideCol',["spplyNm","spplyUnitAmt"]);
-				//$('#ITP_STINFO06010_DETAIL_jqGridView').jqGrid('hideCol',["spplyNm","spplyUnitAmt"]);
-				
-				
-				
 			} else {
-				//console.log("22222222222222222222222");
-				//$('#ITP_STINFO06010_DETAIL_jqGrid_list').jqGrid('showCol',["spplyNm","spplyUnitAmt"]);
-				//$('#ITP_STINFO06010_DETAIL_jqGrid').jqGrid('showCol',["spplyNm","spplyUnitAmt"]);
-				//$('#ITP_STINFO06010_DETAIL_jqGridView').jqGrid('showCol',["spplyNm","spplyUnitAmt"]);
-				
-				
-				
 				fn_show_btn_auth_array(['#ITP_BTN_STINFO06010_CANCELLIST', '#ITP_BTN_STINFO06010_SAVE']);
 			}
 			$('#ITP_BTN_STINFO06010_DETAIL_SEARCH_STORE').attr('disabled', true);
@@ -459,6 +523,7 @@ let listObj = {
 			let param = $('#ITP_FORM_STINFO06010_SEARCH').serializeObject();
 			param.gridSize = $.jgrid.defaults.rowNum;
 			param.sbrandId = fn_make_user_info.get('brandId');
+			param.sstoreId = fn_make_user_info.get('storeId');
 
 			var option = {
 				gridId: STINFO06010_GRID_ID,
@@ -557,7 +622,7 @@ let modifyObj = {
 			
 			var option = {
 				gridId: STINFO06010_DETAIL_GRID_ID,
-				colModel: gridColModel.detail,
+				colModel: fn_make_user_info.get('authTpCd') === '50' ?  gridColModel.sdetail : gridColModel.detail,
 				param: param,
 				url: DOMAIN + API_DETAIL_INFO,
 				loadComplete: function(data) {
@@ -687,7 +752,7 @@ let createObj = {
 			console.log(param);
 			var option = {
 				gridId: STINFO06010_DETAIL_GRID_ID,
-				colModel: gridColModel.detail,
+				colModel: fn_make_user_info.get('authTpCd') === '50' ?  gridColModel.sdetail : gridColModel.detail,
 				mtype: 'POST',
 				param: param,
 				url: DOMAIN + API_DETAIL_NEW,

src/main/webapp/js/app/stockmng/ITP_STOCKMNG07010.js

@@ -0,0 +1,54 @@
+/********************************************************
+ --------------------------------------------------------
+ - Object 목록								            -
+ --------------------------------------------------------
+ * let pageObj = {}			: 화면공통 Object			*
+ * let viewObj = {}			: 상세화면 Object			*
+ *******************************************************/
+ require(['config'], function() {
+	require([
+		'kakao.map.util'
+	], function($) {
+		pageObj.init();
+	});
+});
+ google.charts.load('current', {'packages':['corechart']});
+ google.charts.setOnLoadCallback(drawChart1);
+ google.charts.setOnLoadCallback(drawChart2);
+ 
+ function drawChart1() {
+   var data = google.visualization.arrayToDataTable([
+     ['Year', 'Sales', 'Expenses'],
+     ['2004',  1000,      400],
+     ['2005',  1170,      460],
+     ['2006',  660,       1120],
+     ['2007',  1030,      540]
+   ]);
+
+   var options = {
+     title: '1년전 구매기준',
+     legend: { position: 'bottom' }
+   };
+
+   var chart = new google.visualization.LineChart(document.getElementById('ITP_PCH_STDD'));
+
+   chart.draw(data, options);
+ }
+ function drawChart2() {
+	   var data = google.visualization.arrayToDataTable([
+	     ['Year', 'Sales', 'Expenses'],
+	     ['2004',  1000,      400],
+	     ['2005',  1170,      460],
+	     ['2006',  660,       1120],
+	     ['2007',  1030,      540]
+	   ]);
+
+	   var options = {
+	     title: '1년전 구매기준',
+	     legend: { position: 'bottom' }
+	   };
+
+	   var chart = new google.visualization.LineChart(document.getElementById('ITP_PCH_NEW_STDD'));
+
+	   chart.draw(data, options);
+	 }

src/main/webapp/main.html

@@ -232,18 +232,10 @@
 									</div>
 								</div>
 								<div id="ITP_MAIN_GRAPH_AREA">
-									<div id="ITP_PCH_REQ_GRAPH" class="itp_graph_area">
-									
-									</div>
-									<div id="ITP_PCH_PODR_GRAPH" class="itp_graph_area">
-									
-									</div>
-									<div id="ITP_PCH_REQ_UP_ITEM_GRAPH" class="itp_graph_area">
-									
-									</div>
-									<div id="ITP_STTL_GRAPH" class="itp_graph_area">
-									
-									</div>
+									<div id="ITP_PCH_REQ_GRAPH" class="itp_graph_area"></div>
+									<div id="ITP_PCH_PODR_GRAPH" class="itp_graph_area"></div>
+									<div id="ITP_PCH_REQ_UP_ITEM_GRAPH" class="itp_graph_area"></div>
+									<div id="ITP_STTL_GRAPH" class="itp_graph_area"></div>
 								</div>
 							</div>
 						</article>