diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java index 3193c9f..42add12 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java @@ -112,7 +112,7 @@ public class DifficultHelpApplyController { @SaCheckPermission("member.apply.submit") @SLog(tag = "困难补助申请", msg = "保存申请,填写人: ${args[0].proxyUserName}") public Result save(@Param("data") DifficultHelpInfo difficultHelpInfo) { - difficultHelpCommonService.validateApplyUser(difficultHelpInfo); + difficultHelpCommonService.validateApplyUser(difficultHelpInfo, false); difficultHelpInfo.setApplyTime(ObjectUtil.defaultIfNull(difficultHelpInfo.getApplyTime(), new Date())); difficultHelpCommonService.refreshApplyCount(difficultHelpInfo); if (difficultHelpCommonService.hasAppliedInYear(difficultHelpInfo.getUserId(), difficultHelpInfo.getApplyTime(), difficultHelpInfo.getId())) { diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/DifficultHelpCommonService.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/DifficultHelpCommonService.java index 5deeb26..d538d74 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/DifficultHelpCommonService.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/DifficultHelpCommonService.java @@ -21,6 +21,8 @@ public interface DifficultHelpCommonService extends BaseService false) - if (!valid) return + onSave() { this.$confirm("您确定保存吗?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html index d8b3d3a..6f7e539 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html @@ -379,9 +379,6 @@ layout("/layouts/platform_h5.html"){ v-model="formData.bankOfDeposit" label="开户行" maxlength="20" - type="textarea" - rows="4" - autosize placeholder="请填写开户行" :rules="[{ required: true }]" required