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

1

Browse Source
This commit is contained in:
c-zhangr1
2026-04-25 16:38:47 +08:00
parent e8e39c128c
commit f454b6d6c3
89 changed files with 299 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/static/components/module/userInfo/index.vue
-1
View File
@@ -22,7 +22,6 @@
{{ viewData.arrivalAtSchoolDate ? $moment(viewData.arrivalAtSchoolDate).format("YYYY-MM-DD") : null }}
</el-descriptions-item>
<el-descriptions-item label="身份类别">{{ viewData.identityType }}</el-descriptions-item>
<el-descriptions-item label="编制类别">{{ viewData.preparedBy }}</el-descriptions-item>
<el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
<el-descriptions-item label="预计离退休时间">
src/main/resources/views/platform/sys/data/user/pull.html
+4 -4
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
@@ -52,7 +52,7 @@ layout("/layouts/platform.html"){
<el-option v-for="item in preparedByOptions" :label="item" :value="item"></el-option>
</el-select>
</search-item>
<search-item label="教职工类别">
<search-item label="人员类型">
<el-select v-model="pageForm.personType" clearable filterable>
<el-option v-for="item in personTypeOptions" :label="item" :value="item"></el-option>
</el-select>
@@ -77,8 +77,7 @@ layout("/layouts/platform.html"){
</el-table-column>
<el-table-column prop="userState" label="在职状态" sortable width="120"></el-table-column>
<el-table-column prop="arrivalAtSchoolDate" 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="personType" 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>
<el-table-column prop="education" label="学历" show-overflow-tooltip sortable width="120"></el-table-column>
@@ -209,3 +208,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/sys/data/user/update.html
+5 -9
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
@@ -39,10 +39,7 @@ 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="编制类别">
<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 +69,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="personType" 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>
@@ -162,9 +158,8 @@ layout("/layouts/platform.html"){
{ label: "生日", value: "birthday" },
{ label: "手机号", value: "mobile" },
{ label: "在职状态", value: "userState" },
{ label: "编制类别", value: "preparedBy" },
{ label: "进站时间", value: "postDoctoralJoinDate" },
{ label: "教职工类别", value: "personType" },
{ label: "人员类型", value: "personType" },
{ label: "来校年月", value: "arrivalAtSchoolDate" },
{ label: "单位", value: "unitName" },
{ label: "单位编码", value: "unitId" },
@@ -314,3 +309,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/sys/msg/msgManage/msgManageForm.js
+3 -4
View File
@@ -30,8 +30,7 @@ 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="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 +92,7 @@ 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="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>
@@ -262,3 +260,4 @@ const MSG_FORM_TEMPLATE = {
this.roleList = await this.getRoleList()
}
}
src/main/resources/views/platform/zhgh/activity/sports/ActivityResults/index.html
+3 -3
View File
@@ -394,8 +394,8 @@ layout("/layouts/platform.html"){
</el-form-item>
<el-form-item prop="sex" label="性&emsp;&emsp;别">
<el-radio-group v-model="formData.sex">
<el-radio :label="'男性'" border>男性</el-radio>
<el-radio :label="'女性'" border>女性</el-radio>
<el-radio :label="'男'" border>男</el-radio>
<el-radio :label="'女'" border>女</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item prop="unitId" label="所在单位">
@@ -522,7 +522,7 @@ layout("/layouts/platform.html"){
this.$set(this.formData, "awardsMode", this.awardsMode)
this.$set(this.formData, "identity", ['1'])
this.$set(this.formData, "status", 2)
this.$set(this.formData, "sex", "男性")
this.$set(this.formData, "sex", "男")
this.dialogVisible = true
if (this.$refs['form']) {
this.$refs['form'].resetFields()
src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js
+4 -4
View File
@@ -586,13 +586,13 @@ var ACTIVITY_SPORTS_APPLY_USER = {
message = teamName + "替补最多设置" + substituteNum + "人"
break
}
const womanYdyNum = teamApplyData[i].filter((v) => ["女", "女性"].includes(v.sex) && v.identity.includes("1")).length
const womanYdyNum = teamApplyData[i].filter((v) => ["女"].includes(v.sex) && v.identity.includes("1")).length
if (restrictGirlNum > 0 && womanYdyNum < restrictGirlNum) {
msgFlag = false
message = teamName + "女运动员至少设置" + restrictGirlNum + "人"
break
}
const manYdyNum = teamApplyData[i].filter((v) => ["男", "男性"].includes(v.sex) && v.identity.includes("1")).length
const manYdyNum = teamApplyData[i].filter((v) => ["男"].includes(v.sex) && v.identity.includes("1")).length
if (restrictBoyNum > 0 && manYdyNum < restrictBoyNum) {
msgFlag = false
message = teamName + "男运动员至少设置" + restrictBoyNum + "人"
@@ -675,7 +675,7 @@ var ACTIVITY_SPORTS_APPLY_USER = {
) {
this.$notify({
title: "警告",
message: "该项目暂不支持男性运动员报名",
message: "该项目暂不支持男运动员报名",
type: "warning"
})
return
@@ -689,7 +689,7 @@ var ACTIVITY_SPORTS_APPLY_USER = {
) {
this.$notify({
title: "警告",
message: "该项目暂不支持女性运动员报名",
message: "该项目暂不支持女运动员报名",
type: "warning"
})
return
src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js
+3 -2
View File
@@ -1,4 +1,4 @@
let ACTIVITY_SPORTS_ADD_ACTIVITY = {
let ACTIVITY_SPORTS_ADD_ACTIVITY = {
template: `
<div>
<el-steps :active="active" finish-status="success" simple>
@@ -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},
]*/
}
},
@@ -1206,3 +1206,4 @@ let ACTIVITY_SPORTS_ADD_ACTIVITY = {
this.unitOptions = this.clubOptions.concat(units)
}
}
src/main/resources/views/platform/zhgh/benefit/userList/index.html
+4 -3
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
@@ -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 }
@@ -218,3 +218,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/benefit/userSelectionList/index.html
+4 -3
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
@@ -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 },
@@ -258,3 +258,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/club/examine/common/examineInfo.js
+3 -2
View File
@@ -1,4 +1,4 @@
const EXAMINE_INFO_COMPONENT = {
const EXAMINE_INFO_COMPONENT = {
template: `
<div>
<el-tabs tab-position="top" v-model="activeName">
@@ -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="yearReduceNum"></el-table-column>
@@ -196,3 +196,4 @@ const EXAMINE_INFO_COMPONENT = {
}
`
}
src/main/resources/views/platform/zhgh/club/infoManage/exitManage/index.html
+3 -2
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
<style></style>
@@ -16,7 +16,7 @@ layout("/layouts/platform.html"){
<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="在职状态">
@@ -98,3 +98,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js
+3 -2
View File
@@ -1,4 +1,4 @@
const CLUB_INFO_MANAGE_TEMPLATE = {
const CLUB_INFO_MANAGE_TEMPLATE = {
template: `
<div>
<el-card shadow="never">
@@ -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="在职状态">
@@ -353,3 +353,4 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
await this.pageData()
}
}
src/main/resources/views/platform/zhgh/dayofficework/fund/member/batchJoin/index.html
+4 -8
View File
@@ -35,14 +35,10 @@ layout("/layouts/platform.html"){
<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.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>
</el-card>
<el-card shadow="never">
@@ -105,8 +101,7 @@ layout("/layouts/platform.html"){
{ label: "性别", prop: "sex" },
{ label: "出生年月", prop: "birthday" },
{ label: "在职状态", prop: "userState", sortable: true },
{ label: "教职工类别", prop: "personType", sortable: true },
{ label: '编制类别', prop: 'preparedBy', sortable: true },
{ label: "人员类型", prop: "personType", sortable: true },
{ label: "所属工会", prop: "unionName" },
{ label: "所属单位", prop: "unitName" },
],
@@ -183,3 +178,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html
+4 -8
View File
@@ -39,14 +39,10 @@ layout("/layouts/platform.html"){
<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.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>
</el-card>
<el-card shadow="never">
@@ -113,8 +109,7 @@ layout("/layouts/platform.html"){
{ label: "性别", prop: "sex" },
{ label: "出生年月", prop: "birthday" },
{ label: "在职状态", prop: "userState", sortable: true },
{ label: "教职工类别", prop: "personType", sortable: true },
{ label: '编制类别', prop: 'preparedBy', sortable: true },
{ label: "人员类型", prop: "personType", sortable: true },
{ label: "所属工会", prop: "unionName" },
{ label: "所属单位", prop: "unitName" },
{ label: "加入时间", prop: "joinTime" },
@@ -219,3 +214,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/projectMange/index.html
+2 -2
View File
@@ -436,8 +436,7 @@ layout("/layouts/platform.html"){
{label: "年龄", value: "age"},
{label: "婚姻状况", value: "marriage"},
{label: "在职状态", value: "userState"},
{label: "编制类别", value: "preparedBy"},
{label: "教职工类别", value: "personType"},
{label: "人员类型", value: "personType"},
],
conditionGroup: {
logic: "AND",
@@ -701,3 +700,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/dayofficework/integral/manage/index.html
+5 -4
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
@@ -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},
@@ -460,3 +460,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/dayofficework/meeting/common/meetingInfo.js
+2 -2
View File
@@ -31,8 +31,7 @@ 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="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>
@@ -68,3 +67,4 @@ const meetingInfo = {
}
`
}
src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/basicForm.js
+3 -4
View File
@@ -114,8 +114,7 @@ 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="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 +177,7 @@ 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="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>
@@ -394,3 +392,4 @@ const basicForm = {
`
}
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html
+1 -1
View File
@@ -44,7 +44,7 @@
<el-descriptions-item label="性别">
<el-form-item prop="sex">
<el-select v-model="formData.sex" placeholder="请选择性别" clearable style="width: 100%">
<el-option v-for="item in ['男性','女性']" :key="item" :label="item" :value="item">
<el-option v-for="item in ['男','女']" :key="item" :label="item" :value="item">
</el-option>
</el-select>
</el-form-item>
src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/apply/index.html
+11 -11
View File
@@ -215,13 +215,13 @@ layout("/layouts/platform.html"){
return total;
},
// 是否为男性
// 是否为男
isMale() {
return this.formData.sex === '男性' || this.formData.sex === '男';
return this.formData.sex === '男';
},
// 是否为女性
// 是否为女
isFemale() {
return this.formData.sex === '女性' || this.formData.sex === '女';
return this.formData.sex === '女';
},
},
watch: {
@@ -237,7 +237,7 @@ layout("/layouts/platform.html"){
// 监听性别变化，设置默认值
isMale(newVal) {
if (newVal) {
// 男性默认设置
// 男默认设置
this.$set(this.formData, 'loverSex', '女');
this.$set(this.formData, 'withLeave', 15);
this.$set(this.formData, 'parentalLeave', 10);
@@ -245,7 +245,7 @@ layout("/layouts/platform.html"){
},
isFemale(newVal) {
if (newVal) {
// 女性默认设置
// 女默认设置
this.$set(this.formData, 'loverSex', '男');
this.$set(this.formData, 'maternityLeave', 98);
this.$set(this.formData, 'extendLeave', 60);
@@ -255,7 +255,7 @@ layout("/layouts/platform.html"){
methods: {
// 计算休假时间止
calculateEndTime() {
// 如果是男性，则不自动计算结束时间
// 如果是男，则不自动计算结束时间
if (this.isMale) {
return;
}
@@ -372,19 +372,19 @@ layout("/layouts/platform.html"){
}
// 根据性别设置默认值
if (this.isMale) {
// 男性默认设置
// 男默认设置
this.$set(this.formData, 'loverSex', '女');
this.$set(this.formData, 'withLeave', 15);
this.$set(this.formData, 'parentalLeave', 10);
// 男性默认产假和延长假为0，因为男性不休产假
// 男默认产假和延长假为0，因为男不休产假
this.$set(this.formData, 'maternityLeave', 0);
this.$set(this.formData, 'extendLeave', 0);
} else if (this.isFemale) {
// 女性默认设置
// 女默认设置
this.$set(this.formData, 'loverSex', '男');
this.$set(this.formData, 'maternityLeave', 98);
this.$set(this.formData, 'extendLeave', 60);
// 女性默认陪产假和育儿假为0
// 女默认陪产假和育儿假为0
this.$set(this.formData, 'withLeave', 0);
this.$set(this.formData, 'parentalLeave', 0);
}
src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/common/info.js
+6 -6
View File
@@ -21,22 +21,22 @@ const maternityLeaveInfo = {
</el-descriptions>
<table-tool label="假期类型"></table-tool>
<el-descriptions :column="2" border class="flow-task-form">
<el-descriptions-item label="陪产假" v-if="viewData.sex === '男性' || viewData.sex === '男'">
<el-descriptions-item label="陪产假" v-if="viewData.sex === '男'">
{{viewData.withLeave}}
</el-descriptions-item>
<el-descriptions-item label="育儿假" v-if="viewData.sex === '男性' || viewData.sex === '男'">
<el-descriptions-item label="育儿假" v-if="viewData.sex === '男'">
{{viewData.parentalLeave}}
</el-descriptions-item>
<el-descriptions-item label="产假" v-if="viewData.sex === '女性' || viewData.sex === '女'">
<el-descriptions-item label="产假" v-if="viewData.sex === '女'">
{{viewData.maternityLeave}}
</el-descriptions-item>
<el-descriptions-item label="延长假" v-if="viewData.sex === '女性' || viewData.sex === '女'">
<el-descriptions-item label="延长假" v-if="viewData.sex === '女'">
{{viewData.extendLeave}}
</el-descriptions-item>
<el-descriptions-item label="多胞胎" v-if="viewData.sex === '女性' || viewData.sex === '女'">
<el-descriptions-item label="多胞胎" v-if="viewData.sex === '女'">
{{viewData.birthsLeave}}
</el-descriptions-item>
<el-descriptions-item label="难产假" v-if="viewData.sex === '女性' || viewData.sex === '女'">
<el-descriptions-item label="难产假" v-if="viewData.sex === '女'">
{{viewData.difficultLeave}}
</el-descriptions-item>
<el-descriptions-item label="寒假">{{viewData.winterLeave}}</el-descriptions-item>
src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html
+3 -2
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
@@ -102,7 +102,7 @@ layout("/layouts/platform.html"){
{ prop: "loginName", label: "工号", sortable: true },
{ prop: "userName", 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 },
@@ -194,3 +194,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js
+4 -3
View File
@@ -1,4 +1,4 @@
const COMMON_QUERY = {
const COMMON_QUERY = {
template: /*language=HTML*/ `
<search @search="doSearch">
<search-item label="姓名/工号">
@@ -27,8 +27,8 @@ 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.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="编制类别">-->
@@ -99,3 +99,4 @@ const COMMON_QUERY = {
this.initData()
}
}
src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/info.js
+2 -2
View File
@@ -27,8 +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.preparedBy }}</el-descriptions-item>
<!-- <el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>-->
<el-descriptions-item label="婚姻状况">{{ viewData.marriage }}</el-descriptions-item>
<el-descriptions-item label="入职时间">{{ viewData.arrivalAtSchoolDate }}</el-descriptions-item>
<el-descriptions-item></el-descriptions-item>
@@ -147,3 +146,4 @@ const INFO = {
}
}
}
src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/memberApplyAuditInfo.js
+3 -2
View File
@@ -1,4 +1,4 @@
const MEMBER_APPLY_AUDIT_INFO = {
const MEMBER_APPLY_AUDIT_INFO = {
template: /*language=HTML*/ `
<div>
<el-tabs v-model="activeName">
@@ -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">
@@ -125,3 +125,4 @@ const MEMBER_APPLY_AUDIT_INFO = {
}
}
}
src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html
+3 -2
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
@@ -85,7 +85,7 @@ layout("/layouts/platform.html"){
{ prop: "loginName", label: "工号", sortable: true },
{ prop: "userName", 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 },
@@ -161,3 +161,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html
+3 -2
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
@@ -120,7 +120,7 @@ layout("/layouts/platform.html"){
{ prop: "loginName", label: "工号", sortable: true },
{ prop: "userName", 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 },
@@ -225,3 +225,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/form.html
+3 -2
View File
@@ -1,4 +1,4 @@
<div id="member_apply">
<div id="member_apply">
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="：" class="flow-task-form">
<el-descriptions :column="3" border>
<el-descriptions-item label="工号">
@@ -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>
@@ -464,3 +464,4 @@
}
})
</script>
src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html
+3 -2
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
@@ -96,7 +96,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"
style="width: 100%"></dict-select>
@@ -477,3 +477,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/apply/uniongroupapproval/index.html
+2 -2
View File
@@ -104,8 +104,7 @@ layout("/layouts/platform.html"){
{ prop: "loginName", label: "工号", sortable: true },
{ prop: "userName", label: "姓名", sortable: true },
{ prop: "userState", 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: "sign", label: "签字" },
@@ -196,3 +195,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/apply/view/index.html
+3 -2
View File
@@ -1,4 +1,4 @@
<div id="member_apply_view">
<div id="member_apply_view">
<el-descriptions :column="3" border>
<el-descriptions-item label="工号">{{ viewData.loginname }}</el-descriptions-item>
<el-descriptions-item label="姓名">{{ viewData.username }}</el-descriptions-item>
@@ -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">
@@ -142,3 +142,4 @@
width: 15%;
}
</style>
src/main/resources/views/platform/zhgh/staffmanage/member/branch/verification/check/index.html
+4 -6
View File
@@ -42,11 +42,8 @@ layout("/layouts/platform.html"){
<search-item label="在职状态">
<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" 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 +243,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 },
@@ -549,3 +546,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/change/branchunionaudit/index.html
+3 -2
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
@@ -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: 'preparedBy', label: '编制类别', sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
@@ -204,3 +204,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js
+4 -3
View File
@@ -1,4 +1,4 @@
const COMMON_QUERY = {
const COMMON_QUERY = {
template: /*language=HTML*/ `
<search @search="doSearch">
<search-item label="姓名/工号">
@@ -22,8 +22,8 @@ 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.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="编制类别">-->
@@ -97,3 +97,4 @@ const COMMON_QUERY = {
this.initData()
}
}
src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js
+2 -2
View File
@@ -30,8 +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.preparedBy }}</el-descriptions-item>
<el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
<template v-if="viewData.userState == '退休'">
<el-descriptions-item label="退休日期">{{ viewData.retireDate ?
@@ -178,3 +177,4 @@ const INFO = {
}
}
}
src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberAllChangeInfo.js
+2 -2
View File
@@ -24,8 +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.preparedBy }}</el-descriptions-item>
<el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
<template v-if="viewData.userState == '退休'">
<el-descriptions-item label="退休日期">{{ viewData.retireDate ? $moment(viewData.retireDate).format("YYYY-MM-DD") : '暂无' }}</el-descriptions-item>
@@ -109,3 +108,4 @@ const MEMBER_ALL_CHANGE_INFO = {
}
}
}
src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js
+2 -7
View File
@@ -139,18 +139,12 @@ const MEMBER_CHANGE = {
: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>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="编制类别">
<el-form-item prop="preparedBy">
<dict-select v-model="formData.preparedBy" code="USER_PREPARED_BY_TYPE"
:disabled="allowFields('preparedBy')" style="width: 100%"></dict-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="人员属性">
<el-form-item prop="userAttribute">
<dict-select v-model="formData.userAttribute" code="USER_ATTRIBUTE"
@@ -512,3 +506,4 @@ const MEMBER_CHANGE = {
}
`
}
src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html
+5 -4
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
@@ -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="编制类别">-->
@@ -548,7 +548,7 @@ layout("/layouts/platform.html"){
{ prop: "mobile", label: "联系电话", width: 120 },
{ prop: "political", label: "政治面貌", width: 120, sortable: true},
{ prop: "userState", label: "在职状态", width: 120, sortable: true },
{ prop: "personType", label: "教职工类别", width: 120, sortable: true, checked: 0 },
{ prop: "personType", label: "人员类型", width: 120, sortable: true, checked: 0 },
// { prop: "preparedBy", label: "编制类别", width: 120, sortable: true },
{ prop: "postDoctoralJoinDate", label: "进站时间", sortable: true, checked: 0 },
{ prop: "unionName", label: "所属工会", width: 120, sortable: true },
@@ -847,3 +847,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/change/mine/index.html
+3 -2
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app">
@@ -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: "preparedBy", label: "编制类别", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
@@ -157,3 +157,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/change/record/index.html
+5 -4
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
@@ -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="变更类型">
@@ -135,7 +135,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},
@@ -227,3 +227,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/change/schoolunionaudit/index.html
+3 -2
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
@@ -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: 'preparedBy', label: '编制类别', sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
@@ -206,3 +206,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/form.html
+3 -2
View File
@@ -1,4 +1,4 @@
<div id="member_change">
<div id="member_change">
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="：" class="flow-task-form">
<el-descriptions :column="3" border>
<el-descriptions-item label="工号">
@@ -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>
@@ -530,3 +530,4 @@
}
})
</script>
src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html
+3 -2
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app">
@@ -139,7 +139,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>
@@ -552,3 +552,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/change/uniongroupaudit/index.html
+2 -2
View File
@@ -94,8 +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: 'preparedBy', 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 },
@@ -204,3 +203,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/change/view/index.html
+3 -2
View File
@@ -1,4 +1,4 @@
<div id="member_change_view">
<div id="member_change_view">
<el-tabs v-model="activeName">
<el-tab-pane label="基础信息" name="basicInfo">
<el-descriptions :column="3" border class="descriptions-form">
@@ -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 == '退休'">
@@ -163,3 +163,4 @@
width: 15%;
}
</style>
src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js
+2 -2
View File
@@ -70,8 +70,7 @@ const MEMBER_INFO = {
<!-- 第 3 行 -->
<el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
<el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="编制类别">{{ viewData.preparedBy }}</el-descriptions-item>
<el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
<!-- 第 4 行 -->
<el-descriptions-item label="职称">{{ viewData.professionalTitle }}</el-descriptions-item>
@@ -104,3 +103,4 @@ const MEMBER_INFO = {
}
}
};
src/main/resources/views/platform/zhgh/staffmanage/member/common/manage/memberManageQuery.js
+3 -6
View File
@@ -27,12 +27,8 @@ const MEMBER_MANAGE_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.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="更新日期">
@@ -134,3 +130,4 @@ const MEMBER_MANAGE_QUERY = {
this.initData()
}
}
src/main/resources/views/platform/zhgh/staffmanage/member/common/manage/memberManageTable.js
+2 -2
View File
@@ -154,8 +154,7 @@ const MEMBER_MANAGE_TABLE = {
{ prop: "sex", label: "性别", sortable: true, width: "100px" },
{ 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 }
],
@@ -257,3 +256,4 @@ const MEMBER_MANAGE_TABLE = {
})
}
}
src/main/resources/views/platform/zhgh/staffmanage/member/common/verification/memberVerificationChange.js
+3 -2
View File
@@ -1,4 +1,4 @@
const MEMBER_VERIFICATION_CHANGE = {
const MEMBER_VERIFICATION_CHANGE = {
template: `
<el-card shadow="never">
<div>
@@ -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>
@@ -94,3 +94,4 @@ const MEMBER_VERIFICATION_CHANGE = {
}
}
}
src/main/resources/views/platform/zhgh/staffmanage/member/info/batchmake/index.html
+3 -2
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app">
@@ -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 },
@@ -133,3 +133,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/info/board/index1.html
+3 -2
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
<style>
@@ -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"
@@ -716,3 +716,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.js
+4 -3
View File
@@ -1,4 +1,4 @@
const COMMON_QUERY = {
const COMMON_QUERY = {
template: /*language=HTML*/ `
<search @search="doSearch">
<search-item label="姓名/工号">
@@ -37,8 +37,8 @@ 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="教职工类别" v-if="!query_disable">
<dict-select v-model="pageForm.personTypes" placeholder="请选择教职工类别" @change="doSearch"
<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="编制类别">-->
@@ -125,3 +125,4 @@ const COMMON_QUERY = {
this.initData()
}
}
src/main/resources/views/platform/zhgh/staffmanage/member/info/common/memberAddForm.js
+2 -1
View File
@@ -120,7 +120,7 @@
<!-- 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"-->
<!-- style="width: 100%"></dict-select>-->
@@ -370,3 +370,4 @@
this.initUnits()
}
}
src/main/resources/views/platform/zhgh/staffmanage/member/info/datamanage/index.html
+4 -3
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
@@ -97,7 +97,7 @@ layout("/layouts/platform.html"){
</div>
</div>
<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 },
@@ -314,3 +314,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/info/group/index.html
+3 -2
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
@@ -126,7 +126,7 @@ layout("/layouts/platform.html"){
{ prop: "mobile", label: "联系电话", width: 120 },
{ prop: "political", label: "政治面貌", width: 120, sortable: true},
{ prop: "userState", label: "在职状态", width: 120, sortable: true },
{ prop: "personType", label: "教职工类别", width: 120, sortable: true, checked: 0 },
{ prop: "personType", label: "人员类型", width: 120, sortable: true, checked: 0 },
// { prop: "preparedBy", label: "编制类别", width: 120, sortable: true },
{ prop: "postDoctoralJoinDate", label: "进站时间", sortable: true, checked: 0 },
{ prop: "unionName", label: "所属工会", width: 120, sortable: true },
@@ -238,3 +238,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/info/history/index.html
+4 -11
View File
@@ -43,17 +43,9 @@ layout("/layouts/platform.html"){
<search-item label="在职状态">
<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" 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-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.aidFundMemberUserType" placeholder="请选择人员分类" @change="doSearch" code="AIDFUND_MEMBER_USER_TYPE"></dict-select>
</search-item>
@@ -128,7 +120,7 @@ layout("/layouts/platform.html"){
{ prop: "sex", label: "性别" },
{ prop: "mobile", label: "联系电话" },
{ 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 }
@@ -177,3 +169,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/info/input/index.html
+4 -3
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
@@ -43,8 +43,8 @@ layout("/layouts/platform.html"){
<search-item label="在职状态">
<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" 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-item label="人员分类">
<dict-select v-model="pageForm.aidFundMemberUserType" placeholder="请选择人员分类" @change="doSearch" code="AIDFUND_MEMBER_USER_TYPE"></dict-select>
@@ -201,3 +201,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/modelworker/manage/index.html
+5 -4
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
@@ -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: '所属单位'},
@@ -234,3 +234,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/schoolViewAndHandle.js
+4 -8
View File
@@ -19,12 +19,8 @@ const SCHOOL_VIEW_AND_HANDLE = {
<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"
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>
@@ -140,8 +136,7 @@ const SCHOOL_VIEW_AND_HANDLE = {
{ label: "工号", prop: "loginname" },
{ label: "性别", prop: "sex" },
{ label: "在职状态", prop: "userState" },
{ label: "编制类别", prop: "preparedBy" },
{ label: "教职工类别", prop: "personType" },
{ label: "人员类型", prop: "personType" },
{ label: "所属单位", prop: "unitName" },
{ label: "是否变更", prop: "isChanged" },
// { label: "分工会状态", prop: "branchUnionChecked" },
@@ -287,3 +282,4 @@ const SCHOOL_VIEW_AND_HANDLE = {
created() {
}
}
src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/viewChangeTypeUser.js
+4 -8
View File
@@ -17,12 +17,8 @@ const VIEW_CHANGE_TYPE_USER = {
<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"
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>
@@ -76,8 +72,7 @@ const VIEW_CHANGE_TYPE_USER = {
{ prop: "loginname", label: "工号", sortable: true },
{ 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 },
@@ -117,3 +112,4 @@ const VIEW_CHANGE_TYPE_USER = {
}
}
}
src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationQuery.js
+4 -3
View File
@@ -1,4 +1,4 @@
const VERIFICATION_QUERY = {
const VERIFICATION_QUERY = {
template: `
<el-card>
<search @search="doSearch">
@@ -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="变更类型">
@@ -62,3 +62,4 @@ const VERIFICATION_QUERY = {
},
created() {}
}
src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationSetUserList.js
+3 -6
View File
@@ -28,14 +28,10 @@ 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="编制类别">
<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.changeType" placeholder="变更类型" @change="doSearch"
code="MEMBER_CHANGE_TYPE"></dict-select>
@@ -496,3 +492,4 @@ const VERIFICATION_SET_USER_LIST = {
// this.findList()
}
}
src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationShowSelectionUsers.js
+4 -8
View File
@@ -26,12 +26,8 @@ const VERIFICATION_SHOW_SELECTION_USERS = {
<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"
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>
@@ -43,8 +39,7 @@ const VERIFICATION_SHOW_SELECTION_USERS = {
<el-table-column label="姓名" prop="username"></el-table-column>
<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">
@@ -183,3 +178,4 @@ const VERIFICATION_SHOW_SELECTION_USERS = {
},
created() {}
}
src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html
+3 -2
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app">
@@ -158,7 +158,7 @@ layout("/layouts/platform.html"){
{ prop: "mobile", label: "联系电话", width: 120 },
{ prop: "political", label: "政治面貌", width: 120, sortable: true},
{ prop: "userState", label: "在职状态", width: 120, sortable: true },
{ prop: "personType", label: "教职工类别", width: 120, sortable: true, checked: 0 },
{ prop: "personType", label: "人员类型", width: 120, sortable: true, checked: 0 },
// { prop: "preparedBy", label: "编制类别", width: 120, sortable: true },
{ prop: "postDoctoralJoinDate", label: "进站时间", sortable: true, checked: 0 },
{ prop: "unionName", label: "所属工会", width: 120, sortable: true },
@@ -275,3 +275,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/queryForm.js
+4 -27
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"
@@ -87,30 +87,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
</el-col>
</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-content query-row-content-tag">
<el-tag
style="margin-right: 10px;cursor: pointer"
v-for="item in preparedByOptions"
:key="item.code"
:type="item.name"
:effect="pageForm.preparedBys.includes(item.name)?'dark':'plain'"
@click="tagClick('preparedBys',item.name)">
{{ item.name }}
</el-tag>
<el-link type="danger"
v-if="preparedByOptions.length&&pageForm.preparedBys.length"
:underline="false"
@click="pageForm.preparedBys=[];doSearch()">清空
</el-link>
<el-link :underline="false"
@click="pageForm.preparedBys=preparedByOptions.map(p=>p.code);doSearch()"
type="success">全部
</el-link>
</el-col>
</el-row>
<el-row type="flex" align="middle" class="query-row query-row-tag">
<el-col class="query-row-title">人员分类：</el-col>
@@ -283,8 +259,8 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
unions: [],
units: [],
sexTypeOptions: [
{ code: "男性", name: "男性" },
{ code: "女性", name: "女性" }
{ code: "男", name: "男" },
{ code: "女", name: "女" }
],
pickerOptions: {
disabledDate: (time) => {
@@ -491,3 +467,4 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
}
`
}
src/main/resources/views/platform/zhgh/staffmanage/membercost/config.html
+3 -2
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
<style>
@@ -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>
@@ -368,3 +368,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/membercost/mine/minePayInfo.js
+3 -2
View File
@@ -1,4 +1,4 @@
const MINE_PAY_INFO = {
const MINE_PAY_INFO = {
template: /*language=html*/ `
<div>
<el-descriptions title="缴费信息" :column="3" border>
@@ -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>
@@ -123,3 +123,4 @@ const MINE_PAY_INFO = {
},
}
}
src/main/resources/views/platform/zhgh/staffmanage/membercost/summary.html
+5 -4
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
@@ -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 },
@@ -484,3 +484,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/membercost/user.html
+4 -3
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
@@ -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>
@@ -335,3 +335,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/personnelcheck/common/commonQuery.js
+3 -6
View File
@@ -24,14 +24,10 @@ 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.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>
</template>
</search>
`,
@@ -90,3 +86,4 @@ const COMMON_QUERY = {
this.initData()
}
}
src/main/resources/views/platform/zhgh/staffmanage/personnelcheck/manage/add/importAndMap.js
+2 -2
View File
@@ -142,8 +142,7 @@ const importAndMap = {
{ value: "mobile", label: "联系电话" },
{ value: "political", label: "政治面貌"},
{ value: "userState", label: "在职状态" },
{ value: "personType", label: "教职工类别" },
{ value: "preparedBy", label: "编制类别" },
{ value: "personType", label: "人员类型" },
{ value: "postDoctoralJoinDate", label: "进站时间" },
{ value: "unionId", label: "所属工会" },
{ value: "unitId", label: "所属单位" },
@@ -404,3 +403,4 @@ const importAndMap = {
}
`
}
src/main/resources/views/platform/zhgh/staffmanage/singleTeacher/ledger/index.html
+5 -4
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
@@ -21,8 +21,8 @@ layout("/layouts/platform.html"){
</search-item>
<search-item label="性别">
<el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">
<el-option label="男性" value="男性"></el-option>
<el-option label="女性" value="女性"></el-option>
<el-option label="男" value="男"></el-option>
<el-option label="女" value="女"></el-option>
</el-select>
</search-item>
<search-item label="年龄区间">
@@ -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">
@@ -154,3 +154,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html
+5 -4
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
<style>
@@ -44,8 +44,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="编制类别">-->
@@ -199,7 +199,7 @@ layout("/layouts/platform.html"){
{ prop: "username", label: "姓名", sortable: true },
{ prop: "sex", label: "性别", sortable: true, width: "100px" },
{ 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 },
@@ -323,3 +323,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/specialstaff/manage/index.html
+5 -4
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
@@ -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 },
@@ -380,3 +380,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffmanage/thirtyTeach/manage/index.html
+6 -5
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform.html"){
#-->
@@ -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},
@@ -340,3 +340,4 @@ layout("/layouts/platform.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js
-8
View File
@@ -84,13 +84,6 @@ const filterUser = {
v-model="pageForm.personTypes"></dict-select>
</search-item>
<search-item label="编制类别：">
<dict-select clearable code="USER_PREPARED_BY_TYPE"
multiple
collapse-tags
placeholder="请选择编制类别"
v-model="pageForm.preparedBys"></dict-select>
</search-item>
<search-item label="在职状态：">
<dict-select clearable code="USER_STATE"
@@ -170,7 +163,6 @@ const filterUser = {
{ prop: "sex", label: "性别", sortable: true, checked: 0 },
{ prop: "birthday", label: "出生日期", sortable: true, checked: 0 },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "preparedBy", 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/statistics/selectedUser.js
+2 -2
View File
@@ -50,8 +50,7 @@ const selectedUser = {
{ label: "姓名", prop: "userName" },
{ label: "生日", prop: "birthday" },
{ prop: "userState", label: "在职状态", width: 120, sortable: true },
{ prop: "personType", label: "教职工类别", width: 120, sortable: true },
{ prop: "preparedBy", label: "编制类别", width: 120, sortable: true },
{ prop: "personType", label: "人员类型", width: 120, sortable: true },
{ prop: "postDoctoralJoinDate", label: "进站时间", sortable: true },
{ label: "单位", prop: "welfareUnitName" },
{ label: "手机号", prop: "mobile" },
@@ -95,3 +94,4 @@ const selectedUser = {
}
}
}
src/main/resources/views/platform/zhgh/welfare/statistics/unSelectedUser.js
+2 -2
View File
@@ -49,8 +49,7 @@ const unSelectedUser = {
{ label: "姓名", prop: "userName" },
{ label: "生日", prop: "birthday" },
{ prop: "userState", label: "在职状态", width: 120, sortable: true },
{ prop: "personType", label: "教职工类别", width: 120, sortable: true },
{ prop: "preparedBy", label: "编制类别", width: 120, sortable: true },
{ prop: "personType", label: "人员类型", width: 120, sortable: true },
{ prop: "postDoctoralJoinDate", label: "进站时间", sortable: true },
{ label: "单位", prop: "welfareUnitName" }
]
@@ -86,3 +85,4 @@ const unSelectedUser = {
}
}
}
src/main/resources/views/platform/zhgh/welfare/welfareUser/addUser.js
-8
View File
@@ -86,13 +86,6 @@ const addUser = {
v-model="pageForm.personTypes"></dict-select>
</search-item>
<search-item label="编制类别：">
<dict-select clearable code="USER_PREPARED_BY_TYPE"
multiple
collapse-tags
placeholder="请选择编制类别"
v-model="pageForm.preparedBys"></dict-select>
</search-item>
<search-item label="在职状态：">
<dict-select clearable code="USER_STATE"
@@ -175,7 +168,6 @@ const addUser = {
{ prop: "sex", label: "性别", sortable: true, checked: 0 },
{ prop: "birthday", label: "出生日期", sortable: true, checked: 0 },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "preparedBy", 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/welfareUser/index.html
-11
View File
@@ -98,16 +98,6 @@ layout("/layouts/platform.html"){
></dict-select>
</search-item>
<search-item label="编制类别：">
<dict-select
clearable
code="USER_PREPARED_BY_TYPE"
multiple
collapse-tags
placeholder="请选择编制类别"
v-model="pageForm.preparedBys"
></dict-select>
</search-item>
<search-item label="在职状态：">
<dict-select
@@ -265,7 +255,6 @@ layout("/layouts/platform.html"){
{ prop: "sex", label: "性别", sortable: true, checked: 0 },
{ prop: "birthday", label: "出生日期", sortable: true, checked: 0 },
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "preparedBy", label: "编制类别", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "welfareUnionName", label: "所属工会", sortable: true },
{ prop: "welfareUnitName", label: "所属单位", sortable: true },
src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html
+1 -1
View File
@@ -71,7 +71,7 @@ layout("/layouts/platform_h5.html"){
<van-popup v-model="showSexPicker" position="bottom">
<van-picker
show-toolbar
:columns="['男性', '女性']"
:columns="['男', '女']"
@confirm="onSexConfirm"
@cancel="showSexPicker=false"
></van-picker>
src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/apply/index.html
+17 -17
View File
@@ -257,13 +257,13 @@ layout("/layouts/platform_h5.html"){
this.$set(this.formData, 'leaveDays', total);
return total;
},
// 是否为男性
// 是否为男
isMale() {
return this.formData.sex === '男性' || this.formData.sex === '男';
return this.formData.sex === '男';
},
// 是否为女性
// 是否为女
isFemale() {
return this.formData.sex === '女性' || this.formData.sex === '女';
return this.formData.sex === '女';
}
},
watch: {
@@ -279,7 +279,7 @@ layout("/layouts/platform_h5.html"){
// 监听性别变化，设置默认值
isMale(newVal) {
if (newVal) {
// 男性默认设置
// 男默认设置
this.$set(this.formData, 'loverSex', '女');
this.$set(this.formData, 'withLeave', 15);
this.$set(this.formData, 'parentalLeave', 10);
@@ -287,7 +287,7 @@ layout("/layouts/platform_h5.html"){
},
isFemale(newVal) {
if (newVal) {
// 女性默认设置
// 女默认设置
this.$set(this.formData, 'loverSex', '男');
this.$set(this.formData, 'maternityLeave', 98);
this.$set(this.formData, 'extendLeave', 60);
@@ -322,7 +322,7 @@ layout("/layouts/platform_h5.html"){
},
// 计算休假时间止
calculateEndTime() {
// 如果是男性，则不自动计算结束时间
// 如果是男，则不自动计算结束时间
if (this.isMale) {
return;
}
@@ -363,8 +363,8 @@ layout("/layouts/platform_h5.html"){
const errors = [];
// 根据性别确定需要验证的字段
const isMale = this.formData.sex === '男性' || this.formData.sex === '男';
const isFemale = this.formData.sex === '女性' || this.formData.sex === '女';
const isMale = this.formData.sex === '男';
const isFemale = this.formData.sex === '女';
// 必填字段验证
if (!this.formData.loverName) {
@@ -562,17 +562,17 @@ layout("/layouts/platform_h5.html"){
// 根据性别设置默认值
if (this.isMale) {
// 男性默认设置
// 男默认设置
if (!this.formData.withLeave) this.$set(this.formData, 'withLeave', 15);
if (!this.formData.parentalLeave) this.$set(this.formData, 'parentalLeave', 10);
// 男性默认产假和延长假为0
// 男默认产假和延长假为0
if (!this.formData.maternityLeave) this.$set(this.formData, 'maternityLeave', 0);
if (!this.formData.extendLeave) this.$set(this.formData, 'extendLeave', 0);
} else if (this.isFemale) {
// 女性默认设置
// 女默认设置
if (!this.formData.maternityLeave) this.$set(this.formData, 'maternityLeave', 98);
if (!this.formData.extendLeave) this.$set(this.formData, 'extendLeave', 60);
// 女性默认陪产假和育儿假为0
// 女默认陪产假和育儿假为0
if (!this.formData.withLeave) this.$set(this.formData, 'withLeave', 0);
if (!this.formData.parentalLeave) this.$set(this.formData, 'parentalLeave', 0);
}
@@ -594,19 +594,19 @@ layout("/layouts/platform_h5.html"){
// 根据性别设置默认值
if (this.isMale) {
// 男性默认设置
// 男默认设置
this.$set(this.formData, 'loverSex', '女');
this.$set(this.formData, 'withLeave', 15);
this.$set(this.formData, 'parentalLeave', 10);
// 男性默认产假和延长假为0
// 男默认产假和延长假为0
this.$set(this.formData, 'maternityLeave', 0);
this.$set(this.formData, 'extendLeave', 0);
} else if (this.isFemale) {
// 女性默认设置
// 女默认设置
this.$set(this.formData, 'loverSex', '男');
this.$set(this.formData, 'maternityLeave', 98);
this.$set(this.formData, 'extendLeave', 60);
// 女性默认陪产假和育儿假为0
// 女默认陪产假和育儿假为0
this.$set(this.formData, 'withLeave', 0);
this.$set(this.formData, 'parentalLeave', 0);
}
src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/common/info.js
+6 -6
View File
@@ -18,12 +18,12 @@ const MATERNITY_LEAVE_INFO = {
</van-cell-group>
<van-cell-group title="假期类型">
<van-cell title="陪产假" v-if="viewData.sex === '男性' || viewData.sex === '男'">{{ viewData.withLeave }}</van-cell>
<van-cell title="育儿假" v-if="viewData.sex === '男性' || viewData.sex === '男'">{{ viewData.parentalLeave }}</van-cell>
<van-cell title="产假" v-if="viewData.sex === '女性' || viewData.sex === '女'">{{ viewData.maternityLeave }}</van-cell>
<van-cell title="延长假" v-if="viewData.sex === '女性' || viewData.sex === '女'">{{ viewData.extendLeave }}</van-cell>
<van-cell title="多胞胎" v-if="viewData.sex === '女性' || viewData.sex === '女'">{{ viewData.birthsLeave }}</van-cell>
<van-cell title="难产假" v-if="viewData.sex === '女性' || viewData.sex === '女'">{{ viewData.difficultLeave }}</van-cell>
<van-cell title="陪产假" v-if="viewData.sex === '男'">{{ viewData.withLeave }}</van-cell>
<van-cell title="育儿假" v-if="viewData.sex === '男'">{{ viewData.parentalLeave }}</van-cell>
<van-cell title="产假" v-if="viewData.sex === '女'">{{ viewData.maternityLeave }}</van-cell>
<van-cell title="延长假" v-if="viewData.sex === '女'">{{ viewData.extendLeave }}</van-cell>
<van-cell title="多胞胎" v-if="viewData.sex === '女'">{{ viewData.birthsLeave }}</van-cell>
<van-cell title="难产假" v-if="viewData.sex === '女'">{{ viewData.difficultLeave }}</van-cell>
<van-cell title="寒假">{{ viewData.winterLeave }}</van-cell>
<van-cell title="暑假">{{ viewData.summerLeave }}</van-cell>
<van-cell title="合计">{{ viewData.leaveDays }}</van-cell>
src/main/resources/views/platform/zhghh5/staffmanage/member/apply/common/info.js
-1
View File
@@ -23,7 +23,6 @@ const INFO = {
<van-cell title="入职时间">{{ viewData.arrivalAtSchoolDate }}</van-cell>
<van-cell title="在职状态">{{ viewData.userState }}</van-cell>
<van-cell title="编制类别">{{ viewData.preparedBy || '暂无' }}</van-cell>
<van-cell title="婚姻状况">{{ viewData.marriage || '暂无' }}</van-cell>
<van-cell title="家庭住址">
<template #label>
src/main/resources/views/platform/zhghh5/staffmanage/member/apply/submit/index.html
+2 -9
View File
@@ -142,19 +142,11 @@ layout("/layouts/platform_h5.html"){
<van-field
v-model="formData.personType"
name="personType"
label="教职工类别"
label="人员类型"
readonly
placeholder="请填写人员类型"
clickable
></van-field>
<van-field
v-model="formData.preparedBy"
name="preparedBy"
label="编制类别"
readonly
placeholder="请填写编制类别"
clickable
></van-field>
<van-field
v-model="formData.marriage"
name="marriage"
@@ -610,3 +602,4 @@ layout("/layouts/platform_h5.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhghh5/staffmanage/member/common/mobileMemberChangeInfo.js
+2 -2
View File
@@ -13,8 +13,7 @@ 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.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>
@@ -89,3 +88,4 @@ const MOBILE_MEMBER_CHANGE_INFO = {
}
}
}
src/main/resources/views/platform/zhghh5/staffmanage/member/common/mobileMemberInfo.js
+3 -2
View File
@@ -1,4 +1,4 @@
const MOBILE_MEMBER_INFO = {
const MOBILE_MEMBER_INFO = {
template: /*language=HTML*/ `
<div class="detail-container">
<van-cell-group title="基本信息">
@@ -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">
@@ -89,3 +89,4 @@ const MOBILE_MEMBER_INFO = {
}
}
}
src/main/resources/views/platform/zhghh5/staffmanage/memberCost/summary.html
+3 -2
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform_h5.html"){
#-->
<div id="app" v-cloak>
@@ -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>
@@ -196,3 +196,4 @@ layout("/layouts/platform_h5.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhghh5/sys/home/mine.js
+2 -6
View File
@@ -35,7 +35,7 @@ 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">
@@ -43,11 +43,6 @@ const mine = {
<span class="item-label">在职状态</span>
<span class="info-value">{{ $store.state.user.userState }}</span>
</div>
<div class="info-item">
<van-icon name="user-o"></van-icon>
<span class="item-label">编制类别</span>
<span class="info-value">{{ $store.state.user.preparedBy }}</span>
</div>
<div class="info-item">
<van-icon name="wap-home-o"></van-icon>
<span class="item-label">所属单位</span>
@@ -374,3 +369,4 @@ const mine = {
`
}
}