From 6815fb7f38909400eeeae800fb0811695de40695 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Mon, 24 Aug 2026 18:07:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E6=94=B9=E6=8F=90=E6=A1=88UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../transact/ProposalCaseCheckController.java | 9 - .../ProposalCommissionerController.java | 7 - .../ProposalDelegationController.java | 7 - .../ProposalFeedbackEvaluationController.java | 7 - .../transact/ProposalMineController.java | 6 - .../transact/ProposalPreAuditController.java | 7 - ...roposalSchoolLeaderApprovalController.java | 7 - .../transact/ProposalSecondedController.java | 6 - .../ProposalUnderTakeReplyController.java | 6 - ...ProposalUndertakeSuggestionController.java | 6 - .../ProposalViceDelegationController.java | 6 - ...5ProposalQueryComprehensiveController.java | 6 - .../dayofficework/tour/signup/index.html | 4 +- .../democratic/proposal/common/info.css | 158 ++++++ .../zhghh5/democratic/proposal/common/info.js | 34 +- .../democratic/proposal/common/task-popup.js | 130 +++++ .../proposal/query/comprehensive/index.html | 60 ++- .../proposal/query/comprehensive/info.html | 35 -- .../proposal/transact/caseCheck/index.html | 269 +--------- .../proposal/transact/caseCheck/info.html | 363 ------------- .../proposal/transact/commissioner/index.html | 167 +++++- .../proposal/transact/commissioner/info.html | 152 ------ .../proposal/transact/delegation/index.html | 269 +--------- .../proposal/transact/delegation/info.html | 122 ----- .../transact/feedbackEvaluation/index.html | 274 +--------- .../transact/feedbackEvaluation/info.html | 187 ------- .../proposal/transact/mine/index.html | 171 +++++- .../proposal/transact/mine/info.html | 36 -- .../proposal/transact/mine/inviteSeconder.js | 274 ++++++---- .../proposal/transact/preAudit/index.html | 269 +--------- .../proposal/transact/preAudit/info.html | 143 ----- .../transact/schoolLeaderApproval/index.html | 161 ++---- .../transact/schoolLeaderApproval/info.html | 107 ---- .../proposal/transact/seconded/index.html | 501 +++++++++--------- .../proposal/transact/seconded/info.html | 136 ----- .../proposal/transact/suggestion/index.html | 46 +- .../proposal/transact/suggestion/info.html | 118 ----- .../proposal/transact/unitReply/index.html | 282 +--------- .../proposal/transact/unitReply/info.html | 188 ------- .../proposal/transact/unitReply/transfer.js | 174 ++---- .../transact/viceDelegation/index.html | 59 ++- .../transact/viceDelegation/info.html | 36 -- .../proposal/transact/write/index.html | 69 ++- 43 files changed, 1398 insertions(+), 3676 deletions(-) create mode 100644 src/main/resources/views/platform/zhghh5/democratic/proposal/common/task-popup.js delete mode 100644 src/main/resources/views/platform/zhghh5/democratic/proposal/query/comprehensive/info.html delete mode 100644 src/main/resources/views/platform/zhghh5/democratic/proposal/transact/caseCheck/info.html delete mode 100644 src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/info.html delete mode 100644 src/main/resources/views/platform/zhghh5/democratic/proposal/transact/delegation/info.html delete mode 100644 src/main/resources/views/platform/zhghh5/democratic/proposal/transact/feedbackEvaluation/info.html delete mode 100644 src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/info.html delete mode 100644 src/main/resources/views/platform/zhghh5/democratic/proposal/transact/preAudit/info.html delete mode 100644 src/main/resources/views/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/info.html delete mode 100644 src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/info.html delete mode 100644 src/main/resources/views/platform/zhghh5/democratic/proposal/transact/suggestion/info.html delete mode 100644 src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/info.html delete mode 100644 src/main/resources/views/platform/zhghh5/democratic/proposal/transact/viceDelegation/info.html 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 9047969e..7581bcd9 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 @@ -65,15 +65,6 @@ public class ProposalCaseCheckController { 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(value = {"proposal.caseCheck", "h5.proposal.caseCheck"}, mode = SaMode.OR) @ApiOperation("分页列表") 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 85fd36f4..c4e11b0a 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,13 +49,6 @@ 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") public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) { 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 6282a2fe..2fc098f8 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,13 +67,6 @@ 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") @ApiOperation("分页列表") 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 fb7209cb..ed96fa89 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,13 +54,6 @@ 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") @ApiOperation("分页列表") 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 99b2631a..f517360f 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,12 +107,6 @@ 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 3bc7295e..498e08e2 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 @@ -58,13 +58,6 @@ public class ProposalPreAuditController { 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") @ApiOperation("分页列表") 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 f23a9a76..ef9e6101 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,13 +74,6 @@ 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") @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 5580bba8..b54cb81a 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,12 +88,6 @@ 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 e8cea18e..47e4a5d8 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,12 +76,6 @@ 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 5c945937..42252763 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,12 +62,6 @@ 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 cdd52f51..2a0d0028 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,12 +42,6 @@ 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 99783f3f..a9927f91 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,10 +19,4 @@ 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/views/platform/zhghh5/dayofficework/tour/signup/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/tour/signup/index.html index e7f56577..a71fc0d1 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/tour/signup/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/tour/signup/index.html @@ -166,7 +166,7 @@ layout("/layouts/platform_tour_signup_h5.html"){
- + @@ -57,11 +62,26 @@ layout("/layouts/platform_h5.html"){
+ +
+ +
+ +
+
+
+ diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/query/comprehensive/info.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/query/comprehensive/info.html deleted file mode 100644 index 6594ac22..00000000 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/query/comprehensive/info.html +++ /dev/null @@ -1,35 +0,0 @@ - - -
- - -
- - diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/caseCheck/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/caseCheck/index.html index 4fc4da73..31d0731f 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/caseCheck/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/caseCheck/index.html @@ -229,6 +229,9 @@ layout("/layouts/platform_h5.html"){ } } +
@@ -305,15 +308,15 @@ layout("/layouts/platform_h5.html"){ @@ -321,11 +324,15 @@ layout("/layouts/platform_h5.html"){
+ - diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/index.html index 8b36e468..a45fbb13 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/index.html @@ -1,8 +1,11 @@ +
- + +
+ +
+ +
+ + + +
+

+ 审批意见 + * +

+ +
+
+
+ 取消 + 提交 +
+
+
+
+
+
+ + + + + + + + +
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/info.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/info.html deleted file mode 100644 index 1799c1cc..00000000 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/info.html +++ /dev/null @@ -1,152 +0,0 @@ - - -
- - -
-
提案委员会成员意见
- - - - - - - - - - -
- 取消 - 提交 -
-
-
-
- - 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 c538d284..f0f6e344 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 @@ -229,6 +229,9 @@ layout("/layouts/platform_h5.html"){ } } +
@@ -303,15 +306,15 @@ layout("/layouts/platform_h5.html"){ @@ -319,12 +322,15 @@ layout("/layouts/platform_h5.html"){
- + - diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/feedbackEvaluation/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/feedbackEvaluation/index.html index 8524ab1f..8dd647fc 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/feedbackEvaluation/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/feedbackEvaluation/index.html @@ -229,6 +229,9 @@ layout("/layouts/platform_h5.html"){ } } +
+
- 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 0d84f8fe..16e1bea1 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 @@ -2,6 +2,8 @@ layout("/layouts/platform_h5.html"){ #-->
- +
@@ -338,27 +390,27 @@ layout("/layouts/platform_h5.html"){ @@ -366,18 +418,49 @@ layout("/layouts/platform_h5.html"){
- + +
+ + +
+ +
+
+
+ + +
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/info.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/info.html deleted file mode 100644 index 3d06b2cd..00000000 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/info.html +++ /dev/null @@ -1,36 +0,0 @@ - - -
- - -
- - diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/inviteSeconder.js b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/inviteSeconder.js index ad495885..cdc9b4ab 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/inviteSeconder.js +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/inviteSeconder.js @@ -1,62 +1,101 @@ const PROPOSAL_INVITE_SECONDER_COMPONENT = { - template: ` - - - - - - - - - - - - {{item.userName}} - ({{item.loginName}}) - - - {{item.unitName}} - - - - -
- - 邀请 -
-
- -
- 暂无附议人插画 -
暂无附议人
-
- {{ isInvite === "1" ? "当前暂无已邀请的附议人" : "当前暂无可邀请的附议人" }} -
+ template: /*language=HTML*/ ` + + + + + + + + + + + + + + + + {{item.userName}}({{item.loginName}}) + + + {{item.unitName}} + + + + + +
+ + + + 邀请 +
- - `, +
+ + +
+ 暂无附议人插画 +
暂无附议人
+
+ {{ isInvite === "1" ? "当前暂无已邀请的附议人" : "当前暂无可邀请的附议人" }} +
+
+ + + +
+ `, + props: { + visible: { + type: Boolean, + default: false + }, + confirmVisible: { + type: Boolean, + default: false + } + }, data() { return { - visible: false, secondedNum: 0, record: {}, tableData: [], @@ -71,72 +110,86 @@ const PROPOSAL_INVITE_SECONDER_COMPONENT = { }, config: {}, isInvite: "0", - tableSelection: [] + tableSelection: [], + confirmMessage: "" + } + }, + watch: { + visible(value) { + if (!value || !this.record.id) return + this.getConfig().then(() => { + this.pageData() + }) } }, methods: { - async onOpen(record) { - this.visible = true - this.record = record - await this.getConfig() - this.pageData() - - - }, - detail(id) { + /** + * 准备邀请附议弹框数据。 + * record 为列表当前提案对象,至少包含 id 和 sessionId;该方法只缓存提案并重置查询条件,无返回值。 + */ + prepare(record) { + this.$set(this, "record", record || {}) + this.$set(this, "isInvite", "0") + this.$set(this, "tableSelection", []) + this.$set(this.pageForm, "pageNumber", 1) + this.$set(this.pageForm, "isInvite", false) + this.$set(this.pageForm, "searchKeyword", null) }, + + // 校验勾选结果后打开确认 Dialog,实际提交在确认并回退 Dialog 历史层后执行。 invite() { if (this.tableSelection.length === 0) { - this.$toast("请先选择附议人后在点击邀请") + this.$toast("请先选择附议人后再点击邀请") return } + const userNames = [...new Set(this.tableSelection.map((item) => item.userName))] + this.$set(this, "confirmMessage", "您确定要邀请" + userNames.join("、") + "代表附议吗?") + this.$emit("open-confirm") + }, - const loginNames = [...new Set(this.tableSelection.map((s) => s.loginName))] - const userName = [...new Set(this.tableSelection.map((s) => s.userName))] - - console.log(this.tableSelection) - - this.$dialog.confirm({ - title: '提示', - message: "您确定要邀请" + userName.join("、") + "代表附议吗?", - }).then(() => { - this.$axios.post("/platform/proposal/mine/inviteSeconder", { - proposalId: this.record.id, - seconders: JSON.stringify(loginNames) - }).then((res) => { - if (res.code === 0) { - this.pageData() - this.$toast.success(res.msg) - this.tableSelection = [] - // this.visible = false - this.$emit("refresh", null) - } - }) - }).catch(() => { - + /** + * 提交邀请附议人。 + * 参数 proposalId 为当前提案主键,seconders 为已勾选人员工号数组;接口返回 Result,code 为 0 表示邀请成功。 + */ + submitInvite() { + const loginNames = [...new Set(this.tableSelection.map((item) => item.loginName))] + this.$axios.post("/platform/proposal/mine/inviteSeconder", { + proposalId: this.record.id, + seconders: JSON.stringify(loginNames) + }).then((res) => { + if (res.code === 0) { + this.pageData() + this.$toast.success(res.msg) + this.$set(this, "tableSelection", []) + this.$emit("refresh") + } }) }, + + /** + * 查询邀请附议人列表。 + * 参数包含当前提案 ID、届次 ID、邀请状态、关键词及分页条件;返回分页对象并更新列表和总数。 + */ pageData() { this.$axios.post("/platform/proposal/mine/listSeconder", { ...this.pageForm, sessionId: this.record.sessionId, proposalId: this.record.id + }).then((res) => { + if (res.code === 0) { + this.$set(this, "tableData", res.data.list || []) + this.$set(this.pageForm, "totalCount", res.data.totalCount || 0) + this.echoCheckBox() + } }) - .then((res) => { - if (res.code === 0) { - this.tableData = res.data.list - this.pageForm.totalCount = res.data.totalCount - this.echoCheckBox() - } - }) }, - // 翻页回显勾选 + // 翻页后回显当前已勾选的附议人。 echoCheckBox() { this.$nextTick(() => { this.tableData.forEach((item) => { - const checkboxRef = this.$refs['checkboxes' + item.loginName] - if (checkboxRef && this.tableSelection.map((s) => s.loginName).includes(item.loginName)) { + const checkboxRef = this.$refs["checkboxes" + item.loginName] + if (checkboxRef && this.tableSelection.map((selected) => selected.loginName).includes(item.loginName)) { checkboxRef[0].toggle() } }) @@ -144,24 +197,29 @@ const PROPOSAL_INVITE_SECONDER_COMPONENT = { }, doSearch() { - this.pageForm.pageNumber = 1 + this.$set(this.pageForm, "pageNumber", 1) this.pageData() }, - isInviteClick(index, title) { - this.pageForm.isInvite = index === "1" + isInviteClick(name) { + this.$set(this.pageForm, "isInvite", name === "1") this.doSearch() }, tableRowToggle(index) { - console.log(index) + if (this.pageForm.isInvite || index < 0) return }, - async getConfig() { - const {code, data} = await this.$axios.post("/platform/proposal/common/config") - if (code === 0) { - this.config = data - } + /** + * 查询提案附议配置。 + * 接口无业务参数,返回 ProposalConfig 配置对象;Promise 用于确保配置完成后再查询人员列表。 + */ + getConfig() { + return this.$axios.post("/platform/proposal/common/config").then((res) => { + if (res.code === 0) { + this.$set(this, "config", res.data || {}) + } + }) } } } diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/preAudit/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/preAudit/index.html index 742f7ee0..dd090341 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/preAudit/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/preAudit/index.html @@ -212,6 +212,9 @@ layout("/layouts/platform_h5.html"){ } } +
@@ -287,15 +290,15 @@ layout("/layouts/platform_h5.html"){ @@ -303,11 +306,15 @@ layout("/layouts/platform_h5.html"){
+
- diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/index.html index 2a38cbd6..a923b847 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/index.html @@ -1,131 +1,58 @@ +
- + - - - - - - - - + + + - - - - @@ -326,13 +371,75 @@ layout("/layouts/platform_h5.html"){
+ +
+ + +
+ +
+
+

+ 提案附议 + * +

+ + + + +
+
+ 不同意 + 同意 +
+
+
+
+
+
+ + + + diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/info.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/info.html deleted file mode 100644 index bca06262..00000000 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/info.html +++ /dev/null @@ -1,136 +0,0 @@ - - -
- - -
-
提案附议
- - - -
- 不同意 - 同意 -
-
-
-
- - diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/suggestion/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/suggestion/index.html index 9fa8b981..459e45bd 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/suggestion/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/suggestion/index.html @@ -7,9 +7,12 @@ layout("/layouts/platform_h5.html"){ height: 26px; } +
- + - -
+ +
+ +
@@ -76,14 +81,19 @@ layout("/layouts/platform_h5.html"){ +
- +
+
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/suggestion/info.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/suggestion/info.html deleted file mode 100644 index 42e2d48a..00000000 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/suggestion/info.html +++ /dev/null @@ -1,118 +0,0 @@ - - -
- - -
-
承办单位意见
- - - - - - - -
- 取消 - 提交 -
-
-
-
- - 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 index 336c20a1..acd5d1cf 100644 --- 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 @@ -229,6 +229,9 @@ layout("/layouts/platform_h5.html"){ } } +
@@ -304,22 +307,22 @@ layout("/layouts/platform_h5.html"){ @@ -328,10 +331,13 @@ layout("/layouts/platform_h5.html"){
- + +
- diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/transfer.js b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/transfer.js index 78e9bb72..1decf96d 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/transfer.js +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/transfer.js @@ -1,147 +1,49 @@ const transfer = { template: /*language=HTML*/ ` - -
- -
-
{{transferForm.code}}
-
{{transferForm.name}}
-
{{transferForm.delegationName}}
-
- - - - - - 请搜索需要转办的用户 - - - - -
- 取消 - 提交 + +
+ +
+
+
{{transferForm.code}}
+
{{transferForm.name}}
+
{{transferForm.delegationName}}
+
+
+
取消提交
- + + + 请搜索需要转办的用户 + + + +
`, data() { - return { - showTransferDialog: false, - transferForm: {}, - transferUserOptions: [], - searchKeyword: '', - showUserList: false, - keyword: '' + return {showTransferDialog:false,transferForm:{},transferUserOptions:[],searchKeyword:"",showUserList:false,keyword:"",confirmVisible:false,historyLayerPageKey:"proposal-unit-reply-transfer",unsubscribeHistoryLayer:null} + }, + computed: { + confirmMessage() { + const item=this.transferUserOptions.find((option) => option.id === this.transferForm.userId) + return "您确定要将" + (this.transferForm.name || "") + "提案转交给" + (item ? item.username : "") + "办理吗?" } }, methods: { - openTransfer(row) { - this.showTransferDialog = true - this.transferForm = { taskId: row.taskId, name: row.name, code: row.code, delegationName: row.delegationName } - this.searchKeyword = '' - }, - selectUser(item) { - this.transferForm.userId = item.id - this.searchKeyword = item.username - this.showUserList = false - }, - selectTransferUser(keyword) { - this.$axios.post("/platform/proposal/unitReply/selectViceUser", {keyword}).then(res => { - if (res.code === 0) this.transferUserOptions = res.data - }) - }, - - // 转办 - handleTransfer() { - if (!this.transferForm.userId) { - this.$toast('请选择转交用户') - return - } - - const transferUserName = this.transferUserOptions.find(item => item.id === this.transferForm.userId)?.username - const name = this.transferForm.name - - this.$dialog.confirm({ - title: '提示', - message: `您确定要将` + name + `提案转交给` + transferUserName + `办理吗?`, - confirmButtonText: '确定', - cancelButtonText: '取消' - }).then(() => { - this.$axios.post('/platform/proposal/unitReply/transfer', this.transferForm).then(res => { - if (res.code === 0) { - this.$toast.success(res.msg) - this.showTransferDialog = false - this.doSearch() - } - }) - }).catch(() => { - // 取消操作 - }) - } + syncLayers(stack) { this.$set(this,"showTransferDialog",stack.includes("transfer")); this.$set(this,"showUserList",stack.includes("user-list")); this.$set(this,"confirmVisible",stack.includes("confirm")) }, + openTransfer(row) { this.$set(this,"transferForm",{taskId:row.taskId,name:row.name,code:row.code,delegationName:row.delegationName}); this.$set(this,"searchKeyword",""); window.h5HistoryLayerManager.open("transfer") }, + closeTransfer() { window.h5HistoryLayerManager.close("transfer") }, + openUserList() { window.h5HistoryLayerManager.open("user-list") }, + closeUserList() { window.h5HistoryLayerManager.close("user-list") }, + closeConfirm() { window.h5HistoryLayerManager.close("confirm") }, + selectUser(item) { this.$set(this.transferForm,"userId",item.id); this.$set(this,"searchKeyword",item.username); this.closeUserList() }, + /** keyword 为姓名关键字,接口返回可转交用户数组。 */ + selectTransferUser(keyword) { this.$axios.post("/platform/proposal/unitReply/selectViceUser",{keyword:keyword}).then((res) => { if (res.code === 0) this.$set(this,"transferUserOptions",res.data || []) }) }, + handleTransfer() { if (!this.transferForm.userId) { this.$toast("请选择转交用户"); return } window.h5HistoryLayerManager.open("confirm") }, + /** 提交 taskId 和 userId 完成转办,成功后清理弹层并通知父列表刷新。 */ + confirmTransfer() { this.$axios.post("/platform/proposal/unitReply/transfer",this.transferForm).then((res) => { if (res.code === 0) { this.$toast.success(res.msg); window.h5HistoryLayerManager.closeAll(() => this.$emit("success")) } }) } }, - style: /*language=CSS*/ ` - .transfer-dialog { - height: 100%; - background: #fff; - padding: 16px 16px 65px; - } - - .proposal-info-card { - background: #f8f9fa; - border-radius: 8px; - padding: 16px; - margin-bottom: 16px; - } - - .proposal-info-content { - display: flex; - flex-direction: column; - gap: 12px; - } - - .info-item { - display: flex; - flex-direction: column; - gap: 4px; - } - - .info-item label { - font-size: 12px; - color: #969799; - } - - .info-item span { - font-size: 14px; - color: #323233; - font-weight: 500; - } - - .button-group { - position: fixed; - bottom: 0; - left: 0; - right: 0; - padding: 16px; - background: #fff; - border-top: 1px solid #ebedf0; - z-index: 10; - display: flex; - justify-content: space-between; - column-gap: 10px; - padding: 10px - } - - .cancel-btn, - .submit-btn { - - } - - .empty-tip { - text-align: center; - padding: 50px 16px; - color: #969799; - font-size: 14px; - } - ` + created() { window.h5HistoryLayerManager.ensureRegistered(this.historyLayerPageKey); this.$set(this,"unsubscribeHistoryLayer",window.h5HistoryLayerManager.subscribe((stack) => this.syncLayers(stack))) }, + beforeDestroy() { if (this.unsubscribeHistoryLayer) this.unsubscribeHistoryLayer(); if (window.h5HistoryLayerManager.pageKey === this.historyLayerPageKey) window.h5HistoryLayerManager.unregister(this.historyLayerPageKey) } } diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/viceDelegation/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/viceDelegation/index.html index b41b3cc3..8564b046 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/viceDelegation/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/viceDelegation/index.html @@ -1,8 +1,11 @@ +
- + + +
+ +
+ +
+
+
+
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/viceDelegation/info.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/viceDelegation/info.html deleted file mode 100644 index 3d06b2cd..00000000 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/viceDelegation/info.html +++ /dev/null @@ -1,36 +0,0 @@ - - -
- - -
- - diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/write/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/write/index.html index b88f953b..be43f26f 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/write/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/write/index.html @@ -353,7 +353,7 @@ layout("/layouts/platform_h5.html"){
-
@@ -409,7 +409,7 @@ layout("/layouts/platform_h5.html"){ @click="setVisibleState('showSessionPicker', true)" :rules="[{ required: true, message: '请选择所属教代会' }]" > - + - + - + - + - +
@@ -626,7 +626,9 @@ layout("/layouts/platform_h5.html"){ + close-on-click-action + :close-on-click-overlay="false" + @cancel="setVisibleState('noticeDialogVisible', false)">
@@ -670,10 +672,18 @@ layout("/layouts/platform_h5.html"){ showSuggestionUnitPicker: false, selectedSuggestionUnits: [], // 当前选中的承办单位 suggestionUnitSearchText: '', // 搜索文本 - filteredSuggestionUnits: [] // 过滤后的承办单位列表 + filteredSuggestionUnits: [], // 过滤后的承办单位列表 + historyLayerPageKey: "proposal-write" } }, methods: { + handlePageBack() { + if (window.h5HistoryLayerManager.stack.length) { + window.h5HistoryLayerManager.close(); + return; + } + historyBack(); + }, /** * 更新页面弹层显示状态,避免在模板事件中直接为 Vue 数据赋值。 * @param {String} stateName showSessionPicker、showSourcePicker 等弹层状态字段名。 @@ -681,7 +691,30 @@ layout("/layouts/platform_h5.html"){ * @return {void} 无返回值,仅更新当前页面状态。 */ setVisibleState(stateName, visible) { - this.$set(this, stateName, visible); + const layerName = { + showSessionPicker: "session-picker", + showSourcePicker: "source-picker", + showTypePicker: "type-picker", + showCommitteePicker: "committee-picker", + showSuggestionUnitPicker: "suggestion-unit-picker", + noticeDialogVisible: "notice" + }[stateName]; + if (visible) { + window.h5HistoryLayerManager.open(layerName); + return; + } + window.h5HistoryLayerManager.close(layerName); + }, + + registerHistoryLayers() { + window.h5HistoryLayerManager.register(this.historyLayerPageKey, (stack) => { + this.$set(this, "showSessionPicker", stack.includes("session-picker")); + this.$set(this, "showSourcePicker", stack.includes("source-picker")); + this.$set(this, "showTypePicker", stack.includes("type-picker")); + this.$set(this, "showCommitteePicker", stack.includes("committee-picker")); + this.$set(this, "showSuggestionUnitPicker", stack.includes("suggestion-unit-picker")); + this.$set(this, "noticeDialogVisible", stack.includes("notice")); + }); }, // 选择器确认事件 @@ -691,33 +724,33 @@ layout("/layouts/platform_h5.html"){ if (selectedOption) { this.$set(this.formData, 'sessionName', selectedOption.fullName); } - this.showSessionPicker = false; + this.setVisibleState("showSessionPicker", false); this.meetingChange(value.value); }, onSourceConfirm(value) { this.formData.source = value.value; this.$set(this.formData, 'sourceName', value.text); - this.showSourcePicker = false; + this.setVisibleState("showSourcePicker", false); }, onTypeConfirm(value) { this.$set(this.formData, 'typeId', value.value); this.$set(this.formData, 'typeName', value.text); - this.showTypePicker = false; + this.setVisibleState("showTypePicker", false); }, onSuggestionUnitConfirm() { // 将选中的承办单位保存到表单数据中 this.formData.suggestUnits = [...this.selectedSuggestionUnits]; - this.showSuggestionUnitPicker = false; + this.setVisibleState("showSuggestionUnitPicker", false); }, onSuggestionUnitCancel() { // 取消时恢复到之前的选择状态 this.selectedSuggestionUnits = [...this.formData.suggestUnits]; this.suggestionUnitSearchText = ''; - this.showSuggestionUnitPicker = false; + this.setVisibleState("showSuggestionUnitPicker", false); }, // 切换承办单位选择状态 @@ -750,7 +783,7 @@ layout("/layouts/platform_h5.html"){ onCommitteeConfirm(value) { this.formData.committeeId = value.value; this.$set(this.formData, 'committeeName', value.text); - this.showCommitteePicker = false; + this.setVisibleState("showCommitteePicker", false); }, // 保存草稿:校验当前表单后保存 ProposalInfo,接口成功时返回提案数据并回到我的提案。 @@ -1049,7 +1082,7 @@ layout("/layouts/platform_h5.html"){ } }); } else { - this.noticeDialogVisible = true; + this.setVisibleState("noticeDialogVisible", true); this.listOpenSession(false); // 设置用户信息 @@ -1063,10 +1096,14 @@ layout("/layouts/platform_h5.html"){ } }, created() { + this.registerHistoryLayers(); this.init(); this.listSuggestUnit(); this.getProposalConfig(); }, + beforeDestroy() { + window.h5HistoryLayerManager.unregister(this.historyLayerPageKey); + }, watch: { // 监听suggestUnitOptions变化,初始化过滤列表 suggestUnitOptions: {