tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'rosewiper'

Browse Source
This commit is contained in:
rosewiper 2023-10-13 15:33:46 +09:00
commit 7c2cb2e0e4
8 changed files with 201 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberCmpHst_SQL_Mysql.xml
View File

@ -201,6 +201,15 @@
UPDATE LETTNGNRLMBER SET
MBER_STTUS = #mberSttus#
, DEPT = #dept#
<isNotEmpty property="mberNm">
, MBER_NM = #mberNm#
</isNotEmpty>
<isNotEmpty property="ceoNm">
, CEO_NM = #ceoNm#
</isNotEmpty>
<isNotEmpty property="bizNo">
, BIZ_NO = #bizNo#
</isNotEmpty>
<isNotEmpty property="atchFileId">
, ATCH_FILE_ID = #atchFileId#
</isNotEmpty>

11
src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp
View File

@ -109,7 +109,7 @@ function biznoPop(p_bizno) {
// 기업회원 신청 승인/반려 처리
function setMberCmpHstStatusSave(hstSttus, cmphstId, hstType, mberId, managerNm, mbtlNum) {
function setMberCmpHstStatusSave(hstSttus, cmphstId, hstType, mberId, managerNm, mbtlNum, mberNm, ceoNm, bizNo) {
var sMsg = "";
if (hstSttus == "02") {
sMsg = "승인";
@ -128,7 +128,9 @@ function setMberCmpHstStatusSave(hstSttus, cmphstId, hstType, mberId, managerNm,
if(hstType == '02' && hstSttus == '02'){ //기업회원 전환 승인이라면 기존 mberNm -> managerNm 으로 수정
$("#managerNm").val(managerNm);
}
$("#mberNm").val(mberNm);
$("#ceoNm").val(ceoNm);
$("#bizNo").val(bizNo);
var form = document.listForm;
@ -326,6 +328,9 @@ function fnSetCalMonth(val) {
<input type="hidden" name="cmphstId" id="cmphstId" />
<input type="hidden" name="hstType" id="hstType" />
<input type="hidden" name="mberId" id="mberId" />
<input type="hidden" name="mberNm" id="mberNm" />
<input type="hidden" name="ceoNm" id="ceoNm" />
<input type="hidden" name="bizNo" id="bizNo" />
<input type="hidden" name="managerNm" id="managerNm" />
<input type="hidden" name="mbtlNum" id="mbtlNum" />
<input type="hidden" name="atchFileId" id="atchFileId" />
@ -546,7 +551,7 @@ function fnSetCalMonth(val) {
</td>
<td>
<c:if test="${result.hstSttus eq '01'}">
<button class="btnType btnType20" onclick="setMberCmpHstStatusSave('02','<c:out value="${result.cmphstId}"/>','<c:out value="${result.hstType}"/>','<c:out value="${result.mberId}"/>' ,'<c:out value="${result.managerNm}"/>' ,'<c:out value="${result.mbtlNum}"/>'); return false;">승인</button>
<button class="btnType btnType20" onclick="setMberCmpHstStatusSave('02','<c:out value="${result.cmphstId}"/>','<c:out value="${result.hstType}"/>','<c:out value="${result.mberId}"/>' ,'<c:out value="${result.managerNm}"/>' ,'<c:out value="${result.mbtlNum}"/>' ,'<c:out value="${result.mberNm}"/>' ,'<c:out value="${result.ceoNm}"/>' ,'<c:out value="${result.bizNo}"/>'); return false;">승인</button>
<%-- <button class="btnType btnType20" onclick="setMberCmpHstStatusSave('03','<c:out value="${result.cmphstId}"/>','<c:out value="${result.hstType}"/>','<c:out value="${result.mberId}"/>' ,'<c:out value="${result.managerNm}"/>' ,'<c:out value="${result.mbtlNum}"/>'); return false;">반려</button> --%>
<button class="btnType btnType20" onclick="returnPop('<c:out value="${result.cmphstId}"/>'); return false;">반려</button>
</c:if>

26
src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp
View File

@ -592,10 +592,10 @@ function sendTemplateInfo(){
divideChk = "N"
}
var divideCnt = $("select[name='divideCnt']").val();
//var divideCnt = $("select[name='frmDivideCnt']").val();
var divideCnt = $('#frmDivideCnt').val();
var divideTime = $("select[name='divideTime']").val();
$('#bizForm #divideChk').val(divideChk);
$('#bizForm #divideCnt').val(divideCnt);
$('#bizForm #divideTime').val(divideTime);
@ -1045,7 +1045,20 @@ function goToPayUserKaKaoView(){
location.href="/web/member/pay/PayUserWithKakaoList.do";
}
function checkNumber(event) {
var divideCnt = $('#frmDivideCnt').val();
if(!(event.key >= 0 && event.key <= 9)) {
return false;
}
var totCnt = divideCnt + "" + event.key;
if(Number(totCnt) > 5000){
alert("분할전송 건수는 5,000건을 초과할 수 없습니다.");
return false;
}
return true;
}
</script>
@ -1518,13 +1531,8 @@ function goToPayUserKaKaoView(){
<div class="rev_bottom">
<input type="checkbox" id="inputDivideChk" name="inputDivideChk">
<label for="">분할전송</label>
<select class="selType1" id="divideCnt" name="divideCnt">
<option value="2">2</option>
<option value="10">10</option>
<option value="20">20</option>
<option value="30">30</option>
</select>
<label for="divideCnt">건</label>
<input type="text" class="dividType1" id="frmDivideCnt" name="frmDivideCnt" value="20" onkeypress='return checkNumber(event)' style="width:60px;" maxlength="4"/>
<label for="divideCnt">건씩</label>
<select class="selType1" id="divideTime" name="divideTime">
<option value="5">05분</option>
<option value="10">10분</option>

26
src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
View File

@ -3163,6 +3163,23 @@ $(".btn_event_cash").off().on("click", function(){
}
});
function checkNumber(event) {
var divideCnt = $('#divideCnt').val();
if(!(event.key >= 0 && event.key <= 9)) {
return false;
}
var totCnt = divideCnt + "" + event.key;
if(Number(totCnt) > 5000){
alert("분할전송 건수는 5,000건을 초과할 수 없습니다.");
return false;
}
return true;
}
</script>
<div class="loading_layer">
<div class="loading_container">
@ -4207,13 +4224,8 @@ $(".btn_event_cash").off().on("click", function(){
<div class="rev_bottom">
<input type="checkbox" id="divideChk" name="divideChk">
<label for="divideChk">분할전송</label>
<select class="selType1" id="divideCnt" name="divideCnt">
<option value="2">2</option>
<option value="10">10</option>
<option value="20">20</option>
<option value="30">30</option>
</select>
<label for="divideCnt">건</label>
<input type="text" class="dividType1" id="divideCnt" name="divideCnt" value="20" onkeypress='return checkNumber(event)' style="width:60px;" maxlength="4"/>
<label for="divideCnt">건씩</label>
<select class="selType1" id="divideTime" name="divideTime">
<option value="5">05분</option>
<option value="10">10분</option>

26
src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp
View File

@ -2807,6 +2807,23 @@ $(".btn_event_cash").off().on("click", function(){
}
});
function checkNumber(event) {
var divideCnt = $('#divideCnt').val();
if(!(event.key >= 0 && event.key <= 9)) {
return false;
}
var totCnt = divideCnt + "" + event.key;
if(Number(totCnt) > 5000){
alert("분할전송 건수는 5,000건을 초과할 수 없습니다.");
return false;
}
return true;
}
</script>
<div class="loading_layer">
@ -3756,13 +3773,8 @@ $(".btn_event_cash").off().on("click", function(){
<div class="rev_bottom">
<input type="checkbox" id="divideChk" name="divideChk">
<label for="divideChk">분할전송</label>
<select class="selType1" id="divideCnt" name="divideCnt">
<option value="2">2</option>
<option value="10">10</option>
<option value="20">20</option>
<option value="30">30</option>
</select>
<label for="divideCnt">건</label>
<input type="text" class="dividType1" id="divideCnt" name="divideCnt" value="20" onkeypress='return checkNumber(event)' style="width:60px;" maxlength="4"/>
<label for="divideCnt">건씩</label>
<select class="selType1" id="divideTime" name="divideTime">
<option value="5">05분</option>
<option value="10">10분</option>

25
src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
View File

@ -3171,6 +3171,23 @@ $(".btn_event_cash").off().on("click", function(){
}
});
function checkNumber(event) {
var divideCnt = $('#divideCnt').val();
if(!(event.key >= 0 && event.key <= 9)) {
return false;
}
var totCnt = divideCnt + "" + event.key;
if(Number(totCnt) > 5000){
alert("분할전송 건수는 5,000건을 초과할 수 없습니다.");
return false;
}
return true;
}
</script>
<div class="loading_layer">
@ -4255,13 +4272,7 @@ $(".btn_event_cash").off().on("click", function(){
<div class="rev_bottom">
<input type="checkbox" id="divideChk" name="divideChk">
<label for="divideChk">분할전송</label>
<input type="text" class="dividType1"> <!-- 2023 10 13 수정 -->
<!--<select class="selType1" id="divideCnt" name="divideCnt">
<option value="2">2</option>
<option value="10">10</option>
<option value="20">20</option>
<option value="30">30</option>
</select>-->
<input type="text" class="dividType1" id="divideCnt" name="divideCnt" value="20" onkeypress='return checkNumber(event)' style="width:60px;" maxlength="4"/>
<label for="divideCnt">건씩</label> <!-- 2023 10 13 수정 -->
<select class="selType1" id="divideTime" name="divideTime">
<option value="5">05분</option>

26
src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp
View File

@ -2891,6 +2891,23 @@ $(".btn_event_cash").off().on("click", function(){
}
});
function checkNumber(event) {
var divideCnt = $('#divideCnt').val();
if(!(event.key >= 0 && event.key <= 9)) {
return false;
}
var totCnt = divideCnt + "" + event.key;
if(Number(totCnt) > 5000){
alert("분할전송 건수는 5,000건을 초과할 수 없습니다.");
return false;
}
return true;
}
</script>
<div class="loading_layer">
@ -3514,13 +3531,8 @@ $(".btn_event_cash").off().on("click", function(){
<div class="rev_bottom">
<input type="checkbox" id="divideChk" name="divideChk">
<label for="divideChk">분할전송</label>
<select class="selType1" id="divideCnt" name="divideCnt">
<option value="2">2</option>
<option value="10">10</option>
<option value="20">20</option>
<option value="30">30</option>
</select>
<label for="divideCnt">건</label>
<input type="text" class="dividType1" id="divideCnt" name="divideCnt" value="20" onkeypress='return checkNumber(event)' style="width:60px;" maxlength="4"/>
<label for="divideCnt">건씩</label>
<select class="selType1" id="divideTime" name="divideTime">
<option value="5">05분</option>
<option value="10">10분</option>

95
src/main/webapp/WEB-INF/jsp/web/user/membershipChangeReturn.jsp
View File

@ -9,6 +9,11 @@
<script language=javascript>
$(document).ready(function(){
$(".fileView").children('img').remove()
//사업자등록번호 입력
$("input[name=bizNo]").on("keyup", function() {
$(this).val(bizNo($(this).val().replace(/[^-\.0-9]/g,"")))
})
});
@ -31,11 +36,36 @@ function membershipChange(){
return false;
} */
//사업자등록번호 체크
var numberMap = $("#bizNo").val().replace(/-/gi, '').split('').map(function (d){
return parseInt(d, 10);
});
if(numberMap.length == 10){
var keyArr = [1, 3, 7, 1, 3, 7, 1, 3, 5];
var chk = 0;
keyArr.forEach(function(d, i){
chk += d * numberMap[i];
});
chk += parseInt((keyArr[8] * numberMap[8])/ 10, 10);
if(Math.floor(numberMap[9]) !== ( (10 - (chk % 10) ) % 10)){
alert("사업자 번호가 유효하지 않습니다.");
return false;
}
}else{
alert("사업자 번호가 유효하지 않습니다.");
return false;
}
if(doubleSubmitFlag){
alert("이미 재등록하셨습니다.");
return false;
}else{
form.bizNo.value = form.bizNo.value.replace(/-/gi, "").trim();
var _fileForm2 = new Array();
var data = new FormData(form);
_fileForm2.forEach(function(obj, idx) {
@ -75,6 +105,56 @@ function changeValueWork(obj){
$('#atFileBasicWriteWork').val(obj.value);
}
//사업자등록번호 - 넣기
function bizNo(str){
str = str.replace(/[^0-9]/g, '');
var tmp = '';
if(str.length < 4){
return str;
}else if(str.length < 7){
tmp += str.substr(0, 3);
tmp += '-';
tmp += str.substr(3);
return tmp;
}else{
tmp += str.substr(0, 3);
tmp += '-';
tmp += str.substr(3, 2);
tmp += '-';
tmp += str.substr(5);
return tmp;
}
return str;
}
//사업자등록번호 확인
function bizNoCheck(){
var numberMap = $("#bizNo").val().replace(/-/gi, '').split('').map(function (d){
return parseInt(d, 10);
});
if(numberMap.length == 10){
var keyArr = [1, 3, 7, 1, 3, 7, 1, 3, 5];
var chk = 0;
keyArr.forEach(function(d, i){
chk += d * numberMap[i];
});
chk += parseInt((keyArr[8] * numberMap[8])/ 10, 10);
console.log(chk);
if(Math.floor(numberMap[9]) === ( (10 - (chk % 10) ) % 10)){
alert("사업자등록번호 확인이 완료되었습니다.");
return false;
}else{
alert("사업자 번호가 유효하지 않습니다.");
return false;
}
}
alert("사업자 번호가 유효하지 않습니다.");
return false;
}
</script>
<div class="inner">
<!-- send top -->
@ -87,9 +167,9 @@ function changeValueWork(obj){
<input type="hidden" name="mberId" value="${cmpChangeManageVO.mberId}"/>
<input type="hidden" name="uniqId" value="${cmpChangeManageVO.uniqId}"/>
<input type="hidden" name="bizType" value="${cmpChangeManageVO.bizType}"/>
<input type="hidden" name="mberNm" value="${cmpChangeManageVO.mberNm}"/>
<%-- <input type="hidden" name="mberNm" value="${cmpChangeManageVO.mberNm}"/>
<input type="hidden" name="ceoNm" value="${cmpChangeManageVO.ceoNm}"/>
<input type="hidden" name="bizNo" value="${cmpChangeManageVO.bizNo}"/>
<input type="hidden" name="bizNo" value="${cmpChangeManageVO.bizNo}"/> --%>
<input type="hidden" name="managerNm" value="${loginVO.name}"/> <!-- 담당자 명 -->
<input type="hidden" name="atchFileSttus" id="atchFileSttus" value="${cmpChangeManageVO.atchFileSttus}"/>
<input type="hidden" name="workAtchFileSttus" id="workAtchFileSttus" value="${cmpChangeManageVO.workAtchFileSttus}"/>
@ -123,13 +203,15 @@ function changeValueWork(obj){
<div class="input_list_item">
<div class="input_left">회사명</div>
<div class="input_right">
<c:out value='${cmpChangeManageVO.mberNm}'/>
<%-- <c:out value='${cmpChangeManageVO.mberNm}'/> --%>
<input type="text" class="list_inputType1" name="mberNm" id="mberNm" value="<c:out value='${cmpChangeManageVO.mberNm}'/>" maxlength="30" />
</div>
</div>
<div class="input_list_item">
<div class="input_left">대표</div>
<div class="input_right">
<c:out value='${cmpChangeManageVO.ceoNm}'/>
<%-- <c:out value='${cmpChangeManageVO.ceoNm}'/> --%>
<input type="text" class="list_inputType1 onlyC" name="ceoNm" id="ceoNm" value="<c:out value='${cmpChangeManageVO.ceoNm}'/>" maxlength="50" />
</div>
</div>
<div class="input_list_item">
@ -143,7 +225,10 @@ function changeValueWork(obj){
<div class="input_left">사업자등록번호</div>
<div class="input_right">
<label for="" class="label">사업자등록번호 입력</label>
<c:out value='${fn:substring(cmpChangeManageVO.bizNo, 0, 3)}'/>-<c:out value='${fn:substring(cmpChangeManageVO.bizNo, 3, 5)}'/>-<c:out value='${fn:substring(cmpChangeManageVO.bizNo, 5, 10)}'/>
<input type="text" class="list_inputType1" name="bizNo" id="bizNo" value="<c:out value='${fn:substring(cmpChangeManageVO.bizNo, 0, 3)}'/>-<c:out value='${fn:substring(cmpChangeManageVO.bizNo, 3, 5)}'/>-<c:out value='${fn:substring(cmpChangeManageVO.bizNo, 5, 10)}'/>" maxlength="12">
<div class="list_btn_wrap">
<button type="button" onclick="bizNoCheck(); return false;">사업자등록번호 확인</button>
</div>
</div>
</div>
<div class="input_list_item">