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 3faa8e0f..6a8bbdf7 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 @@ -59,6 +59,13 @@ public class ProposalDelegationController { public void index() { } + @At("/platform/h5/proposal/delegation") + @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/delegation/index.html") + @SaCheckPermission("proposal.delegation") + public void h5Index() { + } + + @At @SaCheckPermission("proposal.delegation") @ApiOperation("分页列表") 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 870b9e57..9d9a8b2e 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 @@ -68,13 +68,6 @@ public class ProposalSecondedController { public void h5Index() { } - @At(value = "/platform/h5/proposal/seconded/approval",top = true) - @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/seconded/approval.html") - @SaCheckPermission("proposal.seconded") - public void h5Approval(){ - - } - @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 0b6f2c7f..79d0b6e1 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 @@ -25,6 +25,7 @@ import org.nutz.mvc.annotation.Ok; import javax.validation.Valid; import java.util.List; +import java.util.stream.Stream; @IocBean @At("/platform/proposal/unitReply") @@ -44,6 +45,12 @@ public class ProposalUnderTakeReplyController { public void index() { } + @At(value = "/platform/h5/proposal/unitReply",top = true) + @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/unitReply/index.html") + @SaCheckPermission("proposal.unitReply") + public void h5Index() { + } + @At @SaCheckPermission("proposal.unitReply") @ApiOperation("分页列表") @@ -105,10 +112,13 @@ public class ProposalUnderTakeReplyController { List list = pagination.getList(); for (NutMap row : list) { - if (row.getInt("taskIsMaster") == 0) { - boolean b = List.of("85cf23da-2dd5-4007-a1e9-bd9bfddc68f0", "c9a1586e-272b-41b8-b438-0be9f9e3781d", "04ecf80c-a9d0-4986-8aac-231758d6a7af").stream() + if (row.getInt("taskIsMaster") == 1) { + boolean b = Stream.of("85cf23da-2dd5-4007-a1e9-bd9bfddc68f0", "c9a1586e-272b-41b8-b438-0be9f9e3781d", "04ecf80c-a9d0-4986-8aac-231758d6a7af") .anyMatch(a -> row.getString("curTaskKey").contains(a)); - row.setv("canRevoke",b); + row.setv("canRevoke",b && row.getInt("taskState") == ProcessTaskStateEnum.FINISHED.getCode()); + }else{ + boolean b = Stream.of("85cf23da-2dd5-4007-a1e9-bd9bfddc68f0", "c9a1586e-272b-41b8-b438-0be9f9e3781d").anyMatch(a -> row.getString("curTaskKey").contains(a)); + row.setv("canRevoke",b && row.getInt("taskState") == ProcessTaskStateEnum.FINISHED.getCode()); } } pagination.setList(list); diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js b/src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js index a9b0a910..edf6b3e4 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js @@ -1,7 +1,7 @@ -const H5_PROPOSAL_INFO_COMPONENT = { +const PROPOSAL_INFO = { name: "ProposalInfo", template: /*language=HTML*/ ` -
+
基本信息
@@ -80,15 +80,16 @@ const H5_PROPOSAL_INFO_COMPONENT = { -
+ `, dicts: ["PROPOSAL_TYPE", "PROPOSAL_CASE_FILING_RESULT","PROCESS_TASK_SUBMIT_TYPE"], data() { return { + visible:false, + viewData: {}, doneTasks: [], row: null, - viewDialogVisible: false } }, methods: { @@ -99,6 +100,12 @@ const H5_PROPOSAL_INFO_COMPONENT = { this.getInfo() this.getDoneTasks() }, + + // 关闭 + onClose(){ + this.visible = false + }, + // 获取申请信息 getInfo() { this.$axios.post("/platform/proposal/common/proposalInfo", {id: this.row.id}).then((res) => { @@ -110,7 +117,6 @@ const H5_PROPOSAL_INFO_COMPONENT = { // 查看提案 openView(id) { - this.viewDialogVisible = true this.$nextTick(() => { this.$refs.infoDialogRef.onOpen(id) }) diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/delegation/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/delegation/index.html index 611dc468..17ff60ce 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/delegation/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/delegation/index.html @@ -5,86 +5,73 @@ layout("/layouts/platform_h5.html"){ - + - - - + + + - - -
-
- - - - - - - - - - - 查看 - - 审核 - - - 撤回 - - -
+ + + + - - - - -
- -
-
{{formData.processInstanceNodeName}}
-
- - - - -
-
- 退回重新填写 - 建议撤销 - 同意 -
+ +
+
{{formData.taskName}}
+ + + +
+ 退回 + 不同意 + 同意
- +
+
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/index.html index 7378380c..ba0c4a4d 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/index.html @@ -57,14 +57,8 @@ layout("/layouts/platform_h5.html"){ - - - - -
- -
-
+ +
- - diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html index caa05971..ce69904f 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html @@ -5,23 +5,26 @@ layout("/layouts/platform_h5.html"){ - + - + - - - - - -
- -
-
{{formData.processInstanceNodeName}}
-
- - - -
-
- 拒绝 - 同意 -
+ +
+
{{formData.taskName}}
+ + + + + + +
+ 不同意 + 同意
- +
+
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/index.html new file mode 100644 index 00000000..266659e8 --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/index.html @@ -0,0 +1,257 @@ + +
+ + + + + + + + + + + + + + + + + + +
+
{{formData.taskName}}
+ + + + + + + + + + + + + + + + +
+ 取消 + 提交 +
+
+
+ +
+ +