From 132e1bf550901bb1cf605f108ae1b0305a62891c Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 8 Apr 2026 14:42:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=85=B0=E9=97=AE=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CondolenceApplyController.java | 13 +- .../controller/CondolenceMineController.java | 49 +++- ...enceSchoolPrincipalApprovalController.java | 11 + ...ndolenceSchoolUnionApprovalController.java | 21 ++ .../CondolencesHelpUserSignController.java | 130 +++++++++++ .../staffbenefit/condolence/apply/index.html | 8 +- .../condolence/helpUserSign/index.html | 221 ++++++++++++++++++ .../schoolPrincipalApproval/index.html | 79 +++++-- .../condolence/schoolUnionApproval/index.html | 48 ++-- .../staffbenefit/condolence/apply/index.html | 3 + .../condolence/helpUserSign/index.html | 191 +++++++++++++++ .../schoolPrincipalApproval/index.html | 77 ++++-- .../condolence/schoolUnionApproval/index.html | 18 +- 13 files changed, 804 insertions(+), 65 deletions(-) create mode 100644 src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolencesHelpUserSignController.java create mode 100644 src/main/resources/views/platform/zhgh/staffbenefit/condolence/helpUserSign/index.html create mode 100644 src/main/resources/views/platform/zhghh5/staffbenefit/condolence/helpUserSign/index.html diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceApplyController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceApplyController.java index 75c49b6..9ebdcb1 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceApplyController.java @@ -89,13 +89,22 @@ public class CondolenceApplyController { public Result submit(@Param("data") Condolence condolence) { if(StrUtil.isBlank(condolence.getId())) condolence.setCreateTime(DateUtil.now()); dao.insertOrUpdate(condolence); - // 开启流程实例 + + //开启流程实例 Dict args = Dict.create(); + String type = "normal"; + if ("b8ee30faacb2469593dfedb5b52565aa".equals(condolence.getType())) { + type = "died"; + args.set("userId", condolence.getCertifierUserId()); + } else { + args.set("userId", condolence.getHelpUserId()); + } args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode()); args.set(FlowConst.FORM_DATA, condolence); - args.set("userId", condolence.getCertifierUserId()); + args.set("type", type); ProcessInstance instance = flowEngine.startProcessInstanceByKey("ZGWW", condolence.getId(), SecurityUtil.getUserId(), args); + // 自动完成第一个申请任务 List doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null); for (ProcessTask task : doingTaskList) { diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java index e332be7..beff311 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java @@ -205,23 +205,34 @@ public class CondolenceMineController { dao.execute(sql); NutMap info = (NutMap) sql.getResult(); + //慰问报销审批单 HashMap docData = new HashMap<>(); + //武汉城市职业学院报销审批单 HashMap docData2 = new HashMap<>(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime createTime = LocalDateTime.parse(condolence.getCreateTime(), formatter); - docData.put("createTime", DateUtil.format(createTime, "yyyy年MM月dd日")); docData.put("applyUnionName", condolence.getApplyUnionName()); + docData.put("createTime", DateUtil.format(createTime, "yyyy年MM月dd日")); docData.put("info", info); + if (StrUtil.isNotBlank(condolence.getSignature())) { + docData.put("sign", sysOfficeTemplateUtil.createPictureRenderData(condolence.getSignature())); + } + docData2.put("createTime", DateUtil.format(createTime, "yyyy年MM月dd日")); docData2.put("applyUnionName", condolence.getApplyUnionName()); + docData2.put("name", condolence.getHelpUserName() + "(" + condolence.getHelpLoginName() + ")"); docData2.put("bankUserName", condolence.getBankUserName()); docData2.put("bankCardNumber", condolence.getBankCardNumber()); docData2.put("bankOfDeposit", condolence.getBankOfDeposit()); docData2.put("info", info); + if (StrUtil.isNotBlank(condolence.getSignature())) { + docData2.put("sign", sysOfficeTemplateUtil.createPictureRenderData(condolence.getSignature())); + } + // 金额转大写 // if (condolence.getMoney() != null) { // docData.put("money_big", MoneyUtil.toRMBUpper(String.valueOf(condolence.getMoney()))); @@ -328,6 +339,40 @@ public class CondolenceMineController { doneTaskVos.add(taskVO); } + // 慰问人签字 + doneTaskVos.stream().filter(task -> "慰问人签字".equals(task.getDisplayName())) + .max(Comparator.comparing(ProcessTaskVO::getCreatedAt)) + .ifPresent(v -> { + Dict taskFormData = v.getTaskFormData(); + HashMap approval = new HashMap<>(); + + approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); + approval.put("user", taskFormData.getStr("tf_userName")); + if (StrUtil.isNotBlank(taskFormData.getStr("tf_userSign"))) { + approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_userSign"))); + } + approval.put("opinion", taskFormData.getStr("tf_opinion")); + docData.put("wwr", approval); + docData2.put("wwr", approval); + }); + + // 证明人签字 + doneTaskVos.stream().filter(task -> "证明人签字".equals(task.getDisplayName())) + .max(Comparator.comparing(ProcessTaskVO::getCreatedAt)) + .ifPresent(v -> { + Dict taskFormData = v.getTaskFormData(); + HashMap approval = new HashMap<>(); + + approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); + approval.put("user", taskFormData.getStr("tf_userName")); + if (StrUtil.isNotBlank(taskFormData.getStr("tf_userSign"))) { + approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_userSign"))); + } + approval.put("opinion", taskFormData.getStr("tf_opinion")); + docData.put("zmr", approval); + docData2.put("zmr", approval); + }); + // 分工会审核 doneTaskVos.stream().filter(task -> "分工会审核".equals(task.getDisplayName())) .max(Comparator.comparing(ProcessTaskVO::getCreatedAt)) @@ -345,7 +390,7 @@ public class CondolenceMineController { docData2.put("fgh", approval); }); - // 校工会副主席审核 + // 校工会副主席审核 校工会审核 doneTaskVos.stream().filter(task -> "校工会审核".equals(task.getDisplayName())) .max(Comparator.comparing(ProcessTaskVO::getCreatedAt)) .ifPresent(v -> { diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolPrincipalApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolPrincipalApprovalController.java index 30193ba..36e719c 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolPrincipalApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolPrincipalApprovalController.java @@ -2,7 +2,9 @@ package com.budwk.app.zhgh.staffbenefit.condolence.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; @@ -120,4 +122,13 @@ public class CondolenceSchoolPrincipalApprovalController { Pagination pageVO = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); return Result.success(pageVO); } + + @At + @ApiOperation("保存退休人员-账户、户名、开户行") + @SaCheckPermission(value = {"condolence.schoolPrincipalApproval", "h5.condolence.schoolPrincipalApproval"}, mode = SaMode.OR) + @SLog(tag = "职工慰问系统-校工会预审", msg = "保存信息") + public Result save(@Param("data") Condolence condolence) { + condolenceService.dao().updateIgnoreNull(condolence); + return Result.success(); + } } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolUnionApprovalController.java index ac36de4..839076c 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolUnionApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolUnionApprovalController.java @@ -6,6 +6,8 @@ import cn.hutool.core.util.StrUtil; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; +import com.budwk.app.base.sms.SmsService; +import com.budwk.app.base.sms.WechatEnterpriseService; import com.budwk.app.base.utils.PageUtil; import com.budwk.app.flow.enums.ProcessTaskStateEnum; import com.budwk.app.web.commons.auth.utils.SecurityUtil; @@ -13,10 +15,12 @@ import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence; import com.budwk.app.zhgh.staffbenefit.condolence.service.CondolenceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; import org.nutz.dao.util.cri.SqlExpressionGroup; +import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.util.NutMap; @@ -39,6 +43,8 @@ import java.util.List; @Ok("json:full") public class CondolenceSchoolUnionApprovalController { + @Inject + private WechatEnterpriseService wechatEnterpriseService; @Inject private CondolenceService condolenceService; @@ -122,4 +128,19 @@ public class CondolenceSchoolUnionApprovalController { Pagination pageVO = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); return Result.success(pageVO); } + + @At + @ApiOperation("发送企业微信通知") + @SaCheckPermission("condolence.schoolUnionApproval") + @Aop(TransAop.READ_COMMITTED) + public Result sendWechat(@Param("id") String id) { + Condolence condolence = condolenceService.fetch(id); + if (condolence == null) { + return Result.error("慰问申请不存在"); + } + String content = "您的慰问流程已审批完毕，请及时登陆电脑版下载文件。"; + wechatEnterpriseService.sendSingleMessage(condolence.getApplyLoginName(),content); + + return Result.success(); + } } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolencesHelpUserSignController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolencesHelpUserSignController.java new file mode 100644 index 0000000..dba1e5e --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolencesHelpUserSignController.java @@ -0,0 +1,130 @@ +package com.budwk.app.zhgh.staffbenefit.condolence.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.utils.PageUtil; +import com.budwk.app.flow.enums.ProcessTaskStateEnum; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence; +import com.budwk.app.zhgh.staffbenefit.condolence.service.CondolenceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +import java.util.List; + +/** + * @author zhf + * @date 2026/1/9 09:50 + * @description 慰问人签字 + */ +@IocBean +@At("/platform/condolence/helpUserSign") +@Ok("json:full") +@Api("证明人签字") +@Slf4j +public class CondolencesHelpUserSignController { + + + @Inject + private CondolenceService condolenceService; + + @At("/") + @Ok("beetl:/platform/zhgh/staffbenefit/condolence/helpUserSign/index.html") + @SaCheckPermission("condolence.helpUserSign") + public void index() { + } + @At("/h5") + @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/helpUserSign/index.html") + @SaCheckPermission("h5.condolence.helpUserSign") + public void h5Index() { + } + + + @At + @ApiOperation("分页查询") + @SaCheckPermission(value = {"condolence.helpUserSign", "h5.condolence.helpUserSign"}, mode = SaMode.OR) + public Result pageData(PageForm pageForm, + boolean approval, + Integer year, + String unionId, + String unitId, + String type) { + Sql sql = Sqls.create(""" + SELECT + info.*, + type.name as typeName, + ins.id AS instanceId, + ins.businessNo, + ins.state instanceState, + ins.variable instanceVariable, + ins.processDefineId instanceProcessDefineId, + t.id taskId, + t.taskName AS taskKey, + t.displayName taskName, + t.taskType, + t.performType taskPerformType, + t.taskState, + t.finishTime, + t.taskParentId, + t.variable taskVariable, + IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName, + IF(rt.id IS NOT NULL, 1, 0) AS canRevoke + FROM + wf_process_task t + LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId + LEFT JOIN condolence info ON info.id = ins.businessNo + LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + LEFT JOIN condolence_type type ON info.type = type.id + LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10 + LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10 + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.and("t.taskName", "=", "701e247f-e2a4-49e7-bdf9-e2c5afc7a3ea"); + cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + + if (approval) { + cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); + } else { + cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); + } + + cnd.andEX("year(info.createTime)", "=", year); + cnd.andEX("info.applyUnionId", "=", unionId); + cnd.andEX("info.applyUnitId", "=", unitId); + cnd.andEX("info.type", "=", type); + + + if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.or(Condolence::getHelpUserName, "like", "%" + pageForm.getSearchKeyword() + "%"); + seg.or(Condolence::getHelpLoginName, "like", "%" + pageForm.getSearchKeyword() + "%"); + cnd.and(seg); + } + if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { + cnd.desc("info.createTime"); + } else { + cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); + } + cnd.groupBy("info.id"); + cnd.desc("info.createdAt"); + sql.setCondition(cnd); + Pagination pagination = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success(pagination); + } + +} diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html index d2023e1..ab1da74 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html @@ -93,7 +93,7 @@ layout("/layouts/platform.html"){ @@ -127,14 +127,14 @@ layout("/layouts/platform.html"){ - + - + - + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 已签字 + 未签字 + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolPrincipalApproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolPrincipalApproval/index.html index 442dc71..c3fc575 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolPrincipalApproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolPrincipalApproval/index.html @@ -97,6 +97,27 @@ layout("/layouts/platform.html"){ + + + + + + + + + + + + + + + + + + @@ -147,7 +168,8 @@ layout("/layouts/platform.html"){ unionList: [], unitList: [], formData: {}, - showApprovalForm: false + showApprovalForm: false, + condolenceType: '' } }, methods: { @@ -160,31 +182,52 @@ layout("/layouts/platform.html"){ onAudit(row) { this.$refs.guava.edit(()=>{ this.showApprovalForm = true + this.condolenceType = row.type this.formData = { processTaskId: row.taskId, - taskName: row.curTaskName + taskName: row.curTaskName, + bankCardNumber: row.bankCardNumber || '', + bankUserName: row.bankUserName || '', + bankOfDeposit: row.bankOfDeposit || '' } this.$refs.condolenceInfoRef.onOpen(row) }) }, handleTaskAction(val) { - this.$confirm("您确定要提交吗？", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - this.$axios.post("/flow/common/executeTask", { - data: JSON.stringify({ - ...this.formData, - submitType: val + this.$refs.formRef.validate((valid) => { + if (valid) { + this.$confirm("您确定要提交吗？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + const submitData = { + ...this.formData, + submitType: val + }; + + if (val === 1) { + this.$axios.post("/platform/condolence/schoolPrincipalApproval/save", { + data: JSON.stringify({ + id: this.$refs.condolenceInfoRef.row.id, + bankCardNumber: this.formData.bankCardNumber, + bankUserName: this.formData.bankUserName, + bankOfDeposit: this.formData.bankOfDeposit + }) + }); + } + + this.$axios.post("/flow/common/executeTask", { + data: JSON.stringify(submitData) + }).then((res) => { + if (res.code === 0) { + this.$refs.guava.index() + this.$message.success(res.msg) + this.doSearch() + } + }) }) - }).then((res) => { - if (res.code === 0) { - this.$refs.guava.index() - this.$message.success(res.msg) - this.doSearch() - } - }) + } }) }, onRevoke(row) { diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html index 442dc71..6e933e2 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html @@ -162,29 +162,43 @@ layout("/layouts/platform.html"){ this.showApprovalForm = true this.formData = { processTaskId: row.taskId, - taskName: row.curTaskName + taskName: row.curTaskName, + id: row.id } this.$refs.condolenceInfoRef.onOpen(row) }) }, handleTaskAction(val) { - this.$confirm("您确定要提交吗？", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - this.$axios.post("/flow/common/executeTask", { - data: JSON.stringify({ - ...this.formData, - submitType: val + this.$refs.formRef.validate((valid) => { + if (valid) { + this.$confirm("您确定要提交吗？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + const submitData = { + ...this.formData, + submitType: val + }; + + this.$axios.post("/flow/common/executeTask", { + data: JSON.stringify(submitData) + }).then((res) => { + if (res.code === 0) { + if (val === 1) { + this.$axios.post("/platform/condolence/schoolUnionApproval/sendWechat", { + id: this.formData.id + }).catch(err => { + console.error("发送企业微信消息失败：", err); + }); + } + this.$refs.guava.index() + this.$message.success(res.msg) + this.doSearch() + } + }) }) - }).then((res) => { - if (res.code === 0) { - this.$refs.guava.index() - this.$message.success(res.msg) - this.doSearch() - } - }) + } }) }, onRevoke(row) { 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 23384ce..aae995b 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 @@ -195,6 +195,7 @@ layout("/layouts/platform_h5.html"){ + +
+ + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + +
+ 退回到发起人 + 同意 +
+ +
+
+ + +
+ + + + diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html index 685d502..d947745 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html @@ -60,6 +60,35 @@ layout("/layouts/platform_h5.html"){
{{formData.taskName}}
+ + + + + { - this.$axios.post("/flow/common/executeTask", { - data: JSON.stringify({ - ...this.formData, - submitType: val - }) - }).then((res) => { - if (res.code === 0) { - this.$refs.infoRef.onClose() - this.$toast.success(res.msg) - this.doSearch() - } - }) + }).then(async () => { + const submitData = { + ...this.formData, + submitType: val + }; + + if (val === 1) { + await this.$axios.post("/platform/condolence/schoolPrincipalApproval/save", { + data: JSON.stringify({ + id: this.$refs.infoRef.row.id, + bankCardNumber: this.formData.bankCardNumber, + bankUserName: this.formData.bankUserName, + bankOfDeposit: this.formData.bankOfDeposit + }) + }); + } + + const res = await this.$axios.post("/flow/common/executeTask", { + data: JSON.stringify(submitData) + }); + + if (res.code === 0) { + this.$refs.infoRef.onClose() + this.$toast.success(res.msg) + this.doSearch() + } }).catch(() => { }) diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html index b6415a1..0352a11 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html @@ -135,7 +135,8 @@ layout("/layouts/platform_h5.html"){ this.$refs.infoRef.onOpen(row) this.formData = { processTaskId: row.taskId, - taskName: row.curTaskName + taskName: row.curTaskName, + id: row.id } }, async handleTaskAction(val) { @@ -152,17 +153,20 @@ layout("/layouts/platform_h5.html"){ }) }).then((res) => { if (res.code === 0) { + if (val === 1) { // 同意时发企业微信 + this.$axios.post("/platform/condolence/schoolUnionApproval/sendWechat", { + id: this.formData.id + }).catch(err => { + console.error("发送企业微信消息失败：", err); + }); + } this.$refs.infoRef.onClose() this.$toast.success(res.msg) this.doSearch() } }) - }).catch(() => { - - }) - } catch (error) { - - } + }).catch(() => {}) + } catch (error) {} }, onRevoke(row){ this.$dialog.confirm({