c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
=
2025-10-16 18:26:14 +08:00
parent 5c4a1de207
commit 049de15cd8
16 changed files with 103 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeMineController.java
+2 -1
View File
@@ -1,6 +1,7 @@
package com.budwk.app.zhgh.staffmanage.member.controller.change; package com.budwk.app.zhgh.staffmanage.member.controller.change;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaMode;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.annotation.SLog;
import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.constant.RoleConstant;
@@ -147,7 +148,7 @@ public class MemberChangeMineController {
@At @At
@ApiOperation("根据id查询变更记录") @ApiOperation("根据id查询变更记录")
@SaCheckPermission("member.change.mine") @SaCheckPermission(value = {"member.change.mine", "member.change.unionGroup.audit"}, mode = SaMode.OR)
public Result findMemberChangeRecord(String id){ public Result findMemberChangeRecord(String id){
MemberChangeRecord record = dao.fetch(MemberChangeRecord.class, id); MemberChangeRecord record = dao.fetch(MemberChangeRecord.class, id);
NutMap nutMap = Lang.obj2nutmap(record); NutMap nutMap = Lang.obj2nutmap(record);
src/main/resources/views/platform/sys/union/index.html
+9 -1
View File
@@ -20,7 +20,15 @@ layout("/layouts/platform.html"){
@node-click="treeNodeClick" @node-click="treeNodeClick"
:filter-node-method="filterNode" :filter-node-method="filterNode"
highlight-current highlight-current
></el-tree> >
<template slot-scope="{ node, data }">
<span class="el-tree-node__label">
<i class="el-icon-folder-opened" v-if="node.level===1"></i>
<i class="el-icon-folder" v-else></i>
{{node.label}}
</span>
</template>
</el-tree>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
src/main/resources/views/platform/sys/unit/index.html
+9 -1
View File
@@ -21,7 +21,15 @@ layout("/layouts/platform.html"){
@node-click="treeNodeClick" @node-click="treeNodeClick"
:filter-node-method="filterNode" :filter-node-method="filterNode"
highlight-current highlight-current
></el-tree> >
<template slot-scope="{ node, data }">
<span class="el-tree-node__label">
<i class="el-icon-folder-opened" v-if="node.level===1"></i>
<i class="el-icon-folder" v-else></i>
{{node.label}}
</span>
</template>
</el-tree>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
src/main/resources/views/platform/zhgh/activity/basic/settings/index.html
+9 -1
View File
@@ -20,7 +20,15 @@ layout("/layouts/platform.html"){
highlight-current highlight-current
node-key="id" node-key="id"
ref="treeRef" ref="treeRef"
></el-tree> >
<template slot-scope="{ node, data }">
<span class="el-tree-node__label">
<i class="el-icon-folder-opened" v-if="node.level===1"></i>
<i class="el-icon-folder" v-else></i>
{{node.label}}
</span>
</template>
</el-tree>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
src/main/resources/views/platform/zhgh/activity/basic/union/index.html
+9 -1
View File
@@ -18,7 +18,15 @@ layout("/layouts/platform.html"){
default-expand-all default-expand-all
highlight-current highlight-current
ref="treeRef" ref="treeRef"
></el-tree> >
<template slot-scope="{ node, data }">
<span class="el-tree-node__label">
<i class="el-icon-folder-opened" v-if="node.level===1"></i>
<i class="el-icon-folder" v-else></i>
{{node.label}}
</span>
</template>
</el-tree>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
src/main/resources/views/platform/zhgh/activity/basic/unit/index.html
+9 -1
View File
@@ -19,7 +19,15 @@ layout("/layouts/platform.html"){
highlight-current highlight-current
node-key="id" node-key="id"
ref="treeRef" ref="treeRef"
></el-tree> >
<template slot-scope="{ node, data }">
<span class="el-tree-node__label">
<i class="el-icon-folder-opened" v-if="node.level===1"></i>
<i class="el-icon-folder" v-else></i>
{{node.label}}
</span>
</template>
</el-tree>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
src/main/resources/views/platform/zhgh/club/infoManage/manage/index.html
+9 -1
View File
@@ -20,7 +20,15 @@ layout("/layouts/platform.html"){
@node-click="treeNodeClick" @node-click="treeNodeClick"
:filter-node-method="filterNode" :filter-node-method="filterNode"
highlight-current highlight-current
></el-tree> >
<template slot-scope="{ node, data }">
<span class="el-tree-node__label">
<i class="el-icon-folder-opened" v-if="node.level===1"></i>
<i class="el-icon-folder" v-else></i>
{{node.label}}
</span>
</template>
</el-tree>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
src/main/resources/views/platform/zhgh/dayofficework/honor/basic/index.html
+12 -3
View File
@@ -24,7 +24,16 @@ layout("/layouts/platform.html"){
highlight-current highlight-current
node-key="id" node-key="id"
ref="treeRef" ref="treeRef"
></el-tree> >
<template slot-scope="{ node, data }">
<span class="el-tree-node__label">
<i class="el-icon-folder-opened" v-if="node.level===1"></i>
<i class="el-icon-folder" v-else></i>
{{node.label}}
</span>
</template>
</el-tree>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
@@ -36,8 +45,8 @@ layout("/layouts/platform.html"){
新建基础类型 新建基础类型
</el-button> </el-button>
</table-tool> </table-tool>
<el-table :data="tableData" :height="tableHeight" border ref="table" size="small"> <el-table :data="tableData" :height="tableHeight" border ref="table" size="medium">
<el-table-column label="序号" sortable type="index"></el-table-column> <el-table-column label="序号" sortable type="index" width="50px"></el-table-column>
<el-table-column label="名称" prop="name"></el-table-column> <el-table-column label="名称" prop="name"></el-table-column>
<el-table-column label="代码" prop="code"></el-table-column> <el-table-column label="代码" prop="code"></el-table-column>
<el-table-column label="等级" prop="level" <el-table-column label="等级" prop="level"
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationOnePush/index.html
+4 -4
View File
@@ -28,14 +28,14 @@ layout("/layouts/platform.html"){
</el-select> </el-select>
</search-item> </search-item>
<search-item label="代表团" v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])"> <search-item label="代表团" v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])">
<el-select clearable filterable placeholder="代表团" style="width: 100%" <el-select clearable filterable placeholder="请选择代表团" style="width: 100%"
v-model="pageForm.delegationId"> v-model="pageForm.delegationId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in delegations"></el-option> v-for="item in delegations"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="分工会"> <search-item label="分工会">
<el-select clearable filterable placeholder="分工会" style="width: 100%" <el-select clearable filterable placeholder="请选择分工会" style="width: 100%"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unionOptions"></el-option> v-for="item in unionOptions"></el-option>
@@ -69,9 +69,9 @@ layout("/layouts/platform.html"){
<el-table-column label="姓名" prop="userName"></el-table-column> <el-table-column label="姓名" prop="userName"></el-table-column>
<el-table-column label="年龄" prop="age"></el-table-column> <el-table-column label="年龄" prop="age"></el-table-column>
<el-table-column label="性别" prop="sex"></el-table-column> <el-table-column label="性别" prop="sex"></el-table-column>
<el-table-column label="所属单位" prop="unitName"></el-table-column>
<el-table-column label="所属工会" prop="unionName"></el-table-column>
<el-table-column label="代表团" prop="delegationName"></el-table-column> <el-table-column label="代表团" prop="delegationName"></el-table-column>
<el-table-column label="所属工会" prop="unionName"></el-table-column>
<el-table-column label="所属单位" prop="unitName"></el-table-column>
<el-table-column label="操作" width="100" fixed="right"> <el-table-column label="操作" width="100" fixed="right">
<template scope="{row}"> <template scope="{row}">
<el-button <el-button
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/index.html
+4 -4
View File
@@ -28,14 +28,14 @@ layout("/layouts/platform.html"){
</el-select> </el-select>
</search-item> </search-item>
<search-item label="代表团" > <search-item label="代表团" >
<el-select clearable filterable placeholder="代表团" style="width: 100%" <el-select clearable filterable placeholder="请选择代表团" style="width: 100%"
v-model="pageForm.delegationId"> v-model="pageForm.delegationId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in delegations"></el-option> v-for="item in delegations"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="分工会"> <search-item label="分工会">
<el-select clearable filterable placeholder="分工会" style="width: 100%" <el-select clearable filterable placeholder="请选择分工会" style="width: 100%"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unionOptions"></el-option> v-for="item in unionOptions"></el-option>
@@ -69,9 +69,9 @@ layout("/layouts/platform.html"){
<el-table-column label="姓名" prop="userName"></el-table-column> <el-table-column label="姓名" prop="userName"></el-table-column>
<el-table-column label="年龄" prop="age"></el-table-column> <el-table-column label="年龄" prop="age"></el-table-column>
<el-table-column label="性别" prop="sex"></el-table-column> <el-table-column label="性别" prop="sex"></el-table-column>
<el-table-column label="所属单位" prop="unitName"></el-table-column>
<el-table-column label="所属工会" prop="unionName"></el-table-column>
<el-table-column label="代表团" prop="delegationName"></el-table-column> <el-table-column label="代表团" prop="delegationName"></el-table-column>
<el-table-column label="所属工会" prop="unionName"></el-table-column>
<el-table-column label="所属单位" prop="unitName"></el-table-column>
<el-table-column label="操作" width="100" fixed="right"> <el-table-column label="操作" width="100" fixed="right">
<template scope="{row}"> <template scope="{row}">
<el-button <el-button
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html
+7 -7
View File
@@ -35,22 +35,22 @@ layout("/layouts/platform.html"){
</el-select> </el-select>
</search-item> </search-item>
<search-item label="代表团" > <search-item label="代表团" >
<el-select clearable filterable placeholder="代表团" style="width: 100%" <el-select clearable filterable placeholder="请选择代表团" style="width: 100%"
v-model="pageForm.delegationId"> v-model="pageForm.delegationId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in delegations"></el-option> v-for="item in delegations"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属工会"> <search-item label="分工会">
<el-select clearable filterable placeholder="所属工会" style="width: 100%" <el-select clearable filterable placeholder="请选择分工会" style="width: 100%"
v-model="pageForm.unionId" @change="flushUnits" @clear="flushUnits"> v-model="pageForm.unionId" @change="flushUnits" @clear="flushUnits">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unionOptions"></el-option> v-for="item in unionOptions"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属单位"> <search-item label="单位">
<el-select clearable filterable style="width: 100%" <el-select clearable filterable style="width: 100%"
placeholder="请选择所属单位" v-model="pageForm.unitId"> placeholder="请选择单位" v-model="pageForm.unitId">
<el-option <el-option
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
@@ -87,9 +87,9 @@ layout("/layouts/platform.html"){
<el-table-column label="姓名" prop="userName"></el-table-column> <el-table-column label="姓名" prop="userName"></el-table-column>
<el-table-column label="年龄" prop="age"></el-table-column> <el-table-column label="年龄" prop="age"></el-table-column>
<el-table-column label="性别" prop="sex"></el-table-column> <el-table-column label="性别" prop="sex"></el-table-column>
<el-table-column label="所属单位" prop="unitName"></el-table-column> <el-table-column label="代表团" prop="delegationName"></el-table-column>
<el-table-column label="所属工会" prop="unionName"></el-table-column> <el-table-column label="所属工会" prop="unionName"></el-table-column>
<el-table-column label="所属代表团" prop="delegationName"></el-table-column> <el-table-column label="所属单位" prop="unitName"></el-table-column>
<el-table-column label="票数" prop="pushCount"></el-table-column> <el-table-column label="票数" prop="pushCount"></el-table-column>
<el-table-column label="操作" width="130" fixed="right"> <el-table-column label="操作" width="130" fixed="right">
<template scope="{row}"> <template scope="{row}">
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/preparatoryGroupPush/index.html
+4 -4
View File
@@ -28,14 +28,14 @@ layout("/layouts/platform.html"){
</el-select> </el-select>
</search-item> </search-item>
<search-item label="分工会"> <search-item label="分工会">
<el-select clearable filterable placeholder="分工会" style="width: 100%" <el-select clearable filterable placeholder="请选择分工会" style="width: 100%"
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in unionOptions"></el-option> v-for="item in unionOptions"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="代表团"> <search-item label="代表团">
<el-select clearable filterable placeholder="代表团" style="width: 100%" <el-select clearable filterable placeholder="请选择代表团" style="width: 100%"
v-model="pageForm.delegationId"> v-model="pageForm.delegationId">
<el-option :key="item.id" :label="item.name" :value="item.id" <el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in delegations"></el-option> v-for="item in delegations"></el-option>
@@ -69,9 +69,9 @@ layout("/layouts/platform.html"){
<el-table-column align="center" label="姓名" prop="userName"></el-table-column> <el-table-column align="center" label="姓名" prop="userName"></el-table-column>
<el-table-column align="center" label="年龄" prop="age"></el-table-column> <el-table-column align="center" label="年龄" prop="age"></el-table-column>
<el-table-column align="center" label="性别" prop="sex"></el-table-column> <el-table-column align="center" label="性别" prop="sex"></el-table-column>
<el-table-column align="center" label="所属单位" prop="unitName"></el-table-column> <el-table-column align="center" label="代表团" prop="delegationName"></el-table-column>
<el-table-column align="center" label="所属工会" prop="unionName"></el-table-column> <el-table-column align="center" label="所属工会" prop="unionName"></el-table-column>
<el-table-column align="center" label="所属代表团" prop="delegationName"></el-table-column> <el-table-column align="center" label="所属单位" prop="unitName"></el-table-column>
<el-table-column align="center" label="操作" width="100" fixed="right"> <el-table-column align="center" label="操作" width="100" fixed="right">
<template scope="{row}"> <template scope="{row}">
<el-button <el-button
src/main/resources/views/platform/zhgh/democratic/workercongress/delegation/tree.js
+9 -1
View File
@@ -16,7 +16,15 @@ const TREE_TEMPLATE = {
default-expand-all default-expand-all
@node-click="treeNodeClick" @node-click="treeNodeClick"
:filter-node-method="filterNode" :filter-node-method="filterNode"
></el-tree> >
<template slot-scope="{ node, data }">
<span class="el-tree-node__label">
<i class="el-icon-folder-opened" v-if="node.level===1"></i>
<i class="el-icon-folder" v-else></i>
{{node.label}}
</span>
</template>
</el-tree>
</el-card> </el-card>
`, `,
data() { data() {
src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/collect/index.html
+4
View File
@@ -180,6 +180,10 @@ layout("/layouts/platform.html"){
this.$set(this.pageForm, 'year', currentYear); this.$set(this.pageForm, 'year', currentYear);
// 获取当前年份的项目列表 // 获取当前年份的项目列表
this.getProjectByYear(); this.getProjectByYear();
//工会查询
this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
//单位查询
this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
} }
}) })
</script> </script>
src/main/resources/views/platform/zhgh/staffmanage/childManage/manage/index.html
+1 -1
View File
@@ -38,7 +38,7 @@ layout("/layouts/platform.html"){
</el-input> </el-input>
</search-item> </search-item>
<search-item label="性别"> <search-item label="性别">
<el-select clearable placeholder="请选择性别" <el-select clearable placeholder="请选择子女性别"
style="width: 100%;" style="width: 100%;"
v-model="pageForm.childrenSex"> v-model="pageForm.childrenSex">
<el-option label="男" value="男"></el-option> <el-option label="男" value="男"></el-option>
src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js
+2 -1
View File
@@ -50,7 +50,8 @@ const INFO = {
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item></el-descriptions-item> <el-descriptions-item></el-descriptions-item>
<template v-if="viewData.loginname == $store.state.user.loginname"> <!-- <template v-if="viewData.loginname == $store.state.user.loginname">-->
<template>
<el-descriptions-item label="家庭主要成员" :span="3"> <el-descriptions-item label="家庭主要成员" :span="3">
<el-table v-if="viewData.families&&viewData.families.length" <el-table v-if="viewData.families&&viewData.families.length"
:data="viewData.families" size="mini" border :data="viewData.families" size="mini" border