구매요청 위시리스트 수정조치함

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

@@ -14,7 +14,7 @@
 						<div class="col-xs-12 itp_form_inline">
 							<div class="form-horizontal fix">
 								<div class="col-xs-8 itp_ip itp_pr" style="padding:0;">
-									<select type="text" name="swhsNm" id="ITP_FORM_BIZPOP_WISH_LIST_ITEM_LIST" class="form-control itp_input">
+									<select type="text" name="swishListNm" id="ITP_FORM_BIZPOP_WISH_LIST_ITEM_LIST" class="form-control itp_input">
 										<option value="">위시리스트 목록</option>
 									</select>
 								</div>

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

@@ -734,6 +734,21 @@ function fn_make_select_whs(options, select_id, all_show_yn, all_name) { //창
 	});
 };
 
+function fn_make_select_wish(options, select_id, all_show_yn, all_name) { //위시리스트 셀렉트 박스 만들기
+	$select_id = $('#' + select_id);
+	$select_id.empty();
+	if(all_show_yn == true) {
+		$('<option/>', {'value': '', 'text': all_name}).prependTo($select_id);
+	}
+	$.each(options, function(key, value) {
+		$('<option/>', {
+            'value': value.wishListMgntNo,	// 위시리스트아이디
+            'text': value.wishListNm		// 위시리스트명
+        }).appendTo($select_id);
+	});
+};
+
+
 function fn_make_select_location(options, select_id, all_show_yn, all_name) { //위치 셀렉트 박스 만들기
 	$select_id = $('#' + select_id);
 	$select_id.empty();

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

@@ -618,23 +618,31 @@ let createObj = {
 			} else {
 				whsDvsn = "W02";
 			}
-			const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'),whsDvsn: whsDvsn};
+			const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+			
 			fn_call_popup('biz', 'BIZPOP_WISH_LIST_ITEM', '#ITP_ASIDE', function(result) {
+				console.log("result");
+				console.log(result);
+				
 				grid=$(POMNG01010_DETAIL_GRID_ID);
 				if(result.length==0) {
 					$(POMNG01010_DETAIL_GRID_EMPTY).show();
 				} else {
+					console.log("")
+					
 					var exists = [];
-					for(var cur of grid.getRowData() ) exists.push(cur.itemId);
+					for(var cur of grid.getRowData() ) exists.push(cur.brandUnitUnqNo);
 					for(var cur of result  ) {
-						if(exists.indexOf(cur.itemId)==-1 ) {
+						if(exists.indexOf(cur.brandUnitUnqNo)==-1 ) {
 							cur.viewCd='C';
 							grid.jqGrid('addRowData', cur.brandUnitUnqNo, cur, 'first');
 						}
 				   }
 				   $(POMNG01010_DETAIL_GRID_EMPTY).hide();
 				} 
-			});
+			}, key, 'S');
+			
+			
 		}
 	},
 	load: function() {

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

@@ -84,8 +84,7 @@ function itp_fn_BIZPOP_ITEM(parentPopFn, args, returnType) {
 	itp_fn_BIZPOP_ITEM_empty.push();
 	let param = $('#ITP_FORM_BIZPOP_ITEM').serializeObject();
 	param.gridSize = 10;
-	console.log(JSON.stringify(param));
-
+	
 	$(THIS_GIRD_ID).jqGrid({
 		colModel: [
 			{

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

@@ -6,19 +6,144 @@ require(['config'], function() {
 	});
 });
 
-// #ITP_FORM_BIZPOP_WISH_LIST_ITEM_LIST 위시리스트 마스터 선택
+let API_POP_WISH_LIST = '/api/item/select-pop-wishlist-item';
+let API_WISH_LIST = '/api/pomng/select-wishlist';
+
 
 function itp_fn_BIZPOP_WISH_LIST_ITEM(parentPopFn, args, returnType) {
+	console.log(args);
+	let itp_BIZPOP_WISH_LIST_ITEM_param = {};
+	let itp_BIZPOP_WISH_LIST_ITEM_search = false;
+	let firstWishId;
+
+	const THIS_FORM_ID = '#ITP_FORM_BIZPOP_WISH_LIST_ITEM';
 	const THIS_GIRD_ID = '#ITP_BIZPOP_WISH_LIST_ITEM_jqGrid';
 	const THIS_GIRD_PAGER = '#ITP_BIZPOP_WISH_LIST_ITEM_jqGridPager';
-	// 그리드 조회
-	const grid=$(THIS_GIRD_ID);
-	grid.jqGrid({
-		colModel: [ 
+
+
+	$('#ITP_FORM_BIZPOP_WISH_LIST_ITEM_BRAND_ID').val(fn_make_user_info.get('brandId'));
+	$('#ITP_FORM_BIZPOP_WISH_LIST_ITEM_STORE_ID').val(fn_make_user_info.get('storeId'));
+
+
+	$('#ITP_BIZPOP_WISH_LIST_ITEM').one('shown.bs.modal', function(e) {
+		itp_fn_jqgrid_resize(THIS_GIRD_ID, '#ITP_BIZPOP_WISH_LIST_ITEM_jqGrid_list', '');
+		itp_fn_fire_window_resize();
+	}).one('hidden.bs.modal', function(e) {
+		$('#ITP_BIZPOP_WISH_LIST_ITEM').remove();
+	}).modal('show');
+
+	$('#ITP_BIZPOP_SAFE_STCK_ITEM_BTN_SEARCH').on('click', function() {
+		itp_BIZPOP_WISH_LIST_ITEM_search = true;
+		let param = $(THIS_FORM_ID).serializeObject();
+		//param.gridSize = 10;
+		//param.gridPage = $.jgrid.defaults.page;
+		//console.log(param);
+		$(THIS_GIRD_ID).setGridParam({ 'postData': JSON.stringify(param) }).trigger('reloadGrid');
+	});
+
+	$('#ITP_BIZPOP_WISH_LIST_ITEM_BTN_SELECT').on('click', function() {
+
+		const rowKey = $(THIS_GIRD_ID).getGridParam('selrow');
+		if (!rowKey) {
+			return;
+		}
+
+		var list = [];
+		var selectedIds = $(THIS_GIRD_ID).getGridParam('selarrrow');
+
+		//if (selectedIds.length > 1) { // 1개만 선택
+			// itp_fn_modal_alert('1명을 선택해주세요.');
+			// return;
+		//}
+
+		for (var i=selectedIds.length-1; i>=0; i--) {
+			list.push($(THIS_GIRD_ID).jqGrid('getRowData', selectedIds[i]));	
+		}
+		
+		parentPopFn(list);
+		$('#ITP_BIZPOP_WISH_LIST_ITEM').modal('hide'); // 팝업닫기
+	});
+
+	$('#ITP_BIZPOP_WISH_LIST_ITEM_jqGridEmpty').on('click', function() {
+		itp_fn_BIZPOP_WISH_LIST_ITEM_empty.back();
+		//itp_BIZPOP_WISH_LIST_ITEM_param.gridSize = 10;
+		$(THIS_GIRD_ID).setGridParam({ 'postData': JSON.stringify(itp_BIZPOP_WISH_LIST_ITEM_param) }).trigger('reloadGrid');
+	});
+
+	var itp_fn_BIZPOP_WISH_LIST_ITEM_empty = {
+		push: function() {
+			let param = $(THIS_FORM_ID).serializeObject();
+			itp_BIZPOP_WISH_LIST_ITEM_param = param;
+		},
+		back: function() {
+			$(THIS_FORM_ID + '_BRAND_ID').val(itp_BIZPOP_WISH_LIST_ITEM_param.brandId);
+			$(THIS_FORM_ID + '_STROE_ID').val(itp_BIZPOP_WISH_LIST_ITEM_param.storeId);
+		}
+	};
+
+	let fnWishList = function(fnCall) {
+		
+		const brandIdVal = fn_make_user_info.get('brandId');
+		const storeIdVal = fn_make_user_info.get('storeId');
+
+		const param = { brandId: brandIdVal, storeId: storeIdVal };
+		
+		fn_ajax_call(API_WISH_LIST, param, function(result) {
+			
+			console.log(JSON.stringify(result));
+			
+			firstWishId = result.selectRows[0].wishListMgntNo;
+			fn_make_select_wish(result.selectRows, 'ITP_FORM_BIZPOP_WISH_LIST_ITEM_LIST');
+			
+			if (fnCall !== undefined || typeof fnCall !== 'undefined') fnCall();
+		}, 'GET');
+	}
+	fnWishList();
+
+	itp_fn_BIZPOP_WISH_LIST_ITEM_empty.push();
+	
+	const brandIdVal = fn_make_user_info.get('brandId');
+	const storeIdVal = fn_make_user_info.get('storeId');
+	
+	let param = { brandId: fn_make_user_info.get('brandId'), storeId: fn_make_user_info.get('storeId'), wishListMgntNo: firstWishId };
+	
+	$(THIS_GIRD_ID).jqGrid({
+		colModel: [
+			{
+				index: 'ITEM_ID', name: 'itemId',
+				label: '품목ID', //
+				width: '13', fixed: false, align: 'center',
+				sortable: false, hidden: false
+			},
+			{
+				index: 'ITEM_NM', name: 'itemNm',
+				label: '품목명', //
+				width: '8', fixed: false, align: 'left',
+				sortable: false, hidden: false, classes: 'ui-ellipsis'
+			},
 			{
-				index: 'BRAND_ID', name: 'brandId',
-				label: ITP_MSG_LOCALE.label.brandId,
-				width: 0, fixed: false, align: 'center',
+				index: 'UNIT', name: 'unit',
+				label: '단위', //
+				width: '4', fixed: false, align: 'center',
+				sortable: false, hidden: false
+			},
+			{
+				index: 'UNIT_AMT', name: 'unitAmt',
+				label: '단가', //
+				width: '10', fixed: false, align: 'right',
+				sortable: false, hidden: false,
+				formatter: 'integer', formatoptions: { thousandsSeparator: ',' }
+			},
+			{
+				index: 'PODR_PSSBL_DVSN_NM', name: 'podrPssblDvsnNm',
+				label: '발주여부', //
+				width: '6', fixed: false, align: 'center',
+				sortable: false, hidden: false
+			},
+			{
+				index: 'PODR_PSSBL_DVSN', name: 'podrPssblDvsn',
+				label: '발주가능여부', //
+				width: '6', fixed: false, align: 'center',
 				sortable: false, hidden: true
 			},
 			{
@@ -38,116 +163,26 @@ function itp_fn_BIZPOP_WISH_LIST_ITEM(parentPopFn, args, returnType) {
 				label: '매장단가고유번호', //
 				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: true
-			},   
-			{
-				index: 'ITEM_NO', name: 'itemId',
-				label: '품목번호',
-				width: 120, fixed: false, align: 'center',
-				sortable: false, hidden: false
-			},
-			{
-				index: 'ITEM_CLASS_NM', name: 'itemNm',
-				label: '품목명',
-				width: 200, fixed: false, align: 'left',
-				sortable: false, hidden: false, classes: 'ui-ellipsis'
-			},
-			{
-				index: 'UNIT', name: 'unit',
-				label: '단위', 
-				width: 80, fixed: false, align: 'center'
-			},  			
-			{
-				index: 'UNIT', name: 'unitAmt',
-				label: '단가', 
-				width: 120, fixed: false, align: 'right',
-				sortable: false, hidden: false,
-				formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 			}
 		],
+		loadBeforeSend: function(jqXHR) {
+			jqXHR.setRequestHeader('X-AUTH-TOKEN', CONN_KEY);
+		},
+		postData: JSON.stringify(param),
+		url: DOMAIN + API_POP_WISH_LIST,
+		pager: THIS_GIRD_PAGER,
 		multiselect: true,
-		rownumbers: false, 
-	}).navGrid(THIS_GIRD_PAGER, ITP_GRID_NAV_DEFAULTS.navGrid);
-	
-
-	const search=function() { 
-		if(!wishListMgntNo) return itp_fn_modal_alert_ajax("조회할 위시리스트를 선택하세요");
-		ajaxCall('/api/pomng/select-wishlist-item', {brandId, storeId, wishListMgntNo}, function(result) { 
-			grid.jqGrid('clearGridData');
-			for(var cur of result.selectRows ) {
-				grid.jqGrid('addRowData', cur.itemId, cur, 'last');
-			}
-			gridStatus(THIS_GIRD_ID, 'BIZPOP_WISH_LIST_ITEM', '위시리스트를 선택하세요');			
-		}); 
-	};
-	 
-	var wishListMgntArr=[], currentNode=null;
-	var wishListMgntNo=null; 
-	const combo=$('#ITP_FORM_BIZPOP_WISH_LIST_ITEM_LIST');	
-	const brandId=fn_make_user_info.get('brandId'), storeId=fn_make_user_info.get('storeId');
-	const wishListFind= function() {
-		console.log("find ", wishListMgntArr, wishListMgntNo )
-		for(var cur of wishListMgntArr) if(cur.wishListMgntNo==wishListMgntNo) return cur;
-		return null;
-	};
-	const wishListMgntCall= function() {
-		/* 위시리스트 추가/수정 API 처리 */
-		ajaxCall('/api/pomng/select-wishlist', {brandId, storeId}, function(result) {
-			combo.data('changeCheck', true);
-			combo.children('option:not(:first)').remove();
-			wishListMgntArr=result.selectRows;
-			var def='';
-			for(var cur of wishListMgntArr ) {
-				if(!def) def=cur.wishListMgntNo;
-				$('<option/>', { 'value': cur.wishListMgntNo, 'text': cur.wishListNm }).appendTo(combo);
-			}
-			combo.data('changeCheck', false);
-			if(def) combo.val(def);
-			combo.trigger('change');
-			
-		}, 'GET'); 
-	}; 
-	// 위시리스트 콤보 변경처리
-	combo.on('change', function() {
-		if(combo.data('changeCheck')) return;
-		wishListMgntNo=combo.val();
-		currentNode=wishListFind();
-		if(wishListMgntNo) search();
-	});
-	// 위시리스트 콤보 조회
-	wishListMgntCall();	 
-	/*
-	$('#ITP_FORM_BIZPOP_WISH_LIST_ITEM_BRAND_ID').val(fn_make_user_info.get('brandId'));
-	$('#ITP_FORM_BIZPOP_WISH_LIST_ITEM_STORE_ID').val(fn_make_user_info.get('storeId'));
-	$('#ITP_FORM_BIZPOP_WISH_LIST_ITEM_WHS_DVSN').val(args.whsDvsn);
-	*/
-	
-	$('#ITP_BIZPOP_WISH_LIST_ITEM').one('shown.bs.modal', function(e) {
-		grid.setGridWidth(642, true); 
-		const cols =grid.getGridParam('colModel'), last=cols.length-1, col=cols[last];
-		$(THIS_GIRD_ID+'_list table').find('td:eq('+last+')').each(function(){$(this).css('width',col.width-2);});  
-		 
-	}).one('hidden.bs.modal', function(e) {
-		$('#ITP_BIZPOP_WISH_LIST_ITEM').remove();
-	}).modal('show');
-
-	$('#ITP_BIZPOP_WISH_LIST_ITEM_BTN_SEARCH').on('click', function() {
-		search();
-	});
-	
-	$('#ITP_BIZPOP_WISH_LIST_ITEM_BTN_SELECT').on('click', function() {	
-		const rowKey = grid.getGridParam('selrow');
-	    if (!rowKey) {
-	    	return;
-	    }
-		const selectedIds = grid.getGridParam('selarrrow'), result=[]; 
-		if(Array.isArray(selectedIds) ) {
-			for (var i=selectedIds.length-1; i>=0; i--) {
-				const cur=grid.jqGrid('getRowData', selectedIds[i]);
-				result.push(cur );
-			} 
-			parentPopFn(result);
-			$('#ITP_BIZPOP_WISH_LIST_ITEM').modal('hide'); // 팝업닫기 
+		multiboxonly: true,
+		rownumbers: false,
+		loadComplete: function(data) {
+			console.log(JSON.stringify(data));
+			itp_fn_grid_load_complete(data, THIS_GIRD_ID, true, undefined, 'BIZPOP_WISH_LIST_ITEM', itp_BIZPOP_WISH_LIST_ITEM_search, itp_fn_BIZPOP_WISH_LIST_ITEM_empty, true, data.gridRecords, false);
+		},
+		loadError: function(jqXHR, textStatus, errorThrown) {
+			itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);
+		},
+		onPaging: function(action) {
+			itp_fn_grid_paging(THIS_GIRD_ID, action, param);
 		}
-	}); 
-	
+	}).navGrid(THIS_GIRD_PAGER, ITP_GRID_NAV_DEFAULTS.navGrid);
 };