웹 납품서 보기 팝업 수정

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

@@ -2,6 +2,10 @@
 	<div class="modal-dialog" style="width:1200px;">
 		<div class="modal-content">
 			<form id="ITP_FORM_BIZPOP_DLV_STTMT_PRN">
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_FORM_DT" name="fromDt" value="">
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_TO_DT" name="toDt" value="">
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID" name="sbrandId" value="">
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_SPPLY_ID" name="sspplyId" value="">
 				<div id="ITP_POPUP_CONTAINER">
 					<div class="modal-header">
 						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
@@ -31,23 +35,23 @@
 									<div>
 										<label style="width:100px;">발행일</label>
 										<label>:</label>
-										<span class="fnDlvRegDt">2022.01.01</span>
+										<span class="fnDlvRegDt"></span>
 									</div>
 									<div>
 										<label style="width:100px;">납품확인번호</label>
 										<label>:</label>
-										<span class="fnDlvSttmtUnqNo">2211020000002001</span>
+										<span class="fnDlvSttmtUnqNo"></span>
 									</div>
 									<div>
 										<label style="width:100px;">납품일</label>
 										<label>:</label>
-										<span class="fnDlvRegDt">2022.12.31</span>
+										<span class="fnDlvRegDt"></span>
 									</div>
 									<div>
 										<label style="width:100px;">납품담당</label>
 										<label>:</label>
-										<span class="fnDlvMgrNm">홍길동</span>
-										(<span class="fnDlvMgrTelNo">010-2525-2525</span>)
+										<span class="fnDlvMgrNm"></span>
+										<span class="fnDlvMgrTelNo"></span>
 									</div>
 								</div>
 								<div class="col-xs-6">
@@ -61,9 +65,7 @@
 										<div class="itp_sign_header">
 											<label>납품확인일</label>
 										</div>
-										<div class="itp_sign_area fnDlvCnfmDt">
-											2022.01.01
-										</div>
+										<div class="itp_sign_area fnDlvCnfmDt"></div>
 									</div>
 								</div>
 							</div>	
@@ -72,14 +74,14 @@
 									<div>
 										<label style="width:100px;">납품 장소</label>
 										<label>:</label>
-										(<span style="margin:0px; " class="fnZipNo">12345</span>)
-										<span class="fnLoadAddr">서울 송파구 문정동 100 ㅁㄴㄹㅇㅁㄴ</span>
-										<span class="fnDtlAddr">디 매장</span>
+										<span style="margin:0px; " class="fnZipNo"></span>
+										<span class="fnLoadAddr"></span>
+										<span class="fnDtlAddr"></span>
 									</div>
 									<div>
 										<label style="width:100px;">전화번호</label>
 										<label>:</label>
-										<span class="fnVndrTelNo">02-1234-1547</span>
+										<span class="fnVndrTelNo"></span>
 									</div>
 								</div>
 							</div>	
@@ -91,25 +93,25 @@
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-4">등록번호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBsnsRegNo">215-58-584887</div>
+											<div class="col-xs-12 itp_in fnBsnsRegNo"></div>
 										</div>
 									</div>	
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">상호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnSpplyNm">등록업체명</div>
+											<div class="col-xs-12 itp_in fnSpplyNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">성명</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm">공길동</div>
+											<div class="col-xs-12 itp_in fnBrandNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">주소</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm">서울 시송파구 ㄴㄻㄴㄹ</div>
+											<div class="col-xs-12 itp_in fnBrandNm"></div>
 										</div>
 									</div>
 								</div>	
@@ -122,33 +124,30 @@
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-4">등록번호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm">215-58-584887</div>
+											<div class="col-xs-12 itp_in fnBrandNm"></div>
 										</div>
 									</div>	
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">상호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm">등록업체명</div>
+											<div class="col-xs-12 itp_in fnBrandNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">성명</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm">공길동</div>
+											<div class="col-xs-12 itp_in fnBrandNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">주소</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm">서울 시송파구 ㄴㄻㄴㄹ</div>
+											<div class="col-xs-12 itp_in fnBrandNm"></div>
 										</div>
 									</div>
 								</div>	
 							</div>
 						</div>
-						
-						
-						
 						<div id="ITP_BIZPOP_DLV_STTMT_PRN_jqGrid_list" class="itp_tb_list" data-total-cnt="">
 							<div id="ITP_BIZPOP_DLV_STTMT_PRN_jqGridView" class="itp_views fix"></div>
 							<table id="ITP_BIZPOP_DLV_STTMT_PRN_jqGrid"></table>

src/main/webapp/js/app/ordmng/ITP_ORDMNG03010.js

@@ -306,7 +306,12 @@ let listObj = {
 					    if(selectedIds.length !== 1) {
 					    	return;
 					    }
-						var param = {'dlvSttmtUnqNo':selectedIds[0].dlvSttmtUnqNo};
+						var param = {
+							'dlvSttmtUnqNo':selectedIds[0].dlvSttmtUnqNo,
+							'fromDt': $('#ITP_FORM_ORDMNG03010_SEARCH #ITP_FORM_ORDMNG03010_SEARCH_DLV_REQ_DT').val(),
+							'toDt': $('#ITP_FORM_ORDMNG03010_SEARCH #ITP_FORM_ORDMNG03010_SEARCH_DLV_CMPLT_DT').val()
+						};
+						console.log(param);
 						fn_call_popup('biz', 'BIZPOP_DLV_STTMT_PRN', '#ITP_ASIDE', popFn, param, 'S');
 					}
 			}

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

@@ -7,18 +7,44 @@ require(['config'], function() {
 });
 
 let FRCOMP_POP_GRID_LIST = '/api/pomng/inoutmng/spply-deli-grid-list';
-
-function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, returnType) {
+let FRCOMP_POP_INFO_INV  = '/api/pomng/inoutmng/info-inv';	// 상세
+function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, schParam, returnType) {
 	// 공통코드
 	// fn_make_select(CODE_LIST, 'CMPY_TYPE_CD', 'ITP_FORM_BIZPOP_DLV_STTMT_PRN_CMPY_TYPE_CD', true, '가맹점타입 선택');
 	
+	console.log(args);
+	
 	let itp_BIZPOP_DLV_STTMT_PRN_param = {};
 	let itp_BIZPOP_DLV_STTMT_PRN_search = false;
 
 	const THIS_FORM_ID = '#ITP_FORM_BIZPOP_DLV_STTMT_PRN';
 	const THIS_GIRD_ID = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGrid';
 	const THIS_GIRD_PAGER = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGridPager';
-
+	
+let popObj = {	
+	init: function (param) {
+		this.load(param);
+	},
+	load: function(param) {
+		fn_ajax_call(FRCOMP_POP_INFO_INV, param, this.callback, 'GET');
+	},
+	callback: function (result) {
+		console.log(result);
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvMgrTelNo').val(args.dlvMgrTelNo);
+		var divMgrTelNo = "(" + args.divMgrTelNo + ")";
+		
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnZipNo').val(args.zipNo);
+		var zipNo = "(" + args.zipNo + ")";
+		//ord030 파일에서 따서 실험중 
+	}
+};
+	
+	
+	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_FORM_DT').val(args.fromDt);
+	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_TO_DT').val(args.toDt);
+	
+	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID').val(fn_make_user_info.get('brandId'));
+	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
 	if(args) {
 		$('#ITP_FORM_BIZPOP_DLV_STTMT_PRN_CMPY_NM').val(args.brandNm);
 	}
@@ -83,7 +109,7 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, returnType) {
 	$(THIS_GIRD_ID).jqGrid({
 		colModel: [
 			{
-				index: 'AFFL_SHOP_ID', name: 'pchPodrUnqNo',
+				index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
 				label: '발주번호', //
 				width: '5', fixed: false, align: 'center',
 				sortable: false, hidden: false
@@ -95,25 +121,25 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, returnType) {
 				sortable: false, hidden: false
 			},
 			{
-				index: 'BRAND_ID', name: 'itemNm',
+				index: 'ITEM_NM', name: 'itemNm',
 				label: '품목명', //
 				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
-				index: 'BRAND_NM', name: 'podrQty',
+				index: 'PODR_QTY', name: 'podrQty',
 				label: '발주수량', //
 				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
-				index: 'BRAND_ID', name: 'dlvQty',
+				index: 'DLV_QTY', name: 'dlvQty',
 				label: '납품서수량', //
 				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
-				index: 'BRAND_ID', name: 'expryDate',
+				index: 'EXPRY_DATE', name: 'expryDate',
 				label: '유통기한', //
 				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false

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

@@ -1,6 +1,6 @@
 <section id="ITP_MOBILE_MRTNMNG03010">
    <div id="ITP_AJAX_MRTNMNG03010_DETAIL_CONTAINER" style="display: none;">
-  	<form id="ITP_FORM_MRTNMNG03010_VIEW" class="form-horizontal" onsubmit="return false;">
+  	<form id="ITP_FORM_MRTNMNG03010_DETAIL" class="form-horizontal" onsubmit="return false;">
 	  <input type="hidden" id="ITP_FORM_MRTNMNG03010_DETAIL_VIEW_CD" name="viewCd" value="C">
       	<div class="content">
        	<div class="line">