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

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-05-13 17:26:27 +08:00
parent 993f64a835
commit a116a0c61c
3 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/info/MemberGroupInfoController.java
+2 -1
View File
@@ -117,7 +117,8 @@ public class MemberGroupInfoController {
marriage,
education,
hometown,
nation
nation,
remark
from
user
$condition
src/main/resources/views/platform/member/info/GroupInfo.html
+3 -5
View File
@@ -295,19 +295,17 @@ layout("/layouts/platform.html"){
{prop: 'idcard', label: '身份证号', width: 170},
{prop: 'position', label: '职务', sortable: true, checked: 0},
{prop: 'jobTitle', label: '职称', sortable: true, checked: 0},
{prop: 'personType', label: '人员类型', sortable: true},
{prop: 'userState', label: '在职状态', sortable: true},
{prop: 'political', label: '政治面貌', sortable: true},
{prop: 'personType', label: '人员类型', sortable: true},
{prop: 'unionname', label: '所属工会', sortable: true},
{prop: 'unitname', label: '所属单位', sortable: true},
{prop: 'threeUnitName', label: '所在科室', sortable: true, checked: 0},
{prop: 'unionGroupName', label: '工会小组', sortable: true, checked: 0},
{prop: 'campusName', label: '所属校区', sortable: true, checked: 0},
{prop: 'marriage', label: '婚否', checked: 0},
{prop: 'education', label: '学历', checked: 0},
{prop: 'hometown', label: '籍贯', checked: 0},
{prop: 'nation', label: '民族', checked: 0},
{prop: 'memberNumber', label: '会员号', checked: 0},
{prop: 'political', label: '政治面貌', checked: 0},
{prop: 'remark', label: '备注', checked: 0},
],
personTypeOptions: [],
userStateOptions: [],
src/main/resources/views/platform/member/inquire/Integrate.html
+6 -10
View File
@@ -53,7 +53,7 @@ layout("/layouts/platform.html"){
display: none;
}
}
.monthStyle{
.el-date-picker__header--bordered {
display: none !important;
@@ -287,8 +287,8 @@ layout("/layouts/platform.html"){
</el-link>
</el-col>
</el-row>
<el-row type="flex" align="middle" class="query-row">
<el-col class="query-row-title">费用类型：</el-col>
<el-col class="query-row-content">
@@ -301,7 +301,7 @@ layout("/layouts/platform.html"){
@click="tagClick('personalStatus',item.name)">
{{ item.name }}
</el-tag>
<el-link type="danger"
v-if="personalStatusOptions.length&&pageForm.personalStatus.length"
:underline="false"
@@ -313,7 +313,7 @@ layout("/layouts/platform.html"){
</el-link>
</el-col>
</el-row>
<el-row type="flex" align="middle" class="query-row">
<el-col class="query-row-title">系统角色：</el-col>
<el-col class="query-row-content">
@@ -643,20 +643,16 @@ layout("/layouts/platform.html"){
{prop: 'position', label: '职务', sortable: true, checked: 0},
{prop: 'jobTitle', label: '职称', sortable: true, checked: 0},
{prop: 'userState', label: '在职状态', sortable: true},
{prop: 'personType', label: '人员类型', sortable: true},
{prop: 'preparedBy', label: '人员性质', sortable: true},
{prop: 'unionname', label: '所属工会', sortable: true},
{prop: 'unitname', label: '所属单位', sortable: true},
{prop: 'threeUnitName', label: '所在科室', sortable: true},
{prop: 'unionGroupName', label: '工会小组', sortable: true},
{prop: 'campusName', label: '所属校区', sortable: true, checked: 0},
{prop: 'marriage', label: '婚否', checked: 0},
{prop: 'education', label: '学历', checked: 0},
{prop: 'hometown', label: '籍贯', checked: 0},
{prop: 'nation', label: '民族', checked: 0},
{prop: 'political', label: '政治面貌', checked: 0},
{prop: 'memberJoinTime', label: '入会时间', checked: 0},
{prop: 'memberNumber', label: '会员号', checked: 0},
{prop: 'remark', label: '备注', checked: 0},
],
welfareMemberLoading: false,
}