Commit @a9719735e86a141b2e7190c4167036c01b20a3b2

wyh 2024-11-07

수정중 입니다.

@a9719735e86a141b2e7190c4167036c01b20a3b2

fb1882e

a971973

src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrList.jsp

--- src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrList.jsp

+++ src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrList.jsp


 
 <script type="text/javascript" src="<c:url value='/publish/js/content.js'/>"></script>
 <script type="text/javascript" src="https://oss.sheetjs.com/sheetjs/xlsx.full.min.js"></script>
-<script type="text/javascript" src="<c:url value='/js/web/addr/fax/faxTabulator.js'/>?v=20241031"></script>
-<script type="text/javascript" src="<c:url value='/js/web/addr/fax/faxEvent.js'/>?v=20241031"></script>
+<script type="text/javascript" src="<c:url value='/js/user/fax/addr/faxTabulator.js'/>?v=20241031"></script>
+<script type="text/javascript" src="<c:url value='/js/user/fax/addr/faxEvent.js'/>?v=20241031"></script>
 <script type="text/javascript" src="<c:url value='/js/web/addr/cmn.js?date=202409021440'/>"></script>
 <script type="text/javascript" src="<c:url value='/js/web/addr/utils.js'/>?v=20240919"></script>
 

 }
 
 // 주소록 그룹 중복체크
-function getAddrGroupDuplCheckAjax() {
+function getAddrGroupDuplCheckAjax(addrGrpNm) {
 	var isReturn = true;
 	
 	$.ajax({
 		url : "<c:url value='/web/mjon/fax/addr/getFaxAddrGroupDuplCheckAjax.do' />", 
 		type : 'POST', 
-		data : {"addrGrpNm" : $("#addrGrpNm").val()},
+		data : {"addrGrpNm" : addrGrpNm},
 		dataType:'json',
 		async: false,			// 동기
 		success : function(data, status){

 //저장
 function SetAddrMassSave(){
 
+	var $objTabul = fn_utils_getTabulator();
+	var tabulNm = fn_utils_getTabulatorNm();
+	var tabluC = '.'+tabulNm
+	
 	var loginVO = '${LoginVO}';
 	if(loginVO == "" || loginVO == null){
 		alert("로그인 후 이용이 가능합니다.");
 		return false;
 	}
-	
-	var $objTabul = fn_utils_getTabulator();
-	var tabulNm = fn_utils_getTabulatorNm();
 	
 	if($objTabul.getData().length < 1){
 		alert("한 개 이상의 연락처를 입력하세요");

 		return false;
 	}
 	
-	var selectMassVal = $("#addrGrpIdInfo option:selected").val();
-	if ($("#addrGrpIdInfo option:selected").val() == "NEW" && ($("#addrGrpNm").val() == "" || $("#addrGrpNm").val() == null || $("#addrGrpNm").val() == undefined)) {
+	
+	// 주소록이 새로생성이면 새로운 주소록명이 있는지 확인
+	if ($(tabluC+" #addrGrpIdInfo option:selected").val() == "NEW"
+		&& ($(tabluC+" #addrGrpNm").val() == "" 
+			|| $(tabluC+" #addrGrpNm").val() == null 
+			|| $(tabluC+" #addrGrpNm").val() == undefined)) 
+	{
 		alert("저장할 그룹을 선택하거나 새 그룹명을 입력해주세요.");
+		$(tabluC+" #addrGrpNm").focus();
 		return false;		
 	}
 	
+	
 	// 새 그룹명 중복체크
-	if ($("#addrGrpIdInfo option:selected").val() == "NEW" && $("#addrGrpNm").val() != "") {
+	if ($(tabluC+" #addrGrpIdInfo option:selected").val() == "NEW" 
+			&& $(tabluC+" #addrGrpNm").val() != "") 
+	{
+		var addrGrpNm = $(tabluC+" #addrGrpNm").val();
+		console.log('addrGrpNm : ', addrGrpNm);
+		
 		//주소록 중복체크
 		if (getAddrGroupDuplCheckAjax() == false) {
 			alert("중복된 그룹명입니다. 새 그룹명을 입력해주세요.");

fb1882e

a971973

src/main/webapp/js/user/fax/addr/faxEvent.js (Renamed from src/main/webapp/js/web/addr/fax/faxEvent.js)

--- src/main/webapp/js/web/addr/fax/faxEvent.js

+++ src/main/webapp/js/user/fax/addr/faxEvent.js

No changes

fb1882e

a971973

src/main/webapp/js/user/fax/addr/faxTabulator.js (Renamed from src/main/webapp/js/web/addr/fax/faxTabulator.js)

--- src/main/webapp/js/web/addr/fax/faxTabulator.js

+++ src/main/webapp/js/user/fax/addr/faxTabulator.js

No changes

Add a comment

Open 0
Closed 0

List

...	...	@@ -7,8 +7,8 @@
7	7
8	8	<script type="text/javascript" src="<c:url value='/publish/js/content.js'/>"></script>
9	9	<script type="text/javascript" src="https://oss.sheetjs.com/sheetjs/xlsx.full.min.js"></script>
10		-<script type="text/javascript" src="<c:url value='/js/web/addr/fax/faxTabulator.js'/>?v=20241031"></script>
11		-<script type="text/javascript" src="<c:url value='/js/web/addr/fax/faxEvent.js'/>?v=20241031"></script>
	10	+<script type="text/javascript" src="<c:url value='/js/user/fax/addr/faxTabulator.js'/>?v=20241031"></script>
	11	+<script type="text/javascript" src="<c:url value='/js/user/fax/addr/faxEvent.js'/>?v=20241031"></script>
12	12	<script type="text/javascript" src="<c:url value='/js/web/addr/cmn.js?date=202409021440'/>"></script>
13	13	<script type="text/javascript" src="<c:url value='/js/web/addr/utils.js'/>?v=20240919"></script>
14	14
...	...	@@ -656,13 +656,13 @@
656	656	}
657	657
658	658	// 주소록 그룹 중복체크
659		-function getAddrGroupDuplCheckAjax() {
	659	+function getAddrGroupDuplCheckAjax(addrGrpNm) {
660	660	var isReturn = true;
661	661
662	662	$.ajax({
663	663	url : "<c:url value='/web/mjon/fax/addr/getFaxAddrGroupDuplCheckAjax.do' />",
664	664	type : 'POST',
665		- data : {"addrGrpNm" : $("#addrGrpNm").val()},
	665	+ data : {"addrGrpNm" : addrGrpNm},
666	666	dataType:'json',
667	667	async: false, // 동기
668	668	success : function(data, status){
...	...	@@ -687,14 +687,15 @@
687	687	//저장
688	688	function SetAddrMassSave(){
689	689
	690	+ var $objTabul = fn_utils_getTabulator();
	691	+ var tabulNm = fn_utils_getTabulatorNm();
	692	+ var tabluC = '.'+tabulNm
	693	+
690	694	var loginVO = '${LoginVO}';
691	695	if(loginVO == "" \|\| loginVO == null){
692	696	alert("로그인 후 이용이 가능합니다.");
693	697	return false;
694	698	}
695		-
696		- var $objTabul = fn_utils_getTabulator();
697		- var tabulNm = fn_utils_getTabulatorNm();
698	699
699	700	if($objTabul.getData().length < 1){
700	701	alert("한 개 이상의 연락처를 입력하세요");
...	...	@@ -708,14 +709,26 @@
708	709	return false;
709	710	}
710	711
711		- var selectMassVal = $("#addrGrpIdInfo option:selected").val();
712		- if ($("#addrGrpIdInfo option:selected").val() == "NEW" && ($("#addrGrpNm").val() == "" \|\| $("#addrGrpNm").val() == null \|\| $("#addrGrpNm").val() == undefined)) {
	712	+
	713	+ // 주소록이 새로생성이면 새로운 주소록명이 있는지 확인
	714	+ if ($(tabluC+" #addrGrpIdInfo option:selected").val() == "NEW"
	715	+ && ($(tabluC+" #addrGrpNm").val() == ""
	716	+ \|\| $(tabluC+" #addrGrpNm").val() == null
	717	+ \|\| $(tabluC+" #addrGrpNm").val() == undefined))
	718	+ {
713	719	alert("저장할 그룹을 선택하거나 새 그룹명을 입력해주세요.");
	720	+ $(tabluC+" #addrGrpNm").focus();
714	721	return false;
715	722	}
716	723
	724	+
717	725	// 새 그룹명 중복체크
718		- if ($("#addrGrpIdInfo option:selected").val() == "NEW" && $("#addrGrpNm").val() != "") {
	726	+ if ($(tabluC+" #addrGrpIdInfo option:selected").val() == "NEW"
	727	+ && $(tabluC+" #addrGrpNm").val() != "")
	728	+ {
	729	+ var addrGrpNm = $(tabluC+" #addrGrpNm").val();
	730	+ console.log('addrGrpNm : ', addrGrpNm);
	731	+
719	732	//주소록 중복체크
720	733	if (getAddrGroupDuplCheckAjax() == false) {
721	734	alert("중복된 그룹명입니다. 새 그룹명을 입력해주세요.");

Delete comment