From 56b7d3628cb3337d852d1b631377d093613684d2 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Wed, 10 Sep 2025 14:34:15 +0800 Subject: [PATCH] commit --- .../apply/ClubUserJoinApplyController.java | 20 +- .../apply/ClubUserJoinApprovalController.java | 20 +- .../apply/ClubUserJoinMineController.java | 12 +- .../ClubUserJoinSchoolApprovalController.java | 20 +- .../h5controller/H5ClubApplyController.java | 21 - .../h5controller/H5ClubAuditController.java | 21 - .../h5controller/H5ClubMineController.java | 27 - .../site/controller/SiteApplyController.java | 18 +- .../site/controller/SiteMineController.java | 14 +- .../SiteSchoolUnionAuditController.java | 12 +- .../controller/CondolenceApplyController.java | 18 +- ...ndolenceBranchUnionApprovalController.java | 21 +- .../controller/CondolenceMineController.java | 16 +- ...ndolenceSchoolUnionApprovalController.java | 21 +- .../static/assets/platform/css/h5.css | 6 +- .../platform/zhgh/club/join/apply/index.html | 4 +- .../zhgh/club/join/clubApproval/index.html | 7 +- .../club/join/schoolUnionApproval/index.html | 7 +- .../zhgh/dayofficework/site/apply/index.html | 14 +- .../staffbenefit/condolence/apply/index.html | 689 +++++++++--------- .../platform/zhghh5/club/apply/index.html | 16 +- .../platform/zhghh5/club/audit/index.html | 175 ----- .../zhghh5/club/clubApproval/index.html | 185 +++++ .../zhghh5/club/common/clubUserJoin.js | 78 +- .../platform/zhghh5/club/mine/index.html | 17 +- .../club/schoolUnionApproval/index.html | 185 +++++ .../dayofficework/condolence/apply/index.html | 253 ------- .../condolence/branchUnion/audit/index.html | 243 ------ .../condolence/common/condolenceInfo.js | 57 -- .../condolence/common/processRecord.js | 78 -- .../dayofficework/condolence/info/index.html | 219 ------ .../condolence/schoolUnion/audit/index.html | 270 ------- .../dayofficework/site/apply/index.html | 99 +++ .../staffbenefit/condolence/apply/index.html | 448 ++++++++++++ .../condolence/branchUnionApproval/index.html | 191 +++++ .../staffbenefit/condolence/common/info.js | 98 +++ .../staffbenefit/condolence/mine/index.html | 151 ++++ .../condolence/schoolUnionApproval/index.html | 191 +++++ 38 files changed, 2111 insertions(+), 1831 deletions(-) delete mode 100644 src/main/java/com/budwk/app/zhgh/club/h5controller/H5ClubApplyController.java delete mode 100644 src/main/java/com/budwk/app/zhgh/club/h5controller/H5ClubAuditController.java delete mode 100644 src/main/java/com/budwk/app/zhgh/club/h5controller/H5ClubMineController.java delete mode 100644 src/main/resources/views/platform/zhghh5/club/audit/index.html create mode 100644 src/main/resources/views/platform/zhghh5/club/clubApproval/index.html create mode 100644 src/main/resources/views/platform/zhghh5/club/schoolUnionApproval/index.html delete mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/condolence/apply/index.html delete mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/condolence/branchUnion/audit/index.html delete mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/condolence/common/condolenceInfo.js delete mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/condolence/common/processRecord.js delete mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/condolence/info/index.html delete mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/condolence/schoolUnion/audit/index.html create mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/site/apply/index.html create mode 100644 src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html create mode 100644 src/main/resources/views/platform/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html create mode 100644 src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js create mode 100644 src/main/resources/views/platform/zhghh5/staffbenefit/condolence/mine/index.html create mode 100644 src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java index 344df629..e6290e75 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.club.controller.apply; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; @@ -63,14 +64,19 @@ public class ClubUserJoinApplyController { @Inject private FlowCommonService flowCommonService; - @At("") - @SaCheckPermission("club.join.apply") + @At("/") + @SaCheckPermission("club.join.apply") @Ok("beetl:/platform/zhgh/club/join/apply/index.html") public void index() {} + @At("/h5") + @SaCheckPermission("h5.club.join.apply") + @Ok("beetl:/platform/zhghh5/club/apply/index.html") + public void h5Index() {} + @At @ApiOperation("详情") - @SaCheckPermission("club.join.apply") + @SaCheckPermission(value = {"club.join.apply", "h5.club.join.apply"}, mode = SaMode.OR) public Result info(@Valid String id) { Sql sql = Sqls.create(""" SELECT @@ -97,7 +103,7 @@ public class ClubUserJoinApplyController { @At @ApiOperation("保存申请") - @SaCheckPermission("condolence.apply") + @SaCheckPermission(value = {"club.join.apply", "h5.club.join.apply"}, mode = SaMode.OR) @SLog(tag = "协会管理系统-申请入会", msg = "保存协会入会") public Result save(@Param("data") ClubUserApply clubUserApply) { clubUserApply.setRoleCode(RoleConstant.CLUB_MEMBER.name()); @@ -109,7 +115,7 @@ public class ClubUserJoinApplyController { @At @ApiOperation("提交") - @SaCheckPermission("club.join.apply") + @SaCheckPermission(value = {"club.join.apply", "h5.club.join.apply"}, mode = SaMode.OR) @Aop(TransAop.READ_COMMITTED) @SLog(tag = "协会管理系统-申请入会", msg = "申请协会入会") public Result submit(ClubUserApply clubUserApply) { @@ -144,7 +150,7 @@ public class ClubUserJoinApplyController { @At @ApiOperation("重新提交申请") @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("club.join.apply") + @SaCheckPermission(value = {"club.join.apply", "h5.club.join.apply"}, mode = SaMode.OR) public Result submitAgain(@Param("data") ClubUserApply clubUserApply, @Param("taskId") Long taskId) { dao.insertOrUpdate(clubUserApply); @@ -158,7 +164,7 @@ public class ClubUserJoinApplyController { @At @ApiOperation("校验是否申请过协会") - @SaCheckPermission("club.join.apply") + @SaCheckPermission(value = {"club.join.apply", "h5.club.join.apply"}, mode = SaMode.OR) public Result checkApplyClub(@Valid String clubId) { ClubUserApply userApply = dao.fetch(ClubUserApply.class, Cnd.where("userId", "=", SecurityUtil.getUserId()).and("clubId", "=", clubId).and("mode", "=", 1).desc(ClubUserApply::getApplyDate)); ClubUser clubUser = dao.fetch(ClubUser.class, Cnd.where("userId", "=", SecurityUtil.getUserId()).and("clubId", "=", clubId)); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApprovalController.java b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApprovalController.java index 7a409b1d..1ab66736 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApprovalController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.club.controller.apply; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.constant.RoleConstant; @@ -23,6 +24,7 @@ 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.dao.util.cri.Static; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; @@ -46,13 +48,18 @@ public class ClubUserJoinApprovalController { @Inject private ClubUserJoinService clubUserJoinService; - @At("") + @At("/") @SaCheckPermission("club.join.clubApproval") @Ok("beetl:/platform/zhgh/club/join/clubApproval/index.html") public void index() {} + @At("/h5") + @SaCheckPermission("h5.club.join.clubApproval") + @Ok("beetl:/platform/zhghh5/club/clubApproval/index.html") + public void h5Index() {} + @At - @SaCheckPermission("club.join.clubApproval") + @SaCheckPermission(value = {"club.join.clubApproval", "h5.club.join.clubApproval"}, mode = SaMode.OR) public Result pageData(@Valid ClubUserJoinPageForm pageForm, boolean approval) { Sql sql = Sqls.create(""" SELECT @@ -96,11 +103,16 @@ public class ClubUserJoinApprovalController { cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); cnd.andEX("YEAR(info.applyDate)","=",pageForm.getYear()); - cnd.and(Cnd.likeEX("u.userName", pageForm.getUserName())); - cnd.and(Cnd.likeEX("u.loginName", pageForm.getLoginName())); cnd.andEX("u.unionId","=",pageForm.getUnionId()); cnd.andEX("u.unitId","=",pageForm.getUnitId()); + if (StrUtil.isAllNotBlank(pageForm.getSearchKeyword())) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("u.userName", pageForm.getSearchKeyword()); + seg.orLike("u.loginName", pageForm.getSearchKeyword()); + cnd.and(seg); + } + if (approval) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); } else { diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinMineController.java b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinMineController.java index 74d61329..8ea10be8 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinMineController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinMineController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.club.controller.apply; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.constant.BpmProcessConstant; import com.budwk.app.base.constant.RoleConstant; @@ -43,13 +44,18 @@ public class ClubUserJoinMineController { @Inject private ClubUserJoinService clubUserJoinService; - @At("") + @At("/") @SaCheckPermission("club.join.mine") @Ok("beetl:/platform/zhgh/club/join/mine/index.html") public void index() {} + @At("/h5") + @SaCheckPermission("h5.club.join.mine") + @Ok("beetl:/platform/zhghh5/club/mine/index.html") + public void h5Index() {} + @At - @SaCheckPermission("club.join.mine") + @SaCheckPermission(value = {"club.join.mine", "h5.club.join.mine"}, mode = SaMode.OR) public Result pageData(@Valid PageForm pageForm, @Param("year") Integer year){ Sql sql = Sqls.create(""" @@ -94,7 +100,7 @@ public class ClubUserJoinMineController { } @At - @SaCheckPermission("club.join.apply") + @SaCheckPermission(value = {"club.join.mine", "h5.club.join.mine"}, mode = SaMode.OR) @ApiOperation("删除") @Aop(TransAop.READ_COMMITTED) @SLog(tag = "协会管理系统-申请入会-我的申请", msg = "删除协会入会") diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinSchoolApprovalController.java b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinSchoolApprovalController.java index 384da055..9a9d7a6b 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinSchoolApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinSchoolApprovalController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.club.controller.apply; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.constant.RoleConstant; @@ -28,6 +29,7 @@ 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.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; @@ -52,13 +54,18 @@ public class ClubUserJoinSchoolApprovalController { @Inject private Dao dao; - @At("") + @At("/") @SaCheckPermission("club.join.schoolUnionApproval") @Ok("beetl:/platform/zhgh/club/join/schoolUnionApproval/index.html") public void index() {} + @At("/h5") + @SaCheckPermission("h5.club.join.schoolUnionApproval") + @Ok("beetl:/platform/zhghh5/club/schoolUnionApproval/index.html") + public void h5Index() {} + @At - @SaCheckPermission("club.join.schoolUnionApproval") + @SaCheckPermission(value = {"club.join.schoolUnionApproval", "h5.club.join.schoolUnionApproval"}, mode = SaMode.OR) public Result pageData(@Valid ClubUserJoinPageForm pageForm, boolean approval) { Sql sql = Sqls.create(""" SELECT @@ -102,11 +109,16 @@ public class ClubUserJoinSchoolApprovalController { cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); cnd.andEX("YEAR(info.applyDate)", "=", pageForm.getYear()); - cnd.and(Cnd.likeEX("u.userName", pageForm.getUserName())); - cnd.and(Cnd.likeEX("u.loginName", pageForm.getLoginName())); cnd.andEX("u.unionId", "=", pageForm.getUnionId()); cnd.andEX("u.unitId", "=", pageForm.getUnitId()); + if (StrUtil.isAllNotBlank(pageForm.getSearchKeyword())) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("u.userName", pageForm.getSearchKeyword()); + seg.orLike("u.loginName", pageForm.getSearchKeyword()); + cnd.and(seg); + } + if (approval) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); } else { diff --git a/src/main/java/com/budwk/app/zhgh/club/h5controller/H5ClubApplyController.java b/src/main/java/com/budwk/app/zhgh/club/h5controller/H5ClubApplyController.java deleted file mode 100644 index fdb81e16..00000000 --- a/src/main/java/com/budwk/app/zhgh/club/h5controller/H5ClubApplyController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.budwk.app.zhgh.club.h5controller; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.mvc.annotation.At; -import org.nutz.mvc.annotation.Ok; - -@IocBean -@At("/platform/h5/club/apply") -@Ok("json:full") -@Api("h5申请入会") -public class H5ClubApplyController { - - @At("") - @Ok("beetl:/platform/zhghh5/club/apply/index.html") - @SaCheckPermission("h5.club.apply") - public void index() { - } - -} diff --git a/src/main/java/com/budwk/app/zhgh/club/h5controller/H5ClubAuditController.java b/src/main/java/com/budwk/app/zhgh/club/h5controller/H5ClubAuditController.java deleted file mode 100644 index 321f89b2..00000000 --- a/src/main/java/com/budwk/app/zhgh/club/h5controller/H5ClubAuditController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.budwk.app.zhgh.club.h5controller; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.mvc.annotation.At; -import org.nutz.mvc.annotation.Ok; - -@IocBean -@At("/platform/h5/club/audit") -@Ok("json:full") -@Api("h5入会审核") -public class H5ClubAuditController { - - - @At("") - @Ok("beetl:/platform/zhghh5/club/audit/index.html") - @SaCheckPermission("h5.club.audit") - public void index() { - } -} diff --git a/src/main/java/com/budwk/app/zhgh/club/h5controller/H5ClubMineController.java b/src/main/java/com/budwk/app/zhgh/club/h5controller/H5ClubMineController.java deleted file mode 100644 index 6ec463b5..00000000 --- a/src/main/java/com/budwk/app/zhgh/club/h5controller/H5ClubMineController.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.budwk.app.zhgh.club.h5controller; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.mvc.annotation.At; -import org.nutz.mvc.annotation.Ok; - -/** - * @ClassName H5ClubMineController - * @Author JyuHsin - * @Date 2025/7/2 19:19 - * @Version 1.0 - * @Description TODO - */ -@IocBean -@At("/platform/h5/club/mine") -@Ok("json:full") -@Api("h5申请入会") -public class H5ClubMineController { - - @At("") - @Ok("beetl:/platform/zhghh5/club/mine/index.html") - @SaCheckPermission("h5.club.mine") - public void index() { - } -} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteApplyController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteApplyController.java index c6ec46c9..12b95a88 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteApplyController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.dayofficework.site.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUnit; @@ -76,14 +77,19 @@ public class SiteApplyController { @Inject private FlowCommonService flowCommonService; - @At("") + @At("/") @SaCheckPermission("site.apply") @Ok("beetl:/platform/zhgh/dayofficework/site/apply/index.html") public void index() {} + @At("/h5") + @SaCheckPermission("h5.site.apply") + @Ok("beetl:/platform/zhghh5/dayofficework/site/apply/index.html") + public void h5Index() {} + @At @ApiOperation("分页查询") - @SaCheckPermission("site.apply") + @SaCheckPermission(value = {"site.apply", "h5.site.apply"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, @Param("year") Integer year, @Param("type") String type) { @@ -116,7 +122,7 @@ public class SiteApplyController { @At @ApiOperation("新增/修改场地预约") - @SaCheckPermission("site.apply") + @SaCheckPermission(value = {"site.apply", "h5.site.apply"}, mode = SaMode.OR) @SLog(tag = "场地管理-场地预约", msg = "新增/修改场地预约") public Result submit(@Param("data") SiteApply siteApply, @Param("days") String[] days) { Map validate = applyService.validateApply(siteApply, days[0]); @@ -143,7 +149,7 @@ public class SiteApplyController { @At @ApiOperation("重新提交申请") @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("site.apply") + @SaCheckPermission(value = {"site.apply", "h5.site.apply"}, mode = SaMode.OR) public Result submitAgain(@Param("data") SiteApply siteApply, @Param("days") String[] days, @Param("taskId") String taskId) { @@ -163,7 +169,7 @@ public class SiteApplyController { @At @ApiOperation("查询可以预约的日期") - @SaCheckPermission("site.apply") + @SaCheckPermission(value = {"site.apply", "h5.site.apply"}, mode = SaMode.OR) public Result queryAllowTime(String siteId, String startTime, String endTime) { if(StrUtil.isBlank(siteId)) { return Result.success(new ArrayList<>()); @@ -203,7 +209,7 @@ public class SiteApplyController { @At @ApiOperation("查询可以预约的时间") - @SaCheckPermission("site.apply") + @SaCheckPermission(value = {"site.apply", "h5.site.apply"}, mode = SaMode.OR) public Result queryTimesByDay(String siteId, String day) { //获取场地 SiteInfo siteInfo = infoService.fetch(siteId); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteMineController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteMineController.java index 8282fa51..1112b39b 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteMineController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteMineController.java @@ -2,6 +2,7 @@ package com.budwk.app.zhgh.dayofficework.site.controller; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; @@ -51,14 +52,19 @@ public class SiteMineController { @Inject private SiteApplyService applyService; - @At("") + @At("/") @Ok("beetl:/platform/zhgh/dayofficework/site/mine/index.html") - @SaCheckLogin + @SaCheckPermission("site.mine") public void index() {} + @At("/h5") + @Ok("beetl:/platform/zhgh/dayofficework/site/mine/index.html") + @SaCheckPermission("h5.site.mine") + public void h5Index() {} + @At @ApiOperation("分页查询") - @SaCheckPermission("site.mine") + @SaCheckPermission(value = {"site.mine", "h5.site.mine"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, @Param("year") Integer year, @Param("siteType") String siteType, @@ -117,7 +123,7 @@ public class SiteMineController { @At @ApiOperation("删除") @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("site.mine") + @SaCheckPermission("site") @SLog(tag = "场地管理-场地预约", msg = "删除场地预约") public Result delete(@Param("id") String id) { applyService.delete(id); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteSchoolUnionAuditController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteSchoolUnionAuditController.java index 2f8acbce..887cdc34 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteSchoolUnionAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteSchoolUnionAuditController.java @@ -2,6 +2,7 @@ package com.budwk.app.zhgh.dayofficework.site.controller; import cn.dev33.satoken.annotation.SaCheckLogin; 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; @@ -42,14 +43,19 @@ public class SiteSchoolUnionAuditController { @Inject private SiteApplyService applyService; - @At("") + @At("/") @Ok("beetl:/platform/zhgh/dayofficework/site/schoolUnionAudit/index.html") - @SaCheckLogin + @SaCheckPermission("site.schoolUnionAudit") public void index() {} + @At("/h5") + @SaCheckPermission("h5.site.schoolUnionAudit") + @Ok("beetl:/platform/zhghh5/dayofficework/site/schoolUnionAudit/index.html") + public void h5Index() {} + @At @ApiOperation("分页查询") - @SaCheckPermission("site.schoolUnionAudit") + @SaCheckPermission(value = {"site.schoolUnionAudit", "h5.site.schoolUnionAudit"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, @Param("year") Integer year, @Param("siteType") String siteType, 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 55662947..7ffc2948 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 @@ -2,6 +2,7 @@ package com.budwk.app.zhgh.staffbenefit.condolence.controller; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.StrUtil; @@ -60,14 +61,19 @@ public class CondolenceApplyController { @Inject private FlowCommonService flowCommonService; - @At("") + @At("/") @Ok("beetl:/platform/zhgh/staffbenefit/condolence/apply/index.html") - @SaCheckLogin + @SaCheckPermission("condolence.apply") public void index() {} + @At("/h5") + @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/apply/index.html") + @SaCheckPermission("h5.condolence.apply") + public void h5Index() {} + @At @ApiOperation("保存申请") - @SaCheckPermission("condolence.apply") + @SaCheckPermission(value = {"condolence.apply", "h5.condolence.apply"}, mode = SaMode.OR) @SLog(tag = "职工慰问系统-慰问申请", msg = "保存申请") public Result save(@Param("data") Condolence condolence) { if(StrUtil.isBlank(condolence.getId())) condolence.setCreateTime(DateUtil.now()); @@ -77,7 +83,7 @@ public class CondolenceApplyController { @At @ApiOperation("提交申请") - @SaCheckPermission("condolence.apply") + @SaCheckPermission(value = {"condolence.apply", "h5.condolence.apply"}, mode = SaMode.OR) @SLog(tag = "职工慰问系统-慰问申请", msg = "提交申请") public Result submit(@Param("data") Condolence condolence) { if(StrUtil.isBlank(condolence.getId())) condolence.setCreateTime(DateUtil.now()); @@ -99,7 +105,7 @@ public class CondolenceApplyController { @At @ApiOperation("重新提交申请") @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("condolence.apply") + @SaCheckPermission(value = {"condolence.apply", "h5.condolence.apply"}, mode = SaMode.OR) public Result submitAgain(@Param("data") Condolence condolence, @Param("taskId") Long taskId) { dao.insertOrUpdate(condolence); @@ -112,7 +118,7 @@ public class CondolenceApplyController { @At @ApiOperation("查询用户") - @SaCheckPermission("condolence.apply") + @SaCheckPermission(value = {"condolence.apply", "h5.condolence.apply"}, mode = SaMode.OR) public Object listUser(String keyword) { Sql sql = Sqls.create(""" select 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/CondolenceBranchUnionApprovalController.java index feec2d3a..6bbecf2c 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/CondolenceBranchUnionApprovalController.java @@ -1,7 +1,7 @@ package com.budwk.app.zhgh.staffbenefit.condolence.controller; -import cn.dev33.satoken.annotation.SaCheckLogin; 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; @@ -9,12 +9,14 @@ 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 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; @@ -40,14 +42,19 @@ public class CondolenceBranchUnionApprovalController { @Inject private CondolenceService condolenceService; - @At("") + @At("/") @Ok("beetl:/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html") - @SaCheckLogin + @SaCheckPermission("condolence.branchUnionApproval") public void index() {} + @At("/h5") + @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html") + @SaCheckPermission("h5.condolence.branchUnionApproval") + public void h5Index() {} + @At @ApiOperation("分页查询") - @SaCheckPermission("condolence.branchUnionApproval") + @SaCheckPermission(value = {"condolence.branchUnionApproval", "h5.condolence.branchUnionApproval"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, @Param(value = "year") Integer year, @Param(value = "type") String type, @@ -83,6 +90,12 @@ public class CondolenceBranchUnionApprovalController { $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); 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 5e662f47..ad5f3397 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 @@ -2,6 +2,7 @@ package com.budwk.app.zhgh.staffbenefit.condolence.controller; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.constant.RoleConstant; @@ -50,14 +51,19 @@ public class CondolenceMineController { @Inject private FlowEngine flowEngine; - @At("") + @At("/") @Ok("beetl:/platform/zhgh/staffbenefit/condolence/mine/index.html") - @SaCheckLogin + @SaCheckPermission("condolence.mine") public void index() {} + @At("/h5") + @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/mine/index.html") + @SaCheckPermission("h5.condolence.mine") + public void h5Index() {} + @At @ApiOperation("分页查询") - @SaCheckPermission("condolence.mine") + @SaCheckPermission(value = {"condolence.mine", "h5.condolence.mine"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, @Param(value = "year") Integer year, @Param(value = "type") String type) { @@ -114,7 +120,7 @@ public class CondolenceMineController { @At @ApiOperation("删除") @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("condolence") + @SaCheckPermission(value = {"condolence.mine", "h5.condolence.mine"}, mode = SaMode.OR) @SLog(tag = "职工慰问系统-我的申请", msg = "删除职工慰问") public Result delete(@Param("id") String id) { condolenceService.delete(id); @@ -124,7 +130,7 @@ public class CondolenceMineController { @At @ApiOperation("查询单个慰问申请信息") - @SaCheckPermission("condolence.mine") + @SaCheckPermission("condolence") public Result info(String id) { Condolence condolence = condolenceService.fetch(id); CondolenceType type = condolenceService.dao().fetch(CondolenceType.class, Cnd.where(CondolenceType::getId, "=", condolence.getType())); 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 e5710026..ac36de49 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 @@ -1,7 +1,7 @@ package com.budwk.app.zhgh.staffbenefit.condolence.controller; -import cn.dev33.satoken.annotation.SaCheckLogin; 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; @@ -9,12 +9,14 @@ 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 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; @@ -40,14 +42,19 @@ public class CondolenceSchoolUnionApprovalController { @Inject private CondolenceService condolenceService; - @At("") + @At("/") @Ok("beetl:/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html") - @SaCheckLogin + @SaCheckPermission("condolence.schoolUnionApproval") public void index() {} + @At("/h5") + @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html") + @SaCheckPermission("h5.condolence.schoolUnionApproval") + public void h5Index() {} + @At @ApiOperation("分页查询") - @SaCheckPermission("condolence.schoolUnionApproval") + @SaCheckPermission(value = {"condolence.schoolUnionApproval", "h5.condolence.schoolUnionApproval"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, @Param(value = "year") Integer year, @Param(value = "type") String type, @@ -85,6 +92,12 @@ public class CondolenceSchoolUnionApprovalController { $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); diff --git a/src/main/resources/static/assets/platform/css/h5.css b/src/main/resources/static/assets/platform/css/h5.css index bb2b0fc2..0ee91750 100644 --- a/src/main/resources/static/assets/platform/css/h5.css +++ b/src/main/resources/static/assets/platform/css/h5.css @@ -17,7 +17,7 @@ html, body, #app { } body { - background-color: #f1f1f1; + background-color: #f7f8fa; overflow-x: hidden; font-size: 16px } @@ -297,3 +297,7 @@ body { flex-direction: column; } +.detail-container .direction-column-cell .van-cell__value{ + text-align: left; +} + diff --git a/src/main/resources/views/platform/zhgh/club/join/apply/index.html b/src/main/resources/views/platform/zhgh/club/join/apply/index.html index 0d274016..0a8e2dae 100644 --- a/src/main/resources/views/platform/zhgh/club/join/apply/index.html +++ b/src/main/resources/views/platform/zhgh/club/join/apply/index.html @@ -212,7 +212,7 @@ layout("/layouts/platform.html"){ checkApplyClub(val) { this.$axios.post("/platform/club/join/apply/checkApplyClub", { clubId: val }).then((res) => { if (res.code !== 0) { - this.$message.warning("您已申请加入该协会，请勿重复申请") + this.$message.warning(res.msg) this.formData.clubId = "" } }) @@ -243,7 +243,7 @@ layout("/layouts/platform.html"){ this.$set(this.formData, "unionId", user.union ? user.union.id : null) this.$set(this.formData, "unionName", user.union ? user.union.name : null) this.$set(this.formData, "sex", user.sex) - this.$set(this.formData, "birthday", user.birthday ? this.$moment(user.birthday).format('yyyy-MM-dd') : '') + this.$set(this.formData, "birthday", user.birthday ? this.$moment(user.birthday).format('YYYY-MM-DD') : '') this.$set(this.formData, "nation", user.nation) this.$set(this.formData, "political", user.political) this.$set(this.formData, "education", user.education) diff --git a/src/main/resources/views/platform/zhgh/club/join/clubApproval/index.html b/src/main/resources/views/platform/zhgh/club/join/clubApproval/index.html index bfca91d5..f735a83c 100644 --- a/src/main/resources/views/platform/zhgh/club/join/clubApproval/index.html +++ b/src/main/resources/views/platform/zhgh/club/join/clubApproval/index.html @@ -16,11 +16,8 @@ layout("/layouts/platform.html"){ @change="doSearch" > - - - - - + + diff --git a/src/main/resources/views/platform/zhgh/club/join/schoolUnionApproval/index.html b/src/main/resources/views/platform/zhgh/club/join/schoolUnionApproval/index.html index bfca91d5..f735a83c 100644 --- a/src/main/resources/views/platform/zhgh/club/join/schoolUnionApproval/index.html +++ b/src/main/resources/views/platform/zhgh/club/join/schoolUnionApproval/index.html @@ -16,11 +16,8 @@ layout("/layouts/platform.html"){ @change="doSearch" > - - - - - + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/site/apply/index.html b/src/main/resources/views/platform/zhgh/dayofficework/site/apply/index.html index e2eceb9b..b220eddf 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/site/apply/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/site/apply/index.html @@ -3,7 +3,19 @@ layout("/layouts/platform.html"){ #-->
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 00e21212..0dd6f7e4 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 @@ -3,359 +3,364 @@ layout("/layouts/platform.html"){ #-->
- - - - - {{formData.applyUserName}} - {{formData.applyLoginName}} - {{formData.applyUnitName}} - {{formData.applyUnionName}} + + + + + {{formData.applyUserName}} + {{formData.applyLoginName}} + {{formData.applyUnitName}} + {{formData.applyUnionName}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - 保存 - 提交 - 提交 - - + + + + + + + + + 保存 + 提交 + 提交 + +
- -
- - - - - - - - - -
- -
-
- - - - - - - - - 待协会审核 - 协会不通过 - 待校工会审核 - 校工会不通过 - 审核通过 - - - 待协会审核 - 协会不通过 - 待校工会审核 - 校工会不通过 - 审核通过 - - - 不通过 - 通过 - -
-
- - -
- - - - - - - - - - - - - -
- - - - diff --git a/src/main/resources/views/platform/zhghh5/club/clubApproval/index.html b/src/main/resources/views/platform/zhghh5/club/clubApproval/index.html new file mode 100644 index 00000000..a3fed2c6 --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/club/clubApproval/index.html @@ -0,0 +1,185 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+
{{formData.taskName}}
+ + + +
+ 退回 + 不同意 + 同意 +
+
+ +
+ + + + diff --git a/src/main/resources/views/platform/zhghh5/club/common/clubUserJoin.js b/src/main/resources/views/platform/zhghh5/club/common/clubUserJoin.js index 0dc34e5f..57bd049b 100644 --- a/src/main/resources/views/platform/zhghh5/club/common/clubUserJoin.js +++ b/src/main/resources/views/platform/zhghh5/club/common/clubUserJoin.js @@ -2,77 +2,86 @@ const clubUserJoin = { template: /*language=HTML*/ ` -
- - - - -
- 申请信息 - 审核历史 - 去审核 +
-
+ + `, dicts: ["PROCESS_TASK_SUBMIT_TYPE"], data() { return { + visible:false, viewData: {}, - activeView: 'info', - row: {}, doneTasks: [], + row: null, } }, methods: { onOpen(row) { this.row = row - this.$axios.post("/platform/club/join/mine/info", { id: row.id }).then((res) => { + this.visible = true + this.getInfo() + this.getDoneTasks() + }, + onClose(){ + this.visible = false + }, + getInfo() { + this.$axios.post("/platform/club/join/mine/info", { id: this.row.id }).then((res) => { if (res.code === 0) { this.viewData = res.data } }) - this.getDoneTasks() }, getDoneTasks() { this.$axios.post("/flow/common/doneTasks", {bizId: this.row.id}).then((res) => { @@ -81,9 +90,6 @@ const clubUserJoin = { } }) }, - openChart(){ - this.$refs.snakerChartRef.onOpenFull(this.row.instanceProcessDefineId, this.row.instanceId) - } }, style: /*language=CSS*/ ` diff --git a/src/main/resources/views/platform/zhghh5/club/mine/index.html b/src/main/resources/views/platform/zhghh5/club/mine/index.html index e8f02e71..d216aa73 100644 --- a/src/main/resources/views/platform/zhghh5/club/mine/index.html +++ b/src/main/resources/views/platform/zhghh5/club/mine/index.html @@ -48,14 +48,7 @@ layout("/layouts/platform_h5.html"){ - - - - -
- -
- +
+ + diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/condolence/apply/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/condolence/apply/index.html deleted file mode 100644 index 821346ae..00000000 --- a/src/main/resources/views/platform/zhghh5/dayofficework/condolence/apply/index.html +++ /dev/null @@ -1,253 +0,0 @@ - -
-
- - -
- - - - - - - - - - - - - - - - - - - - 提 交 - -
- -
-
- - - diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/condolence/branchUnion/audit/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/condolence/branchUnion/audit/index.html deleted file mode 100644 index 0ad4faa9..00000000 --- a/src/main/resources/views/platform/zhghh5/dayofficework/condolence/branchUnion/audit/index.html +++ /dev/null @@ -1,243 +0,0 @@ - -
- - - - - - - - - - - - - -
- -
-
- - - - - - - - 查看 - - 审核 - - - 撤回 - - -
-
- - -
- - - - - - - - - - - -
- - diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/condolence/common/condolenceInfo.js b/src/main/resources/views/platform/zhghh5/dayofficework/condolence/common/condolenceInfo.js deleted file mode 100644 index 019e7aef..00000000 --- a/src/main/resources/views/platform/zhghh5/dayofficework/condolence/common/condolenceInfo.js +++ /dev/null @@ -1,57 +0,0 @@ -const MOBILE_CONDOLENCE_INFO = { - template: ` -
- - -
- 申请信息 -
- - {{ viewData.handledByUserName }} - {{ viewData.applyDateTime }} - {{ viewData.beComfortedUserName }} - {{ viewData.payeeUserName }} - {{ viewData.typeName }} - {{ viewData.money }} - {{ viewData.applyReason }} - -
- -
- - -
- `, - props: { - id: { type: String, required: true } - }, - data() { - return { - viewData: {} - } - }, - watch: { - id: { - handler: function () { - this.findCondolenceInfoById() - }, - immediate: true - } - }, - methods: { - findCondolenceInfoById() { - if (!this.id) { - return - } - this.$axios - .post("/platform/condolence/common/info", { - id: this.id - }) - .then((res) => { - if (res.code === 0) { - this.viewData = res.data - } - }) - } - } -} diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/condolence/common/processRecord.js b/src/main/resources/views/platform/zhghh5/dayofficework/condolence/common/processRecord.js deleted file mode 100644 index 5af127cd..00000000 --- a/src/main/resources/views/platform/zhghh5/dayofficework/condolence/common/processRecord.js +++ /dev/null @@ -1,78 +0,0 @@ -const MOBILE_CONDOLENCE_PROCESS_RECORDS_COMPONENT = { - template: ` -
- - -
- - - `, - dicts: ["PROCESS_TASK_SUBMIT_TYPE"], - props: { - id: { - type: String, - required: true - } - }, - watch: { - id: { - handler: function(val) { - if (val) { - this.findOne() - } - }, - immediate: true - } - }, - data() { - return { - approvalRecord: [] - } - }, - methods: { - findOne() { - this.$axios.post("/platform/wf/processCommon/approvalRecord", { businessNo: this.id }).then((res) => { - if (res.code === 0) { - this.approvalRecord = res.data - console.log(res.data) - } - }) - } - } -} diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/condolence/info/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/condolence/info/index.html deleted file mode 100644 index b7c5941f..00000000 --- a/src/main/resources/views/platform/zhghh5/dayofficework/condolence/info/index.html +++ /dev/null @@ -1,219 +0,0 @@ - -
- - - - - - - - - - -
- -
-
- - - - - - - - 查看 - -
-
- - -
- - - - - - - - - - - -
- - diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/condolence/schoolUnion/audit/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/condolence/schoolUnion/audit/index.html deleted file mode 100644 index 7cd913c0..00000000 --- a/src/main/resources/views/platform/zhghh5/dayofficework/condolence/schoolUnion/audit/index.html +++ /dev/null @@ -1,270 +0,0 @@ - -
- - - - - - - - - - - - - - -
- -
-
- - - - - - - - 查看 - - 审核 - - -
-
- - -
- - - - - - - - - - - -
- - diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/site/apply/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/site/apply/index.html new file mode 100644 index 00000000..ee46bea9 --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/dayofficework/site/apply/index.html @@ -0,0 +1,99 @@ + + + + +
+ + + + + + + + + + + + + + + +
+ + + + 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 new file mode 100644 index 00000000..9601c1fa --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html @@ -0,0 +1,448 @@ + + + + +
+ + + + + + + + + + + + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 保存申请 + 提交申请 + 提交申请 +
+ +
+ + + + 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 new file mode 100644 index 00000000..683c9637 --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html @@ -0,0 +1,191 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+
{{formData.taskName}}
+ + + +
+ 退回 + 不同意 + 同意 +
+
+ +
+ + + + 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 new file mode 100644 index 00000000..8cdc91a8 --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js @@ -0,0 +1,98 @@ +const condolenceInfo = { + template: + /*language=HTML*/ + ` + +
+ + {{ viewData.applyUserName }} + {{ viewData.applyLoginName }} + {{ viewData.applyUnitName }} + {{ viewData.applyUnionName }} + {{ viewData.helpUserName }} + {{ viewData.payUserName }} + {{ viewData.typeName }} + {{ viewData.way }} + {{ viewData.money }} + {{ viewData.occurTime }} + {{ viewData.child }} + {{ viewData.hospital }} + {{ viewData.hospitalHouseNum }} + {{ viewData.hospitalHouseBedNum }} + {{ viewData.hospitalBy }} + {{ viewData.deadImmediateFamily }} + + {{ viewData.remark || '暂无' }} + + + + + + 暂无签字 + + + +
+ + + `, + dicts: ["PROCESS_TASK_SUBMIT_TYPE"], + data() { + return { + visible:false, + viewData: {}, + doneTasks: [], + row: null, + } + }, + methods: { + onOpen(row) { + this.row = row + this.visible = true + this.getInfo() + this.getDoneTasks() + }, + onClose(){ + this.visible = false + }, + getInfo() { + this.$axios.post("/platform/condolence/mine/info", { id: this.row.id }).then((res) => { + if (res.code === 0) { + this.viewData = res.data + } + }) + }, + getDoneTasks() { + this.$axios.post("/flow/common/doneTasks", {bizId: this.row.id}).then((res) => { + if (res.code === 0) { + this.doneTasks = res.data + } + }) + }, + }, + style: /*language=CSS*/ ` + + ` +} diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/mine/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/mine/index.html new file mode 100644 index 00000000..8800a7f6 --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/mine/index.html @@ -0,0 +1,151 @@ + + + + +
+ + + + + + + + + + + + + + + + +
+ + + + 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 new file mode 100644 index 00000000..800b23e1 --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html @@ -0,0 +1,191 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+
{{formData.taskName}}
+ + + +
+ 退回 + 不同意 + 同意 +
+
+ +
+ + + +