품목현황 수정중

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

@@ -2,116 +2,120 @@
 	<div class="modal-dialog" style="width:1200px;">
 		<div class="modal-content">
 			<form id="ITP_FORM_BIZPOP_DLV_STTMT_PRN">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-					<h5 class="modal-title">가맹점 검색</h5>
-				</div>
-				<div class="modal-body">
-					<div class="itp_form fix">
-						<div class="col-xs-12 itp_form_inline">
-							<div class="form-horizontal fix">
-								<div class="col-xs-4 itp_in itp_pr">
-									<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_BIZPOP_DLV_STTMT_PRN_BRAND_LOGO "style="border:none; border-radius: 0; height:85px; width:85px; position:absolute; padding:0;" class="form-control itp_input" name="" >
-								</div>
-								<div class="pull-right itp_cicon">
-									<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_DLV_STTMT_PRN_BTN_SEARCH" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;출력&nbsp;&nbsp;</button>
-									<button type="button" class="btn btn-primary btn-sm" id="ITP_BIZPOP_DLV_STTMT_PRN_BTN_SELECT"><i class="glyphicon"></i>&nbsp;&nbsp;다운로드&nbsp;&nbsp;</button>
+				<div id="ITP_POPUP_CONTAINER">
+					<div class="modal-header">
+						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+						<h5 class="modal-title">가맹점 검색</h5>
+					</div>
+					<div class="modal-body">
+						<div class="itp_form fix">
+							<div class="col-xs-12 itp_form_inline">
+								<div class="form-horizontal fix">
+									<div class="col-xs-4 itp_in itp_pr">
+										<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_BIZPOP_DLV_STTMT_PRN_BRAND_LOGO "style="border:none; border-radius: 0; height:85px; width:85px; position:absolute; padding:0;" class="form-control itp_input" name="" >
+									</div>
+									<div class="pull-right itp_cicon">
+										<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_DLV_STTMT_PRN_BTN_SEARCH" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;출력&nbsp;&nbsp;</button>
+										<button type="button" class="btn btn-primary btn-sm" id="ITP_BIZPOP_DLV_STTMT_PRN_BTN_SELECT"><i class="glyphicon"></i>&nbsp;&nbsp;다운로드&nbsp;&nbsp;</button>
+									</div>
 								</div>
 							</div>
-						</div>
-						<div class="col-xs-12 itp_form_inline">
-							<div class="col-xs-5"></div>
-							<div class="itp_title">
-								<label>납품확인서</label>
-							</div>
-						</div>	
-						<div class="col-xs-12 itp_form_inline">
-							<div class="col-xs-6" >
-								<div>
-									<label style="width:100px;">발행일</label>
-									<label>:</label>
-									<span class="fnDlvRegDt">2022.01.01</span>
+							<div class="col-xs-12 itp_form_inline">
+								<div class="col-xs-5"></div>
+								<div class="itp_title">
+									<label>납품확인서</label>
 								</div>
-								<div>
-									<label style="width:100px;">납품확인번호</label>
-									<label>:</label>
-									<span class="fnDlvSttmtUnqNo">2211020000002001</span>
-								</div>
-								<div>
-									<label style="width:100px;">납품일</label>
-									<label>:</label>
-									<span class="fnDlvRegDt">2022.12.31</span>
-								</div>
-								<div>
-									<label style="width:100px;">납품담당</label>
-									<label>:</label>
-									<span class="fnDlvMgrNm">홍길동</span>
-									(<span class="fnDlvMgrTelNo">010-2525-2525</span>)
-								</div>
-							</div>
-							<div class="col-xs-6">
-								<div class="itp_sign">
-									<div class="itp_sign_header">
-										<label>서    명</label>
+							</div>	
+							<div class="col-xs-12 itp_form_inline">
+								<div class="col-xs-6" >
+									<div>
+										<label style="width:100px;">발행일</label>
+										<label>:</label>
+										<span class="fnDlvRegDt">2022.01.01</span>
 									</div>
-									<div class="itp_sign_area"></div>
-								</div>
-								<div class="itp_sign">
-									<div class="itp_sign_header">
-										<label>납품확인일</label>
+									<div>
+										<label style="width:100px;">납품확인번호</label>
+										<label>:</label>
+										<span class="fnDlvSttmtUnqNo">2211020000002001</span>
 									</div>
-									<div class="itp_sign_area">
-										2022.01.01
+									<div>
+										<label style="width:100px;">납품일</label>
+										<label>:</label>
+										<span class="fnDlvRegDt">2022.12.31</span>
+									</div>
+									<div>
+										<label style="width:100px;">납품담당</label>
+										<label>:</label>
+										<span class="fnDlvMgrNm">홍길동</span>
+										(<span class="fnDlvMgrTelNo">010-2525-2525</span>)
 									</div>
 								</div>
-							</div>
-						</div>	
-						<div class="col-xs-12 itp_form_inline">
-							<div class="col-xs-6">
-								<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>
-								</div>
-								<div>
-									<label style="width:100px;">전화번호</label>
-									<label>:</label>
-									<span class="fnDlvRegDt">02-1234-1547</span>
+								<div class="col-xs-6">
+									<div class="itp_sign">
+										<div class="itp_sign_header">
+											<label>서    명</label>
+										</div>
+										<div class="itp_sign_area"></div>
+									</div>
+									<div class="itp_sign">
+										<div class="itp_sign_header">
+											<label>납품확인일</label>
+										</div>
+										<div class="itp_sign_area">
+											2022.01.01
+										</div>
+									</div>
 								</div>
-							</div>
-						</div>	
-						<div class="col-xs-12 itp_form_inline">
-							<div class="col-xs-6">
-								<label class="itp_company_type">공급사</label>
-								<label class="col-xs-2">등록번호</label>
-								<div class="col-xs-4">
-									<div class="col-xs-12 itp_in fnBrandNm">215-58-584887</div>
+							</div>	
+							<div class="col-xs-12 itp_form_inline">
+								<div class="col-xs-6">
+									<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>
+									</div>
+									<div>
+										<label style="width:100px;">전화번호</label>
+										<label>:</label>
+										<span class="fnDlvRegDt">02-1234-1547</span>
+									</div>
 								</div>
-								
+							</div>	
+							<div class="col-xs-12 itp_form_inline">
+								<div class="itp_form_info">
+									<div class="col-xs-6">
+										<label class="itp_company_type">공급처</label>
+										<label class="col-xs-2">등록번호</label>
+										<div class="col-xs-4">
+											<div class="col-xs-12 itp_in fnBrandNm">215-58-584887</div>
+										</div>
+										
+									</div>
+									<div class="col-xs-6">
+										<label class="itp_company_type">발주처</label>
+										<label class="col-xs-2">등록번호</label>
+										<div class="col-xs-4">
+											<div class="col-xs-12 itp_in fnBrandNm">215-58-584887</div>
+										</div>
+										
+									</div>
+								</div>		
 							</div>
-							<div class="col-xs-6">
-								<label class="itp_company_type">공급사</label>
-								<label class="col-xs-2">등록번호</label>
-								<div class="col-xs-4">
-									<div class="col-xs-12 itp_in fnBrandNm">215-58-584887</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>
-						<div id="ITP_BIZPOP_DLV_STTMT_PRN_jqGridPager"></div>
-						<div id="ITP_BIZPOP_DLV_STTMT_PRN_jqGridEmpty" class="itp_no_data"></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>
+							<div id="ITP_BIZPOP_DLV_STTMT_PRN_jqGridPager"></div>
+							<div id="ITP_BIZPOP_DLV_STTMT_PRN_jqGridEmpty" class="itp_no_data"></div>
+						</div>
 					</div>
 				</div>
 			</form>

bin/src/main/webapp/app/vendinfo/VENDINFO02010.html

@@ -17,13 +17,8 @@
 								<input type="hidden" id="ITP_FORM_VENDINFO02010_SEARCH_SPPLY_ID" name="sspplyId">
 								<input type="hidden" id="ITP_FORM_VENDINFO02010_SEARCH_BRAND_ID" name="sbrandId">
 									<div class="form-group">
-										<!-- <div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_VENDINFO02010_SERVICE_ST_CD" data-select-code="ST_CD" class="form-control itp_input" name="sitemStCd">
-												<option value="N"></option>
-											</select>										
-										</div> -->
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_VENDINFO02010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sspplyNm" readonly/>
+											<input type="text" id="ITP_FORM_VENDINFO02010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체 선택" readonly/>
 										</div>
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
 											<button type="button" id="ITP_FORM_VENDINFO02010_SEARCH_STORE_SPPLY" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
@@ -74,13 +69,13 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">품목분류 *</label>
 											<div class="col-xs-12 itp_ip" style="padding:8px 0 0 15px;">
-												<div class="col-xs-a itp_in itp_noMar fnItemClass1"></div>
+												<div class="col-xs-a itp_in itp_noMar fnItemClass1Nm"></div>
 												<label class="col-xs-a itp_in">></label>
-												<div class="col-xs-a itp_in itp_noMar fnItemClass2"></div>
+												<div class="col-xs-a itp_in itp_noMar fnItemClass2Nm"></div>
 												<label class="col-xs-a itp_in">></label>
-												<div class="col-xs-a itp_in itp_noMar fnItemClass3"></div>
+												<div class="col-xs-a itp_in itp_noMar fnItemClass3Nm"></div>
 												<label class="col-xs-a itp_in">></label>
-												<div class="col-xs-a itp_in itp_noMar fnItemClass4"></div>
+												<div class="col-xs-a itp_in itp_noMar fnItemClass4Nm"></div>
 											</div>
 										</div>
 									</div>
@@ -247,7 +242,7 @@
 											<label class="col-xs-2 itp_lb">품목이미지</label>
 											<div class="col-xs-12 itp_ip colspan">
 												<div class="col-xs-1 itp_in" style="width:auto;">
-													<img src="/oqpo-view/images/item-list.jpg" alt="로고 샘플" id="ITP_FORM_STINFO04010_DETAIL "style="top:12px; left:12px; height:150px; width:412px; " class="form-control itp_input" name="" >
+													<img src="/" alt="로고 샘플" id="ITP_FORM_STINFO04010_DETAIL "style="top:12px; left:12px; height:150px; width:412px; " class="form-control itp_input" name="" >
 												</div>
 											</div>
 										</div>

bin/src/main/webapp/css/style.css

@@ -689,10 +689,10 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
 .fnNumericDot {text-align: center;}
 
 /* 팝업 추가 */
-.modal-body .itp_title label {font-size:3rem; text-decoration:underline; text-underline-position:under;}
-.modal-body .itp_title .col-1 {width:100px;}
-.modal-body .itp_sign {float: right;}
-.modal-body .itp_sign .itp_sign_header {border: 1px solid #000; width: 120px; height: 35px; padding: 8px; text-align: center;}
-.modal-body .itp_sign .itp_sign_area {text-align: center; padding: 7px 6px; border: 1px solid #000; border-top:none; height: 110px;}
-.modal-body .itp_sign .itp_form_inline .itp_company_type {float:left;} 
-.modal-body span{margin-right:7px;}
+#ITP_POPUP_CONTAINER .modal-body .itp_title label {font-size:3rem; text-decoration:underline; text-underline-position:under;}
+#ITP_POPUP_CONTAINER .modal-body .itp_title .col-1 {width:100px;}
+#ITP_POPUP_CONTAINER .modal-body .itp_sign {float: right;}
+#ITP_POPUP_CONTAINER .modal-body .itp_sign .itp_sign_header {border: 1px solid #000; width: 120px; height: 35px; padding: 8px; text-align: center;}
+#ITP_POPUP_CONTAINER .modal-body .itp_sign .itp_sign_area {text-align: center; padding: 7px 6px; border: 1px solid #000; border-top:none; height: 110px;}
+#ITP_POPUP_CONTAINER .modal-body .itp_sign .itp_form_inline .itp_form_info .itp_company_type {float:left;}  
+#ITP_POPUP_CONTAINER .modal-body span{margin-right:7px;}

bin/src/main/webapp/js/app/config.js

@@ -1297,7 +1297,7 @@ function itp_fn_open_tab_self(param, fn) {
 };
 
 
-function itp_fn_set_file_upload(wrap, folder, multi, thumb, screen, arg) {
+function itp_fn_set_file_upload(wrap, folder, multi, thumb, screen, arg, fn) {
 	if (thumb) {
 		multi = false;
 		ITP_UPLOAD_DEFAULTS = {
@@ -1351,6 +1351,9 @@ function itp_fn_set_file_upload(wrap, folder, multi, thumb, screen, arg) {
 			        success: function(result) {
 			        	trRow.hide();
 		        		trRow.remove();
+		        		if(fn && $.isFunction(fn)) {
+							fn(param);
+						}
 			        },
 			        error: function(xhr, status, error) {
 						if (xhr.responseJSON !== undefined) { //실패시 서버에서 내려주는 메세지 얼럿
@@ -1697,7 +1700,7 @@ function itp_fn_grid_make_not_paging(option) {
 	});
 }
 
-function itp_fn_grid_make_local(option) {
+function itp_fn_grid_make_local(option) { //예를 원격으로 호출하면 됨     처음url 안주던지     빈 그리드 시용
 	var options = $.extend({
 		multiselect: false,
 		rownumbers: false
@@ -2968,9 +2971,6 @@ var itp_fn_set_timeout = {
 	}
 };
 
-var itp_fn_is_valid = (formId) => {
-};
-
 // 2022-11-02 수발주 추가
 let itp_fn_form_event = {
 	onKeyup: function(formId) {
@@ -2981,12 +2981,19 @@ let itp_fn_form_event = {
 				value = $(this).val().replace(/[^0-9]/g, "");
 			}
 			if ($.inArray('comma', arry) > -1) {
-				value = $(this).val().replace(/[^0-9]/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+				value = $(this).val().replace(/[^0-9]/g, "")
+					.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
 			}
 			if ($.inArray('regNo', arry) > -1) {
 				value = $(this).val().replace(/[^0-9]/g, "")
 					.replace(/(^[0-9]{3}|^0[0-9]{2})([0-9]+)?([0-9]{5})$/,"$1-$2-$3")
 			}
+			if ($.inArray('corpNo', arry) > -1) {
+				if($(this).val().length > 13) return;
+				value = $(this).val().replace(/[^0-9]/g, "")
+					.replace(/(^[0-9]{6})([0-9]+)?([0-9]{7})$/,"######-#######")
+					// .replace(/(\d{6})(\d{7})/, '######-#######')
+			}
 			if ($.inArray('tel', arry) > -1) {
 				value = ($(this).val().startsWith('0')) ? $(this).val().replace(/[^0-9]/g, "")
 					.replace(/(^02|^0505|^1[0-9]{3}|^0[0-9]{2})([0-9]+)?([0-9]{4})$/,"$1-$2-$3")
@@ -3017,4 +3024,18 @@ let itp_fn_form_event = {
 		});
 		return isValid;
 	}
+};
+
+let itp_fn_attach_file = {
+	view: (id, fileList, clazz, style) => {
+		$.each(fileList, function(i, item) {
+			var text = 	'<img ' +
+						'src="' + item.filePath + '" ' +
+						'alt="' + item.fileNm + '" ' +
+						'id="' + (item.fileNo + '_' + i) + '" ' +
+						'class="' + clazz + '" ' +
+						'style="' + style + '" />';
+			$('#' + id).append(text);
+		});
+	}
 };

bin/src/main/webapp/js/app/popup/biz/ITP_BIZPOP_STORE_SPPLY.js

@@ -6,7 +6,9 @@ require(['config'], function() {
 	});
 });
 
-let API_POP_GRID_LIST = '/api/spply/pop-grid-list';
+//let API_POP_GRID_LIST = '/api/spply/pop-grid-list';
+let API_POP_GRID_LIST = '/api/spply/detail-grid-list';
+
 
 function itp_fn_BIZPOP_STORE_SPPLY(parentPopFn, args, returnType) {
 	
@@ -84,20 +86,20 @@ function itp_fn_BIZPOP_STORE_SPPLY(parentPopFn, args, returnType) {
 			{
 				index: 'SPPLY_ID', name: 'spplyId',
 				label: '공급업체ID', //
-				width: '10', fixed: false, align: 'center',
-				sortable: false, hidden: true
+				width: '8', fixed: false, align: 'center',
+				sortable: false, hidden: false
 			},
 			{
 				index: 'SPPLY_NM', name: 'spplyNm',
 				label: '공급업체명', //
-				width: '12', fixed: false, align: 'center',
+				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
 				index: 'ST_CD', name: 'stCd',
 				label: '상태', //
 				width: '6', fixed: false, align: 'center',
-				sortable: false, hidden: false
+				sortable: false, hidden: true
 			}
 		],
 		loadBeforeSend: function(jqXHR) {

bin/src/main/webapp/js/app/vendinfo/ITP_VENDINFO02010.js

@@ -360,15 +360,15 @@ let listObj = {
 	button: {
 			search: function() {
 					listObj.itp_VENDINFO02010_search = true;
+					var url = DOMAIN + API_DETAIL_GRID_LIST;
 					let param = $('#ITP_FORM_VENDINFO02010_SEARCH').serializeObject();
 					param.gridSize = $.jgrid.defaults.rowNum;
 					param.gridPage = $.jgrid.defaults.page;
-					$(VENDINFO02010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
+					$(VENDINFO02010_GRID_ID).setGridParam({'url': url,'data': JSON.stringify(param)}).trigger('reloadGrid');
 			},
 			create: function() {
 					if(!fn_make_user_info.isEmpty()) {
 						createObj.init();
-							
 					}
 			}
 	},
@@ -415,7 +415,41 @@ let listObj = {
 			search: function() {
 					pageObj.switchScreen('LIST');
 					this.unload();
-					this.load();
+					this.localLoad();
+//					this.load();
+			},
+			localLoad: function() {
+				var option = {
+					gridId: VENDINFO02010_GRID_ID,
+					colModel: gridColModel.list,
+					data: [],
+					multiselect: true,
+					pager: VENDINFO02010_GRID_PAGER,
+					onCellSelect: function(rowId, cellIdx, cellValue) {
+						var cm = $(this).jqGrid('getGridParam', 'colModel');
+						var colNm = cm[cellIdx].name;
+						if (colNm == 'itemId') {
+								const selectVal = $(this).jqGrid('getCell', rowId, 'itemId');
+								const key = {brandId:fn_make_user_info.get('brandId'), itemId: selectVal, viewCd: 'R'};
+								var param = $.param(key);
+								viewObj.init(param);
+						}
+					},	
+					loadComplete: function(data) {
+						console.log(data);
+						if(data && data.length > 0) {
+							itp_fn_grid_load_complete(data, VENDINFO02010_GRID_ID, true, 'number', 'VENDINFO02010', listObj.itp_VENDINFO02010_search, listObj.empty, true, data.gridRecords, true);
+							var ids = $(VENDINFO02010_GRID_ID).getDataIDs();
+							$.each(ids, function(idx, rowId) {
+									$(VENDINFO02010_GRID_ID).jqGrid('setCell', rowId, 'itemId', '', ITP_GRID_COL_STYLE.link);
+							});
+						}
+					},
+					onPaging: function(action) {
+						itp_fn_grid_paging(VENDINFO02010_GRID_ID, action, param);
+					}
+				};
+				itp_fn_grid_make_local(option);
 			},
 			load: function() {
 					$('#ITP_FORM_VENDINFO02010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
@@ -485,6 +519,11 @@ let viewObj = {
 			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemClass2').text(result.itemClass2);
 			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemClass3').text(result.itemClass3);
 			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemClass4').text(result.itemClass4);
+			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemClass1Nm').text(result.itemClass1Nm);
+			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemClass2Nm').text(result.itemClass2Nm);
+			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemClass3Nm').text(result.itemClass3Nm);
+			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemClass4Nm').text(result.itemClass4Nm);
+			
 			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemClassMgntNo').text(result.itemClassMgntNo);
 			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemId').text(result.itemId);
 			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemTypeNm').text(result.itemTypeNm);
@@ -706,10 +745,10 @@ let storeSpplyObj = {
 		},
 		callback: {
 			list: function(rowDataPop) {
-				// console.log(rowDataPop);
-				if(rowDataPop.STORE_SPPLY) {
-					$('#ITP_FORM_VENDINFO02010_SEARCH_STORE_SPPLY_ID').val(rowDataPop.STORE_SPPLY.afflShopId);
-					$('#ITP_FORM_VENDINFO02010_SEARCH_STORE_SPPLY_NM').val(rowDataPop.STORE_SPPLY.afflShopNm);
+				 console.log(rowDataPop);
+				if(rowDataPop) {
+					$('#ITP_FORM_VENDINFO02010_SEARCH_SPPLY_ID').val(rowDataPop.spplyId);
+					$('#ITP_FORM_VENDINFO02010_SEARCH_SPPLY_NM').val(rowDataPop.spplyNm);
 				}
 				if(rowDataPop.AFFL_BRAND) {
 					fn_make_select_brand(rowDataPop.AFFL_BRAND, 'ITP_FORM_VENDINFO02010_SEARCH_BRAND_ID', true, '선택');
@@ -717,9 +756,9 @@ let storeSpplyObj = {
 			},
 			create: function(rowDataPop) {
 				console.log(rowDataPop);
-				if(rowDataPop.STORE_SPPLY) {
-					$('#ITP_FORM_VENDINFO02010_DETAIL_SEARCH_STORE_SPPLY_ID').val(rowDataPop.STORE_SPPLY.afflShopId);
-					$('#ITP_FORM_VENDINFO02010_DETAIL_SEARCH_STORE_SPPLY_NM').val(rowDataPop.STORE_SPPLY.afflShopNm);
+				if(rowDataPop) {
+					$('#ITP_FORM_VENDINFO02010_DETAIL_SEARCH_STORE_SPPLY_ID').val(rowDataPop.spplyId);
+					$('#ITP_FORM_VENDINFO02010_DETAIL_SEARCH_STORE_SPPLY_NM').val(rowDataPop.spplyNm);
 				}
 				if(rowDataPop.AFFL_BRAND) {
 					fn_make_select_brand(rowDataPop.AFFL_BRAND, 'ITP_FORM_VENDINFO02010_DETAIL_BRAND_NM', true, '선택');

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

@@ -2,116 +2,120 @@
 	<div class="modal-dialog" style="width:1200px;">
 		<div class="modal-content">
 			<form id="ITP_FORM_BIZPOP_DLV_STTMT_PRN">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-					<h5 class="modal-title">가맹점 검색</h5>
-				</div>
-				<div class="modal-body">
-					<div class="itp_form fix">
-						<div class="col-xs-12 itp_form_inline">
-							<div class="form-horizontal fix">
-								<div class="col-xs-4 itp_in itp_pr">
-									<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_BIZPOP_DLV_STTMT_PRN_BRAND_LOGO "style="border:none; border-radius: 0; height:85px; width:85px; position:absolute; padding:0;" class="form-control itp_input" name="" >
-								</div>
-								<div class="pull-right itp_cicon">
-									<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_DLV_STTMT_PRN_BTN_SEARCH" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;출력&nbsp;&nbsp;</button>
-									<button type="button" class="btn btn-primary btn-sm" id="ITP_BIZPOP_DLV_STTMT_PRN_BTN_SELECT"><i class="glyphicon"></i>&nbsp;&nbsp;다운로드&nbsp;&nbsp;</button>
+				<div id="ITP_POPUP_CONTAINER">
+					<div class="modal-header">
+						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+						<h5 class="modal-title">가맹점 검색</h5>
+					</div>
+					<div class="modal-body">
+						<div class="itp_form fix">
+							<div class="col-xs-12 itp_form_inline">
+								<div class="form-horizontal fix">
+									<div class="col-xs-4 itp_in itp_pr">
+										<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_BIZPOP_DLV_STTMT_PRN_BRAND_LOGO "style="border:none; border-radius: 0; height:85px; width:85px; position:absolute; padding:0;" class="form-control itp_input" name="" >
+									</div>
+									<div class="pull-right itp_cicon">
+										<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_DLV_STTMT_PRN_BTN_SEARCH" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;출력&nbsp;&nbsp;</button>
+										<button type="button" class="btn btn-primary btn-sm" id="ITP_BIZPOP_DLV_STTMT_PRN_BTN_SELECT"><i class="glyphicon"></i>&nbsp;&nbsp;다운로드&nbsp;&nbsp;</button>
+									</div>
 								</div>
 							</div>
-						</div>
-						<div class="col-xs-12 itp_form_inline">
-							<div class="col-xs-5"></div>
-							<div class="itp_title">
-								<label>납품확인서</label>
-							</div>
-						</div>	
-						<div class="col-xs-12 itp_form_inline">
-							<div class="col-xs-6" >
-								<div>
-									<label style="width:100px;">발행일</label>
-									<label>:</label>
-									<span class="fnDlvRegDt">2022.01.01</span>
+							<div class="col-xs-12 itp_form_inline">
+								<div class="col-xs-5"></div>
+								<div class="itp_title">
+									<label>납품확인서</label>
 								</div>
-								<div>
-									<label style="width:100px;">납품확인번호</label>
-									<label>:</label>
-									<span class="fnDlvSttmtUnqNo">2211020000002001</span>
-								</div>
-								<div>
-									<label style="width:100px;">납품일</label>
-									<label>:</label>
-									<span class="fnDlvRegDt">2022.12.31</span>
-								</div>
-								<div>
-									<label style="width:100px;">납품담당</label>
-									<label>:</label>
-									<span class="fnDlvMgrNm">홍길동</span>
-									(<span class="fnDlvMgrTelNo">010-2525-2525</span>)
-								</div>
-							</div>
-							<div class="col-xs-6">
-								<div class="itp_sign">
-									<div class="itp_sign_header">
-										<label>서    명</label>
+							</div>	
+							<div class="col-xs-12 itp_form_inline">
+								<div class="col-xs-6" >
+									<div>
+										<label style="width:100px;">발행일</label>
+										<label>:</label>
+										<span class="fnDlvRegDt">2022.01.01</span>
 									</div>
-									<div class="itp_sign_area"></div>
-								</div>
-								<div class="itp_sign">
-									<div class="itp_sign_header">
-										<label>납품확인일</label>
+									<div>
+										<label style="width:100px;">납품확인번호</label>
+										<label>:</label>
+										<span class="fnDlvSttmtUnqNo">2211020000002001</span>
 									</div>
-									<div class="itp_sign_area">
-										2022.01.01
+									<div>
+										<label style="width:100px;">납품일</label>
+										<label>:</label>
+										<span class="fnDlvRegDt">2022.12.31</span>
+									</div>
+									<div>
+										<label style="width:100px;">납품담당</label>
+										<label>:</label>
+										<span class="fnDlvMgrNm">홍길동</span>
+										(<span class="fnDlvMgrTelNo">010-2525-2525</span>)
 									</div>
 								</div>
-							</div>
-						</div>	
-						<div class="col-xs-12 itp_form_inline">
-							<div class="col-xs-6">
-								<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>
-								</div>
-								<div>
-									<label style="width:100px;">전화번호</label>
-									<label>:</label>
-									<span class="fnDlvRegDt">02-1234-1547</span>
+								<div class="col-xs-6">
+									<div class="itp_sign">
+										<div class="itp_sign_header">
+											<label>서    명</label>
+										</div>
+										<div class="itp_sign_area"></div>
+									</div>
+									<div class="itp_sign">
+										<div class="itp_sign_header">
+											<label>납품확인일</label>
+										</div>
+										<div class="itp_sign_area">
+											2022.01.01
+										</div>
+									</div>
 								</div>
-							</div>
-						</div>	
-						<div class="col-xs-12 itp_form_inline">
-							<div class="col-xs-6">
-								<label class="itp_company_type">공급사</label>
-								<label class="col-xs-2">등록번호</label>
-								<div class="col-xs-4">
-									<div class="col-xs-12 itp_in fnBrandNm">215-58-584887</div>
+							</div>	
+							<div class="col-xs-12 itp_form_inline">
+								<div class="col-xs-6">
+									<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>
+									</div>
+									<div>
+										<label style="width:100px;">전화번호</label>
+										<label>:</label>
+										<span class="fnDlvRegDt">02-1234-1547</span>
+									</div>
 								</div>
-								
+							</div>	
+							<div class="col-xs-12 itp_form_inline">
+								<div class="itp_form_info">
+									<div class="col-xs-6">
+										<label class="itp_company_type">공급처</label>
+										<label class="col-xs-2">등록번호</label>
+										<div class="col-xs-4">
+											<div class="col-xs-12 itp_in fnBrandNm">215-58-584887</div>
+										</div>
+										
+									</div>
+									<div class="col-xs-6">
+										<label class="itp_company_type">발주처</label>
+										<label class="col-xs-2">등록번호</label>
+										<div class="col-xs-4">
+											<div class="col-xs-12 itp_in fnBrandNm">215-58-584887</div>
+										</div>
+										
+									</div>
+								</div>		
 							</div>
-							<div class="col-xs-6">
-								<label class="itp_company_type">공급사</label>
-								<label class="col-xs-2">등록번호</label>
-								<div class="col-xs-4">
-									<div class="col-xs-12 itp_in fnBrandNm">215-58-584887</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>
-						<div id="ITP_BIZPOP_DLV_STTMT_PRN_jqGridPager"></div>
-						<div id="ITP_BIZPOP_DLV_STTMT_PRN_jqGridEmpty" class="itp_no_data"></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>
+							<div id="ITP_BIZPOP_DLV_STTMT_PRN_jqGridPager"></div>
+							<div id="ITP_BIZPOP_DLV_STTMT_PRN_jqGridEmpty" class="itp_no_data"></div>
+						</div>
 					</div>
 				</div>
 			</form>

src/main/webapp/app/vendinfo/VENDINFO02010.html

@@ -17,13 +17,8 @@
 								<input type="hidden" id="ITP_FORM_VENDINFO02010_SEARCH_SPPLY_ID" name="sspplyId">
 								<input type="hidden" id="ITP_FORM_VENDINFO02010_SEARCH_BRAND_ID" name="sbrandId">
 									<div class="form-group">
-										<!-- <div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_VENDINFO02010_SERVICE_ST_CD" data-select-code="ST_CD" class="form-control itp_input" name="sitemStCd">
-												<option value="N"></option>
-											</select>										
-										</div> -->
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_VENDINFO02010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sspplyNm" readonly/>
+											<input type="text" id="ITP_FORM_VENDINFO02010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체 선택" readonly/>
 										</div>
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
 											<button type="button" id="ITP_FORM_VENDINFO02010_SEARCH_STORE_SPPLY" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
@@ -74,13 +69,13 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">품목분류 *</label>
 											<div class="col-xs-12 itp_ip" style="padding:8px 0 0 15px;">
-												<div class="col-xs-a itp_in itp_noMar fnItemClass1"></div>
+												<div class="col-xs-a itp_in itp_noMar fnItemClass1Nm"></div>
 												<label class="col-xs-a itp_in">></label>
-												<div class="col-xs-a itp_in itp_noMar fnItemClass2"></div>
+												<div class="col-xs-a itp_in itp_noMar fnItemClass2Nm"></div>
 												<label class="col-xs-a itp_in">></label>
-												<div class="col-xs-a itp_in itp_noMar fnItemClass3"></div>
+												<div class="col-xs-a itp_in itp_noMar fnItemClass3Nm"></div>
 												<label class="col-xs-a itp_in">></label>
-												<div class="col-xs-a itp_in itp_noMar fnItemClass4"></div>
+												<div class="col-xs-a itp_in itp_noMar fnItemClass4Nm"></div>
 											</div>
 										</div>
 									</div>
@@ -247,7 +242,7 @@
 											<label class="col-xs-2 itp_lb">품목이미지</label>
 											<div class="col-xs-12 itp_ip colspan">
 												<div class="col-xs-1 itp_in" style="width:auto;">
-													<img src="/oqpo-view/images/item-list.jpg" alt="로고 샘플" id="ITP_FORM_STINFO04010_DETAIL "style="top:12px; left:12px; height:150px; width:412px; " class="form-control itp_input" name="" >
+													<img src="/" alt="로고 샘플" id="ITP_FORM_STINFO04010_DETAIL "style="top:12px; left:12px; height:150px; width:412px; " class="form-control itp_input" name="" >
 												</div>
 											</div>
 										</div>

src/main/webapp/css/style.css

@@ -689,10 +689,10 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
 .fnNumericDot {text-align: center;}
 
 /* 팝업 추가 */
-.modal-body .itp_title label {font-size:3rem; text-decoration:underline; text-underline-position:under;}
-.modal-body .itp_title .col-1 {width:100px;}
-.modal-body .itp_sign {float: right;}
-.modal-body .itp_sign .itp_sign_header {border: 1px solid #000; width: 120px; height: 35px; padding: 8px; text-align: center;}
-.modal-body .itp_sign .itp_sign_area {text-align: center; padding: 7px 6px; border: 1px solid #000; border-top:none; height: 110px;}
-.modal-body .itp_sign .itp_form_inline .itp_company_type {float:left;} 
-.modal-body span{margin-right:7px;}
+#ITP_POPUP_CONTAINER .modal-body .itp_title label {font-size:3rem; text-decoration:underline; text-underline-position:under;}
+#ITP_POPUP_CONTAINER .modal-body .itp_title .col-1 {width:100px;}
+#ITP_POPUP_CONTAINER .modal-body .itp_sign {float: right;}
+#ITP_POPUP_CONTAINER .modal-body .itp_sign .itp_sign_header {border: 1px solid #000; width: 120px; height: 35px; padding: 8px; text-align: center;}
+#ITP_POPUP_CONTAINER .modal-body .itp_sign .itp_sign_area {text-align: center; padding: 7px 6px; border: 1px solid #000; border-top:none; height: 110px;}
+#ITP_POPUP_CONTAINER .modal-body .itp_sign .itp_form_inline .itp_form_info .itp_company_type {float:left;}  
+#ITP_POPUP_CONTAINER .modal-body span{margin-right:7px;}

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

@@ -1700,7 +1700,7 @@ function itp_fn_grid_make_not_paging(option) {
 	});
 }
 
-function itp_fn_grid_make_local(option) {
+function itp_fn_grid_make_local(option) { //예를 원격으로 호출하면 됨     처음url 안주던지     빈 그리드 시용
 	var options = $.extend({
 		multiselect: false,
 		rownumbers: false

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

@@ -6,7 +6,9 @@ require(['config'], function() {
 	});
 });
 
-let API_POP_GRID_LIST = '/api/spply/pop-grid-list';
+//let API_POP_GRID_LIST = '/api/spply/pop-grid-list';
+let API_POP_GRID_LIST = '/api/spply/detail-grid-list';
+
 
 function itp_fn_BIZPOP_STORE_SPPLY(parentPopFn, args, returnType) {
 	
@@ -84,20 +86,20 @@ function itp_fn_BIZPOP_STORE_SPPLY(parentPopFn, args, returnType) {
 			{
 				index: 'SPPLY_ID', name: 'spplyId',
 				label: '공급업체ID', //
-				width: '10', fixed: false, align: 'center',
-				sortable: false, hidden: true
+				width: '8', fixed: false, align: 'center',
+				sortable: false, hidden: false
 			},
 			{
 				index: 'SPPLY_NM', name: 'spplyNm',
 				label: '공급업체명', //
-				width: '12', fixed: false, align: 'center',
+				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
 				index: 'ST_CD', name: 'stCd',
 				label: '상태', //
 				width: '6', fixed: false, align: 'center',
-				sortable: false, hidden: false
+				sortable: false, hidden: true
 			}
 		],
 		loadBeforeSend: function(jqXHR) {

src/main/webapp/js/app/vendinfo/ITP_VENDINFO02010.js

@@ -360,15 +360,15 @@ let listObj = {
 	button: {
 			search: function() {
 					listObj.itp_VENDINFO02010_search = true;
+					var url = DOMAIN + API_DETAIL_GRID_LIST;
 					let param = $('#ITP_FORM_VENDINFO02010_SEARCH').serializeObject();
 					param.gridSize = $.jgrid.defaults.rowNum;
 					param.gridPage = $.jgrid.defaults.page;
-					$(VENDINFO02010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
+					$(VENDINFO02010_GRID_ID).setGridParam({'url': url,'data': JSON.stringify(param)}).trigger('reloadGrid');
 			},
 			create: function() {
 					if(!fn_make_user_info.isEmpty()) {
 						createObj.init();
-							
 					}
 			}
 	},
@@ -415,7 +415,41 @@ let listObj = {
 			search: function() {
 					pageObj.switchScreen('LIST');
 					this.unload();
-					this.load();
+					this.localLoad();
+//					this.load();
+			},
+			localLoad: function() {
+				var option = {
+					gridId: VENDINFO02010_GRID_ID,
+					colModel: gridColModel.list,
+					data: [],
+					multiselect: true,
+					pager: VENDINFO02010_GRID_PAGER,
+					onCellSelect: function(rowId, cellIdx, cellValue) {
+						var cm = $(this).jqGrid('getGridParam', 'colModel');
+						var colNm = cm[cellIdx].name;
+						if (colNm == 'itemId') {
+								const selectVal = $(this).jqGrid('getCell', rowId, 'itemId');
+								const key = {brandId:fn_make_user_info.get('brandId'), itemId: selectVal, viewCd: 'R'};
+								var param = $.param(key);
+								viewObj.init(param);
+						}
+					},	
+					loadComplete: function(data) {
+						console.log(data);
+						if(data && data.length > 0) {
+							itp_fn_grid_load_complete(data, VENDINFO02010_GRID_ID, true, 'number', 'VENDINFO02010', listObj.itp_VENDINFO02010_search, listObj.empty, true, data.gridRecords, true);
+							var ids = $(VENDINFO02010_GRID_ID).getDataIDs();
+							$.each(ids, function(idx, rowId) {
+									$(VENDINFO02010_GRID_ID).jqGrid('setCell', rowId, 'itemId', '', ITP_GRID_COL_STYLE.link);
+							});
+						}
+					},
+					onPaging: function(action) {
+						itp_fn_grid_paging(VENDINFO02010_GRID_ID, action, param);
+					}
+				};
+				itp_fn_grid_make_local(option);
 			},
 			load: function() {
 					$('#ITP_FORM_VENDINFO02010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
@@ -485,6 +519,11 @@ let viewObj = {
 			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemClass2').text(result.itemClass2);
 			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemClass3').text(result.itemClass3);
 			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemClass4').text(result.itemClass4);
+			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemClass1Nm').text(result.itemClass1Nm);
+			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemClass2Nm').text(result.itemClass2Nm);
+			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemClass3Nm').text(result.itemClass3Nm);
+			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemClass4Nm').text(result.itemClass4Nm);
+			
 			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemClassMgntNo').text(result.itemClassMgntNo);
 			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemId').text(result.itemId);
 			$('#ITP_FORM_VENDINFO02010_VIEW .fnItemTypeNm').text(result.itemTypeNm);
@@ -706,10 +745,10 @@ let storeSpplyObj = {
 		},
 		callback: {
 			list: function(rowDataPop) {
-				// console.log(rowDataPop);
-				if(rowDataPop.STORE_SPPLY) {
-					$('#ITP_FORM_VENDINFO02010_SEARCH_STORE_SPPLY_ID').val(rowDataPop.STORE_SPPLY.afflShopId);
-					$('#ITP_FORM_VENDINFO02010_SEARCH_STORE_SPPLY_NM').val(rowDataPop.STORE_SPPLY.afflShopNm);
+				 console.log(rowDataPop);
+				if(rowDataPop) {
+					$('#ITP_FORM_VENDINFO02010_SEARCH_SPPLY_ID').val(rowDataPop.spplyId);
+					$('#ITP_FORM_VENDINFO02010_SEARCH_SPPLY_NM').val(rowDataPop.spplyNm);
 				}
 				if(rowDataPop.AFFL_BRAND) {
 					fn_make_select_brand(rowDataPop.AFFL_BRAND, 'ITP_FORM_VENDINFO02010_SEARCH_BRAND_ID', true, '선택');
@@ -717,9 +756,9 @@ let storeSpplyObj = {
 			},
 			create: function(rowDataPop) {
 				console.log(rowDataPop);
-				if(rowDataPop.STORE_SPPLY) {
-					$('#ITP_FORM_VENDINFO02010_DETAIL_SEARCH_STORE_SPPLY_ID').val(rowDataPop.STORE_SPPLY.afflShopId);
-					$('#ITP_FORM_VENDINFO02010_DETAIL_SEARCH_STORE_SPPLY_NM').val(rowDataPop.STORE_SPPLY.afflShopNm);
+				if(rowDataPop) {
+					$('#ITP_FORM_VENDINFO02010_DETAIL_SEARCH_STORE_SPPLY_ID').val(rowDataPop.spplyId);
+					$('#ITP_FORM_VENDINFO02010_DETAIL_SEARCH_STORE_SPPLY_NM').val(rowDataPop.spplyNm);
 				}
 				if(rowDataPop.AFFL_BRAND) {
 					fn_make_select_brand(rowDataPop.AFFL_BRAND, 'ITP_FORM_VENDINFO02010_DETAIL_BRAND_NM', true, '선택');