diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeMineController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeMineController.java
index 18719775..8dbe211e 100644
--- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeMineController.java
+++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeMineController.java
@@ -1,6 +1,7 @@
package com.budwk.app.zhgh.staffmanage.member.controller.change;
import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.annotation.SLog;
import com.budwk.app.base.constant.RoleConstant;
@@ -147,7 +148,7 @@ public class MemberChangeMineController {
@At
@ApiOperation("根据id查询变更记录")
- @SaCheckPermission("member.change.mine")
+ @SaCheckPermission(value = {"member.change.mine", "member.change.unionGroup.audit"}, mode = SaMode.OR)
public Result findMemberChangeRecord(String id){
MemberChangeRecord record = dao.fetch(MemberChangeRecord.class, id);
NutMap nutMap = Lang.obj2nutmap(record);
diff --git a/src/main/resources/views/platform/sys/union/index.html b/src/main/resources/views/platform/sys/union/index.html
index accf5fc4..61029c38 100644
--- a/src/main/resources/views/platform/sys/union/index.html
+++ b/src/main/resources/views/platform/sys/union/index.html
@@ -20,7 +20,15 @@ layout("/layouts/platform.html"){
@node-click="treeNodeClick"
:filter-node-method="filterNode"
highlight-current
- >
+ >
+
+
+
+
+ {{node.label}}
+
+
+
diff --git a/src/main/resources/views/platform/sys/unit/index.html b/src/main/resources/views/platform/sys/unit/index.html
index 22ac05fc..172ae8fd 100644
--- a/src/main/resources/views/platform/sys/unit/index.html
+++ b/src/main/resources/views/platform/sys/unit/index.html
@@ -21,7 +21,15 @@ layout("/layouts/platform.html"){
@node-click="treeNodeClick"
:filter-node-method="filterNode"
highlight-current
- >
+ >
+
+
+
+
+ {{node.label}}
+
+
+
diff --git a/src/main/resources/views/platform/zhgh/activity/basic/settings/index.html b/src/main/resources/views/platform/zhgh/activity/basic/settings/index.html
index 2edf817c..33840388 100644
--- a/src/main/resources/views/platform/zhgh/activity/basic/settings/index.html
+++ b/src/main/resources/views/platform/zhgh/activity/basic/settings/index.html
@@ -20,7 +20,15 @@ layout("/layouts/platform.html"){
highlight-current
node-key="id"
ref="treeRef"
- >
+ >
+
+
+
+
+ {{node.label}}
+
+
+
diff --git a/src/main/resources/views/platform/zhgh/activity/basic/union/index.html b/src/main/resources/views/platform/zhgh/activity/basic/union/index.html
index b66c726f..d55312cc 100644
--- a/src/main/resources/views/platform/zhgh/activity/basic/union/index.html
+++ b/src/main/resources/views/platform/zhgh/activity/basic/union/index.html
@@ -18,7 +18,15 @@ layout("/layouts/platform.html"){
default-expand-all
highlight-current
ref="treeRef"
- >
+ >
+
+
+
+
+ {{node.label}}
+
+
+
diff --git a/src/main/resources/views/platform/zhgh/activity/basic/unit/index.html b/src/main/resources/views/platform/zhgh/activity/basic/unit/index.html
index 14737eb7..d472f6d2 100644
--- a/src/main/resources/views/platform/zhgh/activity/basic/unit/index.html
+++ b/src/main/resources/views/platform/zhgh/activity/basic/unit/index.html
@@ -19,7 +19,15 @@ layout("/layouts/platform.html"){
highlight-current
node-key="id"
ref="treeRef"
- >
+ >
+
+
+
+
+ {{node.label}}
+
+
+
diff --git a/src/main/resources/views/platform/zhgh/club/infoManage/manage/index.html b/src/main/resources/views/platform/zhgh/club/infoManage/manage/index.html
index d8968617..5c69ce2c 100644
--- a/src/main/resources/views/platform/zhgh/club/infoManage/manage/index.html
+++ b/src/main/resources/views/platform/zhgh/club/infoManage/manage/index.html
@@ -20,7 +20,15 @@ layout("/layouts/platform.html"){
@node-click="treeNodeClick"
:filter-node-method="filterNode"
highlight-current
- >
+ >
+
+
+
+
+ {{node.label}}
+
+
+
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/honor/basic/index.html b/src/main/resources/views/platform/zhgh/dayofficework/honor/basic/index.html
index bebe6ec3..ff653da2 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/honor/basic/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/honor/basic/index.html
@@ -24,7 +24,16 @@ layout("/layouts/platform.html"){
highlight-current
node-key="id"
ref="treeRef"
- >
+ >
+
+
+
+
+ {{node.label}}
+
+
+
+
@@ -36,8 +45,8 @@ layout("/layouts/platform.html"){
新建基础类型
-
-
+
+
-
-
@@ -69,9 +69,9 @@ layout("/layouts/platform.html"){
-
-
+
+
-
-
@@ -69,9 +69,9 @@ layout("/layouts/platform.html"){
-
-
+
+
-
-
-
+
-
+
+ placeholder="请选择单位" v-model="pageForm.unitId">
-
+
-
+
diff --git a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/preparatoryGroupPush/index.html b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/preparatoryGroupPush/index.html
index 76a0c9c1..d3c80c4e 100644
--- a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/preparatoryGroupPush/index.html
+++ b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/preparatoryGroupPush/index.html
@@ -28,14 +28,14 @@ layout("/layouts/platform.html"){
-
-
@@ -69,9 +69,9 @@ layout("/layouts/platform.html"){
-
+
-
+
+ >
+
+
+
+
+ {{node.label}}
+
+
+
`,
data() {
diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/collect/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/collect/index.html
index 131a56e4..a394ba1c 100644
--- a/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/collect/index.html
+++ b/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/collect/index.html
@@ -180,6 +180,10 @@ layout("/layouts/platform.html"){
this.$set(this.pageForm, 'year', currentYear);
// 获取当前年份的项目列表
this.getProjectByYear();
+ //工会查询
+ this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+ //单位查询
+ this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
}
})
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/childManage/manage/index.html b/src/main/resources/views/platform/zhgh/staffmanage/childManage/manage/index.html
index 624bdda1..24f694e3 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/childManage/manage/index.html
+++ b/src/main/resources/views/platform/zhgh/staffmanage/childManage/manage/index.html
@@ -38,7 +38,7 @@ layout("/layouts/platform.html"){
-
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js
index 442bc013..d258e01b 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js
@@ -50,7 +50,8 @@ const INFO = {
-
+
+