Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
김현주
2025-07-18 11:49:36 +09:00
3 changed files with 18 additions and 9 deletions

View File

@@ -45,18 +45,10 @@
#{regionSubCode}, #{regionSubCode},
#{regionDetailCode}, #{regionDetailCode},
#{address}, #{address},
<if test="industryLargeCode != null and industryLargeCode != ''">
#{industryLargeCode}, #{industryLargeCode},
</if>
<if test="industryMiddleCode != null and industryMiddleCode != ''">
#{industryMiddleCode}, #{industryMiddleCode},
</if>
<if test="industrySubMiddle != null and industrySubMiddle != ''">
#{industrySubMiddle}, #{industrySubMiddle},
</if>
<if test="industryDetail != null and industryDetail != ''">
#{industryDetail}, #{industryDetail},
</if>
#{isPanel}, #{isPanel},
#{usageType}, #{usageType},
#{employmentType}, #{employmentType},

View File

@@ -100,7 +100,14 @@ var ajaxUtil = {
contentType : 'application/json; charset=UTF-8', contentType : 'application/json; charset=UTF-8',
async: async, async: async,
statusCode : { statusCode : {
400:function(){ 400:function(rstData){
if (options.handle422Type === 'alert') {
if (typeof errorCallback !== 'undefined') {
errorCallback(400, rstData); // 호출한 쪽에서 alert 처리
}
return;
}
ajaxUtil._alertError(ajaxUtil.$400); ajaxUtil._alertError(ajaxUtil.$400);
}, },
404:function(rstData){ 404:function(rstData){

View File

@@ -342,6 +342,11 @@
const checkHouseholdNum = () => { const checkHouseholdNum = () => {
const f = document.reqForm; const f = document.reqForm;
if($('#householdNum').val() === '') {
alert('임가번호를 입력해주세요.');
return;
}
ajaxUtil._ajaxMethod( ajaxUtil._ajaxMethod(
'/api/households/check', '/api/households/check',
{ householdNum : f.householdNum.value }, { householdNum : f.householdNum.value },
@@ -381,8 +386,13 @@
function(response) { // 성공 function(response) { // 성공
alert("등록이 완료되었습니다."); alert("등록이 완료되었습니다.");
location.href = '/households'; location.href = '/households';
console.log("code", response)
}, },
function (code, rstData) { function (code, rstData) {
console.log("code", code)
console.log("rstData", rstData)
if(code == 422) alert(rstData.responseText); if(code == 422) alert(rstData.responseText);
if(code == 400) alert(rstData.responseJSON.message); //임가번호 중복체크 if(code == 400) alert(rstData.responseJSON.message); //임가번호 중복체크
}, },