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

src/main/webapp/app/rtnmng/RTNMNG03010.html

@@ -139,7 +139,7 @@
 													</select>
 												</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-7 itp_in">
 													<div class="input-group">

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

@@ -287,9 +287,7 @@ let pageObj = {
 			var now = new Date();
 			$('#ITP_TAB_POMNG02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
 			$('#ITP_FORM_POMNG02010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setDate(now.getDate()-30)));
-			$('#ITP_FORM_POMNG02010_SEARCH_TO_DT').datepicker('setDate', new Date(now.setDate(now.getDate()+30)));
-			
-			
+			$('#ITP_FORM_POMNG02010_SEARCH_TO_DT').datepicker('setDate', new Date(now.setDate(now.getDate()+30)));		
 		},
 		/*
 		form: function() {
@@ -331,7 +329,6 @@ let pageObj = {
 			$('#ITP_FORM_POMNG02010_DETAIL_WHS_ID').val('');
 			$('#ITP_FORM_POMNG02010_DETAIL_LOCATION_NM').val('');
 			$('#ITP_FORM_POMNG02010_DETAIL_LOCATION').val('');
-			
 		});
 		
 	},
@@ -356,10 +353,6 @@ let pageObj = {
 			}
 		}
 		
-		
-		
-		
-		
 		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn: whsDvsn};
 		fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
 		
@@ -416,7 +409,6 @@ let pageObj = {
 				
 				pageObj.grid.recal();
 			});
-
 			
 		}
 	},
@@ -470,7 +462,6 @@ let pageObj = {
 			this.unload();
 			this.load(mode, gridRows);
 		},
-		
 		gridId: '',
 		gridList: '',
 		gridEmpty: '',
@@ -488,7 +479,6 @@ let pageObj = {
 							exists = exists + value.brandUnitUnqNo + ';';	
 						}
 					});
-
 					$.each(rowDataPop, function(key, value) {
 						if (exists.indexOf(value.brandUnitUnqNo) < 0 && value.podrPssblDvsn == 'PO01') {
 							value['viewCd'] = "C";
@@ -562,9 +552,7 @@ let pageObj = {
 		unload : function() {
 			$.jgrid.gridUnload(this.gridId);
 		}
-		
 	}
-	
 };
 
 /*목록화면 Object*/
@@ -665,7 +653,6 @@ let listObj = {
 					itp_fn_grid_paging(POMNG02010_GRID_ID, action, param);
 				}
 			};
-			
 			itp_fn_grid_make_remote(option);
 		},
 		/*
@@ -721,7 +708,6 @@ let viewObj = {
 		$('#ITP_FORM_POMNG02010_VIEW .fnPchReqStNm').text(result.pchReqStNm);
 		$('#ITP_FORM_POMNG02010_VIEW .pchReqMgrNm').text(result.pchReqMgrNm);
 		
-		
 		$('#ITP_FORM_POMNG02010_VIEW .fnPchReqTotalAmt').text(itp_fn_number_comma(result.pchReqTotalAmt));
 		$('#ITP_FORM_POMNG02010_VIEW .fnDlvReqDt').text(result.dlvReqDt);
 		$('#ITP_FORM_POMNG02010_VIEW .fnWhsNm').text(result.whsNm + " - " + result.locationNm);
@@ -732,8 +718,6 @@ let viewObj = {
 		$('#ITP_FORM_POMNG02010_VIEW .fnPchReqRjctNm').text(result.pchReqRjctNm);
 		$('#ITP_FORM_POMNG02010_VIEW .fnPchReqRjctRsn').text(result.pchReqRjctRsn);
 		
-		
-		
 		// 품목  리스트 조회
 		pageObj.grid.init('VIEW', result.pchReqDtlList);
 	}
@@ -792,13 +776,10 @@ let modifyObj = {
 			
 			//정산 타입이 무정산이면 스킵
 			var apprTypeCd = "Y" // Y 정상결재, NP 선불, NA 후불   
-			
 			var now = new Date();
 			var today = now.getFullYear() +
 							"." + (now.getMonth()+1 > 9 ? (now.getMonth()+1).toString() : "0" + (now.getMonth()+1).toString()) +
 							"." + (now.getDate() > 9 ? now.getDate().toString() : "0" + now.getDate().toString());
-			
-			
 			var dlvReqDt = $('#ITP_FORM_POMNG02010_DETAIL_DLV_REQ_DT').val();
 			if (today > dlvReqDt) {
 				alert("납품요청일은 오늘 이후이어야 합니다.");
@@ -863,14 +844,11 @@ let modifyObj = {
 				if (chkQtyYn == "Y") return;
 				
 				if (arg == 'PR20') {
-					
 					apprArg.dlvReqDt = dlvReqDt;
 					apprArg.itemcnt = itemcnt;
 					apprArg.pchReqAtm = itp_fn_number_comma(pchReqAtm);
 					apprArg.pchPssblAtm = itp_fn_number_comma(pchActAtm);
 					apprArg.dlvReqAmt = dlvReqAmt;
-					
-					
 					if (apprTypeCd == "Y") {  // 여신 구분, 여신금액
 						
 						var prIngFn =  {
@@ -894,8 +872,7 @@ let modifyObj = {
 						$(formId).val(arg);
 						let gridInsertData = [];
 						let gridUpdateData = [];
-						let gridDeleteData = [];
-						
+						let gridDeleteData = [];					
 						const rowData = $(POMNG02010_DETAIL_GRID_ID).getRowData();
 						
 						$.each(rowData, function(key, value) {
@@ -950,7 +927,6 @@ let modifyObj = {
 						fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'S');
 					}
 				};
-				
 				var apprNFn =  {
 				callBack: function(args) {
 						// 임시저장 처리한다.

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

@@ -219,7 +219,7 @@ const gridColModel = {
 		{
 			index: 'RTN_DVSN', name: 'rtnDvsn',
 			label: '반품구분',
-			width: '10', fixed: false, align: 'left',
+			width: '10', fixed: false, align: 'center',
 			classes: 'input_color',
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_RTN_DVSN},
@@ -229,7 +229,7 @@ const gridColModel = {
 			index: 'RTN_RSN_DVSN', name: 'rtnRsnDvsn',
 			label: '사유구분',
 			classes: 'input_color',
-			width: '10', fixed: false, align: 'left',
+			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: true, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_RTN_RSN_DVSN},
 			editrules: {required: true}

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

@@ -169,8 +169,8 @@ const gridColModel = {
 		},
 		{
 			index: 'RTN_REQ_DTL_NO', name: 'rtnReqDtlNo',
-			label: '반품요청항번', 
-			width: '8', fixed: false, align: 'center',
+			label: '항번', 
+			width: '4', fixed: false, align: 'center',
 			sortable: true, editable: false, edittype: 'text',
 			hidden: false
 		},
@@ -231,7 +231,7 @@ const gridColModel = {
 		{
 			index: 'RTN_DVSN_NM', name: 'rtnDvsnNm',
 			label: '반품구분', 
-			width: '6', fixed: false, align: 'left',
+			width: '6', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
 			hidden: false
 		},
@@ -245,14 +245,14 @@ const gridColModel = {
 		{
 			index: 'RTN_RSN_DVSN_NM', name: 'rtnRsnDvsnNm',
 			label: '사유구분', 
-			width: '7', fixed: false, align: 'left',
+			width: '7', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
 			hidden: false
 		},
 		{
 			index: 'RTN_RSN_DVSN', name: 'rtnRsnDvsn',
 			label: '사유구분', 
-			width: '7', fixed: false, align: 'left',
+			width: '7', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
 			hidden: true
 		},
@@ -294,8 +294,8 @@ const gridColModel = {
 		},
 		{
 			index: 'RTN_REQ_DTL_NO', name: 'rtnReqDtlNo',
-			label: '반품요청항번', 
-			width: '10', fixed: false, align: 'center',
+			label: '항번', 
+			width: '4', fixed: false, align: 'center',
 			sortable: true, editable: false, edittype: 'text',
 			hidden: true
 		},

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

@@ -40,7 +40,7 @@ const gridColModel = {
 		},
 		{
 			index: 'RTN_PODR_UNQ_NO', name: 'rtnPodrUnqNo',
-			label: '반품발주번호', 
+			label: '반품발주번호/상태', 
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},

src/main/webapp/main.html

@@ -376,7 +376,7 @@
 									</div>
 									<div class="col_4">
 										<div class="itp_header_label">
-										발주완료
+										납품완료
 										</div>
 										<div class="itp_header_result fnPoEndCount">
 										10건

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

@@ -159,21 +159,21 @@
 					</div>
 					<div class="itp_oper_info">
 						<label class="col_6">구매요청건수</label>
-						<div class="full fnPr20Count">2 건</div>
+						<div class="full fnPr20Count"></div>
 					</div>
 				</div>
 				<div id="ITP_MAIN_HEADER_STORE" class="itp_oper_info_area" style="display: none;">
 					<div class="itp_oper_info">
 						<label class="col_6">구매요청</label>
-						<div class="col_6 fnPr20Count">2 건</div>
+						<div class="col_6 fnPr20Count"></div>
 						<label>발주진행</label>
-						<div class="fnPo30Count">12,000,000원</div>
+						<div class="fnPo30Count"></div>
 					</div>
 					<div class="itp_oper_info">
 						<label class="col_6">구매가능금액</label>
-						<div class="col_6 fnPoPsblAmt">1,000원</div>
-						<label>발주완료</label>
-						<div class="fnPoEndCount">1,000원</div>
+						<div class="col_6 fnPoPsblAmt"></div>
+						<label>납품완료</label>
+						<div class="fnPoEndCount"></div>
 					</div>
 				</div>
 				<div id="ITP_MAIN_HEADER_SPPLY" class="itp_oper_info_area" style="display: none;">
@@ -181,11 +181,11 @@
 						<label>수주건수</label>
 						<div class="fnOrdersCount">2 건</div>
 						<label>수주금액</label>
-						<div class="fnOrdersAmt">12,000,000원</div>
+						<div class="fnOrdersAmt"></div>
 					</div>
 					<div class="itp_oper_info">
 						<label class="col_6">정산요청금액</label>
-						<div class="full fnSttlReqAmt">1,000원</div>
+						<div class="full fnSttlReqAmt"></div>
 					</div>
 				</div>
 				<div id="ITP_MAIN_DRAW_CHART_REQ" class="itp_graph_area">

src/main/webapp/mobile/app/mloanmng/MLOANMNG02010.html

@@ -10,7 +10,7 @@
 					<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">입금관리</div>
 		      	</div>
 				<div class="line">
-				  <label>매장선텍</label>
+				  <label>매장선택</label>
 				  <div class="float_left">
 					<input id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_STORE_NM" name="sstoreNm" type="text" placeholder="" readonly>
 					<div class="itp_input_btn">	

src/main/webapp/mobile/app/mstockmng/MSTOCKMNG01010.html

@@ -133,7 +133,7 @@
 		</div>
 	</div>
 	<div id="ITP_POP_MSTOCKMNG01010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: none;">
-		<div class="pop" style="height:480px;">
+		<div class="pop" style="height:390px;">
 			<div class="header">
 				<div class="header_left">
 					<label>재고처리</label>

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

@@ -60,12 +60,12 @@ section .popup2 .pop .search_bar button {position:relative; width:34px; height:3
 section .popup2 .pop .search_bar button img {width: 18px; position:relative; top:-1px;}
 section .popup2 .pop .search_bar button.search {float: none; width: 50%; height: 35px; background:rgb(46, 46, 248); color: #fff; font-size: 1rem; padding: 0; border: 1px solid #000; margin: 0 auto;}
 section .popup2 .pop .search_item_bar {width:98%;margin:5px auto; position: relative; top:-40px; display:flex;}
-section .popup2 .pop .search_item_bar input {width:40%; height:34px; border-radius:5px; margin:0; font-size:12px;}
-section .popup2 .pop .search_item_bar select {width:22%; height:34px; padding:0; border-radius:5px; margin-right:5px;}
+section .popup2 .pop .search_item_bar input {width:40%; height:26px; border-radius:5px; margin:0; font-size:12px;}
+section .popup2 .pop .search_item_bar select {width:22%; height:26px; padding:0; border-radius:5px; margin-right:5px;}
 section .popup2 .pop .search_btn_bar {width:100%; height:50px; margin-top:-30px; margin-right:10px;}
 section .popup2 .pop .search_btn_bar .btn_right {float:right; margin-right:10px;}
-section .popup2 .pop .search_btn_bar .btn_right button img{width:18px; height:18px; margin-right:2px;}
-section .popup2 .pop .search_btn_bar .btn_right button {height:34px; padding:5px 12px; font-size:12pt; font-weight:100; border-radius:3px; border:1px solid #333;}
+section .popup2 .pop .search_btn_bar .btn_right button img{width:16px; height:16px; margin-right:5px;}
+section .popup2 .pop .search_btn_bar .btn_right button {height:26px; padding:1px 12px; font-size:10pt; font-weight:100; border-radius:3px; border:1px solid #333;}
 section .popup2 .pop .table>tbody>tr {border-bottom:1px solid #ddd;}
 section .popup2 .pop .table{width:98%; margin:0 auto; border:1px solid #aaa; border-bottom:none; border-left:none; border-right:none;}
 section .popup2 .pop .table .table_tr {display:flex;}
@@ -121,11 +121,11 @@ section .popup2 .pop .popup_scroll li .add button{float: right; width: 60px; hei
 section .popup2 .pop .popup_scroll li .right input {width:43px; height:27px; margin:0; padding:3px; text-align:center; border-radius:0px; border:1px solid #E0B8AB;}
 section .popup2 .pop .popup_scroll li .right input:focus {outline:none;}
 section .popup2 .pop .content .line button {width: 35%; height: 35px;font-size: 14px; font-weight:100; padding-top: 7px; margin: 0 10px;}
-section .popup2	.list_line {width:98%; float:left; height:40px;display: inline-flex; margin:0 1%; font-size:12px;}
+section .popup2	.list_line {width:98%; float:left; height:30px;display: inline-flex; margin:0 1%; font-size:12px;}
 section .popup2 .border {border-bottom: 1px solid #000 !important;}
-section .popup2 .list_line .list_label {width:30%;border:1px solid #000; height:40px; padding-top:10px; border-bottom:none; background:#eee;}
+section .popup2 .list_line .list_label {width:30%;border:1px solid #000; height:30px; padding-top:4px; border-bottom:none; background:#eee;}
 section .popup2 .list_line .list_label label{font-size:12pt;}
-section .popup2 .list_line .list_info {width:70%;height:40px; border:1px solid #000; padding-top:10px; border-left:none; border-bottom:none;}
+section .popup2 .list_line .list_info {width:70%;height:30px; border:1px solid #000; padding-top:4px; border-left:none; border-bottom:none;}
 section .popup2 .list_line .list_info input{width:90%;}
 section .popup2 .list_line .mail input {width:30%;}
 section .popup2 .list_line .mail select {width:30%;}
@@ -135,7 +135,7 @@ section .popup_scroll li .right button {background:#e1cac1; color:#fff; border:1
 section .popup_scroll li .right button:hover {background:#FCD5C1;}
 section .popup_scroll li .right button:checked {background:#ccc;}
 section .popup2 .list_line .line_right {float:right; width:70%;}
-section .popup2 .list_line .line_right select {width:200px; float:right; height:34px; margin-top:4px;}
+section .popup2 .list_line .line_right select {width:200px; float:right; height:26px; margin-top:4px;}
 section .popup2 .list_line .line_right input {width:200px; float:right; text-align:right;}
 section .popup2 .list_line .info{width:30%; padding-top:8px; padding-left:20px; text-align:left; font-size:12pt;}
 
@@ -375,7 +375,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line .line_right input.m9 {margin-right:93px;}
 .content .line .line_right input.left {text-align: left;}
 .content .line .line_right input.mg0 {margin-right:10px;}
-.content .line .line_right input.date{width:194px; margin-right:132px; height:35px; margin-left:3px;} 
+.content .line .line_right input.date{width:194px; margin-right:132px; height:26px; margin-left:3px;} 
 .content .line .line_right select {float: right; width: 180px; height: 30px; margin-top: 7px; border: 1px solid #000; font-size: 1rem; margin-right:93px;}
 .content .line input.date {width: 168px; height: 26px; float: left; text-align:center; font-size:12pt; background: url(../img/calender.png) 95%/18px no-repeat white}
 .content .line input.full {width: 100%;}
@@ -385,7 +385,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line div.date_to div.at {width: 6%;  font-size: 16px; padding-top:12px; float: right;}
 .content .line .search {width: 100%; height: 50px; padding-top:6px;}
 .content .line .search button {width: 40%; height: 26px; font-size: 12pt; font-weight:100; padding: 0;}
-.content .line .search button.col_3 {width: 25%; height:34px; margin:0 10px;}
+.content .line .search button.col_3 {width: 25%; height:26px; margin:0 10px;}
 .content .list_line {width:98%; float:left; height:50px;display: inline-flex; margin:0 1%; font-size:12px;}
 .content .border {border-bottom: 1px solid #000 !important;}
 .content .list_line .list_label {width:30%;border:1px solid #000; height:50px; padding-top:14px; border-bottom:none; background:#eee;}
@@ -489,7 +489,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 
 
 .scroll_area li.history_list9 .button_right {float: right; display: grid;}
-.scroll_area li.history_list9 .button_right button {width: 45px; height: 85px; font-size: 10pt; font-weight:100; margin: 0; padding:0; border-radius: 0;}
+.scroll_area li.history_list9 .button_right button {width: 45px; height: 85px; font-size: 12pt; font-weight:100; margin: 0; padding:0; border-radius: 0;}
 
 .scroll_area li.history_list1 {height: 120px;}
 .scroll_area li.history_list2 {height: 160px; padding-top:5px;}