Explorar el Código

이태영 - 20210719 BOS 수정사항 수정 중

xodud lee hace 4 años
padre
commit
b63ab8a2e7

+ 5 - 1
src/main/webapp/WEB-INF/views/marketing/FreeGoodsPromotionRegiForm.html

@@ -78,6 +78,7 @@
 								<label class="chkBox disabledPoint" id="G011_20"><input type="checkbox" id="extmallYn" name="extmallYn" value="Y" class="disabledPoint"/>제휴몰</label>
 								<button type="button" class="btn btnRight btn-success btn-lg" id="btnExtmallPopup">선택</button><span id="extmallCntArea"> 선택 : <span id="extmallCnt">00</span>개</span>
 								<div id="gridFGExtmallList" style="display:none;"></div>
+								<div id="gridExtmallIdList" style="display:none;"></div>
 							</td>
 						</tr>
 					</table>
@@ -1032,12 +1033,15 @@
 			}
 
 			// 추가된 데이터 중 중복되지 않은 데이터 리스트에 추가
-			if(addChk) {	resultList.push(result[i]);	}
+			if(addChk) {
+				resultList.push(result[i]);
+			}
 		}
 
 		// 추가된 정보 그리드에 추가
 		for(let i = 0 ; i < resultList.length ; i++) {
 			gagaAgGrid.addRowData(gridOptionsFGExtmallList, resultList[i], "extmallId");
+			$("#freeGoodsPromotionForm #gridExtmallIdList").append('<input type="hidden" class="extmallIdList" name="extmallIdList" value="' + resultList[i].extmallId + '" />');
 		}
 
 		// 수정된 수량 갯수 수정

+ 11 - 4
src/main/webapp/WEB-INF/views/ocm/ExtmallSearchForm.html

@@ -67,7 +67,7 @@
 		/*<![CDATA[*/
 		let extmallGbList = gagajf.convertToArray([[${extmallGbList}]]);		// 상품 상태 리스트
 		let columnExtmallPopupDefList = [
-			{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
+			{width: 40, minWidth: 40, field: "extmallCheck", cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
 			{headerName: "제휴몰구분", field: "vendorId" , width: 120, cellClass: 'text-center',
 				cellEditorParams: { values: gagaAgGrid.extractValues(extmallGbList) },
 				valueFormatter: function (params) { return gagaAgGrid.lookupValue(extmallGbList, params.value); },
@@ -88,8 +88,15 @@
 		// 조회
 		$('#btnSearchExtmallList').on('click', function() {
 			// Fetch data
-			gagaAgGrid.fetch($('#searchExtmallListForm').prop('action'), gridOptionsExtmallPopupList, '#searchExtmallListForm');
-			gridOptions.api.setRowData(result.morebetterList);
+			gagaAgGrid.fetch($('#searchExtmallListForm').prop('action'), gridOptionsExtmallPopupList, '#searchExtmallListForm', function() {
+				gridOptionsExtmallPopupList.api.forEachNode(function(rowNode, index) {
+					$("#freeGoodsPromotionForm #gridExtmallIdList input[name=extmallIdList]").each(function(i, e){
+						if(rowNode.data.extmallId == $(this).val()) {
+							rowNode.setSelected(true);
+						}
+					});
+				});
+			});
 		});
 
 		// 확인
@@ -97,7 +104,7 @@
 			var selectedData = gagaAgGrid.selectedRowData(gridOptionsExtmallPopupList);
 
 			if (selectedData.length == 0) {
-				mcxDialog.alert('선택된 공급업체가 없습니다.');
+				mcxDialog.alert('선택된 외부몰이 없습니다.');
 				return false;
 			}