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

src/main/webapp/app/oper/OPER03010.html

@@ -140,7 +140,7 @@
 												<!-- <button type="button" id="ITP_BTN_STINFO01010_RESET_PW" class="btn btn-danger btn-xs PWC" style="margin: 3px 0px 0px 3px;">비밀번호 초기화</button> -->
 											</div>
 											<label class="col-xs-2 itp_lb"></label>
-											<div class="col-xs-4 itp_in"></div>
+											<div id="ITP_OPER03010_DETAIL_LOGO_FILE" class="col-xs-4 itp_in"></div>
 										</div>
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">전화번호 *</label>
@@ -150,9 +150,10 @@
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb" style="border-top:none;">가맹점 로고</label>
-											<div class="col-xs-4 itp_ip"style="border-top:none;">
-												<div class="col-xs-5 itp_in">
-												</div>
+											<div class="col-xs-4 itp_in" style="border-top:none;">
+												<!--<div class="col-xs-5 itp_in">
+													<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_FORM_OPER03010_DETAIL_ "style="border:none; top:12px; left:12px; height:70px; width:85px; position:absolute;" class="form-control itp_input" name="" >
+												</div>-->
 											</div>
 										</div>
 										<div class="form-group">
@@ -313,7 +314,7 @@
 												<div class="col-xs-7 itp_in fnCorpTypeNm"></div>
 											</div>
 											<label class="col-xs-2 itp_lb"></label>
-											<div class="col-xs-4 itp_in"></div>
+											<div id="ITP_OPER03010_VIEW_LOGO_FILE" class="col-xs-4 itp_in"></div>
 										</div>
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">전화번호 *</label>
@@ -321,9 +322,7 @@
 												<div class="col-xs-7 itp_in fnTelNo"></div>
 											</div>
 											<label class="col-xs-2 itp_lb" style="border-top:none;">가맹점 로고</label>
-											<div class="col-xs-4 itp_ip"style="border-top:none;">
-												<div class="col-xs-5 itp_in">
-												</div>
+											<div class="col-xs-4 itp_in" style="border-top:none;">
 											</div>
 										</div>
 										<div class="form-group">

src/main/webapp/app/oper/OPER03011.html

@@ -135,8 +135,7 @@
 												<!-- <button type="button" id="ITP_BTN_STINFO01010_RESET_PW" class="btn btn-danger btn-xs PWC" style="margin: 3px 0px 0px 3px;">비밀번호 초기화</button> -->
 											</div>
 											<label class="col-xs-2 itp_lb"></label>
-											<div class="col-xs-4 itp_in">
-												<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_FORM_OPER03011_DETAIL_ "style="border:none; top:12px; left:12px; height:70px; width:85px; position:absolute;" class="form-control itp_input" name="" >
+											<div id="ITP_FORM_OPER03011_DETAIL_LOGO_FILE" class="col-xs-4 itp_in">
 											</div>
 										</div>
 										<div class="form-group">
@@ -148,7 +147,7 @@
 											</div>
 											<label class="col-xs-2 itp_lb" style="border-top:none;">가맹점 로고</label>
 											<div class="col-xs-4 itp_ip" style="border-top:none;">
-												<div id="ITP_FORM_OPER03011_DETAIL_LOGO_FILE" class="col-xs-5 itp_in">
+												<div class="col-xs-5 itp_in">
 												</div>
 											</div>
 										</div>
@@ -310,8 +309,7 @@
 												<div class="col-xs-7 itp_in fnCorpTypeNm"></div>
 											</div>
 											<label class="col-xs-2 itp_lb"></label>
-											<div class="col-xs-4 itp_in">
-												<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_FORM_STINFO01010_DETAIL_LOGO "style="border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;" class="form-control itp_input" name="" >
+											<div id="ITP_OPER03011_VIEW_LOGO_FILE" class="col-xs-4 itp_in">
 											</div>
 										</div>
 										<div class="form-group">

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) { //실패시 서버에서 내려주는 메세지 얼럿
@@ -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) {
@@ -3024,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);
+		});
+	}
 };

src/main/webapp/js/app/oper/ITP_OPER03010.js

@@ -152,7 +152,6 @@ let pageObj = {
 	init: function () {
 		this.ui.init();
 		this.event.init();
-		this.fileUpload();
 	},
 	itp_OPER03010_param: {},
 	itp_OPER03010_search: false,
@@ -234,13 +233,17 @@ let pageObj = {
 		//파일업로드(수정화면)
 		var id = 'OPER03010';
 		$('#ITP_' + id + '_DETAIL_UPLOAD').empty();
+		$('#ITP_' + id + '_DETAIL_LOGO_FILE').empty();
+		var removeFn = (param) => {
+			$('#ITP_' + id + '_DETAIL_LOGO_FILE').empty();
+		};
 		const fileArgs = {
 			'fileNo': $('#ITP_FORM_' + id + '_DETAIL_FILE_NO').val(),
 			'viewCd': $('#ITP_FORM_' + id + '_DETAIL_VIEW_CD').val(),
 			'showYn': $('#ITP_' + id + '_DETAIL_UPLOAD').attr('data-show-yn'),
 			'fileId': '#ITP_FORM_' + id + '_DETAIL_FILE_NO' //파일번호를 서버에서 받아서 넣을 파일번호 인풋박스 아이디
 		};
-		itp_fn_set_file_upload('ITP_' + id + '_DETAIL_UPLOAD', 'notice', true, false, id, fileArgs);
+		itp_fn_set_file_upload('ITP_' + id + '_DETAIL_UPLOAD', 'affl', true, false, id, fileArgs, removeFn);
 	},
 	switchScreen: function(mode) {
 		$('.itp_det_head').find('button[id^="ITP_BTN_OPER03010_"]').each(function(i) {
@@ -485,6 +488,9 @@ let viewObj = {
 		$('#ITP_FORM_OPER03010_VIEW .fnLoadAddr').text(result.addr1);
 		$('#ITP_FORM_OPER03010_VIEW .fnDtlAddr').text(result.addr2);
 
+		itp_fn_attach_file.view('ITP_OPER03010_VIEW_LOGO_FILE', result.fileLogNoList
+			, 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
+
 		let locate = result.addr1 + ' ' + result.addr2;
 		kakaoMap.init('ITP_FORM_OPER03010_VIEW', locate);
 
@@ -537,6 +543,11 @@ let modifyObj = {
 		$('#ITP_FORM_OPER03010_DETAIL .fnAddDt').text(result.regDt);
 		$('#ITP_FORM_OPER03010_DETAIL .fnChgDt').text(result.chgDt);
 
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_FILE_NO').val(result.cmpnyLogoFileNo);
+		pageObj.fileUpload();
+		itp_fn_attach_file.view('ITP_OPER03010_DETAIL_LOGO_FILE', result.fileLogNoList
+			, 'form-control itp_input', 'border:none; top:12px; left:12px; height:70px; width:85px; position:absolute;');
+
 		kakaoMap.init('ITP_FORM_OPER03010_DETAIL', $('#ITP_FORM_OPER03010_DETAIL_ADRES').val());
 
 		// 권한정보 리스트 조회
@@ -547,6 +558,7 @@ let modifyObj = {
 /*신규화면 Object*/
 let createObj = {
 	init: function () {
+		pageObj.fileUpload();
 		kakaoMap.init('ITP_FORM_OPER03010_DETAIL', '');
 		pageObj.grid.init('DETAIL', []);
 	},

src/main/webapp/js/app/oper/ITP_OPER03011.js

@@ -107,7 +107,6 @@ let pageObj = {
 	init: function () {
 		this.ui.init();
 		this.event.init();
-		this.fileUpload();
 	},
 	itp_OPER03011_param: {},
 	itp_OPER03011_search: false,
@@ -179,13 +178,17 @@ let pageObj = {
 		//파일업로드(수정화면)
 		var id = 'OPER03011';
 		$('#ITP_' + id + '_DETAIL_UPLOAD').empty();
+		$('#ITP_' + id + '_DETAIL_LOGO_FILE').empty();
+		var removeFn = (param) => {
+			$('#ITP_' + id + '_DETAIL_LOGO_FILE').empty();
+		};
 		const fileArgs = {
 			'fileNo': $('#ITP_FORM_' + id + '_DETAIL_FILE_NO').val(),
 			'viewCd': $('#ITP_FORM_' + id + '_DETAIL_VIEW_CD').val(),
 			'showYn': $('#ITP_' + id + '_DETAIL_UPLOAD').attr('data-show-yn'),
 			'fileId': '#ITP_FORM_' + id + '_DETAIL_FILE_NO' //파일번호를 서버에서 받아서 넣을 파일번호 인풋박스 아이디
 		};
-		itp_fn_set_file_upload('ITP_' + id + '_DETAIL_UPLOAD', 'notice', true, false, id, fileArgs);
+		itp_fn_set_file_upload('ITP_' + id + '_DETAIL_UPLOAD', 'notice', true, false, id, fileArgs, removeFn);
 	},
 	switchScreen: function(mode) {
 		$('.itp_det_head').find('button[id^="ITP_BTN_OPER03011_"]').each(function(i) {
@@ -307,6 +310,11 @@ let viewObj = {
 		$('#ITP_FORM_OPER03011_VIEW .fnLoadAddr').text(result.addr1);
 		$('#ITP_FORM_OPER03011_VIEW .fnDtlAddr').text(result.addr2);
 
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_FILE_NO').val(result.cmpnyLogoFileNo);
+		pageObj.fileUpload();
+		itp_fn_attach_file.view('ITP_OPER03011_VIEW_LOGO_FILE', result.fileLogNoList
+			, 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
+
 		let locate = result.addr1 + ' ' + result.addr2;
 		kakaoMap.init('ITP_FORM_OPER03011_VIEW', locate);
 
@@ -435,6 +443,9 @@ let modifyObj = {
 		$('#ITP_FORM_OPER03011_DETAIL .fnAddDt').text(result.regDt);
 		$('#ITP_FORM_OPER03011_DETAIL .fnChgDt').text(result.chgDt);
 
+		itp_fn_attach_file.view('ITP_FORM_OPER03011_DETAIL_LOGO_FILE', result.fileLogNoList
+			, 'form-control itp_input', 'border:none; top:12px; left:12px; height:70px; width:85px; position:absolute;');
+
 		kakaoMap.init('ITP_FORM_OPER03011_DETAIL', $('#ITP_FORM_OPER03011_DETAIL_ADRES').val());
 
 		// 권한정보 리스트 조회