From 572c9b2df702f7aabd1fc69e04f50a2e14839b5c Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Tue, 23 Dec 2025 10:34:29 +0800 Subject: [PATCH] commit --- .../config/ProposalConfigUnitController.java | 14 ++++++++++ .../platform/js/mixin/initTableMixins.js | 26 +++++++++++++++++-- .../resources/views/layouts/platform_h5.html | 20 ++++++++++++++ .../resources/views/layouts/v4/home/user.js | 2 +- .../proposal/config/unit/index.html | 20 ++++++++++++-- .../democratic/proposal/config/unit/tree.js | 10 ++++++- .../proposal/senior/expediting/index.html | 7 +++++ .../proposal/transact/delegation/index.html | 8 +++++- .../views/platform/zhghh5/sys/home/todo.js | 2 +- 9 files changed, 101 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/config/ProposalConfigUnitController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/config/ProposalConfigUnitController.java index 1034f6e..61cf798 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/config/ProposalConfigUnitController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/config/ProposalConfigUnitController.java @@ -16,6 +16,7 @@ import com.budwk.app.sys.models.Sys_role; import com.budwk.app.sys.models.Sys_unit; import com.budwk.app.sys.models.Sys_user_role; import com.budwk.app.sys.services.SysRoleService; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.democratic.proposal.models.ProposalConfig; import com.budwk.app.zhgh.democratic.proposal.models.ProposalUndertake; import lombok.extern.slf4j.Slf4j; @@ -240,5 +241,18 @@ public class ProposalConfigUnitController { return Result.success(Map.of("allUsers", allUsers, "selectUserIds", selectUserIds)); } + @At + @SaCheckPermission("proposal.config.unit") + @Aop(TransAop.READ_COMMITTED) + @SLog(tag = "提案管理-承办单位管理", msg = "删除承办单位") + public Result delete(@Valid String id) { + // 删除承办单位表 + dao.delete(ProposalUndertake.class, id); + // 删除角色表中有关 + dao.clear(Sys_user_role.class, Cnd.where(Sys_user_role::getUnderTakeId, "=", id)); + + log.info("工号：{}, 姓名：{}, 删除了承办单位，Id等于：{}", SecurityUtil.getUserLoginname(), SecurityUtil.getUserUsername(), id); + return Result.success(); + } } diff --git a/src/main/resources/static/assets/platform/js/mixin/initTableMixins.js b/src/main/resources/static/assets/platform/js/mixin/initTableMixins.js index f038667..0c9c320 100644 --- a/src/main/resources/static/assets/platform/js/mixin/initTableMixins.js +++ b/src/main/resources/static/assets/platform/js/mixin/initTableMixins.js @@ -29,7 +29,9 @@ const initTableMixins = { dialogFormVisible: false, viewData: {}, - viewDialogVisible: false + viewDialogVisible: false, + + _approvalInitialized: false } }, methods: { @@ -95,6 +97,26 @@ const initTableMixins = { title: "错误", message: msg }) + }, + initApprovalFromUrl() { + if (this._approvalInitialized) return; + + if (!this.pageForm) { + return; + } + + // 从 URL 读取 approval 参数（适用于独立页面） + const urlParams = new URLSearchParams(window.location.search); + const approvalParam = urlParams.get('tab'); + + if (approvalParam !== null) { + this.$set(this.pageForm, 'approval', approvalParam === 'done') + this.$set(this.pageForm, 'isAudit', approvalParam === 'done') + this._approvalInitialized = true; + } } - } + }, + created() { + this.initApprovalFromUrl(); + }, } diff --git a/src/main/resources/views/layouts/platform_h5.html b/src/main/resources/views/layouts/platform_h5.html index 26d26d4..6e0596c 100644 --- a/src/main/resources/views/layouts/platform_h5.html +++ b/src/main/resources/views/layouts/platform_h5.html @@ -172,6 +172,26 @@ historyBack: function(func = ()=>{}) { historyBack(func); } + }, + created() { + // 只处理有 pageForm 且 pageForm 有 approval 字段的组件 + if ( + this.pageForm && + typeof this.pageForm === 'object' && + ('approval' in this.pageForm || 'isAudit' in this.pageForm) + ) { + // 从 URL 查询参数中读取 approval + const urlParams = new URLSearchParams(window.location.search); + const approvalParam = urlParams.get('tab'); + + if (approvalParam === 'done') { + this.$set(this.pageForm, 'approval', true); + this.$set(this.pageForm, 'isAudit', true); + } else if (approvalParam === 'todo') { + this.$set(this.pageForm, 'approval', false); + this.$set(this.pageForm, 'isAudit', false); + } + } } }) diff --git a/src/main/resources/views/layouts/v4/home/user.js b/src/main/resources/views/layouts/v4/home/user.js index ba5c538..7b12800 100644 --- a/src/main/resources/views/layouts/v4/home/user.js +++ b/src/main/resources/views/layouts/v4/home/user.js @@ -258,7 +258,7 @@ const user = { this.$message.warning("当前流程没有配置地址") return } - window.open(formKey + "?taskId=" + taskId + "bizId=" + businessNo + "taskKey=" + taskKey) + window.open(formKey + "?taskId=" + taskId + "bizId=" + businessNo + "taskKey=" + taskKey + "&tab=" + this.activeTab) }, getRoleNames() { $.post("/platform/sys/role/getRoleNames").then(res => { diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/index.html index a622fb3..d207277 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/index.html @@ -33,7 +33,7 @@ layout("/layouts/platform.html"){ @@ -85,7 +85,23 @@ layout("/layouts/platform.html"){ this.$refs.treeRef.listTree() } }) - } + }, + + onDelete (row) { + this.$confirm("您确定要删除吗？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "info" + }).then(() => { + $.post(loc() + "/delete", { id: row.id }).then((res) => { + if (res.code === 0) { + this.$message.success(res.msg) + this.doSearch() + this.$refs.treeRef.listTree() + } + }) + }) + }, }, created() { this.pageData() diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/tree.js b/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/tree.js index 48e2b48..5af6a68 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/tree.js +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/tree.js @@ -36,13 +36,21 @@ const TREE_COMPONENT = { treeData: [] } }, + watch: { + name(val) { + this.$refs.treeRef.filter(val) + } + }, methods: { treeNodeClick(data, node) { this.currentTreeData = data this.currentTreeNode = node this.$emit("node-click", data, node) }, - filterNode() {}, + filterNode(value, data, node) { + if (!value) return true + return data.name.indexOf(value) !== -1 + }, listTree() { this.$axios.post("/platform/proposal/config/unit/tree").then((res) => { if (res.code === 0) { diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/expediting/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/expediting/index.html index d7fc914..2b8e298 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/expediting/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/expediting/index.html @@ -204,6 +204,13 @@ layout("/layouts/platform.html"){ async meetingChange(val) { this.doSearch() }, + listDelegation() { + this.$axios.post("/platform/proposal/common/listDelegation", {sessionId: this.pageForm.sessionId}).then((res) => { + if (res.code === 0) { + this.delegationOptions = res.data + } + }) + }, // 查询开启的教代会 listOpenSession() { this.$axios.post("/platform/proposal/common/listOpenSession").then((res) => { diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/delegation/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/delegation/index.html index cd32a16..367a609 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/delegation/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/delegation/index.html @@ -182,7 +182,13 @@ layout("/layouts/platform.html"){ this.formData.committeeId = null this.doSearch() }, - + listDelegation() { + this.$axios.post("/platform/proposal/common/listDelegation", {sessionId: this.pageForm.sessionId}).then((res) => { + if (res.code === 0) { + this.delegationOptions = res.data + } + }) + }, // 查询开启的教代会 listOpenSession() { this.$axios.post("/platform/proposal/common/listOpenSession").then((res) => { diff --git a/src/main/resources/views/platform/zhghh5/sys/home/todo.js b/src/main/resources/views/platform/zhghh5/sys/home/todo.js index d92bfe2..43e809f 100644 --- a/src/main/resources/views/platform/zhghh5/sys/home/todo.js +++ b/src/main/resources/views/platform/zhghh5/sys/home/todo.js @@ -182,7 +182,7 @@ const todo = { this.$toast("当前流程没有配置地址"); return; } - this.$pjaxReplace(h5FormKey + "?taskId=" + taskId + "bizId=" + businessNo + "taskKey=" + taskKey) + this.$pjaxReplace(h5FormKey + "?taskId=" + taskId + "bizId=" + businessNo + "taskKey=" + taskKey+ "&tab=" + this.activeTab) }, // 获取空状态文本