diff --git a/admin/src/main/resources/templates/households/modal/modal-visit-info.html b/admin/src/main/resources/templates/households/modal/modal-visit-info.html index 1420a0af..5f5f997e 100644 --- a/admin/src/main/resources/templates/households/modal/modal-visit-info.html +++ b/admin/src/main/resources/templates/households/modal/modal-visit-info.html @@ -145,6 +145,7 @@ (response) => { console.log("임가방문정보 상세 응답값 : ", response); setVisitFormData(response); + document.querySelector(".modal-visit-info").ui.open(); }, function (code, rstData) { console.log("error : ", code); @@ -152,9 +153,9 @@ 'get', 'json' ); + } else { + document.querySelector(".modal-visit-info").ui.open(); } - - document.querySelector(".modal-visit-info").ui.open(); } // 임가방문정보 상세 값 set diff --git a/admin/src/main/resources/templates/households/tab/forest-product.html b/admin/src/main/resources/templates/households/tab/forest-product.html index 0e8bc902..7d54dc4c 100644 --- a/admin/src/main/resources/templates/households/tab/forest-product.html +++ b/admin/src/main/resources/templates/households/tab/forest-product.html @@ -222,9 +222,6 @@ etUI.dialog.confirm({ title: '삭제 안내', message: '선택하신 내용을 삭제하시겠습니까?
삭제한 항목은 복구할 수 없습니다.', - negativeCallback: function () { - - }, positiveCallback: function () { goDeleteForestProduct(checkedIds); }, @@ -234,7 +231,6 @@ // 임산물현황 삭제 const goDeleteForestProduct = (checkedIds) => { const f = document.reqForm; - console.log("f.monthlyInputStatusId.value", f.monthlyInputStatusId.value); ajaxUtil._ajaxMethod( '/api/household/forestProducts/delete', diff --git a/admin/src/main/resources/templates/households/tab/household-visit.html b/admin/src/main/resources/templates/households/tab/household-visit.html index e7545c37..f286fb36 100644 --- a/admin/src/main/resources/templates/households/tab/household-visit.html +++ b/admin/src/main/resources/templates/households/tab/household-visit.html @@ -10,7 +10,7 @@

-
diff --git a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/model/UpdateUserReqVO.java b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/model/UpdateUserReqVO.java index 2a87c84c..041b0c64 100644 --- a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/model/UpdateUserReqVO.java +++ b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/model/UpdateUserReqVO.java @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; public class UpdateUserReqVO { @NotBlank(message = "이름을 입력해주세요.")//"이름은 필수 항목입니다.") - @Pattern(regexp = "^[가-힣]{2,10}$", message = "이름을 입력해주세요.")//"이름은 2~10자의 한글이어야 합니다.") + @Pattern(regexp = "^[가-힣0-9()]{2,10}$", message = "이름을 입력해주세요.")//"이름은 2~10자의 한글이어야 합니다.") private String ownerName; @NotNull(message = "나이를 입력해주세요.") @@ -19,13 +19,13 @@ public class UpdateUserReqVO { @Max(value = 120, message = "나이를 입력해주세요.")//"나이는 120세 이하이어야 합니다.") private Integer ownerAge; - @Pattern(regexp = "^\\d{2,3}$", message = "가구 연락처를 입력해주세요.")//"가구 연락처는 2~3자리 숫자여야 합니다.") + @Pattern(regexp = "^$|^\\d{2,3}$", message = "가구 연락처를 입력해주세요.")//"가구 연락처는 2~3자리 숫자여야 합니다.") private String tel1; - @Pattern(regexp = "^\\d{3,4}$", message = "가구 연락처를 입력해주세요.")//"가운데 번호는 3~4자리 숫자여야 합니다.") + @Pattern(regexp = "^$|^\\d{3,4}$", message = "가구 연락처를 입력해주세요.")//"가운데 번호는 3~4자리 숫자여야 합니다.") private String tel2; - @Pattern(regexp = "^\\d{4}$", message = "가구 연락처를 입력해주세요.")//"끝 번호는 4자리 숫자여야 합니다.") + @Pattern(regexp = "^$|^\\d{4}$", message = "가구 연락처를 입력해주세요.")//"끝 번호는 4자리 숫자여야 합니다.") private String tel3; @Pattern(regexp = "^\\d{2,3}$", message = "휴대폰 번호를 입력해주세요.")//"휴대폰 번호는 2~3자리 숫자여야 합니다.") diff --git a/front/src/main/resources/templates/info/bank/input.html b/front/src/main/resources/templates/info/bank/input.html index 83002cc4..488a7b19 100644 --- a/front/src/main/resources/templates/info/bank/input.html +++ b/front/src/main/resources/templates/info/bank/input.html @@ -369,7 +369,6 @@ errors.push({field: form.transferCategoryCode.value+"_value", message: '수입대상을 입력해주세요.'}); } } - if (!form.sourcePurpose.value) errors.push({field: 'sourcePurpose', message: '수입원을 입력해주세요.'}); if(form.count.value){ if(!form.unitCode.value){ @@ -559,7 +558,9 @@
diff --git a/front/src/main/resources/templates/info/bank/inputForm.html b/front/src/main/resources/templates/info/bank/inputForm.html index ae59b020..f4b0c739 100644 --- a/front/src/main/resources/templates/info/bank/inputForm.html +++ b/front/src/main/resources/templates/info/bank/inputForm.html @@ -86,12 +86,16 @@
-
- +
+
+
+
@@ -100,7 +104,6 @@
diff --git a/front/src/main/resources/templates/info/bank/output.html b/front/src/main/resources/templates/info/bank/output.html index 7a6a27dd..b72e077b 100644 --- a/front/src/main/resources/templates/info/bank/output.html +++ b/front/src/main/resources/templates/info/bank/output.html @@ -361,7 +361,6 @@ } } - if (!form.sourcePurpose.value) errors.push({field: 'sourcePurpose', message: '용도 입력해주세요.'}); if(form.count.value){ if(!form.unitCode.value){ errors.push({ @@ -552,7 +551,9 @@ ${buttonGroupHtml}
diff --git a/front/src/main/resources/templates/info/bank/outputForm.html b/front/src/main/resources/templates/info/bank/outputForm.html index 9b6461ff..7abf796c 100644 --- a/front/src/main/resources/templates/info/bank/outputForm.html +++ b/front/src/main/resources/templates/info/bank/outputForm.html @@ -63,7 +63,6 @@