From aa516ab4e763802fbb4a06ca78ffa0961e8e196c Mon Sep 17 00:00:00 2001 From: = <=> Date: Tue, 30 Sep 2025 13:46:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8B=AC=E7=94=9F=E5=AD=90=E5=A5=B3=E7=88=B6?= =?UTF-8?q?=E6=AF=8D=E9=80=80=E4=BC=91bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DsznfmtxSchoolAuditController.java | 2 +- .../cadreTraining/schoolAudit/index.html | 2 +- .../staffbenefit/dsznfmtx/apply/index.html | 16 +++-- .../staffbenefit/dsznfmtx/mine/index.html | 2 +- .../dsznfmtx/schoolAudit/index.html | 2 +- .../dsznfmtx/unionAudit/index.html | 25 +++++-- .../maternityLeave/schoolAudit/index.html | 2 +- .../maternityLeave/unionAudit/index.html | 65 ++++++++++++------- .../unionReimburse/review/index.html | 20 ++++++ .../dsznfmtx/schoolAudit/index.html | 20 ++++++ .../dsznfmtx/unionAudit/index.html | 20 ++++++ .../maternityLeave/schoolAudit/index.html | 20 ++++++ .../maternityLeave/unionAudit/index.html | 20 ++++++ 13 files changed, 174 insertions(+), 42 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxSchoolAuditController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxSchoolAuditController.java index a2a022b6..ad275b7c 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxSchoolAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxSchoolAuditController.java @@ -53,7 +53,7 @@ public class DsznfmtxSchoolAuditController { @At @ApiOperation("分页查询") - @SaCheckPermission(value = {"dsznfmtx.unionAudit", "h5.dsznfmtx.unionAudit"}, mode = SaMode.OR) + @SaCheckPermission(value = {"dsznfmtx.schoolAudit", "h5.dsznfmtx.schoolAudit"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, boolean approval, Integer year, diff --git a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html index 9a622cfd..d97327e0 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html @@ -170,7 +170,7 @@ layout("/layouts/platform.html"){ cancelButtonText: "取消", type: "warning" }).then(() => { - this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => { + this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => { if (res.code === 0) { this.$message.success(res.msg) this.pageData() diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html index 0fc9973f..d4e346d0 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html @@ -4,7 +4,7 @@ layout("/layouts/platform.html"){
- + @@ -106,20 +106,21 @@ layout("/layouts/platform.html"){ - - + + - - + + + @@ -349,6 +350,7 @@ layout("/layouts/platform.html"){ unionName: union.name, sex: sex, birthday: birthday, + loverSex: sex === '男' ? '女' : '男' } } } diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/mine/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/mine/index.html index 1c62f3ea..a30f7d17 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/mine/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/mine/index.html @@ -34,7 +34,7 @@ layout("/layouts/platform.html"){ 编辑 撤回 - 删除 + 删除 diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/schoolAudit/index.html index 2ef69174..98ef5480 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/schoolAudit/index.html @@ -173,7 +173,7 @@ layout("/layouts/platform.html"){ cancelButtonText: "取消", type: "warning" }).then(() => { - this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => { + this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => { if (res.code === 0) { this.$message.success(res.msg) this.pageData() diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/unionAudit/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/unionAudit/index.html index 791a03e8..1e378bdd 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/unionAudit/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/unionAudit/index.html @@ -18,6 +18,7 @@ layout("/layouts/platform.html"){ + @@ -150,7 +152,7 @@ layout("/layouts/platform.html"){ cancelButtonText: "取消", type: "warning" }).then(() => { - this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => { + this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => { if (res.code === 0) { this.$message.success(res.msg) this.pageData() @@ -181,10 +183,23 @@ layout("/layouts/platform.html"){ }, created() { this.pageData() - //工会查询 - this.$businessTool.listUnion().then((res) => (this.unionOptions = res)) - //单位查询 - this.$businessTool.listUnit().then((res) => (this.unitOptions = res)) + // 根据用户角色加载相应的工会和单位数据 + if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) { + this.$businessTool.listUnion().then((data) => { + this.unionOptions = data || [] + }) + this.$businessTool.listUnit().then((data) => { + this.unitOptions = data || [] + }) + } else if (this.$auth.hasRole("BRANCH_UNION_CHAIRMAN")) { + const userUnionId = this.$store.state.user.union.id + this.$businessTool.listUnion(userUnionId).then((data) => { + this.unionOptions = data ? [data] : [] + }) + this.$businessTool.listUnit(userUnionId).then((data) => { + this.unitOptions = data || [] + }) + } } }) diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/schoolAudit/index.html index 56ba5781..bb765613 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/schoolAudit/index.html @@ -151,7 +151,7 @@ layout("/layouts/platform.html"){ cancelButtonText: "取消", type: "warning" }).then(() => { - this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => { + this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => { if (res.code === 0) { this.$message.success(res.msg) this.pageData() diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/unionAudit/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/unionAudit/index.html index 483e5568..da6b0ea8 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/unionAudit/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/unionAudit/index.html @@ -18,26 +18,28 @@ layout("/layouts/platform.html"){ - - - - - - - - - - + @@ -151,7 +153,7 @@ layout("/layouts/platform.html"){ cancelButtonText: "取消", type: "warning" }).then(() => { - this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => { + this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => { if (res.code === 0) { this.$message.success(res.msg) this.pageData() @@ -182,10 +184,23 @@ layout("/layouts/platform.html"){ }, created() { this.pageData() - //工会查询 - this.$businessTool.listUnion().then((res) => (this.unionOptions = res)) - //单位查询 - this.$businessTool.listUnit().then((res) => (this.unitOptions = res)) + // 根据用户角色加载相应的工会和单位数据 + if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) { + this.$businessTool.listUnion().then((data) => { + this.unionOptions = data || [] + }) + this.$businessTool.listUnit().then((data) => { + this.unitOptions = data || [] + }) + } else if (this.$auth.hasRole("BRANCH_UNION_CHAIRMAN")) { + const userUnionId = this.$store.state.user.union.id + this.$businessTool.listUnion(userUnionId).then((data) => { + this.unionOptions = data ? [data] : [] + }) + this.$businessTool.listUnit(userUnionId).then((data) => { + this.unitOptions = data || [] + }) + } } }) diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html index 1ddeab88..c3d73de4 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html @@ -49,6 +49,10 @@ layout("/layouts/platform_h5.html"){ 审核
+
+ + 撤回 +
@@ -116,6 +120,22 @@ layout("/layouts/platform_h5.html"){ } }, methods: { + onRevoke(row) { + this.$dialog.confirm({ + title: '温馨提示', + message: '您确定要撤回吗？', + }).then(() => { + this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then(res => { + if (res.code === 0) { + this.$toast.success("提交成功") + this.doSearch() + this.infoShow = false + } + }) + }).catch(() => { + // on cancel + }); + }, handleTaskAction(val) { this.$refs.formRef.validate().then(() => { this.$dialog.confirm({ diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/schoolAudit/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/schoolAudit/index.html index 24745d5c..08c68e4b 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/schoolAudit/index.html @@ -41,6 +41,10 @@ layout("/layouts/platform_h5.html"){ 审核 +
+ + 撤回 +
@@ -185,6 +189,22 @@ layout("/layouts/platform_h5.html"){ console.error('获取申请数据失败:', error); }); }, + onRevoke(row) { + this.$dialog.confirm({ + title: '温馨提示', + message: '您确定要撤回吗？', + }).then(() => { + this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then(res => { + if (res.code === 0) { + this.$toast.success("提交成功") + this.doSearch() + this.infoShow = false + } + }) + }).catch(() => { + // on cancel + }); + }, // 执行任务操作 executeTaskAction(val) { diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/unionAudit/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/unionAudit/index.html index f037939a..1e2096d1 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/unionAudit/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/unionAudit/index.html @@ -41,6 +41,10 @@ layout("/layouts/platform_h5.html"){ 审核 +
+ + 撤回 +
@@ -108,6 +112,22 @@ layout("/layouts/platform_h5.html"){ } }, methods: { + onRevoke(row) { + this.$dialog.confirm({ + title: '温馨提示', + message: '您确定要撤回吗？', + }).then(() => { + this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then(res => { + if (res.code === 0) { + this.$toast.success("提交成功") + this.doSearch() + this.infoShow = false + } + }) + }).catch(() => { + // on cancel + }); + }, handleTaskAction(val) { this.$refs.formRef.validate().then(() => { this.$dialog.confirm({ diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/schoolAudit/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/schoolAudit/index.html index be0d9ee5..89a7396e 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/schoolAudit/index.html @@ -41,6 +41,10 @@ layout("/layouts/platform_h5.html"){ 审核 +
+ + 撤回 +
@@ -108,6 +112,22 @@ layout("/layouts/platform_h5.html"){ } }, methods: { + onRevoke(row) { + this.$dialog.confirm({ + title: '温馨提示', + message: '您确定要撤回吗？', + }).then(() => { + this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then(res => { + if (res.code === 0) { + this.$toast.success("提交成功") + this.doSearch() + this.infoShow = false + } + }) + }).catch(() => { + // on cancel + }); + }, handleTaskAction(val) { this.$refs.formRef.validate().then(() => { this.$dialog.confirm({ diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/unionAudit/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/unionAudit/index.html index 87334f18..6d42fe5b 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/unionAudit/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/unionAudit/index.html @@ -41,6 +41,10 @@ layout("/layouts/platform_h5.html"){ 审核 +
+ + 撤回 +
@@ -108,6 +112,22 @@ layout("/layouts/platform_h5.html"){ } }, methods: { + onRevoke(row) { + this.$dialog.confirm({ + title: '温馨提示', + message: '您确定要撤回吗？', + }).then(() => { + this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then(res => { + if (res.code === 0) { + this.$toast.success("提交成功") + this.doSearch() + this.infoShow = false + } + }) + }).catch(() => { + // on cancel + }); + }, handleTaskAction(val) { this.$refs.formRef.validate().then(() => { this.$dialog.confirm({