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

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

@@ -29,7 +29,7 @@
 								</div>
 							</div>
 							<div class="col-xs-12 itp_form_inline">
-								<div class="col-xs-6" style="top:10px;">
+								<div class="col-xs-6 itp_print_top20">
 									<div>
 										<label style="width:100px;">발행일</label>
 										<label>:</label>

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

@@ -18,6 +18,8 @@
 				                <input type="hidden" id="ITP_FORM_STOCKMNG04011_DETAIL_BRAND_ID" name="brandId" value="">
 				                <input type="hidden" id="ITP_FORM_STOCKMNG04011_DETAIL_STORE_ID" name="storeId" value="">
 				                <input type="hidden" id="ITP_FORM_STOCKMNG04011_DETAIL_WHS_ID" name="whsId" value="">
+				                
+				                <input type="hidden" id="ITP_FORM_STOCKMNG04011_DETAIL_WHS_ST_CD" name="whsStCd" value="">
 				    
 				                <section class="itp_form_sec">
 				                    <h4 class="itp_form_tit">브랜드 정보</h4>
@@ -27,10 +29,10 @@
 				                                <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>
+				                            <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_STOCKMNG04011_DETAIL_WHS_ST_CD" class="form-control itp_input" name="whsStCd"></select>
+				                                    <div class="col-xs-8 itp_in fnWhsStNm"></div>
 				                                </div>
 				                            </div>
 				                        </div>
@@ -106,10 +108,12 @@
 				    <div class="itp_table fix">
 					    <div class="itp_table_head fix" style="background:#f5f5f5;">
 					        <h4 class="itp_table_tit">로케이션 정보</h4>
+					        <!-- 
 					        <div class="pull-right itp_cicon">
 					            <button type="button" id="ITP_BTN_STOCKMNG04011_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;행추가&nbsp;&nbsp;</button>
 					            <button type="button" id="ITP_BTN_STOCKMNG04011_DETAIL_DELROW" class="btn btn-danger btn-sm DRB"><i class="glyphicon"></i>&nbsp;&nbsp;행삭제&nbsp;&nbsp;</button>									
 					        </div>
+					         -->
 					    </div>
 					    <div id="ITP_STOCKMNG04011_DETAIL_jqGrid_list" class="itp_tb_list">
 					        <div id="ITP_STOCKMNG04011_DETAIL_jqGridView" class="itp_views fix"></div>

src/main/webapp/css/style.css

@@ -1,6 +1,10 @@
 @charset "UTF-8";
-@media print {
+@page print {
 	*{ margin:0; paddig:0;}
+	.itp_print_top20 {top:40px;}
+}
+@page {
+	margin:10px;
 }
 /* COMMON */
 html, body {width:100%; height:100%; background:#eee; overflow-y:hidden;}
@@ -809,4 +813,7 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
 }
 .itp_graph_title select { 
 	margin-left: 16px;
-}
+}
+
+/* 프린트 페이지 수정 */
+.itp_print_top20 {top:35px;}

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

@@ -319,6 +319,8 @@ function drawLine() {
 		var options = {
 		    title: '',
 		    width: 900,
+			crosshair: { trigger: 'both', color:'#ddd' },
+			pointSize: 4,
 		    legend: { position: 'top' }
 		};
 		

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

@@ -47,7 +47,7 @@ var popPageObj = {
 			const formId = '#ITP_FORM_DSPT_INFO_REG_POPUP';
 			itp_fn_form_clear_validate(null, formId);
 			
-			var vali_dpstAmt = itp_fn_form_validate(formId, formId + '_DPST_AMT', ['empty','number'], undefined); // 입금금액
+			var vali_dpstAmt = itp_fn_form_validate(formId, formId + '_DPST_AMT', ['empty','num'], undefined); // 입금금액
 			var vali_dpstDt = itp_fn_form_validate(formId, formId + '_DPST_DT', ['empty'], undefined); // 입금일자
 			var vali_dpstNm = itp_fn_form_validate(formId, formId + '_DPST_NM', ['empty'], undefined); // 입금자명
 			var vali_dpstBnkCd = itp_fn_form_validate(formId, formId + '_DPST_BNK_CD', ['empty'], undefined); // 입금은행

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

@@ -147,7 +147,7 @@ let pageObj = {
 			$('#ITP_FORM_STOCKMNG04011_VIEW_STORE_ID').val(fn_make_user_info.get('storeId'));
 			
 			// 공통코드 표시
-			fn_make_select(CODE_LIST, 'WHS_ST_CD', 'ITP_FORM_STOCKMNG04011_DETAIL_WHS_ST_CD', true, '선택');
+			//fn_make_select(CODE_LIST, 'WHS_ST_CD', 'ITP_FORM_STOCKMNG04011_DETAIL_WHS_ST_CD', true, '선택');
 		},
 		form: function() {
 			itp_fn_form_event.onKeyup('#ITP_FORM_STOCKMNG04011_DETAIL');
@@ -177,8 +177,8 @@ let pageObj = {
 						case 'ITP_BTN_STOCKMNG04011_MODIFY'				: modifyObj.button.modify();	break;	// 수정 버튼
 						case 'ITP_BTN_STOCKMNG04011_CANCELLIST'			: modifyObj.button.cancel(); 	break;	// 취소/목록 버튼
 						case 'ITP_BTN_STOCKMNG04011_SAVE'				: modifyObj.button.save(); 		break;	// 저장 버튼
-						case 'ITP_BTN_STOCKMNG04011_DETAIL_ADDROW'		: locInfoObj.button.addRow();	break;	// 상세:추가버튼
-						case 'ITP_BTN_STOCKMNG04011_DETAIL_DELROW'		: locInfoObj.button.delRow();	break;	// 상세:삭제버튼
+						//case 'ITP_BTN_STOCKMNG04011_DETAIL_ADDROW'		: locInfoObj.button.addRow();	break;	// 상세:추가버튼
+						//case 'ITP_BTN_STOCKMNG04011_DETAIL_DELROW'		: locInfoObj.button.delRow();	break;	// 상세:삭제버튼
 						case 'ITP_BTN_STOCKMNG04011_DETAIL_ADDRESS_SEARCH'		: modifyObj.button.address();	break;	// 신규등록 주소 찾기
 					}
 				});
@@ -393,6 +393,10 @@ let modifyObj = {
 		$('#ITP_FORM_STOCKMNG04011_DETAIL .fnRegDtm').text(result.sysRegDttm);
 		
 		$('#ITP_FORM_STOCKMNG04011_DETAIL #ITP_FORM_STOCKMNG04011_DETAIL_WHS_ST_CD').val(result.whsStCd);
+		$('#ITP_FORM_STOCKMNG04011_DETAIL .fnWhsStNm').text(result.whsStNm);
+		
+		
+		
 		$('#ITP_FORM_STOCKMNG04011_DETAIL #ITP_FORM_STOCKMNG04011_DETAIL_WHS_NM').val(result.whsNm);
 		$('#ITP_FORM_STOCKMNG04011_DETAIL #ITP_FORM_STOCKMNG04011_DETAIL_WHS_NM').val(result.whsNm);
 		$('#ITP_FORM_STOCKMNG04011_DETAIL #ITP_FORM_STOCKMNG04011_DETAIL_MGR_TEL_NO').val(result.mgrTelNo);
@@ -482,12 +486,10 @@ let locInfoObj = {
 	},
 	button: {
 		addRow: function() {
-			// $(STOCKMNG04011_DETAIL_GRID_ID).jqGrid('addRow', {position: 'last'});
-			// $(STOCKMNG04011_DETAIL_GRID_EMPTY).hide();
-			STOCKMNG04011_DETAIL_GRID_LAST_ROW_ID = itp_fn_add_grid_row(STOCKMNG04011_DETAIL_GRID_ID, undefined, ['location'],'STOCKMNG04011_DETAIL');
+			//STOCKMNG04011_DETAIL_GRID_LAST_ROW_ID = itp_fn_add_grid_row(STOCKMNG04011_DETAIL_GRID_ID, undefined, ['location'],'STOCKMNG04011_DETAIL');
 		},
 		delRow: function() {
-			itp_fn_grid_del_row(STOCKMNG04011_DETAIL_GRID_ID);
+			//itp_fn_grid_del_row(STOCKMNG04011_DETAIL_GRID_ID);
 		}
 	},
 	make: function() {

src/main/webapp/mobile/app/mpomng/MPOMNG06010.html

@@ -110,7 +110,8 @@
 								<div class=" fnDlvQty"></div>
 								<label class="">입고수량</label>
 								<span>:</span>
-								<input id="ITP_FORM_MPOMNG06010_LIST_WHS_QTY" class="fnWhsQty" name="whsQty" type="text" placeholder="">
+								<div class="fnWhsQty"></div>
+								<button id="ITP_BTN_MPOMNG06010_WHS_QTY" class="btn-m-orange" name="whsQty">입력</button>
 							</div>
 						</div>
 					</li>

src/main/webapp/mobile/app/mrtnmng/MRTNMNG05010.html

@@ -111,7 +111,8 @@
 								<div class=" fnRodrQty"></div>
 								<label class="col_6">수거수량</label>
 								<span>:</span>
-								<input class="" id="ITP_FORM_MRTNMNG05010_LIST_COL_QTY" type="text" name="colQty">
+								<div class="auto fnColQty">1</div>
+								<button id="ITP_BTN_MPOMNG06010_WHS_QTY" class="btn-m-orange" name="colQty">입력</button>
 							</div>
 						</div>
 					</li>

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

@@ -530,6 +530,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal .half label {min-width:auto;}
 .scroll_area li .left .nomal .half div {min-width:auto; margin-right:5px; margin-top:0;}
 .scroll_area li .left .nomal  input{ width:calc(50% - 85px);height:28px; top:-5px; position:relative;}
+.scroll_area li .left .nomal  button {width:60px; margin-left:5px; height:26px; padding:0;border-radius:5px;}
 .scroll_area li .left .nomal  select{ width:calc(50% - 85px); height:28px; top:-5px; position:relative;}
 
 .scroll_area li .scroll_btn {width:10%; height:158px; margin-top:-5px; display:inline-flex;}

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

@@ -297,11 +297,15 @@ var mobMainObj = {
 			const key = { brandId:fn_make_user_info.get('brandId'), storeId:fn_make_user_info.get('storeId') };
 			var param = $.param(key);
 			fn_ajax_call(MAIN_CHART_SFT_STCK_CHART, param, function(result) {
-
-				var data = google.visualization.arrayToDataTable( eval(result.chartData) );
-
+				var list=[], idx=0, res=eval(result.chartData);
+				for(var c of res) {
+					if(idx>5) break;
+					list.push(res[idx++]);
+				}
+				var data = google.visualization.arrayToDataTable( list );
 				var options = {
-					title: '',
+					title: '', 
+					pointSize: 4,		
 					width: chartWidth + 100,
 					legend: { position: 'top' }
 				};