+ diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCaseCheckController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCaseCheckController.java index 6cd1af9a..9047969e 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCaseCheckController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCaseCheckController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.democratic.proposal.controller.transact; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.ExportTableColumns; @@ -55,8 +56,26 @@ public class ProposalCaseCheckController { public void index() { } + /** + * 打开提案委员会审查手机端列表页。 + */ + @At("/h5") + @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/caseCheck/index.html") + @SaCheckPermission("h5.proposal.caseCheck") + public void h5Index() { + } + + /** + * 打开提案委员会审查手机端详情及审核页。 + */ + @At("/info/h5") + @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/caseCheck/info.html") + @SaCheckPermission("h5.proposal.caseCheck") + public void h5Info() { + } + @At - @SaCheckPermission("proposal.caseCheck") + @SaCheckPermission(value = {"proposal.caseCheck", "h5.proposal.caseCheck"}, mode = SaMode.OR) @ApiOperation("分页列表") public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) { Sql sql = Sqls.create(""" @@ -129,7 +148,7 @@ public class ProposalCaseCheckController { } @At - @SaCheckPermission("proposal.caseCheck") + @SaCheckPermission(value = {"proposal.caseCheck", "h5.proposal.caseCheck"}, mode = SaMode.OR) @ApiOperation("查询当前提案承办单位") public Result listReplyUnits(String proposalId) { return Result.success(proposalCaseCheckService.listReplyUnits(proposalId)); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommissionerController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommissionerController.java index 91046e88..85fd36f4 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommissionerController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommissionerController.java @@ -49,6 +49,12 @@ public class ProposalCommissionerController { public void h5Index() { } + @At("/info/h5") + @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/commissioner/info.html") + @SaCheckPermission("h5.proposal.commissioner") + public void h5Info() { + } + @At @SaCheckPermission("proposal.commissioner") diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java index cd024a5a..6282a2fe 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java @@ -67,6 +67,12 @@ public class ProposalDelegationController { public void h5Index() { } + @At("/info/h5") + @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/delegation/info.html") + @SaCheckPermission("h5.proposal.delegation") + public void h5Info() { + } + @At @SaCheckPermission("proposal.delegation") diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalFeedbackEvaluationController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalFeedbackEvaluationController.java index bef308e3..fb7209cb 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalFeedbackEvaluationController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalFeedbackEvaluationController.java @@ -54,6 +54,12 @@ public class ProposalFeedbackEvaluationController { public void h5Index() { } + @At("/info/h5") + @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/feedbackEvaluation/info.html") + @SaCheckPermission("h5.proposal.feedbackEvaluation") + public void h5Info() { + } + @At @SaCheckPermission("proposal.feedbackEvaluation") diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java index f517360f..99b2631a 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java @@ -107,6 +107,12 @@ public class ProposalMineController { public void h5Index() { } + @At("/info/h5") + @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/mine/info.html") + @SaCheckPermission("h5.proposal.mine") + public void h5Info() { + } + @At @SaCheckPermission("proposal.mine") @Aop(TransAop.READ_COMMITTED) diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalPreAuditController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalPreAuditController.java index a2381d9d..3bc7295e 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalPreAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalPreAuditController.java @@ -52,6 +52,18 @@ public class ProposalPreAuditController { public void index() { } + @At("/h5") + @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/preAudit/index.html") + @SaCheckPermission("proposal.preAudit") + public void h5Index() { + } + + @At("/info/h5") + @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/preAudit/info.html") + @SaCheckPermission("h5.proposal.preAudit") + public void h5Info() { + } + @At @SaCheckPermission("proposal.preAudit") diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java index 7561186b..f23a9a76 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java @@ -74,6 +74,12 @@ public class ProposalSchoolLeaderApprovalController { public void h5Index() { } + @At("/info/h5") + @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/info.html") + @SaCheckPermission("h5.proposal.schoolLeaderApproval") + public void h5Info() { + } + @At @SaCheckPermission("proposal.schoolLeaderApproval") diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java index b54cb81a..5580bba8 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java @@ -88,6 +88,12 @@ public class ProposalSecondedController { public void h5Index() { } + @At("/info/h5") + @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/seconded/info.html") + @SaCheckPermission("h5.proposal.seconded") + public void h5Info() { + } + @At @SaCheckPermission("proposal.seconded") public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) { diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReplyController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReplyController.java index 47e4a5d8..e8cea18e 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReplyController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReplyController.java @@ -76,6 +76,12 @@ public class ProposalUnderTakeReplyController { public void h5Index() { } + @At("/info/h5") + @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/unitReply/info.html") + @SaCheckPermission("h5.proposal.unitReply") + public void h5Info() { + } + @At @SaCheckPermission("proposal.unitReply") @ApiOperation("分页列表") diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUndertakeSuggestionController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUndertakeSuggestionController.java index 42252763..5c945937 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUndertakeSuggestionController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUndertakeSuggestionController.java @@ -62,6 +62,12 @@ public class ProposalUndertakeSuggestionController { public void h5Index() { } + @At("/info/h5") + @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/suggestion/info.html") + @SaCheckPermission("h5.proposal.suggestion") + public void h5Info() { + } + @At @SaCheckPermission(value = {"proposal.suggestion", "h5.proposal.suggestion"}, mode = SaMode.OR) @ApiOperation("分页列表") diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalViceDelegationController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalViceDelegationController.java index 2a0d0028..cdd52f51 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalViceDelegationController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalViceDelegationController.java @@ -42,6 +42,12 @@ public class ProposalViceDelegationController { public void h5Index() { } + @At("/info/h5") + @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/viceDelegation/info.html") + @SaCheckPermission("h5.proposal.vice.delegation") + public void h5Info() { + } + @At @SaCheckPermission("proposal.vice.delegation") @ApiOperation("分页列表") diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/h5controller/H5ProposalQueryComprehensiveController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/h5controller/H5ProposalQueryComprehensiveController.java index a9927f91..99783f3f 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/h5controller/H5ProposalQueryComprehensiveController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/h5controller/H5ProposalQueryComprehensiveController.java @@ -19,4 +19,10 @@ public class H5ProposalQueryComprehensiveController { public void index() { } + @At("/info") + @Ok("beetl:/platform/zhghh5/democratic/proposal/query/comprehensive/info.html") + @SaCheckPermission("h5.proposal.query.comprehensive") + public void info() { + } + } diff --git a/src/main/resources/static/assets/mobile/img/proposal/proposal-empty.png b/src/main/resources/static/assets/mobile/img/proposal/proposal-empty.png new file mode 100644 index 00000000..f43bd511 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/proposal/proposal-empty.png differ diff --git a/src/main/resources/static/components/plugins/h5/TableList.vue b/src/main/resources/static/components/plugins/h5/TableList.vue index f9dfeb3e..4695055b 100644 --- a/src/main/resources/static/components/plugins/h5/TableList.vue +++ b/src/main/resources/static/components/plugins/h5/TableList.vue @@ -9,7 +9,8 @@ finished-text="没有更多了" @load="onLoad">
+
+
+
+
+
+
+