feat: 特殊慰问-职工慰问优化3

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())) {

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/DifficultHelpCommonService.java

@@ -21,6 +21,8 @@ public interface DifficultHelpCommonService extends BaseService<DifficultHelpInf
 
     void validateApplyUser(DifficultHelpInfo difficultHelpInfo);
 
+    void validateApplyUser(DifficultHelpInfo difficultHelpInfo, boolean requireApplyMoney);
+
     /**
      * 导入实际金额数据处理
      * @param file     文件

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/impl/DifficultHelpCommonServiceImpl.java

@@ -56,6 +56,11 @@ public class DifficultHelpCommonServiceImpl extends BaseServiceImpl<DifficultHel
 
     @Override
     public void validateApplyUser(DifficultHelpInfo difficultHelpInfo) {
+        validateApplyUser(difficultHelpInfo, true);
+    }
+
+    @Override
+    public void validateApplyUser(DifficultHelpInfo difficultHelpInfo, boolean requireApplyMoney) {
         if (difficultHelpInfo == null || StrUtil.isBlank(difficultHelpInfo.getUserId())) {
             throw new BaseException("请选择受助人");
         }
@@ -65,8 +70,9 @@ public class DifficultHelpCommonServiceImpl extends BaseServiceImpl<DifficultHel
                 throw new BaseException("只能查看他人代为申请的记录，不能修改或提交");
             }
         }
-        if (difficultHelpInfo.getApplyMoney() == null || !Double.isFinite(difficultHelpInfo.getApplyMoney())
+        if ((requireApplyMoney || difficultHelpInfo.getApplyMoney() != null)
-                || difficultHelpInfo.getApplyMoney() <= 0) {
+                && (difficultHelpInfo.getApplyMoney() == null || !Double.isFinite(difficultHelpInfo.getApplyMoney())
+                || difficultHelpInfo.getApplyMoney() <= 0)) {
             throw new BaseException("请填写大于零的申请金额");
         }
         if (difficultHelpInfo.getUserId().equals(SecurityUtil.getUserId())) {

src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html

@@ -379,9 +379,7 @@ layout("/layouts/platform.html"){
 				callback(valid ? undefined : new Error('申请金额须大于零，最多保留两位小数'))
 			},
 			// 保存
-			async onSave() {
+			onSave() {
-				const valid = await this.$refs.formRef.validate().catch(() => false)
-				if (!valid) return
 				this.$confirm("您确定保存吗？", "提示", {
 					confirmButtonText: "确定",
 					cancelButtonText: "取消",

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