From b325e8a8f58f9fff255a3839c09b046bd4d9f151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=8C=E5=85=88=E8=88=9C?= <2499071264@qq.com> Date: Fri, 9 Oct 2026 19:39:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=81=8C=E5=B7=A5=E6=85=B0=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CondolenceApprovalController.java | 60 +++ ...=> CondolenceFirstApprovalController.java} | 16 +- .../CondolenceFourthApprovalController.java | 152 ++++++++ ...> CondolenceSecondApprovalController.java} | 10 +- ...=> CondolenceThirdApprovalController.java} | 16 +- .../20261009/difficult_help_apply_money.sql | 1 - ...问.sql => 困难帮扶_菜单权限_新增字段.sql} | 1 + .../20261009/职工慰问_四级审核菜单权限.sql | 132 +++++++ .../20261009/职工慰问_菜单权限_字段调整.sql | 14 + .../重庆工贸职业技术学院职工慰问申请表.doc | Bin 0 -> 19968 bytes .../staffbenefit/condolence/apply/index.html | 9 + .../condolence/branchUnionApproval/index.html | 17 +- .../staffbenefit/condolence/common/info.js | 3 + .../condolence/fourthApproval/index.html | 229 ++++++++++++ .../schoolPrincipalApproval/index.html | 17 +- .../condolence/schoolUnionApproval/index.html | 17 +- .../condolence/branchUnionApproval/index.html | 13 +- .../staffbenefit/condolence/common/info.js | 3 + .../condolence/fourthApproval/index.html | 350 ++++++++++++++++++ .../schoolPrincipalApproval/index.html | 13 +- .../condolence/schoolUnionApproval/index.html | 13 +- 21 files changed, 1048 insertions(+), 38 deletions(-) create mode 100644 src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceApprovalController.java rename src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/{CondolenceBranchUnionApprovalController.java => CondolenceFirstApprovalController.java} (90%) create mode 100644 src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceFourthApprovalController.java rename src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/{CondolenceSchoolPrincipalApprovalController.java => CondolenceSecondApprovalController.java} (93%) rename src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/{CondolenceSchoolUnionApprovalController.java => CondolenceThirdApprovalController.java} (90%) delete mode 100644 src/main/resources/db/script/20261009/difficult_help_apply_money.sql rename src/main/resources/db/script/20261009/{困难帮扶_职工慰问.sql => 困难帮扶_菜单权限_新增字段.sql} (97%) create mode 100644 src/main/resources/db/script/20261009/职工慰问_四级审核菜单权限.sql create mode 100644 src/main/resources/db/script/20261009/职工慰问_菜单权限_字段调整.sql create mode 100644 src/main/resources/templates/condolence/重庆工贸职业技术学院职工慰问申请表.doc create mode 100644 src/main/resources/views/platform/zhgh/staffbenefit/condolence/fourthApproval/index.html create mode 100644 src/main/resources/views/platform/zhghh5/staffbenefit/condolence/fourthApproval/index.html diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceApprovalController.java new file mode 100644 index 0000000..bfcf0c9 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceApprovalController.java @@ -0,0 +1,60 @@ +package com.budwk.app.zhgh.staffbenefit.condolence.controller; + +import cn.dev33.satoken.annotation.SaCheckLogin; +import cn.hutool.core.lang.Dict; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.exception.BaseException; +import com.budwk.app.base.result.Result; +import com.budwk.app.flow.constant.FlowConst; +import com.budwk.app.flow.entity.ProcessInstance; +import com.budwk.app.flow.entity.ProcessTask; +import com.budwk.app.flow.service.FlowCommonService; +import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Dao; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.json.Json; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +@IocBean +@Ok("json") +@At("/platform/condolence/approval") +public class CondolenceApprovalController { + + @Inject + private Dao dao; + @Inject + private FlowCommonService flowCommonService; + + @At + @SaCheckLogin + @Aop(TransAop.READ_COMMITTED) + public Result executeTask(@Param("data") String data) { + Dict args = Json.fromJson(Dict.class, data); + if (args == null || args.getLong(FlowConst.PROCESS_TASK_ID_KEY) == null) { + throw new BaseException("审批任务不能为空"); + } + ProcessTask task = dao.fetch(ProcessTask.class, args.getLong(FlowConst.PROCESS_TASK_ID_KEY)); + if (task == null) throw new BaseException("审批任务不存在"); + if (!"4dad0bef-3cf2-4a7d-bba3-35020b9b216d".equals(task.getTaskName()) + && !"34f7938e-47a3-4b3a-b4e0-92b7a3f47865".equals(task.getTaskName()) + && !"ecdaef3b-edf4-4143-9a96-887dd5921711".equals(task.getTaskName()) + && !"cbd41337-3c87-4959-9027-809df5c7ef5e".equals(task.getTaskName())) { + throw new BaseException("当前任务不是职工慰问审批任务"); + } + ProcessInstance instance = dao.fetch(ProcessInstance.class, task.getProcessInstanceId()); + Condolence info = instance == null ? null : dao.fetch(Condolence.class, instance.getBusinessNo()); + if (info == null) throw new BaseException("职工慰问申请不存在"); + if (StrUtil.isBlank(args.getStr("tf_sign"))) throw new BaseException("请完成审批签字"); + if (StrUtil.isBlank(args.getStr("tf_opinion"))) throw new BaseException("请填写审批意见"); + + // 参与者权限由流程引擎校验，业务入口不接受客户端指定管理员代办。 + args.remove(FlowConst.EXT_ENABLE_OPERATOR); + flowCommonService.executeTask(args); + return Result.success(); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceBranchUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceFirstApprovalController.java similarity index 90% rename from src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceBranchUnionApprovalController.java rename to src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceFirstApprovalController.java index 6bbecf2..e4ae16f 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceBranchUnionApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceFirstApprovalController.java @@ -27,7 +27,7 @@ import org.nutz.mvc.annotation.Param; import java.util.List; /** - * @ClassName CondolenceBranchUnionApprovalController + * @ClassName CondolenceFirstApprovalController * @Author JyuHsin * @Date 2025/7/28 11:33 * @Version 1.0 @@ -35,26 +35,26 @@ import java.util.List; */ @IocBean @At("/platform/condolence/branchUnionApproval") -@Api("职工慰问分工会审核") +@Api("职工慰问一级审核") @Ok("json:full") -public class CondolenceBranchUnionApprovalController { +public class CondolenceFirstApprovalController { @Inject private CondolenceService condolenceService; @At("/") @Ok("beetl:/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html") - @SaCheckPermission("condolence.branchUnionApproval") + @SaCheckPermission("condolence.firstApproval") public void index() {} @At("/h5") @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html") - @SaCheckPermission("h5.condolence.branchUnionApproval") + @SaCheckPermission("h5.condolence.firstApproval") public void h5Index() {} @At @ApiOperation("分页查询") - @SaCheckPermission(value = {"condolence.branchUnionApproval", "h5.condolence.branchUnionApproval"}, mode = SaMode.OR) + @SaCheckPermission(value = {"condolence.firstApproval", "h5.condolence.firstApproval"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, @Param(value = "year") Integer year, @Param(value = "type") String type, @@ -100,7 +100,9 @@ public class CondolenceBranchUnionApprovalController { cnd.andEX("YEAR(info.createTime)", "=", year); cnd.and("t.taskName", "=", "4dad0bef-3cf2-4a7d-bba3-35020b9b216d"); - cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + if (!"superadmin".equals(SecurityUtil.getUserLoginname())) { + cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + } if (approval) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceFourthApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceFourthApprovalController.java new file mode 100644 index 0000000..ade70b0 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceFourthApprovalController.java @@ -0,0 +1,152 @@ +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.constant.RoleConstant; +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.AuthUtil; +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 org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; +import org.nutz.dao.util.cri.Static; +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 org.nutz.mvc.annotation.Param; + +import java.util.List; + +/** + * @ClassName CondolenceFourthApprovalController + * @Author JyuHsin + * @Date 2025/7/29 16:23 + * @Version 1.0 + * @Description TODO + */ +@IocBean +@At("/platform/condolence/fourthApproval") +@Api("职工慰问四级审核") +@Ok("json:full") +public class CondolenceFourthApprovalController { + + @Inject + private Dao dao; + @Inject + private CondolenceService condolenceService; + + @At("/") + @Ok("beetl:/platform/zhgh/staffbenefit/condolence/fourthApproval/index.html") + @SaCheckPermission("condolence.fourthApproval") + public void index() {} + + @At("/h5") + @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/fourthApproval/index.html") + @SaCheckPermission("h5.condolence.fourthApproval") + public void h5Index() {} + + @At + @ApiOperation("分页查询") + @SaCheckPermission(value = {"condolence.fourthApproval", "h5.condolence.fourthApproval"}, mode = SaMode.OR) + public Result pageData(PageForm pageForm, + @Param(value = "year") Integer year, + @Param(value = "type") String type, + @Param(value = "unionId") String unionId, + @Param(value = "unitId") String unitId, + @Param(value = "approval") Boolean approval) { + 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(); + 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); + } + cnd.andEX("info.type", "=", type); + cnd.andEX("YEAR(info.createTime)", "=", year); + cnd.andEX("info.applyUnionId", "=", unionId); + cnd.andEX("info.applyUnitId", "=", unitId); + + cnd.and("t.taskName", "=", "cbd41337-3c87-4959-9027-809df5c7ef5e"); + if (!"superadmin".equals(SecurityUtil.getUserLoginname()) && !AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name())) { + Sql unitSql = Sqls.queryString(""" + SELECT DISTINCT ur.unitId + FROM sys_user_role ur + INNER JOIN sys_role r ON r.id = ur.roleId + WHERE ur.userId = @userId + AND ur.enable = true + AND r.disabled = false + AND r.code = @roleCode + AND ur.unitId IS NOT NULL + AND ur.unitId <> '' + """); + unitSql.setParam("userId", SecurityUtil.getUserId()); + unitSql.setParam("roleCode", RoleConstant.UNIT_SCHOOL_LEADER.name()); + dao.execute(unitSql); + List managedUnitIds = unitSql.getList(String.class); + if (managedUnitIds.isEmpty()) { + cnd.and(new Static("1 = 0")); + } else { + cnd.and("info.applyUnitId", "in", managedUnitIds); + } + } + + if (approval) { + cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); + } else { + cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); + } + + if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { + cnd.desc("info.createTime"); + } else { + cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); + } + cnd.groupBy("t.id"); + sql.setCondition(cnd); + Pagination pageVO = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success(pageVO); + } +} 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/CondolenceSecondApprovalController.java similarity index 93% rename from src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolPrincipalApprovalController.java rename to src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSecondApprovalController.java index 7e7de9d..138510e 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/CondolenceSecondApprovalController.java @@ -33,26 +33,26 @@ import java.util.List; */ @IocBean @At("/platform/condolence/schoolPrincipalApproval") -@Api("职工慰问校工会预审") +@Api("职工慰问二级审核") @Ok("json:full") -public class CondolenceSchoolPrincipalApprovalController { +public class CondolenceSecondApprovalController { @Inject private CondolenceService condolenceService; @At("/") @Ok("beetl:/platform/zhgh/staffbenefit/condolence/schoolPrincipalApproval/index.html") - @SaCheckPermission("condolence.schoolPrincipalApproval") + @SaCheckPermission("condolence.secondApproval") public void index() {} @At("/h5") @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html") - @SaCheckPermission("h5.condolence.schoolPrincipalApproval") + @SaCheckPermission("h5.condolence.secondApproval") public void h5Index() {} @At @ApiOperation("分页查询") - @SaCheckPermission(value = {"condolence.schoolPrincipalApproval", "h5.condolence.schoolPrincipalApproval"}, mode = SaMode.OR) + @SaCheckPermission(value = {"condolence.secondApproval", "h5.condolence.secondApproval"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, @Param(value = "year") Integer year, @Param(value = "type") String type, 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/CondolenceThirdApprovalController.java similarity index 90% rename from src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolUnionApprovalController.java rename to src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceThirdApprovalController.java index ac36de4..305ea9e 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/CondolenceThirdApprovalController.java @@ -27,7 +27,7 @@ import org.nutz.mvc.annotation.Param; import java.util.List; /** - * @ClassName CondolenceSchoolUnionApprovalController + * @ClassName CondolenceThirdApprovalController * @Author JyuHsin * @Date 2025/7/29 16:23 * @Version 1.0 @@ -35,26 +35,26 @@ import java.util.List; */ @IocBean @At("/platform/condolence/schoolUnionApproval") -@Api("职工慰问校工会审核") +@Api("职工慰问三级审核") @Ok("json:full") -public class CondolenceSchoolUnionApprovalController { +public class CondolenceThirdApprovalController { @Inject private CondolenceService condolenceService; @At("/") @Ok("beetl:/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html") - @SaCheckPermission("condolence.schoolUnionApproval") + @SaCheckPermission("condolence.thirdApproval") public void index() {} @At("/h5") @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html") - @SaCheckPermission("h5.condolence.schoolUnionApproval") + @SaCheckPermission("h5.condolence.thirdApproval") public void h5Index() {} @At @ApiOperation("分页查询") - @SaCheckPermission(value = {"condolence.schoolUnionApproval", "h5.condolence.schoolUnionApproval"}, mode = SaMode.OR) + @SaCheckPermission(value = {"condolence.thirdApproval", "h5.condolence.thirdApproval"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, @Param(value = "year") Integer year, @Param(value = "type") String type, @@ -104,7 +104,9 @@ public class CondolenceSchoolUnionApprovalController { cnd.andEX("info.applyUnitId", "=", unitId); cnd.and("t.taskName", "=", "ecdaef3b-edf4-4143-9a96-887dd5921711"); - cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + if (!"superadmin".equals(SecurityUtil.getUserLoginname())) { + cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + } if (approval) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); diff --git a/src/main/resources/db/script/20261009/difficult_help_apply_money.sql b/src/main/resources/db/script/20261009/difficult_help_apply_money.sql deleted file mode 100644 index 030ca47..0000000 --- a/src/main/resources/db/script/20261009/difficult_help_apply_money.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE difficult_help_info ADD COLUMN applyMoney VARCHAR(200) NULL COMMENT '申请金额'; diff --git a/src/main/resources/db/script/20261009/困难帮扶_职工慰问.sql b/src/main/resources/db/script/20261009/困难帮扶_菜单权限_新增字段.sql similarity index 97% rename from src/main/resources/db/script/20261009/困难帮扶_职工慰问.sql rename to src/main/resources/db/script/20261009/困难帮扶_菜单权限_新增字段.sql index 5e4dd11..9f4923e 100644 --- a/src/main/resources/db/script/20261009/困难帮扶_职工慰问.sql +++ b/src/main/resources/db/script/20261009/困难帮扶_菜单权限_新增字段.sql @@ -114,3 +114,4 @@ VALUES ('4d3e3472ae324552b16f0aaf07c37004', '501e0a4edca748ddb739ffb679170d50', 'SCHOOL_OFFICE_DIRECTOR', false, 9614, false, '17a7f8ad3ee947b4a26175049a9c253d', 1791517263500, '17a7f8ad3ee947b4a26175049a9c253d', 1791517263500, false, null); +ALTER TABLE difficult_help_info ADD COLUMN applyMoney VARCHAR(200) NULL COMMENT '申请金额'; diff --git a/src/main/resources/db/script/20261009/职工慰问_四级审核菜单权限.sql b/src/main/resources/db/script/20261009/职工慰问_四级审核菜单权限.sql new file mode 100644 index 0000000..d254344 --- /dev/null +++ b/src/main/resources/db/script/20261009/职工慰问_四级审核菜单权限.sql @@ -0,0 +1,132 @@ +START TRANSACTION; + +-- 一级：分工会主席审批，节点 4dad0bef-3cf2-4a7d-bba3-35020b9b216d。 +UPDATE zhgh_cqgmy.sys_menu +SET name = '分工会主席审批', initialPinyinName = 'f', note = '分工会主席审批', + permission = 'condolence.firstApproval' +WHERE id = '8e24dfdb70e448a899ea7de92319789c'; + +UPDATE zhgh_cqgmy.sys_menu +SET name = '分工会主席审批', initialPinyinName = 'f', note = '分工会主席审批', + permission = 'h5.condolence.firstApproval' +WHERE id = '330e42e0ae914f5392b96fb933f17b5b'; + +-- 二级：校工会办公室主任审批，节点 34f7938e-47a3-4b3a-b4e0-92b7a3f47865。 +UPDATE zhgh_cqgmy.sys_menu +SET name = '校工会办公室主任审批', initialPinyinName = 'x', note = '校工会办公室主任审批', + permission = 'condolence.secondApproval' +WHERE id = '09a59e7a99204ceca8e5dbbf8b2fafcf'; + +UPDATE zhgh_cqgmy.sys_menu +SET name = '校工会办公室主任审批', initialPinyinName = 'x', note = '校工会办公室主任审批', + permission = 'h5.condolence.secondApproval' +WHERE id = '87a2dcfac0da4ec4870b65693807a4d1'; + +-- 三级：分工会主席审批，节点 ecdaef3b-edf4-4143-9a96-887dd5921711。 +UPDATE zhgh_cqgmy.sys_menu +SET name = '分工会主席审批', initialPinyinName = 'f', note = '分工会主席审批', + permission = 'condolence.thirdApproval' +WHERE id = '0917928006574b2a99f7ef3e8804d873'; + +UPDATE zhgh_cqgmy.sys_menu +SET name = '分工会主席审批', initialPinyinName = 'f', note = '分工会主席审批', + permission = 'h5.condolence.thirdApproval' +WHERE id = 'c269f94a5c8a4a4a8c8de0bb8f8f9f9a'; + +-- 四级：分管校领导审批，节点 cbd41337-3c87-4959-9027-809df5c7ef5e。 +INSERT INTO zhgh_cqgmy.sys_menu + (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, + permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, + delFlag, processKey, platform, moduleId, isQuickEntry, picIcon, initialPinyinName, + isRecommendApp, isRecommendService) +VALUES ('3561e97f44d14b47ae07f63ff8312a90', '3b49290f7db44130b9f6394a8212321f', '00900009', + '分管校领导审批', null, 'menu', '/platform/condolence/fourthApproval', null, null, true, false, + 'condolence.fourthApproval', '分管校领导审批', 146, false, + '17a7f8ad3ee947b4a26175049a9c253d', UNIX_TIMESTAMP() * 1000, + '17a7f8ad3ee947b4a26175049a9c253d', UNIX_TIMESTAMP() * 1000, + false, null, 'PC', '07d940ba34bd47399cda140894f5d86b', false, null, 'f', false, false); + +INSERT INTO zhgh_cqgmy.sys_menu + (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, + permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, + delFlag, processKey, platform, moduleId, isQuickEntry, picIcon, initialPinyinName, + isRecommendApp, isRecommendService) +VALUES ('f02d5a68bdeb4c63a1b8ce47296d7304', '024811fd168e44948e6ab84911fc26bb', '01220006', + '分管校领导审批', null, 'menu', '/platform/condolence/fourthApproval/h5', null, null, true, false, + 'h5.condolence.fourthApproval', '分管校领导审批', 32, false, + '17a7f8ad3ee947b4a26175049a9c253d', UNIX_TIMESTAMP() * 1000, + '17a7f8ad3ee947b4a26175049a9c253d', UNIX_TIMESTAMP() * 1000, + false, null, 'H5', '586fffaeddc94a7493c81b6d69e546ab', false, '/platform/sys/file/download?id=d2095854e67dcf28dea1a4a975e90aba', 'f', false, false); + +-- 清除之前的菜单角色权限，按审核角色重新配置。 +-- 一级：分工会主席审批，节点 4dad0bef-3cf2-4a7d-bba3-35020b9b216d。 +DELETE FROM zhgh_cqgmy.sys_role_menu WHERE menuId = '8e24dfdb70e448a899ea7de92319789c'; +INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', '8e24dfdb70e448a899ea7de92319789c'); +INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +values ('fd753e8a8c5a404e8e00ef8e0b0c69da', '8e24dfdb70e448a899ea7de92319789c'); + +DELETE FROM zhgh_cqgmy.sys_role_menu WHERE menuId = '330e42e0ae914f5392b96fb933f17b5b'; +INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', '330e42e0ae914f5392b96fb933f17b5b'); +INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +values ('fd753e8a8c5a404e8e00ef8e0b0c69da', '330e42e0ae914f5392b96fb933f17b5b'); + +-- 二级：校工会办公室主任审批，节点 34f7938e-47a3-4b3a-b4e0-92b7a3f47865。 +DELETE FROM zhgh_cqgmy.sys_role_menu WHERE menuId = '09a59e7a99204ceca8e5dbbf8b2fafcf'; +INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', '09a59e7a99204ceca8e5dbbf8b2fafcf'); +INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +VALUES ('494ac71eb8b44d0e99e19b7fde6bd469', '09a59e7a99204ceca8e5dbbf8b2fafcf'); + +DELETE FROM zhgh_cqgmy.sys_role_menu WHERE menuId = '87a2dcfac0da4ec4870b65693807a4d1'; +INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', '87a2dcfac0da4ec4870b65693807a4d1'); +INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +VALUES ('494ac71eb8b44d0e99e19b7fde6bd469', '87a2dcfac0da4ec4870b65693807a4d1'); + +-- 三级：分工会主席审批，节点 ecdaef3b-edf4-4143-9a96-887dd5921711。 +DELETE FROM zhgh_cqgmy.sys_role_menu WHERE menuId = '0917928006574b2a99f7ef3e8804d873'; +INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', '0917928006574b2a99f7ef3e8804d873'); +INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +SELECT id, '0917928006574b2a99f7ef3e8804d873' FROM zhgh_cqgmy.sys_role WHERE code = 'BRANCH_UNION_CHAIRMAN' AND disabled = false AND delFlag = false; + +DELETE FROM zhgh_cqgmy.sys_role_menu WHERE menuId = 'c269f94a5c8a4a4a8c8de0bb8f8f9f9a'; +INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', 'c269f94a5c8a4a4a8c8de0bb8f8f9f9a'); +INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +SELECT id, 'c269f94a5c8a4a4a8c8de0bb8f8f9f9a' FROM zhgh_cqgmy.sys_role WHERE code = 'BRANCH_UNION_CHAIRMAN' AND disabled = false AND delFlag = false; + +DELETE FROM zhgh_cqgmy.sys_role_menu WHERE menuId = '3561e97f44d14b47ae07f63ff8312a90'; +INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', '3561e97f44d14b47ae07f63ff8312a90'); +INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +VALUES ('b3854469e6f44901b22bb791cb538431', '3561e97f44d14b47ae07f63ff8312a90'); + +DELETE FROM zhgh_cqgmy.sys_role_menu WHERE menuId = 'f02d5a68bdeb4c63a1b8ce47296d7304'; +INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', 'f02d5a68bdeb4c63a1b8ce47296d7304'); +INSERT INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +VALUES ('b3854469e6f44901b22bb791cb538431', 'f02d5a68bdeb4c63a1b8ce47296d7304'); + +-- 补充职工慰问父菜单权限。 +INSERT IGNORE INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', '3b49290f7db44130b9f6394a8212321f'); +INSERT IGNORE INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +VALUES ('494ac71eb8b44d0e99e19b7fde6bd469', '3b49290f7db44130b9f6394a8212321f'); +INSERT IGNORE INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +VALUES ('b3854469e6f44901b22bb791cb538431', '3b49290f7db44130b9f6394a8212321f'); +INSERT IGNORE INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +SELECT id, '3b49290f7db44130b9f6394a8212321f' FROM zhgh_cqgmy.sys_role WHERE code = 'BRANCH_UNION_CHAIRMAN' AND disabled = false AND delFlag = false; + +INSERT IGNORE INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +VALUES ('7f4a820d5a394bb8a0a92d6699afe7c8', '024811fd168e44948e6ab84911fc26bb'); +INSERT IGNORE INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +VALUES ('494ac71eb8b44d0e99e19b7fde6bd469', '024811fd168e44948e6ab84911fc26bb'); +INSERT IGNORE INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +VALUES ('b3854469e6f44901b22bb791cb538431', '024811fd168e44948e6ab84911fc26bb'); +INSERT IGNORE INTO zhgh_cqgmy.sys_role_menu (roleId, menuId) +SELECT id, '024811fd168e44948e6ab84911fc26bb' FROM zhgh_cqgmy.sys_role WHERE code = 'BRANCH_UNION_CHAIRMAN' AND disabled = false AND delFlag = false; + +COMMIT; diff --git a/src/main/resources/db/script/20261009/职工慰问_菜单权限_字段调整.sql b/src/main/resources/db/script/20261009/职工慰问_菜单权限_字段调整.sql new file mode 100644 index 0000000..195c418 --- /dev/null +++ b/src/main/resources/db/script/20261009/职工慰问_菜单权限_字段调整.sql @@ -0,0 +1,14 @@ +truncate table condolence_type; + +INSERT INTO condolence_type (id, code, name, money, way, disabled, isUploadFile, uploadFileDesc, sortNum, createdBy, createdAt, updatedBy, updatedAt, delFlag, isDisabled, location, uploadMeetingRecord, enable) VALUES ('00016fcb72234a8f95cd173665bbe563', 'C3', '生育（三孩）', 5000.00, '慰问金 (A)', false, null, null, 0, '17a7f8ad3ee947b4a26175049a9c253d', 1791539298087, '17a7f8ad3ee947b4a26175049a9c253d', 1791539298087, false, null, 8, false, true); +INSERT INTO condolence_type (id, code, name, money, way, disabled, isUploadFile, uploadFileDesc, sortNum, createdBy, createdAt, updatedBy, updatedAt, delFlag, isDisabled, location, uploadMeetingRecord, enable) VALUES ('3777d15929dd4c66b3aa9ae67dc62528', 'C2', '生育（二孩）', 3000.00, '慰问金 (A)', false, null, null, 0, '17a7f8ad3ee947b4a26175049a9c253d', 1791539214037, '17a7f8ad3ee947b4a26175049a9c253d', 1791539269588, false, null, 7, false, true); +INSERT INTO condolence_type (id, code, name, money, way, disabled, isUploadFile, uploadFileDesc, sortNum, createdBy, createdAt, updatedBy, updatedAt, delFlag, isDisabled, location, uploadMeetingRecord, enable) VALUES ('4cdf253d26044261a1a81359bbde1bb8', 'G', '直系亲属去世', 2000.00, '慰问金 (A)', false, true, '', 0, '17a7f8ad3ee947b4a26175049a9c253d', 1765427298440, '17a7f8ad3ee947b4a26175049a9c253d', 1791539615689, false, null, 2, false, true); +INSERT INTO condolence_type (id, code, name, money, way, disabled, isUploadFile, uploadFileDesc, sortNum, createdBy, createdAt, updatedBy, updatedAt, delFlag, isDisabled, location, uploadMeetingRecord, enable) VALUES ('4e316737e71047e0b01aea78524c1416', 'E', '生病住院', 1000.00, '慰问金 (A)', false, true, '每年累计不超过3000元、每人每年最多申请3次', 1, '29847d7826aa415a92d03b9576d01d3f', 1722084651317, '29847d7826aa415a92d03b9576d01d3f', 1791539558039, false, false, null, false, true); +INSERT INTO condolence_type (id, code, name, money, way, disabled, isUploadFile, uploadFileDesc, sortNum, createdBy, createdAt, updatedBy, updatedAt, delFlag, isDisabled, location, uploadMeetingRecord, enable) VALUES ('5b5f135e523d4cc5b5dc4355ffe9e024', 'B', '生日', 600.00, '慰问金 (A)', false, null, null, 0, '17a7f8ad3ee947b4a26175049a9c253d', 1791539148841, '17a7f8ad3ee947b4a26175049a9c253d', 1791539148841, false, null, 6, false, true); +INSERT INTO condolence_type (id, code, name, money, way, disabled, isUploadFile, uploadFileDesc, sortNum, createdBy, createdAt, updatedBy, updatedAt, delFlag, isDisabled, location, uploadMeetingRecord, enable) VALUES ('60f03a87b62b4823855814afdbf5672a', 'F', '会员去世', 3000.00, '慰问金 (A)', false, true, '需要提供购买的慰问品发票，慰问照片', 0, '17a7f8ad3ee947b4a26175049a9c253d', 1765427276486, '17a7f8ad3ee947b4a26175049a9c253d', 1791539570707, false, null, 1, false, true); +INSERT INTO condolence_type (id, code, name, money, way, disabled, isUploadFile, uploadFileDesc, sortNum, createdBy, createdAt, updatedBy, updatedAt, delFlag, isDisabled, location, uploadMeetingRecord, enable) VALUES ('b8ee30faacb2469593dfedb5b52565aa', 'D', '光荣退休', 2000.00, '慰问金 (A)', false, true, '需要提供购买的慰问品发票，慰问照片', 0, '17a7f8ad3ee947b4a26175049a9c253d', 1765427383848, '17a7f8ad3ee947b4a26175049a9c253d', 1791539529423, false, null, 3, false, true); +INSERT INTO condolence_type (id, code, name, money, way, disabled, isUploadFile, uploadFileDesc, sortNum, createdBy, createdAt, updatedBy, updatedAt, delFlag, isDisabled, location, uploadMeetingRecord, enable) VALUES ('c90cb10dce6542e99ae271bee6fe8cc0', 'C1', '生育（一孩）', 2000.00, '慰问金 (A)', false, true, '需要提供购买的慰问品发票，慰问照片（会员与婴儿合影照，或慰问人员与会员和婴儿的合影照）', 0, '17a7f8ad3ee947b4a26175049a9c253d', 1765427542820, '17a7f8ad3ee947b4a26175049a9c253d', 1791539263656, false, null, 5, false, true); +INSERT INTO condolence_type (id, code, name, money, way, disabled, isUploadFile, uploadFileDesc, sortNum, createdBy, createdAt, updatedBy, updatedAt, delFlag, isDisabled, location, uploadMeetingRecord, enable) VALUES ('cf4ce7af322d464f8f86d818fcc00203', 'A', '结婚', 1000.00, '慰问金 (A)', false, true, '需要提供购买的慰问品的发票、慰问照片、会员的结婚证复印件', 2, '29847d7826aa415a92d03b9576d01d3f', 1722084861840, '29847d7826aa415a92d03b9576d01d3f', 1768875320985, false, false, null, false, true); + + + diff --git a/src/main/resources/templates/condolence/重庆工贸职业技术学院职工慰问申请表.doc b/src/main/resources/templates/condolence/重庆工贸职业技术学院职工慰问申请表.doc new file mode 100644 index 0000000000000000000000000000000000000000..6a9e4683c294bca868aaa24511c6d9acddd976ae GIT binary patch literal 19968 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 CJ&D@@ literal 0 HcmV?d00001 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 2867334..581a025 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 @@ -219,6 +219,15 @@ layout("/layouts/platform.html"){ new Vue({ el: "#app", store, + components: { + ElDatePicker: { + extends: ELEMENT.DatePicker, + mounted() { + // 手动输入触发 change 前初始化日期面板，避免 picker 尚未创建。 + if (!this.picker) this.mountPicker() + } + } + }, data() { return { bizId: GetQueryString("bizId"), diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html index 470bd02..7ee8931 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html @@ -81,6 +81,9 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> + + + 同意申请 @@ -135,18 +138,26 @@ layout("/layouts/platform.html"){ this.showApprovalForm = true this.formData = { processTaskId: row.taskId, - taskName: row.curTaskName + taskName: row.curTaskName, + tf_sign: "", + tf_opinion: "" } this.$refs.condolenceInfoRef.onOpen(row) }) }, - handleTaskAction(val) { + async handleTaskAction(val) { + try { + const valid = await this.$refs.formRef.validate() + if (!valid) return + } catch (error) { + return + } this.$confirm("您确定要提交吗？", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" }).then(() => { - this.$axios.post("/flow/common/executeTask", { + this.$axios.post("/platform/condolence/approval/executeTask", { data: JSON.stringify({ ...this.formData, submitType: val diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js index 79252bf..d2bb27d 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js @@ -65,6 +65,9 @@ const condolenceInfo = { + + + {{ task.taskFormData.opinion }} diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/fourthApproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/fourthApproval/index.html new file mode 100644 index 0000000..37f4f19 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/fourthApproval/index.html @@ -0,0 +1,229 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 已审核 + 未审核 + + + + + + + + + + + + + + + + + +
+ + + + 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 1c75344..37f4f19 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 @@ -101,6 +101,9 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> + + + 同意申请 @@ -158,18 +161,26 @@ layout("/layouts/platform.html"){ this.showApprovalForm = true this.formData = { processTaskId: row.taskId, - taskName: row.curTaskName + taskName: row.curTaskName, + tf_sign: "", + tf_opinion: "" } this.$refs.condolenceInfoRef.onOpen(row) }) }, - handleTaskAction(val) { + async handleTaskAction(val) { + try { + const valid = await this.$refs.formRef.validate() + if (!valid) return + } catch (error) { + return + } this.$confirm("您确定要提交吗？", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" }).then(() => { - this.$axios.post("/flow/common/executeTask", { + this.$axios.post("/platform/condolence/approval/executeTask", { data: JSON.stringify({ ...this.formData, submitType: val 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 1c75344..37f4f19 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 @@ -101,6 +101,9 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> + + + 同意申请 @@ -158,18 +161,26 @@ layout("/layouts/platform.html"){ this.showApprovalForm = true this.formData = { processTaskId: row.taskId, - taskName: row.curTaskName + taskName: row.curTaskName, + tf_sign: "", + tf_opinion: "" } this.$refs.condolenceInfoRef.onOpen(row) }) }, - handleTaskAction(val) { + async handleTaskAction(val) { + try { + const valid = await this.$refs.formRef.validate() + if (!valid) return + } catch (error) { + return + } this.$confirm("您确定要提交吗？", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" }).then(() => { - this.$axios.post("/flow/common/executeTask", { + this.$axios.post("/platform/condolence/approval/executeTask", { data: JSON.stringify({ ...this.formData, submitType: val diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html index f8a9f33..a7e5858 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html @@ -55,7 +55,7 @@ layout("/layouts/platform_h5.html"){
- +
@@ -148,6 +148,12 @@ layout("/layouts/platform_h5.html"){ maxlength="100" show-word-limit > +

+ 审批签字* +

+ + +
@@ -227,6 +233,7 @@ layout("/layouts/platform_h5.html"){ this.$set(this, "formData", { processTaskId: row.taskId, taskName: row.curTaskName, + tf_sign: "", tf_opinion: "" }) this.$refs.infoRef.onOpen(row, row.curTaskName || "慰问审核") @@ -252,10 +259,10 @@ layout("/layouts/platform_h5.html"){ this.submitTaskAction() }) }, - // 提交 processTaskId、taskName、tf_opinion 和 submitType，接口返回统一响应对象。 + // 提交 processTaskId、taskName、tf_opinion、tf_sign 和 submitType，接口返回统一响应对象。 submitTaskAction() { this.$set(this, "formLoading", true) - this.$axios.post("/flow/common/executeTask", { + this.$axios.post("/platform/condolence/approval/executeTask", { data: JSON.stringify({ ...this.formData, submitType: this.pendingSubmitType diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js index 36c8e1a..cc53d0c 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js @@ -85,6 +85,9 @@ const condolenceInfo = { :value="task.ext && task.ext.submitType" > + + +
diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/fourthApproval/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/fourthApproval/index.html new file mode 100644 index 0000000..ab84389 --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/fourthApproval/index.html @@ -0,0 +1,350 @@ + + + + + + +
+
+ + + +
+ + + + + + +
+ + +
+
+
+ +
+
+ + + + + + +
+ + +
+
+

+ 审批意见* +

+ + +

+ 审批签字* +

+ + + + +
+
+ 退回 + 不同意 + 同意 +
+
+ + +
+
+ + + + 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 a0da703..cfac238 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 @@ -55,7 +55,7 @@ layout("/layouts/platform_h5.html"){
- +
@@ -148,6 +148,12 @@ layout("/layouts/platform_h5.html"){ maxlength="100" show-word-limit > +

+ 审批签字* +

+ + +
@@ -227,6 +233,7 @@ layout("/layouts/platform_h5.html"){ this.$set(this, "formData", { processTaskId: row.taskId, taskName: row.curTaskName, + tf_sign: "", tf_opinion: "" }) this.$refs.infoRef.onOpen(row, row.curTaskName || "慰问审核") @@ -252,10 +259,10 @@ layout("/layouts/platform_h5.html"){ this.submitTaskAction() }) }, - // 提交 processTaskId、taskName、tf_opinion 和 submitType，接口返回统一响应对象。 + // 提交 processTaskId、taskName、tf_opinion、tf_sign 和 submitType，接口返回统一响应对象。 submitTaskAction() { this.$set(this, "formLoading", true) - this.$axios.post("/flow/common/executeTask", { + this.$axios.post("/platform/condolence/approval/executeTask", { data: JSON.stringify({ ...this.formData, submitType: this.pendingSubmitType 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 248abb6..49d1852 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 @@ -55,7 +55,7 @@ layout("/layouts/platform_h5.html"){
- +
@@ -148,6 +148,12 @@ layout("/layouts/platform_h5.html"){ maxlength="100" show-word-limit > +

+ 审批签字* +

+ + +
@@ -227,6 +233,7 @@ layout("/layouts/platform_h5.html"){ this.$set(this, "formData", { processTaskId: row.taskId, taskName: row.curTaskName, + tf_sign: "", tf_opinion: "" }) this.$refs.infoRef.onOpen(row, row.curTaskName || "慰问审核") @@ -252,10 +259,10 @@ layout("/layouts/platform_h5.html"){ this.submitTaskAction() }) }, - // 提交 processTaskId、taskName、tf_opinion 和 submitType，接口返回统一响应对象。 + // 提交 processTaskId、taskName、tf_opinion、tf_sign 和 submitType，接口返回统一响应对象。 submitTaskAction() { this.$set(this, "formLoading", true) - this.$axios.post("/flow/common/executeTask", { + this.$axios.post("/platform/condolence/approval/executeTask", { data: JSON.stringify({ ...this.formData, submitType: this.pendingSubmitType