From 3a43ab03528bbcc655a8763197f8794d9a54cebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A3=E4=BA=9B=E8=8A=B1=E5=84=BF?= <1156921458@qq.com> Date: Wed, 10 Sep 2025 08:41:32 +0800 Subject: [PATCH] .. --- ...cultHelpBranchUnionApprovalController.java | 6 + ...cultHelpSchoolUnionApprovalController.java | 5 + ...berApplyBranchUnionApprovalController.java | 6 + .../apply/MemberApplyController.java | 6 + .../apply/MemberApplyMineController.java | 7 + ...berApplySchoolUnionApprovalController.java | 5 + .../info/MemberInfoBoardController.java | 6 + .../MemberComprehensiveController.java | 6 + .../branchunionapproval/index.html | 185 ++++++-- .../staffbenefit/difficulthelp/common/info.js | 33 ++ .../difficulthelp/mine/index.html | 30 +- .../schoolunionapproval/index.html | 233 +++++++++- .../apply/branchunionapproval/index.html | 268 +++++------ .../staffmanage/member/apply/common/info.js | 182 ++++---- .../staffmanage/member/apply/mine/index.html | 30 +- .../apply/schoolunionapproval/index.html | 429 ++++++++---------- .../staffmanage/member/board/index.html | 3 +- .../member/common/mobileMemberInfo.js | 71 ++- .../staffmanage/member/query/index.html | 115 ++--- 19 files changed, 1004 insertions(+), 622 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpBranchUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpBranchUnionApprovalController.java index 32f1e6ba..4f95cc7d 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpBranchUnionApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpBranchUnionApprovalController.java @@ -52,6 +52,12 @@ public class DifficultHelpBranchUnionApprovalController { public void form() { } + @At + @SaCheckPermission("h5.difficultHelp.branchUnionApproval") + @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/branchunionapproval/index.html") + public void h5() { + } + @At @ApiOperation("困难补助分工会审核列表") diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpSchoolUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpSchoolUnionApprovalController.java index 4624de20..886b8b3b 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpSchoolUnionApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpSchoolUnionApprovalController.java @@ -52,6 +52,11 @@ public class DifficultHelpSchoolUnionApprovalController { public void form() { } + @At + @SaCheckPermission("h5.difficultHelp.schoolUnionApproval") + @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/schoolunionapproval/index.html") + public void h5() { + } @At @ApiOperation("困难补助校工会审核列表") diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java index 43c03a83..0f53e888 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java @@ -72,6 +72,12 @@ public class MemberApplyBranchUnionApprovalController { public void form() { } + @At + @Ok("beetl:/platform/zhghh5/staffmanage/member/apply/branchunionapproval/index.html") + @SaCheckPermission("h5.member.apply.branchUnionApproval") + public void h5() { + } + @At @ApiOperation("会员入会申请分工会审核列表") @SaCheckPermission("member.apply.branchUnionApproval") diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyController.java index 4ffafa63..5acd85bc 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyController.java @@ -58,6 +58,12 @@ public class MemberApplyController { public void index() { } + @At + @Ok("beetl:/platform/zhghh5/staffmanage/member/apply/submit/index.html") + @SaCheckPermission("h5.member.apply.submit") + public void h5() { + } + @At @ApiOperation("保存申请") diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyMineController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyMineController.java index 38c139fa..a1c4d235 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyMineController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyMineController.java @@ -53,6 +53,13 @@ public class MemberApplyMineController { } + @At + @Ok("beetl:/platform/zhghh5/staffmanage/member/apply/mine/index.html") + @SaCheckPermission("h5.member.apply.mine") + public void h5() { + } + + @At @ApiOperation("会员入会申请,我的申请列表") @SaCheckPermission("member.apply.mine") diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionApprovalController.java index afcc6bda..6006411c 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionApprovalController.java @@ -70,6 +70,11 @@ public class MemberApplySchoolUnionApprovalController { public void form() { } + @At + @Ok("beetl:/platform/zhghh5/staffmanage/member/apply/schoolunionapproval/index.html") + @SaCheckPermission("h5.member.apply.schoolunionapproval") + public void h5() { + } @At @ApiOperation("会员入会校工会审核列表") diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoBoardController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoBoardController.java index 59d41b16..924b12fa 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoBoardController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoBoardController.java @@ -45,6 +45,12 @@ public class MemberInfoBoardController { public void index() { } + @At + @Ok("beetl:/platform/zhghh5/staffmanage/member/board/index.html") + @SaCheckPermission("h5.member.info.board") + public void h5() { + } + /** * @return 今年和去年的会员数 */ diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/statistics/MemberComprehensiveController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/statistics/MemberComprehensiveController.java index 7d08614f..f590b0ae 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/statistics/MemberComprehensiveController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/statistics/MemberComprehensiveController.java @@ -43,6 +43,12 @@ public class MemberComprehensiveController { public void index() { } + @At + @Ok("beetl:/platform/zhghh5/staffmanage/member/query/index.html") + @SaCheckPermission("h5.member.query") + public void h5() { + } + @At @SaCheckPermission("member.statistics.comprehensive") public Result pageData(MemberStatisticsPageForm pageForm) { diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/branchunionapproval/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/branchunionapproval/index.html index 1f4de2b7..48a45c6f 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/branchunionapproval/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/branchunionapproval/index.html @@ -3,7 +3,7 @@ layout("/layouts/platform_h5.html"){ #-->
- + + + + + - - + + - - - - - - -
-
{{formData.taskName}}
- - - - -
- 退回到发起人 - 拒绝申请 - 同意申请 -
+ + + +
+
{{formData.taskName}}
+ + + +
+ 退回 + 拒绝 + 同意
- - +
+
diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/common/info.js b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/common/info.js index b96b299e..34e39f8e 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/common/info.js +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/common/info.js @@ -86,6 +86,7 @@ const INFO = { `, + dicts: ["PROCESS_TASK_SUBMIT_TYPE"], data() { return { visible: false, @@ -126,4 +127,36 @@ const INFO = { }) }, }, + style: /*language=CSS*/ ` + .column-cell { + flex-direction: column; + } + .family-table { + width: 100%; + max-width: 100%; + border-collapse: collapse; + table-layout: auto; + text-align: center; + font-family: 'Arial', sans-serif; + margin: 20px 0; + } + .table-header { + background-color: gray; + color: white; + font-weight: bold; + text-transform: uppercase; + } + .table-row { + background-color: #f9f9f9; + transition: background-color 0.3s; + } + .table-row:hover { + background-color: #f1f1f1; + } + .table-cell { + padding: 10px 20px; + border: 1px solid #ddd; + text-align: center; + } + ` } diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/mine/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/mine/index.html index 96bcfc18..2b5a899d 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/mine/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/mine/index.html @@ -24,8 +24,8 @@ layout("/layouts/platform_h5.html"){ - - + + - - - - - - - + +
+ diff --git a/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/branchunionapproval/index.html b/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/branchunionapproval/index.html index d99b5162..557d2670 100644 --- a/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/branchunionapproval/index.html +++ b/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/branchunionapproval/index.html @@ -18,51 +18,52 @@ layout("/layouts/platform_h5.html"){ -
- -
-
- {{row.loginName}} - {{row.userName}} - {{row.unionName}} - {{row.unitName}} - {{row.userState}} - {{row.personType}} - - - -
- -
-
- -
+ + + + - - - - - -
-
{{formData.taskName}}
- - - - -
- 退回到发起人 - 拒绝申请 - 同意申请 -
-
-
-
+ +
+
{{formData.taskName}}
+ + + +
+ 退回 + 拒绝 + 同意 +
+
+
@@ -80,8 +75,6 @@ layout("/layouts/platform_h5.html"){ }, unionList: [], unitList: [], - - infoShow: false } }, components: { @@ -89,18 +82,15 @@ layout("/layouts/platform_h5.html"){ }, methods: { historyBack, - + onView(row) { - this.infoShow = true - this.$nextTick(() => { - this.$refs.infoRef.onOpen(row) - }) + this.$refs.infoRef.onOpen(row) }, - + onEdit(row) { this.$pjaxReplace('/platform/h5/member/apply/submit?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id) }, - + onRevoke(row) { this.$dialog.confirm({ title: "提示", @@ -114,7 +104,7 @@ layout("/layouts/platform_h5.html"){ }) }) }, - + onDelete(id) { this.$dialog.confirm({ title: "提示", @@ -132,7 +122,7 @@ layout("/layouts/platform_h5.html"){ }) }) }, - + doSearch() { this.pageForm.pageNumber = 1 this.pageForm.totalCount = 0 diff --git a/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/schoolunionapproval/index.html b/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/schoolunionapproval/index.html index 2aa5dc78..41f5f6fe 100644 --- a/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/schoolunionapproval/index.html +++ b/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/schoolunionapproval/index.html @@ -3,238 +3,211 @@ layout("/layouts/platform_h5.html"){ #-->
- - - - - - - - + + + + + + + -
- -
-
- {{row.loginName}} - {{row.userName}} - {{row.unionName}} - {{row.unitName}} - {{row.userState}} - {{row.personType}} - - - -
- -
-
- -
+ + + + - - - - - -
-
{{formData.taskName}}
- - - - -
- 退回到发起人 - 拒绝申请 - 同意申请 -
-
-
-
+ +
+
{{formData.taskName}}
+ + + +
+ 退回 + 拒绝 + 同意 +
+
+
- + -
- -
-
- - - - - - - - 查看 - -
+ + + + +
总人数:{{pageForm.totalCount}}人 @@ -64,11 +60,8 @@ layout("/layouts/platform_h5.html"){ unionId: "", unitId: "" }, - tableData: [], unionList: [], unitList: [], - tableLoading: false, - tableFinished: false, userId: "", infoShow: false @@ -79,6 +72,11 @@ layout("/layouts/platform_h5.html"){ }, methods: { historyBack, + + onReady() { + this.doSearch() + }, + viewInfo(row) { this.userId = row.id this.infoShow = true @@ -89,63 +87,46 @@ layout("/layouts/platform_h5.html"){ this.doSearch() }, doSearch() { - this.pageForm.pageNumber = 1 - this.tableData = [] - this.finished = false - this.pageData() - }, - pageData() { - this.tableLoading = true - this.$axios.post("/platform/member/info/group/pageData", {pageForm: JSON.stringify(this.pageForm)}).then((resp) => { - this.tableData = this.tableData.concat(resp.data.list) - this.pageForm.totalCount = resp.data.totalCount - if (this.tableData.length >= this.pageForm.totalCount) { - this.tableFinished = true - } else { - this.pageForm.pageNumber++ - } - this.tableLoading = false + this.$nextTick(() => { + this.pageForm.pageNumber = 1 + this.pageForm.totalCount = 0 + this.$refs.tableListRef.doSearch() }) }, - initUnion() { + async initUnion() { const hasAdmin = this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"]) const unionId = hasAdmin ? null : this.$store.state.user.union.id - this.$businessTool.listUnion(unionId).then((data) => { - this.unionList = data - this.unionList.forEach((v) => { - v.text = v.name - v.value = v.id - }) - if (hasAdmin) { - this.unionList.unshift({text: "全部工会", value: null}) - } - if (this.unionList && this.unionList.length > 0) { - this.$set(this.pageForm, "unionId", this.unionList[0].value) - } + this.unionList = await this.$businessTool.listUnion(unionId) + this.unionList.forEach((v) => { + v.text = v.name + v.value = v.id }) + if (hasAdmin) { + this.unionList.unshift({ text: "全部工会", value: null }) + } + if (this.unionList && this.unionList.length > 0) { + this.$set(this.pageForm, "unionId", this.unionList[0].value) + } }, - flushUnits() { + async flushUnits() { const hasAdmin = this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"]) const unionId = hasAdmin ? this.pageForm.unionId : this.$store.state.user.union.id - this.$businessTool.listUnit(unionId).then((data) => { - this.unitList = data - this.unitList.forEach((v) => { - v.text = v.name - v.value = v.id - }) - if (hasAdmin && !this.pageForm.unionId) { - this.unitList.unshift({text: "全部单位", value: null}) - } - if (this.unitList && this.unitList.length > 0) { - this.$set(this.pageForm, "unitId", this.unitList[0].value) - } + this.unitList = await this.$businessTool.listUnit(unionId) + this.unitList.forEach((v) => { + v.text = v.name + v.value = v.id }) - } + if (hasAdmin && !this.pageForm.unionId) { + this.unitList.unshift({ text: "全部单位", value: null }) + } + if (this.unitList && this.unitList.length > 0) { + this.$set(this.pageForm, "unitId", this.unitList[0].value) + } + }, }, created() { this.initUnion() this.flushUnits() - this.pageData() } })