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

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

@@ -1,130 +1,133 @@
 <section id="ITP_MOBILE_MSALESMNG03010">
-<div id="ITP_MOBILE_JS"></div>
-<div id="ITP_MAIN_CONTAINER" class="itp_main_box">  
-	<div style="font-size: 16pt; text-align: left; color: #333; margin-left: 5px; padding-top: 5px;">
-		운영정보
-	</div>
-	<div id="ITP_MAIN_HEADER_BRAND" class="itp_oper_info_area" style="display: none;">
-		<div class="itp_oper_info">
-			<label>입금액</label>
-			<div class="fnDp02Amt">12,000,000원</div>
-			<label>미납금</label>
-			<div class="fnUnpaidAmt">1,000원</div>
+	<div id="ITP_MOBILE_JS"></div>
+	<div id="ITP_MAIN_CONTAINER" class="itp_main_box">  
+		<div style="font-size: 16pt; text-align: left; color: #333; margin-left: 5px; padding-top: 5px;">
+			운영정보
 		</div>
-		<div class="itp_oper_info">
-			<label class="col_6">구매요청건수</label>
-			<div class="full fnPr20Count"></div>
+		<div id="ITP_MAIN_HEADER_BRAND" class="itp_oper_info_area" style="display: none;">
+			<div class="itp_oper_info">
+				<label>입금액</label>
+				<div class="fnDp02Amt">12,000,000원</div>
+				<label>미납금</label>
+				<div class="fnUnpaidAmt">1,000원</div>
+			</div>
+			<div class="itp_oper_info">
+				<label class="col_6">구매요청건수</label>
+				<div class="full fnPr20Count"></div>
+			</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"></div>
-			<label>발주진행</label>
-			<div class="fnPo30Count"></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"></div>
+				<label>발주진행</label>
+				<div class="fnPo30Count"></div>
+			</div>
+			<div class="itp_oper_info">
+				<label class="col_6">구매가능금액</label>
+				<div class="col_6 fnPoPsblAmt"></div>
+				<label>납품완료</label>
+				<div class="fnPoEndCount"></div>
+			</div>
 		</div>
-		<div class="itp_oper_info">
-			<label class="col_6">구매가능금액</label>
-			<div class="col_6 fnPoPsblAmt"></div>
-			<label>납품완료</label>
-			<div class="fnPoEndCount"></div>
+		<div id="ITP_MAIN_HEADER_SPPLY" class="itp_oper_info_area" style="display: none;">
+			<div class="itp_oper_info">
+				<label>수주건수</label>
+				<div class="fnOrdersCount">2 건</div>
+				<label>수주금액</label>
+				<div class="fnOrdersAmt"></div>
+			</div>
+			<div class="itp_oper_info">
+				<label class="col_6">정산요청금액</label>
+				<div class="full fnSttlReqAmt"></div>
+			</div>
 		</div>
-	</div>
-	<div id="ITP_MAIN_HEADER_SPPLY" class="itp_oper_info_area" style="display: none;">
-		<div class="itp_oper_info">
-			<label>수주건수</label>
-			<div class="fnOrdersCount">2 건</div>
-			<label>수주금액</label>
-			<div class="fnOrdersAmt"></div>
+		<div id="ITP_MAIN_DRAW_CHART_REQ" class="itp_graph_area">
+			<div class="itp_graph_header">
+				<label>구매요청</label>
+				<select id="ITP_FORM_MAIN_SEARCH_PR_TYPE" name="prType">
+					<option value="A">당일</option>
+					<option value="B">1주일</option>
+					<option value="C">15일</option>
+					<option value="D">1개월</option>
+				</select>
+			</div>
+			<div id="ITP_PCH_REQ_GRAPH"></div>
 		</div>
-		<div class="itp_oper_info">
-			<label class="col_6">정산요청금액</label>
-			<div class="full fnSttlReqAmt"></div>
+		<div id="ITP_MAIN_DRAW_DELI_CHART" class="itp_graph_area">
+			<div class="itp_graph_header">
+				<label>입고</label>
+				<select id="ITP_FORM_MAIN_SEARCH_DELI_TYPE" name="prType">
+					<option value="A">당일</option>
+					<option value="B">1주일</option>
+					<option value="C">15일</option>
+					<option value="D">1개월</option>
+				</select>
+			</div>
+			<div id="ITP_DELI_GRAPH"></div>
 		</div>
-	</div>
-	<div id="ITP_MAIN_DRAW_CHART_REQ" class="itp_graph_area">
-		<div class="itp_graph_header">
-			<label>구매요청</label>
-			<select id="ITP_FORM_MAIN_SEARCH_PR_TYPE" name="prType">
-				<option value="A">당일</option>
-				<option value="B">1주일</option>
-				<option value="C">15일</option>
-				<option value="D">1개월</option>
-			</select>
+		<div id="ITP_MAIN_DRAW_ORDERS_CHART" class="itp_graph_area">
+			<div class="itp_graph_header">
+				<label>수주내역</label>
+				<select id="ITP_FORM_MAIN_SEARCH_ORDERS_TYPE" name="prType">
+					<option value="A">당일</option>
+					<option value="B">1주일</option>
+					<option value="C">15일</option>
+					<option value="D">1개월</option>
+				</select>
+			</div>
+			<div id="ITP_ORDERS_GRAPH"></div>
 		</div>
-		<div id="ITP_PCH_REQ_GRAPH"></div>
-	</div>
-	<div id="ITP_MAIN_DRAW_DELI_CHART" class="itp_graph_area">
-		<div class="itp_graph_header">
-			<label>입고</label>
-			<select id="ITP_FORM_MAIN_SEARCH_DELI_TYPE" name="prType">
-				<option value="A">당일</option>
-				<option value="B">1주일</option>
-				<option value="C">15일</option>
-				<option value="D">1개월</option>
-			</select>
+		<div id="ITP_MAIN_DRAW_RELEASE_CHART" class="itp_graph_area">
+			<div class="itp_graph_header">
+				<label>출고</label>
+				<select id="ITP_FORM_MAIN_SEARCH_RELEASE_TYPE" name="prType">
+					<option value="A">당일</option>
+					<option value="B">1주일</option>
+					<option value="C">15일</option>
+					<option value="D">1개월</option>
+				</select>
+			</div>
+			<div id="ITP_RELEASE_GRAPH"></div>
 		</div>
-		<div id="ITP_DELI_GRAPH"></div>
-	</div>
-	<div id="ITP_MAIN_DRAW_ORDERS_CHART" class="itp_graph_area">
-		<div class="itp_graph_header">
-			<label>수주내역</label>
-			<select id="ITP_FORM_MAIN_SEARCH_ORDERS_TYPE" name="prType">
-				<option value="A">당일</option>
-				<option value="B">1주일</option>
-				<option value="C">15일</option>
-				<option value="D">1개월</option>
-			</select>
+		<div id="ITP_MAIN_DRAW_CHART_PODR" class="itp_graph_area">
+			<div class="itp_graph_header">
+				<label>구매발주</label>
+				<select id="ITP_FORM_MAIN_SEARCH_PO_TYPE" name="prType">
+					<option value="A">당일</option>
+					<option value="B">1주일</option>
+					<option value="C">15일</option>
+					<option value="D">1개월</option>
+				</select>
+			</div>
+			<div id="ITP_PCH_PODR_GRAPH"></div>
 		</div>
-		<div id="ITP_ORDERS_GRAPH"></div>
-	</div>
-	<div id="ITP_MAIN_DRAW_RELEASE_CHART" class="itp_graph_area">
-		<div class="itp_graph_header">
-			<label>출고</label>
-			<select id="ITP_FORM_MAIN_SEARCH_RELEASE_TYPE" name="prType">
-				<option value="A">당일</option>
-				<option value="B">1주일</option>
-				<option value="C">15일</option>
-				<option value="D">1개월</option>
-			</select>
+		<div id="ITP_MAIN_DRAW_CHART_REQ_UP" class="itp_graph_area">
+			<div class="itp_graph_header">
+				<label>매출순위</label>
+				<select id="ITP_FORM_MAIN_SEARCH_ITEM_CNT_TYPE" name="prType">
+					<option value="A">당일</option>
+					<option value="B">1주일</option>
+					<option value="C">15일</option>
+					<option value="D">1개월</option>
+				</select>
+			</div>
+			<div id="ITP_PCH_REQ_UP_ITEM_GRAPH"></div>
 		</div>
-		<div id="ITP_RELEASE_GRAPH"></div>
-	</div>
-	<div id="ITP_MAIN_DRAW_CHART_PODR" class="itp_graph_area">
-		<div class="itp_graph_header">
-			<label>구매발주</label>
-			<select id="ITP_FORM_MAIN_SEARCH_PO_TYPE" name="prType">
-				<option value="A">당일</option>
-				<option value="B">1주일</option>
-				<option value="C">15일</option>
-				<option value="D">1개월</option>
-			</select>
-		</div>
-		<div id="ITP_PCH_PODR_GRAPH"></div>
-	</div>
-	<div id="ITP_MAIN_DRAW_CHART_REQ_UP" class="itp_graph_area">
-		<div class="itp_graph_header">
-			<label>매출순위</label>
-			<select id="ITP_FORM_MAIN_SEARCH_ITEM_CNT_TYPE" name="prType">
-				<option value="A">당일</option>
-				<option value="B">1주일</option>
-				<option value="C">15일</option>
-				<option value="D">1개월</option>
-			</select>
+		<div id="ITP_MAIN_DRAW_CHART_CORE" class="itp_graph_area">
+			<div class="itp_graph_header">
+				<label>정 산</label>
+			</div>
+			<div id="ITP_STTL_GRAPH"></div>
 		</div>
-		<div id="ITP_PCH_REQ_UP_ITEM_GRAPH"></div>
-	</div>
-	<div id="ITP_MAIN_DRAW_CHART_CORE" class="itp_graph_area">
-		<div class="itp_graph_header">
-			<label>정 산</label>
-		</div>
-		<div id="ITP_STTL_GRAPH"></div>
-	</div>
-	<div id="ITP_MAIN_DRAW_LINE" class="itp_graph_area">
-		<div class="itp_graph_header">
-			<label>안전재고</label>
+		<div id="ITP_MAIN_DRAW_LINE" class="itp_graph_area">
+			<div class="itp_graph_header">
+				<label>안전재고</label>
+			</div>
+			<div id="ITP_SAFE_STCK_GRAPH"></div>
 		</div>
-		<div id="ITP_SAFE_STCK_GRAPH"></div>
+ 		<div class="button_bar" style="position:relative;">
+			<button id="ITP_BTN_MSALESMNG03010_CHART_CLOSE" class="col_12 btn-gray CLB">닫기</button>
+	  	</div>
 	</div>
-</div>
 </section>

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

@@ -546,7 +546,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal  input{ width:calc(50% - 85px);height:28px; top:-5px; position:relative;}
 .scroll_area li .left .nomal  input.full {width:calc(100% - 90px); margin-top:4px;}
 .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 .left .nomal  select{ width:calc(50% - 85px); height:28px; top:-5px; position:relative; padding:0;}
 
 .scroll_area li .scroll_btn {width:10%; height:158px; margin-top:-5px; display:inline-flex;}
 

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

@@ -11,6 +11,7 @@ const API_MOBILE_INFO 				= '/api/pomng/info-pchReq';			// 상세
 const API_MOBILE_SAVE 				= '/api/pomng/save-pchReq';			// 저장
 const API_POP_SEARCH_LIST			= '/api/whs/mng/pop-whs-search';
 const API_POP_ITEM_LIST 			= '/api/item/pop-grid-list';
+const API_MOBILE_BARCODE			= '/api/item/info-barcode-item';	// 바코드
 
 const API_POP_WISH_LIST 		= '/api/item/wish-list';
 const API_POP_SEARCH_WISH_LIST 	= '/api/item/pop-grid-wishlist';
@@ -116,6 +117,9 @@ let mobPageObj = {
 				}
 				return false;
 			});
+			$('#ITP_BTN_MPOMNG02010_DETAIL_SCAN').on('click', function() {
+				mobContObj.barcode.callApp();
+			});
 		}
 	},
 	switchScreen: function(mode) {
@@ -143,7 +147,28 @@ let mobPageObj = {
 	}
 };
 
+function appCallFnBarcode(barcode) {
+	var infoFn = function(result) {
+		// console.log(JSON.stringify(result));
+		if(result) {
+			result.pchReqQty=1;
+			mobContObj.modify.list.attachRow([result]);
+		}
+	};
+	const param = {
+		'sBrandId': fn_make_user_info.get('brandId'),
+		'sStoreId': fn_make_user_info.get('storeId'),
+		'sBarcode': barcode
+	};
+	fn_ajax_call(API_MOBILE_BARCODE, param, infoFn, 'GET');
+}
 let mobContObj = {
+	barcode: {
+		callApp: function() {
+			location.replace('app:scan');
+			// appCallFnBarcode('2210080000001005BRD221000001');
+		}
+	},
 	list: {
 		listPage: 1,
 		rows: [],
@@ -165,6 +190,36 @@ let mobContObj = {
 				CommonObj.moreView('#ITP_LIST_MPOMNG02010_ITEM_AREA', false);
 			this.listPage += 1;
 		},
+		attachRow: function (items) {
+			var _this = this;
+			var fnIsExist = function(rows, item) {
+				var isExist = false;
+				$.each(rows, function(i, row) {
+					if(row.brandUnitUnqNo === item.brandUnitUnqNo) {
+						isExist = true;
+						return false;
+					}
+				});
+				return isExist;
+			};
+			$.each(items, function(i, item) {
+				if(!fnIsExist(_this.rows, item)) {
+					_this.rows.push(item);
+					$('#ITP_LIST_MPOMNG01010_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY').html());
+					var $li = $('#ITP_LIST_MPOMNG01010_ITEM_AREA .panel-group > .list-row:last');
+					$li.find('.fnBrandUnitUnqNo').val(item.brandUnitUnqNo);
+					$li.find('.fnItemNm').text(item.itemNm);
+					$li.find('#ITP_MPOMNG01010_DETAIL_NUM').val(item.pchReqQty ? item.pchReqQty : '1');
+					$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
+					$li.find('.fnOrdAmt').text(CommonObj.currency.add(Number(item.unitAmt) * Number(item.pchReqQty ? item.pchReqQty : '1')));
+					$('.list-row #ITP_BTN_MPOMNG01010_DETAIL_PLUS')[$li.index()].addEventListener('click', function() { _this.actPlus(this); });
+					$('.list-row #ITP_BTN_MPOMNG01010_DETAIL_MINUS')[$li.index()].addEventListener('click', function() { _this.actMinus(this); });
+					$('.item-row #ITP_MPOMNG01010_DETAIL_NUM')[$li.index()].addEventListener('input', function() { _this.actInput(this); });
+					_this.pchReqAmtTot();
+				}
+			});
+			this.empty();
+		},
 		load: function() {
 			var callbackFn = function(result) {
 				/*console.log(result);*/