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

src/main/webapp/js/app/stockmng/ITP_STOCKMNG04010.js

@@ -231,8 +231,6 @@ let pageObj = {
 						case 'ITP_BTN_STOCKMNG04010_CANCELLIST'			: createObj.button.cancel(); 	break;	// 취소/목록 버튼
 						case 'ITP_BTN_STOCKMNG04010_DELETE'				: 								break;	// 삭제 버튼
 						case 'ITP_BTN_STOCKMNG04010_SAVE'				: createObj.button.save(); 		break;	// 저장 버튼
-						case 'ITP_FORM_STOCKMNG04010_DETAIL_DUP'		: createObj.button.duplicate();	break;	// 중복체크
-						case 'ITP_BTN_STOCKMNG04010_RESET_PW'			: createObj.button.resetPass();	break;	// 상세:비밀번호 초기화
 						case 'ITP_BTN_STOCKMNG04010_DETAIL_ADDROW'		: locInfoObj.button.addRow();	break;	// 상세:추가버튼
 						case 'ITP_BTN_STOCKMNG04010_DETAIL_DELROW'		: locInfoObj.button.delRow();	break;	// 상세:삭제버튼
 					}
@@ -268,30 +266,31 @@ let pageObj = {
 			$('#ITP_BTN_STOCKMNG04010_MODIFY').hide();
 			$('#ITP_BTN_STOCKMNG04010_NEWREG').hide();
 			$('#ITP_BTN_STOCKMNG04010_DELETE').hide();
-			$('#ITP_BTN_STOCKMNG04010_RESET_PW').hide();
+			
 			fn_show_btn_auth('#ITP_BTN_STOCKMNG04010_CANCELLIST');
 			fn_show_btn_auth('#ITP_BTN_STOCKMNG04010_SAVE');
 
 			$('#ITP_AJAX_STOCKMNG04010_LIST_CONTAINER').hide();
 			$('#ITP_AJAX_STOCKMNG04010_DETAIL_CONTAINER').show();
 			$('#ITP_AJAX_STOCKMNG04010_VIEW_CONTAINER').hide();
-			$('#ITP_FORM_STOCKMNG04010_DETAIL_USER_ID').removeAttr('readonly');
-			$('#ITP_FORM_STOCKMNG04010_DETAIL_DUP').removeAttr('disabled');
-
+						
+			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_cd'));
 			$('#ITP_FORM_STOCKMNG04010_DETAIL_VIEW_CD').val('C');
-			$('#ITP_FORM_STOCKMNG04010_DETAIL_USER_NM').val('');
-			$('#ITP_FORM_STOCKMNG04010_DETAIL_USER_STAT_CD').val('');
-			$('#ITP_FORM_STOCKMNG04010_DETAIL_USER_ID').val('');
-			$('#ITP_FORM_STOCKMNG04010_DETAIL_USER_PW').val('');
-			$('#ITP_FORM_STOCKMNG04010_DETAIL_TEL_NO').val('');
-			$('#ITP_FORM_STOCKMNG04010_DETAIL_USER_PW_CONFIRM').val('');
-			$('#ITP_FORM_STOCKMNG04010_DETAIL_EMAIL').val('');
-
-			$('#ITP_FORM_STOCKMNG04010_DETAIL_SEARCH_AFFL_SHOP_ID').val('');
-			$('#ITP_FORM_STOCKMNG04010_DETAIL_SEARCH_AFFL_SHOP_NM').val('');
-			$('#ITP_FORM_STOCKMNG04010_DETAIL_SEARCH_BRAND_ID option').remove();
-			$('#ITP_FORM_STOCKMNG04010_DETAIL_SEARCH_AFFL_SHOP').show();
-			$('#ITP_FORM_STOCKMNG04010_DETAIL_DELETE_AFFL_SHOP').show();
+			$('#ITP_FORM_STOCKMNG04010_DETAIL_BRAND_ID').val(data.brandId);
+			$('#ITP_FORM_STOCKMNG04010_DETAIL .fnBrandNm').text(data.brandNm);
+			$('#ITP_FORM_STOCKMNG04010_DETAIL .fnWhsId').text('');
+			$('#ITP_FORM_STOCKMNG04010_DETAIL .fnRegDtm').text('');
+			$('#ITP_FORM_STOCKMNG04010_DETAIL_STORE_ID').val('');
+			$('#ITP_FORM_STOCKMNG04010_DETAIL_WHS_ID').val('');
+			$('#ITP_FORM_STOCKMNG04010_DETAIL_WHS_ST_CD').val('');
+			$('#ITP_FORM_STOCKMNG04010_DETAIL_WHS_NM').val('');
+			$('#ITP_FORM_STOCKMNG04010_DETAIL_MGR_TEL_NO').val('');
+			$('#ITP_FORM_STOCKMNG04010_DETAIL_MGR_NM').val('');
+			$('#ITP_FORM_STOCKMNG04010_DETAIL_STORE_NM').val('');
+			$('#ITP_FORM_STOCKMNG04010_DETAIL_ZIPNO').val('');
+			$('#ITP_FORM_STOCKMNG04010_DETAIL_LOAD_ADDR').val('');
+			$('#ITP_FORM_STOCKMNG04010_DETAIL_DTL_ADDR').val('');
+			
 		} else if(mode == 'MODIFY') { // 수정
 			$('#ITP_BTN_STOCKMNG04010_SRH').hide();
 			$('#ITP_BTN_STOCKMNG04010_MODIFY').hide();
@@ -304,8 +303,8 @@ let pageObj = {
 			$('#ITP_AJAX_STOCKMNG04010_LIST_CONTAINER').hide();
 			$('#ITP_AJAX_STOCKMNG04010_DETAIL_CONTAINER').show();
 			$('#ITP_AJAX_STOCKMNG04010_VIEW_CONTAINER').hide();
-			$('#ITP_FORM_STOCKMNG04010_DETAIL_USER_ID').attr('readonly', true);
-			$('#ITP_FORM_STOCKMNG04010_DETAIL_DUP').attr('disabled', true);
+			// $('#ITP_FORM_STOCKMNG04010_DETAIL_USER_ID').attr('readonly', true);
+			// $('#ITP_FORM_STOCKMNG04010_DETAIL_DUP').attr('disabled', true);
 			$('#ITP_FORM_STOCKMNG04010_DETAIL_SEARCH_AFFL_SHOP_NM').attr('readonly', true);
 
 			$('#ITP_FORM_STOCKMNG04010_DETAIL_SEARCH_AFFL_SHOP').hide();
@@ -341,9 +340,9 @@ let listObj = {
 			$(STOCKMNG04010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
 		},
 		create: function() {
-			pageObj.switchScreen('ADD');
-			itp_fn_form_clear_validate(null, '#ITP_FORM_STOCKMNG04010_DETAIL');
-			// 권한정보 리스트 조회
+			pageObj.switchScreen('ADD');			
+			itp_fn_form_clear_validate(null, '#ITP_FORM_STOCKMNG04010_DETAIL');						
+			// 로케이션 리스트 조회
 			createObj.init();
 		}
 	},
@@ -457,9 +456,11 @@ let viewObj = {
 		$('#ITP_FORM_STOCKMNG04010_VIEW .fnWhsNm').text(result.whsNm);
 		$('#ITP_FORM_STOCKMNG04010_VIEW .fnTelNo').text(result.mgrTelNo);
 		$('#ITP_FORM_STOCKMNG04010_VIEW .fnMgrNm').text(result.mgrNm);		
-		$('#ITP_FORM_STOCKMNG04010_VIEW .fnSpplyNm').text(result.storeNm);		
-		$('#ITP_FORM_STOCKMNG04010_VIEW .fnRegDtm').text(result.sysRegDttm);		
-		$('#ITP_FORM_STOCKMNG04010_VIEW .fnAddress').text('('+result.zipNo+') ' + result.addr1 + ' ' + result.addr2);		
+		$('#ITP_FORM_STOCKMNG04010_VIEW .fnSpplyNm').text(result.storeNm ? result.storeNm : '');		
+		$('#ITP_FORM_STOCKMNG04010_VIEW .fnRegDtm').text(result.sysRegDttm);
+		if(result.zipNo) {
+			$('#ITP_FORM_STOCKMNG04010_VIEW .fnAddress').text('('+result.zipNo+') ' + result.addr1 + ' ' + result.addr2);	
+		}		
 
 		// 권한정보 리스트 조회
 		viewObj.grid.init();
@@ -641,51 +642,41 @@ let createObj = {
 			listObj.grid.search();
 		},
 		save: function() {
+			var detailViewCd = $('#ITP_FORM_STOCKMNG04010_DETAIL_VIEW_CD').val();
 			const formId = '#ITP_FORM_STOCKMNG04010_DETAIL';
 			itp_fn_form_clear_validate(null, formId);
-			var vali_userId = itp_fn_form_validate(formId, formId + '_USER_ID', ['empty'], undefined);
-			var vali_userStatCd = itp_fn_form_validate(formId, formId + '_USER_STAT_CD', ['empty'], undefined);
-			var vali_userNm = itp_fn_form_validate(formId, formId + '_USER_NM', ['empty'], undefined);
-			var vali_telNo = itp_fn_form_validate(formId, formId + '_TEL_NO', ['empty'], undefined);
-			var vali_email = itp_fn_form_validate(formId, formId + '_EMAIL', ['empty'], undefined);
-			var vali_userPw = true;
-			var vali_userPwConfirm = true;
-			if($('#ITP_FORM_STOCKMNG04010_DETAIL_VIEW_CD').val() == 'C') { // 신규
-				vali_userPw = itp_fn_form_validate(formId, formId + '_USER_PW', ['empty'], undefined);
-				vali_userPwConfirm = itp_fn_form_validate(formId, formId + '_USER_PW_CONFIRM', ['empty'], undefined);
-			}
-			if (vali_userId && vali_userStatCd && vali_userNm && vali_userPw && vali_userPwConfirm && vali_telNo && vali_email) {
-				if (ITP_FORM_STOCKMNG04010_DETAIL_IS_DUPLICATE) {
-					itp_fn_modal_duplicate(ITP_MSG_LOCALE.label.userId, formId + '_USER_ID');
-				} else {
-					let gridInsertData = [];
-					let gridUpdateData = [];
-					let gridDeleteData = [];
-					const rowData = $(STOCKMNG04010_DETAIL_GRID_ID).getRowData();
-					const keyValue = $(formId + '_USER_ID').val();
-					$.each(rowData, function(key, value) {
-						if (value.viewCd != 'R') {
-							value.userId = keyValue;
-							if (value.viewCd == 'C') {
-								gridInsertData.push(value);
-							} else if (value.viewCd == 'U') {
-								gridUpdateData.push(value);
-							} else if (value.viewCd == 'D') {
-								gridDeleteData.push(value);
-							}
+			
+			var vali_whsStatCd = itp_fn_form_validate(formId, formId + '_WHS_ST_CD', ['empty'], undefined); // 상태
+			var vali_whsNm = itp_fn_form_validate(formId, formId + '_WHS_NM', ['empty'], undefined);
+			
+			if (vali_whsStatCd && vali_whsNm) {
+				let gridInsertData = [];
+				let gridUpdateData = [];
+				let gridDeleteData = [];
+				const rowData = $(STOCKMNG04010_DETAIL_GRID_ID).getRowData();
+				// const keyValue = $(formId + '_WHS_ID').val();
+				$.each(rowData, function(key, value) {
+					if (value.viewCd != 'R') {
+						// value.whsId = keyValue;
+						if (value.viewCd == 'C') {
+							gridInsertData.push(value);
+						} else if (value.viewCd == 'U') {
+							gridUpdateData.push(value);
+						} else if (value.viewCd == 'D') {
+							gridDeleteData.push(value);
 						}
-					});
-					let param = $(formId).serializeObject();
-					param.gridInsertData = gridInsertData;
-					param.gridUpdateData = gridUpdateData;
-					param.gridDeleteData = gridDeleteData;
-					//console.log(JSON.stringify(param));
-					var searhFn = function() {
-						ITP_FORM_STOCKMNG04010_DETAIL_IS_WRITING = false;
-						listObj.grid.search();
-					};
-					fn_ajax_call(WHS_MNG_MIDIFY_WHS, JSON.stringify(param), searhFn, 'POST');
-				}
+					}
+				});
+				let param = $(formId).serializeObject();
+				param.gridInsertData = gridInsertData;
+				param.gridUpdateData = gridUpdateData;
+				param.gridDeleteData = gridDeleteData;
+				//console.log(JSON.stringify(param));
+				var searhFn = function() {
+					ITP_FORM_STOCKMNG04010_DETAIL_IS_WRITING = false;
+					listObj.grid.search();
+				};
+				fn_ajax_call(detailViewCd == 'C' ? WHS_MNG_ADD_WHS : WHS_MNG_MIDIFY_WHS, JSON.stringify(param), searhFn, 'POST');
 			}
 		}
 	},
@@ -814,8 +805,8 @@ let locInfoObj = {
 		create: function(rowDataPop) {
 			// console.log(rowDataPop);
 			if(rowDataPop.AFFL_SHOP) {
-				$('#ITP_FORM_STOCKMNG04010_DETAIL_SEARCH_AFFL_SHOP_ID').val(rowDataPop.AFFL_SHOP.afflShopId);
-				$('#ITP_FORM_STOCKMNG04010_DETAIL_SEARCH_AFFL_SHOP_NM').val(rowDataPop.AFFL_SHOP.afflShopNm);
+				// $('#ITP_FORM_STOCKMNG04010_DETAIL_SEARCH_AFFL_SHOP_ID').val(rowDataPop.AFFL_SHOP.afflShopId);
+				// $('#ITP_FORM_STOCKMNG04010_DETAIL_SEARCH_AFFL_SHOP_NM').val(rowDataPop.AFFL_SHOP.afflShopNm);
 			}
 			if(rowDataPop.AFFL_BRAND) {
 				fn_make_select_brand(rowDataPop.AFFL_BRAND, 'ITP_FORM_STOCKMNG04010_DETAIL_SEARCH_BRAND_ID', true, '선택');