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:
Paidax
2025-09-25 14:32:23 +08:00
parent b210758ee8
commit 4ef59d727a
103 changed files with 232 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/static/components/module/activity/UserDataScope.vue
+2 -2
View File
@@ -100,7 +100,7 @@
</div>-->
<div class="search-item">
<div class="search-item-label">人员类型：</div>
<div class="search-item-label">教职工类别：</div>
<div class="search-item-option">
<dict-select v-model="pageForm.personType" code="USER_PERSON_TYPE" @change="doSearch"
style="width: 100%"></dict-select>
@@ -242,7 +242,7 @@ module.exports = {
{prop: "sex", label: "性别", sortable: true},
{prop: "birthday", label: "出生年月"},
{prop: "mobile", label: "联系电话"},
{prop: "personType", label: "人员类型", sortable: true},
{prop: "personType", label: "教职工类别", sortable: true},
{prop: "userState", label: "在职状态", sortable: true},
{prop: "unitName", label: "所属单位", sortable: true},
{prop: "unionName", label: "所属工会", sortable: true},
src/main/resources/static/components/module/activity/UserScope.vue
+2 -2
View File
@@ -54,7 +54,7 @@
</el-row>
<el-row class="query-row" v-if="is_A06 === true || is_sysadmin === true || is_H04 === true">
<el-col class="query-title">人员类型：</el-col>
<el-col class="query-title">教职工类别：</el-col>
<el-col class="query-content">
<el-tag
:effect="pageForm.personTypes.includes(item.name) ? 'dark' : 'plain'"
@@ -452,7 +452,7 @@ module.exports = {
{prop: "birthday", label: "出生年月", sortable: true},
{prop: "age", label: "年龄", sortable: true},
{prop: "mobile", label: "联系电话"},
{prop: "personType", label: "人员类型", sortable: true},
{prop: "personType", label: "教职工类别", sortable: true},
{prop: "userState", label: "在职状态", sortable: true},
{prop: "unitName", label: "所属单位", sortable: true},
{prop: "unionName", label: "所属工会", sortable: true}
src/main/resources/views/platform/sys/data/user/pull.html
+1 -1
View File
@@ -76,7 +76,7 @@ layout("/layouts/platform.html"){
<template slot-scope="{row}">{{$moment(row.birthday).format('YYYY-MM-DD')}}</template>
</el-table-column>
<el-table-column prop="userState" label="在职状态" sortable width="120"></el-table-column>
<el-table-column prop="preparedBy" label="人事编制" sortable width="120"></el-table-column>
<el-table-column prop="preparedBy" label="编制类别" sortable width="120"></el-table-column>
<el-table-column prop="postDoctoralJoinDate" label="进站时间" sortable width="120"></el-table-column>
<el-table-column prop="personType" label="教职工类别" sortable width="120"></el-table-column>
<el-table-column prop="comeSchoolDate" label="来校年月" sortable width="120"></el-table-column>
src/main/resources/views/platform/sys/data/user/update.html
+6 -6
View File
@@ -39,10 +39,10 @@ layout("/layouts/platform.html"){
<search-item label="在职状态">
<dict-select v-model="pageForm.userState" code="USER_STATE" style="width: 100%"></dict-select>
</search-item>
<search-item label="人事编制">
<search-item label="编制类别">
<dict-select v-model="pageForm.preparedBy" code="USER_PREPARED_BY_TYPE" style="width: 100%"></dict-select>
</search-item>
<search-item label="人员类型">
<search-item label="教职工类别">
<dict-select v-model="pageForm.personType" code="USER_PERSON_TYPE" style="width: 100%"></dict-select>
</search-item>
</search>
@@ -72,8 +72,8 @@ layout("/layouts/platform.html"){
<template slot-scope="{row}">{{$moment(row.birthday).format('YYYY-MM-DD')}}</template>
</el-table-column>
<el-table-column prop="userState" label="在职状态" sortable width="120"></el-table-column>
<el-table-column prop="preparedBy" label="人事编制" sortable width="120"></el-table-column>
<el-table-column prop="personType" label="人员类型" sortable width="120"></el-table-column>
<el-table-column prop="preparedBy" label="编制类别" sortable width="120"></el-table-column>
<el-table-column prop="personType" label="教职工类别" sortable width="120"></el-table-column>
<el-table-column prop="arrivalAtSchoolDate" label="来校年月" sortable width="120"></el-table-column>
<el-table-column prop="technicalTitle" label="技术职称" sortable width="120"></el-table-column>
<el-table-column prop="position" label="职务" sortable width="120" show-overflow-tooltip></el-table-column>
@@ -155,9 +155,9 @@ layout("/layouts/platform.html"){
{ label: "生日", value: "birthday" },
{ label: "手机号", value: "mobile" },
{ label: "在职状态", value: "userState" },
{ label: "人事编制", value: "preparedBy" },
{ label: "编制类别", value: "preparedBy" },
{ label: "进站时间", value: "postDoctoralJoinDate" },
{ label: "人员类型", value: "personType" },
{ label: "教职工类别", value: "personType" },
{ label: "来校年月", value: "arrivalAtSchoolDate" },
{ label: "单位", value: "unitName" },
{ label: "单位编码", value: "unitId" },
src/main/resources/views/platform/sys/msg/msgManage/msgManageForm.js
+4 -4
View File
@@ -30,8 +30,8 @@ const MSG_FORM_TEMPLATE = {
<el-table-column prop="username" label="姓名" width="120"></el-table-column>
<el-table-column prop="sex" label="性别" width="50"></el-table-column>
<el-table-column prop="userState" label="在职状态" width="120"></el-table-column>
<el-table-column prop="personType" label="人员类型" width="120"></el-table-column>
<el-table-column prop="preparedBy" label="人事编制" width="120"></el-table-column>
<el-table-column prop="personType" label="教职工类别" width="120"></el-table-column>
<el-table-column prop="preparedBy" label="编制类别" width="120"></el-table-column>
<el-table-column prop="mobile" label="手机" width="120"></el-table-column>
<el-table-column prop="unitName" label="所属单位" show-overflow-tooltip></el-table-column>
<el-table-column prop="unionName" label="所属工会" show-overflow-tooltip></el-table-column>
@@ -93,8 +93,8 @@ const MSG_FORM_TEMPLATE = {
<el-table-column prop="username" label="姓名" width="120"></el-table-column>
<el-table-column prop="sex" label="性别" width="50"></el-table-column>
<el-table-column prop="userState" label="在职状态" width="120"></el-table-column>
<el-table-column prop="personType" label="人员类型" width="120"></el-table-column>
<el-table-column prop="preparedBy" label="人事编制" width="120"></el-table-column>
<el-table-column prop="personType" label="教职工类别" width="120"></el-table-column>
<el-table-column prop="preparedBy" label="编制类别" width="120"></el-table-column>
<el-table-column prop="mobile" label="手机" width="120"></el-table-column>
<el-table-column prop="unitName" label="所属单位" show-overflow-tooltip></el-table-column>
<el-table-column prop="unionName" label="所属工会" show-overflow-tooltip></el-table-column>
src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js
+1 -1
View File
@@ -1193,7 +1193,7 @@ let ACTIVITY_SPORTS_ADD_ACTIVITY = {
options: [{label: '男', value: '男'}, {label: '女', value: '女'}]
},
{label: '在职状态', value: 'userState', type: "select", options: userStateOptions},
{label: '人员类型', value: 'personType', type: "select", options: personTypeOptions},
{label: '教职工类别', value: 'personType', type: "select", options: personTypeOptions},
]*/
}
},
src/main/resources/views/platform/zhgh/benefit/userList/addBenefitUserBySelect.js
+1 -1
View File
@@ -27,7 +27,7 @@ let ADD_BENEFIT_USER_BY_SELECT = {
<el-table-column label="工号" prop="loginname" sortable width="150px"></el-table-column>
<el-table-column label="姓名" prop="username" sortable width="150px"></el-table-column>
<el-table-column label="在职状态" prop="userState" sortable width="150px"></el-table-column>
<el-table-column label="人事编制" prop="personType" sortable width="150px"></el-table-column>
<el-table-column label="编制类别" prop="personType" sortable width="150px"></el-table-column>
<el-table-column label="所在单位" prop="unitName" show-overflow-tooltip
sortable></el-table-column>
<el-table-column label="所在工会" prop="unionName" sortable></el-table-column>
src/main/resources/views/platform/zhgh/benefit/userList/index.html
+2 -2
View File
@@ -52,7 +52,7 @@ layout("/layouts/platform.html"){
</el-select>
</search-item>
<search-item label="人员类型：">
<search-item label="教职工类别：">
<dict-select clearable code="USER_PERSON_TYPE" multiple placeholder="请选择人员类型" v-model="pageForm.personTypes"></dict-select>
</search-item>
<search-item label="在职状态：">
@@ -124,7 +124,7 @@ layout("/layouts/platform.html"){
{ prop: "userName", label: "姓名" },
{ prop: "sex", label: "性别", sortable: true },
{ prop: "mobile", label: "联系方式" },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true }
src/main/resources/views/platform/zhgh/benefit/userSelectionList/index.html
+2 -2
View File
@@ -59,7 +59,7 @@ layout("/layouts/platform.html"){
</el-select>
</search-item>
<search-item label="人员类型：">
<search-item label="教职工类别：">
<dict-select clearable code="USER_PERSON_TYPE" multiple placeholder="请选择人员类型" v-model="pageForm.personTypes"></dict-select>
</search-item>
<search-item label="在职状态：">
@@ -192,7 +192,7 @@ layout("/layouts/platform.html"){
{ prop: "loginName", label: "工号" },
{ prop: "userName", label: "姓名" },
{ prop: "sex", label: "性别", sortable: true },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
src/main/resources/views/platform/zhgh/club/examine/common/examineInfo.js
+1 -1
View File
@@ -19,7 +19,7 @@ const EXAMINE_INFO_COMPONENT = {
<!-- <div class="process-title">协会成员变化情况</div>-->
<!-- <el-table :data="viewData.changeUserNum" max-height="300">-->
<!-- <el-table-column label="序号" type="index" width="50"></el-table-column>-->
<!-- <el-table-column label="人员类型" prop="userState"></el-table-column>-->
<!-- <el-table-column label="教职工类别" prop="userState"></el-table-column>-->
<!-- <el-table-column label="年初人员" prop="yearFirstNum"></el-table-column>-->
<!-- <el-table-column label="年度增加" prop="yearAddNum"></el-table-column>-->
<!-- <el-table-column label="年度减少" prop="yearEditNum"></el-table-column>-->
src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js
+1 -1
View File
@@ -6,7 +6,7 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
<search-item label="姓名/工号：">
<el-input placeholder="请输入内容" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
<search-item label="人员类型：">
<search-item label="教职工类别：">
<dict-select code="USER_PERSON_TYPE" placeholder="请选择人员类型" clearable v-model="pageForm.personType"></dict-select>
</search-item>
<search-item label="在职状态：">
src/main/resources/views/platform/zhgh/dayofficework/integral/manage/index.html
+3 -3
View File
@@ -43,8 +43,8 @@ layout("/layouts/platform.html"){
<dict-select v-model="pageForm.userState" placeholder="在职状态" @change="doSearch"
code="USER_STATE"></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
<search-item label="教职工类别">
<dict-select v-model="pageForm.personType" placeholder="教职工类别" @change="doSearch"
code="USER_PERSON_TYPE"></dict-select>
</search-item>
</search>
@@ -249,7 +249,7 @@ layout("/layouts/platform.html"){
{prop: 'username', label: '姓名', sortable: true},
{prop: 'sex', label: '性别'},
{prop: 'mobile', label: '联系电话'},
{prop: 'personType', label: '人员类型', sortable: true},
{prop: 'personType', label: '教职工类别', sortable: true},
{prop: 'userState', label: '在职状态', sortable: true},
{prop: 'unionName', label: '所属工会', sortable: true},
{prop: 'unitName', label: '所属单位', sortable: true},
src/main/resources/views/platform/zhgh/dayofficework/meeting/common/meetingInfo.js
+2 -2
View File
@@ -31,8 +31,8 @@ const meetingInfo = {
<el-table-column prop="userName" label="姓名" width="120"></el-table-column>
<el-table-column prop="sex" label="性别" width="50"></el-table-column>
<el-table-column prop="userState" label="在职状态" width="120"></el-table-column>
<el-table-column prop="personType" label="人员类型" width="120"></el-table-column>
<el-table-column prop="preparedBy" label="人事编制" width="120"></el-table-column>
<el-table-column prop="personType" label="教职工类别" width="120"></el-table-column>
<el-table-column prop="preparedBy" label="编制类别" width="120"></el-table-column>
<el-table-column prop="mobile" label="手机" width="120"></el-table-column>
<el-table-column prop="unitName" label="所属单位" show-overflow-tooltip></el-table-column>
<el-table-column prop="unionName" label="所属工会" show-overflow-tooltip></el-table-column>
src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/basicForm.js
+4 -4
View File
@@ -114,8 +114,8 @@ const basicForm = {
<el-table-column prop="userName" label="姓名" width="120"></el-table-column>
<el-table-column prop="sex" label="性别" width="50"></el-table-column>
<el-table-column prop="userState" label="在职状态" width="120"></el-table-column>
<el-table-column prop="personType" label="人员类型" width="120"></el-table-column>
<el-table-column prop="preparedBy" label="人事编制" width="120"></el-table-column>
<el-table-column prop="personType" label="教职工类别" width="120"></el-table-column>
<el-table-column prop="preparedBy" label="编制类别" width="120"></el-table-column>
<el-table-column prop="mobile" label="手机" width="120"></el-table-column>
<el-table-column prop="unitName" label="所属单位" show-overflow-tooltip></el-table-column>
<el-table-column prop="unionName" label="所属工会" show-overflow-tooltip></el-table-column>
@@ -178,8 +178,8 @@ const basicForm = {
<el-table-column prop="userName" label="姓名" width="120"></el-table-column>
<el-table-column prop="sex" label="性别" width="50"></el-table-column>
<el-table-column prop="userState" label="在职状态" width="120"></el-table-column>
<el-table-column prop="personType" label="人员类型" width="120"></el-table-column>
<el-table-column prop="preparedBy" label="人事编制" width="120"></el-table-column>
<el-table-column prop="personType" label="教职工类别" width="120"></el-table-column>
<el-table-column prop="preparedBy" label="编制类别" width="120"></el-table-column>
<el-table-column prop="mobile" label="手机" width="120"></el-table-column>
<el-table-column prop="unitName" label="所属单位" show-overflow-tooltip></el-table-column>
<el-table-column prop="unionName" label="所属工会" show-overflow-tooltip></el-table-column>
src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html
+1 -1
View File
@@ -103,7 +103,7 @@ layout("/layouts/platform.html"){
{ prop: "userName", label: "姓名", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "preparedBy", label: "编制类别", sortable: true },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
{ prop: "sign", label: "签字" },
src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js
+4 -4
View File
@@ -27,12 +27,12 @@ const COMMON_QUERY = {
<dict-select v-model="pageForm.userStates" placeholder="在职状态" @change="doSearch"
code="USER_STATE" multiple collapse-tags></dict-select>
</search-item>
<search-item label="人事编制">
<dict-select v-model="pageForm.preparedBys" placeholder="人事编制" @change="doSearch"
<search-item label="编制类别">
<dict-select v-model="pageForm.preparedBys" placeholder="编制类别" @change="doSearch"
code="USER_PREPARED_BY_TYPE" multiple collapse-tags></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personTypes" placeholder="人员类型" @change="doSearch"
<search-item label="教职工类别">
<dict-select v-model="pageForm.personTypes" placeholder="教职工类别" @change="doSearch"
code="USER_PERSON_TYPE" multiple collapse-tags></dict-select>
</search-item>
</template>
src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/info.js
+1 -1
View File
@@ -27,7 +27,7 @@ const INFO = {
<el-descriptions-item label="电子邮箱">{{ viewData.email }}</el-descriptions-item>
<el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
<el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item></el-descriptions-item>
<el-descriptions-item label="家庭主要成员" :span="3">
src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/memberApplyAuditInfo.js
+1 -1
View File
@@ -25,7 +25,7 @@ const MEMBER_APPLY_AUDIT_INFO = {
<el-descriptions-item label="电子邮箱">{{ viewData.email }}</el-descriptions-item>
<el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
<el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item></el-descriptions-item>
<el-descriptions-item label="家庭主要成员" :span="3">
src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html
+1 -1
View File
@@ -86,7 +86,7 @@ layout("/layouts/platform.html"){
{ prop: "userName", label: "姓名", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "preparedBy", label: "编制类别", sortable: true },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
{ prop: "sign", label: "签字" },
src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html
+1 -1
View File
@@ -121,7 +121,7 @@ layout("/layouts/platform.html"){
{ prop: "userName", label: "姓名", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "preparedBy", label: "编制类别", sortable: true },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
{ prop: "sign", label: "签字" },
src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/form.html
+1 -1
View File
@@ -90,7 +90,7 @@
disabled style="width: 100%"></dict-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="人员类型">
<el-descriptions-item label="教职工类别">
<el-form-item prop="personType">
<dict-select v-model="formData.personType" code="USER_PERSON_TYPE"
disabled style="width: 100%"></dict-select>
src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html
+1 -1
View File
@@ -95,7 +95,7 @@ layout("/layouts/platform.html"){
disabled style="width: 100%"></dict-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="人员类型">
<el-descriptions-item label="教职工类别">
<el-form-item prop="personType">
<dict-select v-model="formData.personType" code="USER_PERSON_TYPE"
disabled style="width: 100%"></dict-select>
src/main/resources/views/platform/zhgh/staffmanage/member/apply/view/index.html
+1 -1
View File
@@ -21,7 +21,7 @@
<el-descriptions-item label="电子邮箱">{{ viewData.email }}</el-descriptions-item>
<el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
<el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item></el-descriptions-item>
<el-descriptions-item label="家庭主要成员" :span="3">
src/main/resources/views/platform/zhgh/staffmanage/member/branch/verification/check/index.html
+3 -3
View File
@@ -45,8 +45,8 @@ layout("/layouts/platform.html"){
<search-item label="编制类别">
<dict-select v-model="pageForm.preparedBy" placeholder="编制类别" @change="doSearch" code="USER_PREPARED_BY_TYPE"></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch" code="USER_PERSON_TYPE"></dict-select>
<search-item label="教职工类别">
<dict-select v-model="pageForm.personType" placeholder="教职工类别" @change="doSearch" code="USER_PERSON_TYPE"></dict-select>
</search-item>
</search>
</el-card>
@@ -246,7 +246,7 @@ layout("/layouts/platform.html"){
{ prop: "sex", label: "性别", sortable: true, width: "100px" },
{ prop: "userState", label: "在职状态", sortable: true },
// {prop: "preparedBy", label: "编制类别", sortable: true},
// {prop: 'personType', label: '人员类型', sortable: true},
// {prop: 'personType', label: '教职工类别', sortable: true},
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
{ prop: "isChanged", label: "变更状态", sortable: true },
src/main/resources/views/platform/zhgh/staffmanage/member/change/branchUnionAudit/index.html
+1 -1
View File
@@ -94,7 +94,7 @@ layout("/layouts/platform.html"){
{ prop: "userName", label: "姓名", sortable: true },
{ prop: "sex", label: "性别", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
{ prop: "changeTypes", label: "变更类型", sortable: true, width: 200 },
src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js
+6 -6
View File
@@ -22,14 +22,14 @@ const COMMON_QUERY = {
<dict-select v-model="pageForm.userStates" placeholder="在职状态" @change="doSearch"
code="USER_STATE" multiple collapse-tags></dict-select>
</search-item>
<search-item label="人事编制">
<dict-select v-model="pageForm.preparedBys" placeholder="人事编制" @change="doSearch"
code="USER_PREPARED_BY_TYPE" multiple collapse-tags></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personTypes" placeholder="人员类型" @change="doSearch"
<search-item label="教职工类别">
<dict-select v-model="pageForm.personTypes" placeholder="教职工类别" @change="doSearch"
code="USER_PERSON_TYPE" multiple collapse-tags></dict-select>
</search-item>
<search-item label="编制类别">
<dict-select v-model="pageForm.preparedBys" placeholder="编制类别" @change="doSearch"
code="USER_PREPARED_BY_TYPE" multiple collapse-tags></dict-select>
</search-item>
</search>
`,
store,
src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js
+1 -1
View File
@@ -30,7 +30,7 @@ const INFO = {
<el-descriptions-item label="电子邮箱">{{ viewData.email }}</el-descriptions-item>
<el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
<el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="进校时间">{{ viewData.schoolTime }}</el-descriptions-item>
<template v-if="viewData.userState == '退休'">
src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberAllChangeInfo.js
+1 -1
View File
@@ -24,7 +24,7 @@ const MEMBER_ALL_CHANGE_INFO = {
<el-descriptions-item label="电子邮箱">{{ viewData.email }}</el-descriptions-item>
<el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
<el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="进校时间">{{ viewData.schoolTime }}</el-descriptions-item>
<template v-if="viewData.userState == '退休'">
src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js
+1 -1
View File
@@ -145,7 +145,7 @@ const MEMBER_CHANGE = {
:disabled="allowFields('preparedBy')" style="width: 100%"></dict-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="人员类型">
<el-descriptions-item label="教职工类别">
<el-form-item prop="personType">
<dict-select v-model="formData.personType" code="USER_PERSON_TYPE"
:disabled="allowFields('personType')" style="width: 100%"></dict-select>
src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html
+3 -3
View File
@@ -30,8 +30,8 @@ layout("/layouts/platform.html"){
<dict-select v-model="pageForm.userState" placeholder="在职状态" @change="doSearch"
code="USER_STATE"></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
<search-item label="教职工类别">
<dict-select v-model="pageForm.personType" placeholder="教职工类别" @change="doSearch"
code="USER_PERSON_TYPE"></dict-select>
</search-item>
<search-item label="更新日期">
@@ -215,7 +215,7 @@ layout("/layouts/platform.html"){
{prop: 'username', label: '姓名', sortable: true},
{prop: 'sex', label: '性别', sortable: true, width: '100px'},
{prop: 'birthday', label: '出生年月', sortable: true},
{prop: 'personType', label: '人员类型', sortable: true},
{prop: 'personType', label: '教职工类别', sortable: true},
{prop: 'userState', label: '在职状态', sortable: true},
{prop: 'unionName', label: '所属工会', sortable: true},
{prop: 'unitName', label: '所属单位', sortable: true},
src/main/resources/views/platform/zhgh/staffmanage/member/change/mine/index.html
+1 -1
View File
@@ -68,7 +68,7 @@ layout("/layouts/platform.html"){
{ prop: "username", label: "姓名", sortable: true },
{ prop: "sex", label: "性别", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
{ prop: "changeTypes", label: "变更类型", sortable: true, width: 200 },
src/main/resources/views/platform/zhgh/staffmanage/member/change/record/index.html
+3 -3
View File
@@ -27,8 +27,8 @@ layout("/layouts/platform.html"){
<dict-select v-model="pageForm.userState" placeholder="在职状态" @change="doSearch"
code="USER_STATE"></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
<search-item label="教职工类别">
<dict-select v-model="pageForm.personType" placeholder="教职工类别" @change="doSearch"
code="USER_PERSON_TYPE"></dict-select>
</search-item>
<search-item label="变更类型">
@@ -124,7 +124,7 @@ layout("/layouts/platform.html"){
{prop: 'username', label: '姓名'},
{prop: 'sex', label: '性别', sortable: true, width: '100px'},
{prop: 'birthday', label: '出生年月', sortable: true},
{prop: 'personType', label: '人员类型', sortable: true},
{prop: 'personType', label: '教职工类别', sortable: true},
{prop: 'userState', label: '在职状态', sortable: true},
{prop: 'unionName', label: '所属工会', sortable: true},
{prop: 'unitName', label: '所属单位', sortable: true},
src/main/resources/views/platform/zhgh/staffmanage/member/change/schoolUnionAudit/index.html
+1 -1
View File
@@ -96,7 +96,7 @@ layout("/layouts/platform.html"){
{ prop: "userName", label: "姓名", sortable: true },
{ prop: "sex", label: "性别", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
{ prop: "changeTypes", label: "变更类型", sortable: true, width: 200 },
src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/form.html
+1 -1
View File
@@ -131,7 +131,7 @@
:disabled="allowFields('userState')" style="width: 100%"></dict-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="人员类型">
<el-descriptions-item label="教职工类别">
<el-form-item prop="personType">
<dict-select v-model="formData.personType" code="USER_PERSON_TYPE"
:disabled="allowFields('personType')" style="width: 100%"></dict-select>
src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html
+1 -1
View File
@@ -136,7 +136,7 @@ layout("/layouts/platform.html"){
:disabled="allowFields('userState')" style="width: 100%"></dict-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="人员类型">
<el-descriptions-item label="教职工类别">
<el-form-item prop="personType">
<dict-select v-model="formData.personType" code="USER_PERSON_TYPE"
:disabled="allowFields('personType')" style="width: 100%"></dict-select>
src/main/resources/views/platform/zhgh/staffmanage/member/change/view/index.html
+1 -1
View File
@@ -23,7 +23,7 @@
<el-descriptions-item label="电子邮箱">{{ viewData.email }}</el-descriptions-item>
<el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
<el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="进校时间">{{ viewData.schoolTime }}</el-descriptions-item>
<template v-if="viewData.userState == '退休'">
src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js
+1 -1
View File
@@ -64,7 +64,7 @@
<el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
<!-- 第 2 行 -->
<el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="所属校区">{{ viewData.campus }}</el-descriptions-item>
<el-descriptions-item label="进校时间">{{ viewData.arrivalAtSchoolDate ? $moment(viewData.arrivalAtSchoolDate).format('YYYY-MM-DD') : null }}</el-descriptions-item>
src/main/resources/views/platform/zhgh/staffmanage/member/common/manage/memberManageQuery.js
+2 -2
View File
@@ -31,8 +31,8 @@ const MEMBER_MANAGE_QUERY = {
<dict-select v-model="pageForm.preparedBy" placeholder="编制类别" @change="doSearch"
code="USER_PREPARED_BY_TYPE"></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
<search-item label="教职工类别">
<dict-select v-model="pageForm.personType" placeholder="教职工类别" @change="doSearch"
code="USER_PERSON_TYPE"></dict-select>
</search-item>
<search-item label="更新日期">
src/main/resources/views/platform/zhgh/staffmanage/member/common/manage/memberManageTable.js
+1 -1
View File
@@ -155,7 +155,7 @@ const MEMBER_MANAGE_TABLE = {
{ prop: "birthday", label: "出生年月", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "preparedBy", label: "编制类别", sortable: true },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true }
],
src/main/resources/views/platform/zhgh/staffmanage/member/common/verification/memberVerificationChange.js
+1 -1
View File
@@ -10,7 +10,7 @@ const MEMBER_VERIFICATION_CHANGE = {
<el-descriptions-item label="性别">{{ viewData.sex }}</el-descriptions-item>
<el-descriptions-item label="民族">{{ viewData.nation }}</el-descriptions-item>
<el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
<el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="学历">{{ viewData.education }}</el-descriptions-item>
<el-descriptions-item label="政治面貌">{{ viewData.political }}</el-descriptions-item>
<el-descriptions-item label="婚姻状况">{{ viewData.marriage || '' }}</el-descriptions-item>
src/main/resources/views/platform/zhgh/staffmanage/member/info/batchmake/index.html
+2 -2
View File
@@ -58,7 +58,7 @@ layout("/layouts/platform.html"){
{ prop: "username", label: "姓名", sortable: true },
{ prop: "sex", label: "性别", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true },
{ prop: "preparedBy", label: "编制类别", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
@@ -113,7 +113,7 @@ layout("/layouts/platform.html"){
})
},
doExport() {
this.$downLoad("/platform/member/info/batchMake/doExport", this.pageForm)
},
handleSelectionChange(val){
this.selection = val;
src/main/resources/views/platform/zhgh/staffmanage/member/info/board/index1.html
+1 -1
View File
@@ -177,7 +177,7 @@ layout("/layouts/platform.html"){
v-loading="loading.userStateMember"
></div>
<div class="col-title">人员类型</div>
<div class="col-title">教职工类别</div>
<div
id="personTypeMemberChart"
style="width: 100%; height: calc(50% - 35px); box-sizing: border-box; padding: 30px 10px"
src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.js
+29 -7
View File
@@ -2,7 +2,22 @@ const COMMON_QUERY = {
template: /*language=HTML*/ `
<search @search="doSearch">
<search-item label="姓名/工号">
<el-input placeholder="请输入内容" clearable v-model="pageForm.searchKeyword"></el-input>
<el-select
clearable
v-model="pageForm.userIds"
filterable
remote
collapse-tags
placeholder="输入工号或者姓名查找"
:remote-method="queryUser"
@change="doSearch"
style="width: 100%"
multiple
>
<el-option v-for="o in userList" :label="o.username + '(' + o.loginname + ')'" :value="o.id"
:key="o.id"></el-option>
</el-select>
<!-- <el-input placeholder="请输入内容" clearable v-model="pageForm.searchKeyword"></el-input>-->
</search-item>
<search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable filterable
@@ -22,13 +37,13 @@ const COMMON_QUERY = {
<dict-select v-model="pageForm.userStates" placeholder="在职状态" @change="doSearch"
code="USER_STATE" multiple collapse-tags></dict-select>
</search-item>
<search-item label="人事编制">
<dict-select v-model="pageForm.preparedBys" placeholder="人事编制" @change="doSearch"
code="USER_PREPARED_BY_TYPE" multiple collapse-tags></dict-select>
<search-item label="教职工类别" v-if="!query_disable">
<dict-select v-model="pageForm.personTypes" placeholder="教职工类别" @change="doSearch"
code="USER_PERSON_TYPE" multiple collapse-tags></dict-select>
</search-item>
<search-item label="人员类型" v-if="!query_disable">
<dict-select v-model="pageForm.personTypes" placeholder="人员类型" @change="doSearch"
code="USER_PERSON_TYPE" multiple collapse-tags></dict-select>
<search-item label="编制类别">
<dict-select v-model="pageForm.preparedBys" placeholder="编制类别" @change="doSearch"
code="USER_PREPARED_BY_TYPE" multiple collapse-tags></dict-select>
</search-item>
</search>
`,
@@ -41,12 +56,14 @@ const COMMON_QUERY = {
mixins: [initTableMixins],
data() {
return{
userList: [],
unions: [],
units: [],
pageForm: {
searchKeyword: '',
unionId: '',
unitId: '',
userIds: [],
userStates: [],
personTypes: [],
preparedBys: [],
@@ -54,8 +71,13 @@ const COMMON_QUERY = {
}
},
methods: {
async queryUser(val) {
const resp = await $.get("/open/common/userOptions", {query: val})
this.userList = resp.data
},
doSearch(){
const pageForm = clone(this.pageForm)
pageForm.userIds = JSON.stringify(this.pageForm.userIds)
pageForm.userStates = JSON.stringify(this.pageForm.userStates)
pageForm.personTypes = JSON.stringify(this.pageForm.personTypes)
pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys)
src/main/resources/views/platform/zhgh/staffmanage/member/info/datamanage/index.html
+2 -2
View File
@@ -74,7 +74,7 @@ layout("/layouts/platform.html"){
</search-item>
</search>
<div class="search-other mt20">
<div class="search-other-label">人员类型</div>
<div class="search-other-label">教职工类别</div>
<div>
<el-tag
style="margin-right: 10px;cursor: pointer"
@@ -207,7 +207,7 @@ layout("/layouts/platform.html"){
{ prop: "userName", label: "姓名", sortable: true },
{ prop: "sex", label: "性别", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true },
{ prop: "preparedBy", label: "编制类别", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
src/main/resources/views/platform/zhgh/staffmanage/member/info/group/index.html
+4 -1
View File
@@ -171,7 +171,10 @@ layout("/layouts/platform.html"){
pageForm.userStates = JSON.stringify(this.pageForm.userStates)
pageForm.personTypes = JSON.stringify(this.pageForm.personTypes)
pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys)
const data = this.tableColumns.filter(item => this.checkedFields.includes(item.prop)).map(item => {
return {prop: item.prop, label: item.label}
})
pageForm.columns = JSON.stringify(data)
this.$downLoad(loc() + "/exportMember", pageForm)
},
openArchive() {
src/main/resources/views/platform/zhgh/staffmanage/member/info/history/index.html
+3 -3
View File
@@ -51,8 +51,8 @@ layout("/layouts/platform.html"){
code="USER_PREPARED_BY_TYPE"
></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch" code="USER_PERSON_TYPE"></dict-select>
<search-item label="教职工类别">
<dict-select v-model="pageForm.personType" placeholder="教职工类别" @change="doSearch" code="USER_PERSON_TYPE"></dict-select>
</search-item>
</search>
</el-card>
@@ -121,7 +121,7 @@ layout("/layouts/platform.html"){
{ prop: "mobile", label: "联系电话" },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "preparedBy", label: "编制类别", sortable: true },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true }
]
src/main/resources/views/platform/zhgh/staffmanage/member/modelworker/manage/index.html
+3 -3
View File
@@ -26,8 +26,8 @@ layout("/layouts/platform.html"){
<dict-select v-model="pageForm.userState" placeholder="在职状态" @change="doSearch"
code="USER_STATE"></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
<search-item label="教职工类别">
<dict-select v-model="pageForm.personType" placeholder="教职工类别" @change="doSearch"
code="USER_PERSON_TYPE"></dict-select>
</search-item>
</search>
@@ -135,7 +135,7 @@ layout("/layouts/platform.html"){
{prop: 'username', label: '姓名'},
{prop: 'sex', label: '性别'},
{prop: 'mobile', label: '联系电话'},
{prop: 'personType', label: '人员类型'},
{prop: 'personType', label: '教职工类别'},
{prop: 'userState', label: '在职状态'},
{prop: 'unionName', label: '所属工会'},
{prop: 'unitName', label: '所属单位'},
src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/schoolViewAndHandle.js
+3 -3
View File
@@ -23,8 +23,8 @@ const SCHOOL_VIEW_AND_HANDLE = {
<dict-select v-model="pageForm.preparedBy" placeholder="编制类别" @change="doSearch"
code="USER_PREPARED_BY_TYPE"></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
<search-item label="教职工类别">
<dict-select v-model="pageForm.personType" placeholder="教职工类别" @change="doSearch"
code="USER_PERSON_TYPE"></dict-select>
</search-item>
</search>
@@ -141,7 +141,7 @@ const SCHOOL_VIEW_AND_HANDLE = {
{ label: "性别", prop: "sex" },
{ label: "在职状态", prop: "userState" },
{ label: "编制类别", prop: "preparedBy" },
{ label: "人员类型", prop: "personType" },
{ label: "教职工类别", prop: "personType" },
{ label: "所属单位", prop: "unitName" },
{ label: "是否变更", prop: "isChanged" },
// { label: "分工会状态", prop: "branchUnionChecked" },
src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/viewChangeTypeUser.js
+3 -3
View File
@@ -21,8 +21,8 @@ const VIEW_CHANGE_TYPE_USER = {
<dict-select v-model="pageForm.preparedBy" placeholder="编制类别" @change="doSearch"
code="USER_PREPARED_BY_TYPE"></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
<search-item label="教职工类别">
<dict-select v-model="pageForm.personType" placeholder="教职工类别" @change="doSearch"
code="USER_PERSON_TYPE"></dict-select>
</search-item>
</search>
@@ -77,7 +77,7 @@ const VIEW_CHANGE_TYPE_USER = {
{ prop: "username", label: "姓名", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "preparedBy", label: "编制类别", sortable: true },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
{ prop: "member", label: "会员", sortable: true },
src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationQuery.js
+2 -2
View File
@@ -23,8 +23,8 @@ const VERIFICATION_QUERY = {
<dict-select v-model="pageForm.userState" placeholder="在职状态" @change="doSearch"
code="USER_STATE"></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
<search-item label="教职工类别">
<dict-select v-model="pageForm.personType" placeholder="教职工类别" @change="doSearch"
code="USER_PERSON_TYPE"></dict-select>
</search-item>
<search-item label="变更类型">
src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationSetUserList.js
+2 -2
View File
@@ -28,8 +28,8 @@ const VERIFICATION_SET_USER_LIST = {
<dict-select v-model="pageForm.userState" placeholder="在职状态" @change="doSearch"
code="USER_STATE"></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
<search-item label="教职工类别">
<dict-select v-model="pageForm.personType" placeholder="教职工类别" @change="doSearch"
code="USER_PERSON_TYPE"></dict-select>
</search-item>
<search-item label="编制类别">
src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationShowSelectionUsers.js
+3 -3
View File
@@ -30,8 +30,8 @@ const VERIFICATION_SHOW_SELECTION_USERS = {
<dict-select v-model="pageForm.preparedBy" placeholder="编制类别" @change="doSearch"
code="USER_PREPARED_BY_TYPE"></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
<search-item label="教职工类别">
<dict-select v-model="pageForm.personType" placeholder="教职工类别" @change="doSearch"
code="USER_PERSON_TYPE"></dict-select>
</search-item>
</search>
@@ -44,7 +44,7 @@ const VERIFICATION_SHOW_SELECTION_USERS = {
<el-table-column label="性别" prop="sex"></el-table-column>
<el-table-column label="在职状态" prop="userState"></el-table-column>
<el-table-column label="编制类别" prop="preparedBy"></el-table-column>
<el-table-column label="人员类型" prop="personType"></el-table-column>
<el-table-column label="教职工类别" prop="personType"></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="操作" fixed="right" width="80px" v-if="canBeModified">
src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/queryForm.js
+2 -2
View File
@@ -63,7 +63,7 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
</el-row>
<el-row type="flex" align="middle" class="query-row query-row-tag">
<el-col class="query-row-title">人员类型：</el-col>
<el-col class="query-row-title">教职工类别：</el-col>
<el-col class="query-row-content query-row-content-tag">
<el-tag
style="margin-right: 10px;cursor: pointer"
@@ -88,7 +88,7 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
</el-row>
<el-row type="flex" align="middle" class="query-row query-row-tag">
<el-col class="query-row-title">人事编制：</el-col>
<el-col class="query-row-title">编制类别：</el-col>
<el-col class="query-row-content query-row-content-tag">
<el-tag
style="margin-right: 10px;cursor: pointer"
src/main/resources/views/platform/zhgh/staffmanage/membercost/config.html
+1 -1
View File
@@ -146,7 +146,7 @@ layout("/layouts/platform.html"){
</el-form-item>
</template>
</el-table-column>
<el-table-column label="人员类型" prop="personType" >
<el-table-column label="教职工类别" prop="personType" >
<template slot-scope="{row,$index}">
<el-select @change="row.payMode=null" placeholder="请选择人员类型" v-model="row.personType"
style="width: 100%" clearable>
src/main/resources/views/platform/zhgh/staffmanage/membercost/mine/minePayInfo.js
+1 -1
View File
@@ -7,7 +7,7 @@ const MINE_PAY_INFO = {
<el-descriptions-item label="缴费项目">{{ viewData.projectName }}</el-descriptions-item>
<el-descriptions-item label="所在工会">{{ viewData.unionname }}</el-descriptions-item>
<el-descriptions-item label="所在单位">{{ viewData.unitname }}</el-descriptions-item>
<el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="缴费情况">
<el-tag v-if="viewData.personType">已缴费</el-tag>
<el-tag v-else type="warning">未缴费</el-tag>
src/main/resources/views/platform/zhgh/staffmanage/membercost/summary.html
+3 -3
View File
@@ -76,9 +76,9 @@ layout("/layouts/platform.html"){
</search-item>
</template>
<search-item label="人员类型">
<search-item label="教职工类别">
<dict-select v-model="pageForm.personType" style="width: 100%" clearable
placeholder="人员类型" code="USER_PERSON_TYPE"></dict-select>
placeholder="教职工类别" code="USER_PERSON_TYPE"></dict-select>
</search-item>
<search-item label="在职状态">
@@ -237,7 +237,7 @@ layout("/layouts/platform.html"){
{ prop: "mobile", label: "联系电话" },
{ prop: "schoolTime", label: "入职时间" },
{ prop: "retireDate", label: "退休时间" },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "unionname", label: "所属工会", sortable: true },
{ prop: "unitname", label: "所属单位", sortable: true },
src/main/resources/views/platform/zhgh/staffmanage/membercost/user.html
+2 -2
View File
@@ -98,7 +98,7 @@ layout("/layouts/platform.html"){
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="人员类型" size="medium">
<el-form-item label="教职工类别" size="medium">
<span>{{formData.personType}}</span>
</el-form-item>
</el-col>
@@ -159,7 +159,7 @@ layout("/layouts/platform.html"){
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="人员类型" size="medium">
<el-form-item label="教职工类别" size="medium">
<span>{{formData.personType}}</span>
</el-form-item>
</el-col>
src/main/resources/views/platform/zhgh/staffmanage/singleTeacher/ledger/index.html
+1 -1
View File
@@ -47,7 +47,7 @@ layout("/layouts/platform.html"){
v-for="item in dict.type.USER_EDUCATION"></el-option>
</el-select>
</search-item>
<search-item label="人员类型">
<search-item label="教职工类别">
<el-select clearable placeholder="请选择人员类型"
style="width: 100%;"
v-model="pageForm.personType">
src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html
+6 -6
View File
@@ -27,12 +27,12 @@ layout("/layouts/platform.html"){
<dict-select v-model="pageForm.userState" placeholder="在职状态" @change="doSearch"
code="USER_STATE"></dict-select>
</search-item>
<search-item label="人事编制">
<dict-select v-model="pageForm.preparedBy" placeholder="人事编制" @change="doSearch"
<search-item label="编制类别">
<dict-select v-model="pageForm.preparedBy" placeholder="编制类别" @change="doSearch"
code="USER_PREPARED_BY_TYPE"></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
<search-item label="教职工类别">
<dict-select v-model="pageForm.personType" placeholder="教职工类别" @change="doSearch"
code="USER_PERSON_TYPE"></dict-select>
</search-item>
<search-item label="变更类型">
@@ -155,8 +155,8 @@ layout("/layouts/platform.html"){
{ prop: "username", label: "姓名", sortable: true },
{ prop: "sex", label: "性别", sortable: true, width: "100px" },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "preparedBy", label: "人事编制", sortable: true },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "preparedBy", label: "编制类别", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
{ prop: "changeTypes", label: "变更类型", sortable: true },
src/main/resources/views/platform/zhgh/staffmanage/specialstaff/manage/index.html
+3 -3
View File
@@ -31,8 +31,8 @@ layout("/layouts/platform.html"){
<dict-select v-model="pageForm.userState" placeholder="在职状态" @change="doSearch"
code="USER_STATE"></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
<search-item label="教职工类别">
<dict-select v-model="pageForm.personType" placeholder="教职工类别" @change="doSearch"
code="USER_PERSON_TYPE"></dict-select>
</search-item>
</search>
@@ -217,7 +217,7 @@ layout("/layouts/platform.html"){
{ prop: 'username', label: '姓名' },
{ prop: 'sex', label: '性别' },
{ prop: 'mobile', label: '联系电话' },
{ prop: 'personType', label: '人员类型', sortable: true },
{ prop: 'personType', label: '教职工类别', sortable: true },
{ prop: 'userState', label: '在职状态', sortable: true },
{ prop: 'distSpecialStaffType', label: '特别人员类型', sortable: true },
{ prop: 'personnelRelationUnionName', label: '人事关系工会', sortable: true, width: 180 },
src/main/resources/views/platform/zhgh/staffmanage/thirtyTeach/manage/index.html
+4 -4
View File
@@ -48,13 +48,13 @@ layout("/layouts/platform.html"){
<search-item label="在职状态">
<dict-select v-model="pageForm.userState" style="width: 100%"
clearable
placeholder="人员类型"
placeholder="教职工类别"
code="USER_STATE"></dict-select>
</search-item>
<search-item label="人员类型">
<search-item label="教职工类别">
<dict-select v-model="pageForm.personType" style="width: 100%"
clearable
placeholder="人员类型"
placeholder="教职工类别"
code="USER_PERSON_TYPE"></dict-select>
</search-item>
</search>
@@ -189,7 +189,7 @@ layout("/layouts/platform.html"){
{prop: 'username', label: '姓名', sortable: true},
{prop: 'sex', label: '性别'},
{prop: 'teachNum', label: '进校时长(年)', sortable: true},
{prop: 'personType', label: '人员类型', sortable: true},
{prop: 'personType', label: '教职工类别', sortable: true},
{prop: 'userState', label: '在职状态', sortable: true},
{prop: 'unionName', label: '所属工会', sortable: true},
{prop: 'unitName', label: '所属单位', sortable: true},
src/main/resources/views/platform/zhgh/welfare/include/common.js
+1 -1
View File
@@ -66,7 +66,7 @@ let commonColumns = [
{prop: 'loginname', label: '工号', width: "100"},
{prop: 'username', label: '姓名', width: "80"},
{prop: 'sex', label: '性别', sortable: true, width: '100px', checked: 0},
{prop: 'personType', label: '人员类型', sortable: true, width: "100"},
{prop: 'personType', label: '教职工类别', sortable: true, width: "100"},
{prop: 'userState', label: '在职状态', sortable: true, width: "100"},
{prop: 'unionname', label: '所属工会', sortable: true},
{prop: 'unitname', label: '所属单位', sortable: true}
src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js
+2 -2
View File
@@ -76,7 +76,7 @@ const filterUser = {
</el-select>
</search-item>
<search-item label="人员类型：">
<search-item label="教职工类别：">
<dict-select clearable code="USER_PERSON_TYPE"
multiple
collapse-tags
@@ -168,7 +168,7 @@ const filterUser = {
{ prop: "username", label: "姓名" },
{ prop: "sex", label: "性别", sortable: true, checked: 0 },
{ prop: "birthday", label: "出生日期", sortable: true, checked: 0 },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true },
{ prop: "preparedBy", label: "编制类别", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
src/main/resources/views/platform/zhgh/welfare/welfareUser/addUser.js
+2 -2
View File
@@ -78,7 +78,7 @@ const addUser = {
</el-select>
</search-item>
<search-item label="人员类型：">
<search-item label="教职工类别：">
<dict-select clearable code="USER_PERSON_TYPE"
multiple
collapse-tags
@@ -174,7 +174,7 @@ const addUser = {
{ prop: "username", label: "姓名" },
{ prop: "sex", label: "性别", sortable: true, checked: 0 },
{ prop: "birthday", label: "出生日期", sortable: true, checked: 0 },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true },
{ prop: "preparedBy", label: "编制类别", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
src/main/resources/views/platform/zhgh/welfare/welfareUser/addWelfareListBySelect.js
+1 -1
View File
@@ -27,7 +27,7 @@ let ADD_WELFARE_LIST_BY_SELECT = {
<el-table-column label="工号" prop="loginname" sortable width="150px"></el-table-column>
<el-table-column label="姓名" prop="username" sortable width="150px"></el-table-column>
<el-table-column label="在职状态" prop="userState" sortable width="150px"></el-table-column>
<el-table-column label="人事编制" prop="personType" sortable width="150px"></el-table-column>
<el-table-column label="编制类别" prop="personType" sortable width="150px"></el-table-column>
<el-table-column label="所在单位" prop="unitName" show-overflow-tooltip
sortable></el-table-column>
<el-table-column label="所在工会" prop="unionName" sortable></el-table-column>
src/main/resources/views/platform/zhgh/welfare/welfareUser/index.html
+2 -2
View File
@@ -87,7 +87,7 @@ layout("/layouts/platform.html"){
</el-select>
</search-item>
<search-item label="人员类型：">
<search-item label="教职工类别：">
<dict-select
clearable
code="USER_PERSON_TYPE"
@@ -264,7 +264,7 @@ layout("/layouts/platform.html"){
{ prop: "username", label: "姓名" },
{ prop: "sex", label: "性别", sortable: true, checked: 0 },
{ prop: "birthday", label: "出生日期", sortable: true, checked: 0 },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true },
{ prop: "preparedBy", label: "编制类别", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "welfareUnionName", label: "所属工会", sortable: true },
src/main/resources/views/platform/zhghh5/staffmanage/member/apply/common/info.js
+1 -1
View File
@@ -24,7 +24,7 @@ const INFO = {
<van-cell title="电子邮箱">{{ viewData.email }}</van-cell>
<van-cell title="在职状态">{{ viewData.userState }}</van-cell>
<van-cell title="人员类型">{{ viewData.personType }}</van-cell>
<van-cell title="教职工类别">{{ viewData.personType }}</van-cell>
<van-cell title="人员性质">{{ viewData.preparedBy || '暂无' }}</van-cell>
<template v-if="viewData.loginname === $store.state.user.loginnmae">
src/main/resources/views/platform/zhghh5/staffmanage/member/apply/submit/index.html
+1 -1
View File
@@ -138,7 +138,7 @@ layout("/layouts/platform_h5.html"){
<van-field
v-model="formData.personType"
name="personType"
label="人员类型"
label="教职工类别"
readonly
placeholder="请填写人员类型"
clickable
src/main/resources/views/platform/zhghh5/staffmanage/member/common/mobileMemberChangeInfo.js
+2 -2
View File
@@ -13,8 +13,8 @@ const MOBILE_MEMBER_CHANGE_INFO = {
<van-cell title="所属工会">{{ viewData.unionName }}</van-cell>
<van-cell title="所属单位">{{ viewData.unitName }}</van-cell>
<van-cell title="在职状态">{{ viewData.userState }}</van-cell>
<van-cell title="人事编制">{{ viewData.preparedBy }}</van-cell>
<van-cell title="人员类型">{{ viewData.personType }}</van-cell>
<van-cell title="编制类别">{{ viewData.preparedBy }}</van-cell>
<van-cell title="教职工类别">{{ viewData.personType }}</van-cell>
<van-cell title="出生日期">{{ $moment(viewData.birthday).format('YYYY-MM-DD') }}</van-cell>
<van-cell title="学历">{{ viewData.education }}</van-cell>
<van-cell title="政治面貌">{{ viewData.political }}</van-cell>
src/main/resources/views/platform/zhghh5/staffmanage/member/common/mobileMemberInfo.js
+1 -1
View File
@@ -23,7 +23,7 @@ const MOBILE_MEMBER_INFO = {
<van-cell title="电子邮箱">{{ viewData.email }}</van-cell>
<van-cell title="在职状态">{{ viewData.userState }}</van-cell>
<van-cell title="人员类型">{{ viewData.personType }}</van-cell>
<van-cell title="教职工类别">{{ viewData.personType }}</van-cell>
<van-cell title="人员性质">{{ viewData.preparedBy || '暂无' }}</van-cell>
<template v-if="viewData.loginname === $store.state.user.loginnmae">
src/main/resources/views/platform/zhghh5/staffmanage/member/info/board/index.html
+1 -1
View File
@@ -160,7 +160,7 @@ layout("/layouts/platform_h5.html"){
<div class="col-title">在职状态</div>
<div id="userStateMemberChart" style="width: 100%; height: 240px; box-sizing: border-box"></div>
<div class="col-title">人员类型</div>
<div class="col-title">教职工类别</div>
<div id="personTypeMemberChart" style="width: 100%; height: 240px; box-sizing: border-box"></div>
</van-col>
</van-row>
src/main/resources/views/platform/zhghh5/staffmanage/memberCost/summary.html
+1 -1
View File
@@ -33,7 +33,7 @@ layout("/layouts/platform_h5.html"){
<van-tag :type="item.isPayment?'primary':'danger'">{{item.isPayment?'已缴':'未缴'}}</van-tag>
</template>
<template #label>
<div class="custom-title">人员类型：{{item.personType}}</div>
<div class="custom-title">教职工类别：{{item.personType}}</div>
<div class="custom-title">在职状态：{{item.userState}}</div>
<div class="custom-title">所属工会：{{item.unionname}}</div>
<div class="custom-title">所属单位：{{item.unitname}}</div>
src/main/resources/views/platform/zhghh5/sys/home/mine.js
+2 -2
View File
@@ -35,12 +35,12 @@ const mine = {
<div class="info-list">
<div class="info-item">
<van-icon name="user-o"></van-icon>
<span class="item-label">人员类型</span>
<span class="item-label">教职工类别</span>
<span class="info-value">{{ $store.state.user.personType }}</span>
</div>
<div class="info-item">
<van-icon name="user-o"></van-icon>
<span class="item-label">人事编制</span>
<span class="item-label">编制类别</span>
<span class="info-value">{{ $store.state.user.userState }}</span>
</div>
<div class="info-item">