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

src/main/webapp/app/pomng/POMNG02010.html

@@ -204,7 +204,7 @@
 									</div>
 									<div class="itp_form_in">	
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">요청부서(매장/부서)</label>
+											<label class="col-xs-2 itp_lb">구매요청자</label>
 											<div class="col-xs-4 itp_ip pchReqMgrNm"></div>
 											<label class="col-xs-2 itp_lb">구매요청금액</label>
 											<div class="col-xs-4 itp_ip fnPchReqTotalAmt"></div>

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

@@ -82,7 +82,7 @@ require(['config'], function() {
 			// 10:관리자, 20:영업담당자, 30:가맹점, 40:브랜드, 50:매장, 60:공급사
 			// console.log('>>>> authTpCd = ' + authTpCd);
 			
-			if( authTpCd == '40' || authTpCd == '10' ) { // 브랜드
+			if( authTpCd == '40' ) { // 브랜드
 				$('#ITP_MAIN_HEADER_BRAND').show();
 			
 				$('#ITP_MAIN_DRAW_CHART_REQ').show();  
@@ -92,6 +92,7 @@ require(['config'], function() {
 				google.charts.setOnLoadCallback(drawChartPodr); // 구매발주
 			
 				$('#ITP_MAIN_DRAW_CHART_REQ_UP').show();
+				$('#ITP_MAIN_DRAW_CHART_REQ_UP .itp_graph_info').html("요청순위");
 				google.charts.setOnLoadCallback(drawChartReqUp); // 매출순위
 				
 				if(fn_make_user_info.get('brandId')) {
@@ -115,6 +116,7 @@ require(['config'], function() {
 				google.charts.setOnLoadCallback(drawChartDeli); // 입고
 				
 				$('#ITP_MAIN_DRAW_CHART_REQ_UP').show();
+				$('#ITP_MAIN_DRAW_CHART_REQ_UP .itp_graph_info').html("요청순위");
 				google.charts.setOnLoadCallback(drawChartReqUp); // 매출순위
 				
 				$('#ITP_MAIN_DRAW_CHART_CORE').show();
@@ -130,6 +132,7 @@ require(['config'], function() {
 				google.charts.setOnLoadCallback(drawChartRelease); // 출고
 				
 				$('#ITP_MAIN_DRAW_CHART_REQ_UP').show();
+				$('#ITP_MAIN_DRAW_CHART_REQ_UP .itp_graph_info').html("수주순위");
 				google.charts.setOnLoadCallback(drawChartReqUp); // 매출순위
 				
 				$('#ITP_MAIN_DRAW_CHART_CORE').show();

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

@@ -537,7 +537,7 @@ let modifyObj = {
 		$('#ITP_FORM_POMNG04010_DETAIL #ITP_FORM_POMNG04010_DETAIL_AFFL_SHOP_ID').val(result.afflShopId);
 		$('#ITP_FORM_POMNG04010_DETAIL .fnBrandNm').text(result.brandNm);				
 		$('#ITP_FORM_POMNG04010_DETAIL .fnPchPodrUnqNo').text(result.pchPodrUnqNo);
-		$('#ITP_FORM_POMNG04010_DETAIL .fnSpplyNm').text(result.spplyId);
+		$('#ITP_FORM_POMNG04010_DETAIL .fnSpplyNm').text(result.spplyNm);
 		$('#ITP_FORM_POMNG04010_DETAIL .fnPodrDt').text(result.podrDt);
 		$('#ITP_FORM_POMNG04010_DETAIL .fnPchOdrStCd').text(result.pchOdrStNm);
 		$('#ITP_FORM_POMNG04010_DETAIL .fnPodrTotalAmt').text(result.podrTotalAmt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','));

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

@@ -84,7 +84,8 @@
 	            </div>
 				<div class="right" style="width:125px;">
 					<button id="ITP_BTN_MPOMNG01010_DETAIL_MINUS" class="DETAIL_ITEM_MINUS">-</button>
-                    <input type="number" id="ITP_MPOMNG01010_DETAIL_NUM" class="" value="1" maxlength="5">
+					<input id="ITP_MPOMNG01010_DETAIL_NUM" class="">
+					<!-- <div class="num fnPchReqQty">1</div> -->
 					<button id="ITP_BTN_MPOMNG01010_DETAIL_PLUS" class="DETAIL_ITEM_PLUS">+</button>
 				</div>
 			</li>
@@ -222,7 +223,7 @@
                         </div>
                         <div class="right">
 			              <button id="ITP_BTN_MPOMNG01010_POP_ITEM_MINUS">-</button>
-                            <input type="number" id="ITP_MPOMNG01010_POP_NUM" class="" value="1" maxlength="5">
+			              <input id="ITP_MPOMNG01010_POP_NUM" class="">
 			              <button id="ITP_BTN_MPOMNG01010_POP_ITEM_PLUS">+</button>
 			            </div>
                          <div class="scroll_right">

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

@@ -232,10 +232,10 @@
 	              <button id="ITP_BTN_MPOMNG02010_MODIFY_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 	            </div>
 	        </div>
-	        <div class="table_header line">
+	        <div class="table_btn line">
 	          <div>
 	            <h1><구매 품목></h1>
-	            <button type="button" id="ITP_BTN_MPOMNG02010_MODIFY_DEL_ROW" class="btn-primary btn-sm ADB">품목삭제</button>
+	            <button type="button" id="ITP_BTN_MPOMNG02010_MODIFY_DEL_ROW" class="btn-danger btn-sm ADB">품목삭제</button>
 	            <button type="button" id="ITP_BTN_MPOMNG02010_MODIFY_ADD_ROW" class="btn-primary btn-sm ADB">품목추가</button>
 	          </div>
 	        </div>

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

@@ -37,9 +37,9 @@
 							<button id="ITP_BTN_MRTNMNG01010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 						</div>
 					</div>
-					<div class="table_header">
+					<div class="table_btn">
 						<h1><반품 품목></h1>
-						<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
+						<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_DELROW" class="btn-danger btn-sm ADB">품목삭제</button>
 						<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MRTNMNG01010_ITEM_AREA">품목추가</button>
 					</div>
 				</div>

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

@@ -193,9 +193,9 @@
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 						</div>
 					</div>
-					<div class="table_header">
+					<div class="table_btn">
 						<h1><반품 품목></h1>
-						<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_DEL_ROW" class="btn-primary btn-sm ADB">품목삭제</button>
+						<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_DEL_ROW" class="btn-danger btn-sm ADB">품목삭제</button>
 						<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_ADD_ROW" class="btn-primary btn-sm ADB">품목추가</button>
 					</div>
 				</div>
@@ -221,7 +221,7 @@
 						</div>
 						<div class="right">
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_MINUS" class="DETAIL_ITEM_MINUS">-</button>
-							<input type="number" id="ITP_MRTNMNG02010_MODIFY_NUM" class="" value="1" maxlength="5" data-brandUnitUnqNo="">
+							<input id="ITP_MRTNMNG02010_MODIFY_NUM" class="">
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_PLUS" class="DETAIL_ITEM_PLUS">+</button>
 						</div>
 					</li>
@@ -340,7 +340,7 @@
 						</div>
 						<div class="right">
 							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_MINUS" class="POP_ITEM_MINUS">-</button>
-							<input type="number" id="ITP_MRTNMNG02010_POP_NUM" class="" value="1" maxlength="5">
+							<input id="ITP_MRTNMNG02010_POP_NUM" class="">
 							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_PLUS" class="POP_ITEM_PLUS">+</button>
 						</div>
 						<div class="scroll_right">

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

@@ -166,6 +166,7 @@ var mobMainObj = {
 				google.charts.setOnLoadCallback(chart.drawChartDeli); // 입고
 				
 				$('#ITP_MAIN_DRAW_CHART_REQ_UP').show();
+				$('#ITP_MAIN_DRAW_CHART_REQ_UP .itp_graph_header > label').html("요청순위");
 				google.charts.setOnLoadCallback(chart.drawChartReqUp); // 매출순위
 				
 				$('#ITP_MAIN_DRAW_CHART_CORE').show();
@@ -186,6 +187,7 @@ var mobMainObj = {
 				google.charts.setOnLoadCallback(chart.drawChartRelease); // 출고
 				
 				$('#ITP_MAIN_DRAW_CHART_REQ_UP').show();
+				$('#ITP_MAIN_DRAW_CHART_REQ_UP .itp_graph_header > label').html("수주순위");
 				google.charts.setOnLoadCallback(chart.drawChartReqUp); // 매출순위
 				
 				$('#ITP_MAIN_DRAW_CHART_CORE').show();
@@ -203,6 +205,7 @@ var mobMainObj = {
 				google.charts.setOnLoadCallback(chart.drawChartPodr); // 구매발주
 
 				$('#ITP_MAIN_DRAW_CHART_REQ_UP').show();
+				$('#ITP_MAIN_DRAW_CHART_REQ_UP .itp_graph_header > label').html("요청순위");
 				google.charts.setOnLoadCallback(chart.drawChartReqUp); // 매출순위
 
 				if(fn_make_user_info.get('brandId')) {

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

@@ -123,7 +123,7 @@ let mobContObj = {
 					$('#ITP_LIST_MCOLLMNG01010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG01010_LIST_ITEM_ROWCOPY').html());
 					var $li = $('#ITP_LIST_MCOLLMNG01010_LIST_ITEM_AREA .panel-group > .item-row:last');
 					$li.find('.fnBrandNm').text(item.brandNm);
-					$li.find('.fnRtnPodrUnqNo').text(item.rtnPodrUnqNo);
+					$li.find('.fnPchPodrUnqNo').text(item.rtnPodrUnqNo);
 					$li.find('.fnRtnOdrStNm').text(item.rtnOdrStNm);
 					$li.find('.fnRtnOdrRegDt').text(item.rtnOdrRegDt);
 					$li.find('.fnColReqDt').text(item.colReqDt);
@@ -162,23 +162,23 @@ let mobContObj = {
 			var _this = this;
 			var id = '#ITP_AJAX_MCOLLMNG01010_VIEW_CONTAINER';
 			$(id).find('.fnBrandNm').text(result.brandNm);
-			$(id).find('.fnPchPodrUnqNo').text(result.pchPodrUnqNo);
-			$(id).find('.fnPodrDt').text(result.podrDt);
-			$(id).find('.fnPchOdrStNm').text(result.pchOdrStNm);
-			$(id).find('.fnWhsNm').text(result.whsNm);
-			$(id).find('.fnPodrTotalAmt').text(CommonObj.currency.add(result.podrItemQty));
-			$(id).find('.fnPodrMgrNm').text(result.podrMgrNm);
+			$(id).find('.fnRtnPodrUnqNo').text(result.rtnPodrUnqNo);
+			$(id).find('.fnRtnOdrRegDt').text(result.rtnOdrRegDt);
+			$(id).find('.fnRtnOdrStNm').text(result.rtnOdrStNm);
+			$(id).find('.fnRtnWhsNm').text(result.rtnWhsNm);
+			$(id).find('.fnRtnDodrTotalAmt').text(CommonObj.currency.add(result.rtnDodrTotalAmt));
+			$(id).find('.fnRtnMgrNm').text(result.rtnMgrNm);
 			$.each(result.rtnOdrDtlList, function (i, item) {
 				$('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_ROWCOPY').html());
 				var $li = $('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA .panel-group > .item-row:last');
 				$li.find('.fnRtnPodrDtlNo').text(item.rtnPodrDtlNo);
-				$li.find('.fnItemid').text(item.itemId);
+				$li.find('.fnItemId').text(item.itemId);
 				$li.find('.fnItemNm').text(item.itemNm);
 				$li.find('.fnUnitQty').text(item.unitQty);
 				$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
 				$li.find('.fnUnit').text(item.unit);
-				$li.find('.fnRtnReqQty').text(CommonObj.comma.set(item.rtnReqQty));
-				$li.find('.fnRtnAmt').text(CommonObj.currency.add(item.rtnAmt));
+				$li.find('.fnRtnOdrQty').text(CommonObj.comma.set(item.rtnReqQty));
+				$li.find('.fnOdrAmt').text(CommonObj.currency.add(item.rtnOdrAmt));
 				$li.find('.fnColReqDt').text(result.colReqDt);
 			});
 		},