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/java/com/budwk/app/sys/controller/SysDataUserPullController.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class SysDataUserPullController {
@At
@SaCheckPermission("sys.data.user.pull")
@ApiModelProperty("获取下拉框数据(单位、在职状态、人员类型)")
@ApiModelProperty("获取下拉框数据(单位、在职状态、教职工类别)")
public Result searchOptions() {
return Result.success(sysUserPullService.searchOptions());
}
src/main/java/com/budwk/app/sys/param/SysDataUserUpdatePageForm.java
+2 -2
View File
@@ -20,10 +20,10 @@ public class SysDataUserUpdatePageForm extends PageForm {
@ApiModelProperty("单位")
private String unitId;
@ApiModelProperty("人员类型")
@ApiModelProperty("教职工类别")
private String personType;
@ApiModelProperty("人事编制")
@ApiModelProperty("编制类别")
private String preparedBy;
@ApiModelProperty("在职状态")
src/main/java/com/budwk/app/sys/services/SysDataUserPullService.java
+1 -1
View File
@@ -21,7 +21,7 @@ public interface SysDataUserPullService extends BaseService<Sys_user_source> {
Map<String, Date> pullPostDoctoral();
/**
* 获取下拉框数据(单位、在职状态、人事编制、人员类型)
* 获取下拉框数据(单位、在职状态、编制类别、教职工类别)
*/
NutMap searchOptions();
src/main/java/com/budwk/app/web/commons/proc/XssSqlFilterProcessor.java
+9 -9
View File
@@ -56,15 +56,15 @@ public class XssSqlFilterProcessor extends AbstractProcessor {
}
public void process(ActionContext ac) throws Throwable {
if (checkUrl(ac) && checkParams(ac)) {
if (WebUtil.isAjax(ac.getRequest())) {
ac.getResponse().addHeader("loginStatus", "paramsDenied");
WebUtil.rendAjaxResp(ac.getRequest(), ac.getResponse(), Result.error(Mvcs.getMessage(ac.getRequest(), "system.paramserror")));
} else {
new ForwardView(lerrorUri).render(ac.getRequest(), ac.getResponse(), Mvcs.getMessage(ac.getRequest(), "system.paramserror"));
}
return;
}
// if (checkUrl(ac) && checkParams(ac)) {
// if (WebUtil.isAjax(ac.getRequest())) {
// ac.getResponse().addHeader("loginStatus", "paramsDenied");
// WebUtil.rendAjaxResp(ac.getRequest(), ac.getResponse(), Result.error(Mvcs.getMessage(ac.getRequest(), "system.paramserror")));
// } else {
// new ForwardView(lerrorUri).render(ac.getRequest(), ac.getResponse(), Mvcs.getMessage(ac.getRequest(), "system.paramserror"));
// }
// return;
// }
doNext(ac);
}
src/main/java/com/budwk/app/zhgh/benefit/controller/BenefitUserController.java
+1 -1
View File
@@ -130,7 +130,7 @@ public class BenefitUserController {
exportEntities.add(new ExcelExportEntity("工号", "loginName", 20));
exportEntities.add(new ExcelExportEntity("姓名", "userName", 20));
exportEntities.add(new ExcelExportEntity("性别", "sex", 20));
exportEntities.add(new ExcelExportEntity("人员类别", "personType", 20));
exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20));
exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20));
exportEntities.add(new ExcelExportEntity("所在分工会", "unionName", 20));
exportEntities.add(new ExcelExportEntity("所在部门", "unitName", 20));
src/main/java/com/budwk/app/zhgh/benefit/controller/BenefitUserSelectionListController.java
+1 -1
View File
@@ -70,7 +70,7 @@ public class BenefitUserSelectionListController {
exportEntities.add(new ExcelExportEntity("工号", "loginName", 20));
exportEntities.add(new ExcelExportEntity("姓名", "userName", 20));
exportEntities.add(new ExcelExportEntity("性别", "sex", 20));
exportEntities.add(new ExcelExportEntity("人员类别", "personType", 20));
exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20));
exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20));
exportEntities.add(new ExcelExportEntity("所在分工会", "unionName", 20));
exportEntities.add(new ExcelExportEntity("所在部门", "unitName", 20));
src/main/java/com/budwk/app/zhgh/benefit/models/BenefitUser.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class BenefitUser extends BaseModel {
private String unionId;
@Column
@Comment("人员类型")
@Comment("教职工类别")
@ColDefine(type = ColType.VARCHAR)
private String personType;
src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java
+1 -1
View File
@@ -129,7 +129,7 @@ public class HealthCheckupSingleServiceImpl extends BaseServiceImpl<HealthChecku
labelList.add(NutMap.NEW().addv("label", "姓名").addv("prop", "userName"));
labelList.add(NutMap.NEW().addv("label", "联系电话").addv("prop", "mobile"));
labelList.add(NutMap.NEW().addv("label", "身份证").addv("prop", "idCard").addv("width", 20));
labelList.add(NutMap.NEW().addv("label", "人员类型").addv("prop", "personType"));
labelList.add(NutMap.NEW().addv("label", "教职工类别").addv("prop", "personType"));
labelList.add(NutMap.NEW().addv("label", "工会").addv("prop", "unionName"));
labelList.add(NutMap.NEW().addv("label", "单位").addv("prop", "unitName"));
return labelList;
src/main/java/com/budwk/app/zhgh/dayofficework/integral/controller/IntegralManageController.java
+1 -1
View File
@@ -178,7 +178,7 @@ public class IntegralManageController {
* @param year 年度
* @param unionId 工会Id
* @param unitId 单位Id
* @param personType 人员类型
* @param personType 教职工类别
* @param userState 在职状态
* @param integralTime 获取积分时间
* @param response response
src/main/java/com/budwk/app/zhgh/dayofficework/integral/service/impl/IntegralManageServiceImpl.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class IntegralManageServiceImpl extends BaseServiceImpl<IntegralDetail> i
exportEntities.add(new ExcelExportEntity("联系电话", "mobile", 20));
// exportEntities.add(new ExcelExportEntity("身份证号", "idcard", 30));
exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20));
exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20));
exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20));
exportEntities.add(new ExcelExportEntity("所属工会", "unionName", 20));
exportEntities.add(new ExcelExportEntity("所属单位", "unitName", 30));
if (isSum) {
src/main/java/com/budwk/app/zhgh/staffbenefit/recuperation/controller/RecuperationEvaluateStatisticsController.java
+1 -1
View File
@@ -187,7 +187,7 @@ public class RecuperationEvaluateStatisticsController {
entities.add(new ExcelExportEntity("所属单位", "unitname", 20));
entities.add(new ExcelExportEntity("所属工会", "unionname", 20));
entities.add(new ExcelExportEntity("在职状态", "userState", 20));
entities.add(new ExcelExportEntity("人员类型", "personType", 20));
entities.add(new ExcelExportEntity("教职工类别", "personType", 20));
entities.add(new ExcelExportEntity("评分", "evaluateScore", 20));
entities.add(new ExcelExportEntity("评价", "evaluateText", 40));
src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberBatchMakeController.java
+3 -3
View File
@@ -153,12 +153,12 @@ public class MemberBatchMakeController {
unitName,
mobile
from
`user`
`vw_user`
$condition
""");
Cnd cnd = Cnd.NEW();
cnd.and("member", "=", false);
pageForm.buildSearch(cnd, "u.");
pageForm.buildSearch(cnd, "");
sql.setCondition(cnd);
List<NutMap> list = memberCommonService.listMap(sql);
@@ -174,7 +174,7 @@ public class MemberBatchMakeController {
exportEntities.add(new ExcelExportEntity("联系电话", "mobile", 20));
exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20));
exportEntities.add(new ExcelExportEntity("编制类别", "preparedBy", 20));
exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20));
exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20));
exportEntities.add(new ExcelExportEntity("所属工会", "unionName", 20));
exportEntities.add(new ExcelExportEntity("所属单位", "unitName", 30));
src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberApplyRecord.java
+2 -2
View File
@@ -127,13 +127,13 @@ public class MemberApplyRecord extends BaseModel {
private String userState;
@Column
@Comment("人事编制")
@Comment("编制类别")
@ColDefine(type = ColType.VARCHAR, width = 50)
@Size(max = 50)
private String preparedBy;
@Column
@Comment("人员类别")
@Comment("教职工类别")
@ColDefine(type = ColType.VARCHAR, width = 50)
@Size(max = 50)
private String personType;
src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberChangeRecord.java
+2 -2
View File
@@ -125,13 +125,13 @@ public class MemberChangeRecord extends BaseModel {
private String userState;
@Column
@Comment("人事编制")
@Comment("编制类别")
@ColDefine(type = ColType.VARCHAR, width = 50)
@Size(max = 50)
private String preparedBy;
@Column
@Comment("人员类别")
@Comment("教职工类别")
@ColDefine(type = ColType.VARCHAR, width = 50)
@Size(max = 50)
private String personType;
src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberChangePageForm.java
+2 -2
View File
@@ -37,8 +37,8 @@ public class MemberChangePageForm extends PageForm {
@ApiModelProperty("编制类别")
private List<String> preparedBys;
// 人员类型
@ApiModelProperty("人员类型")
// 教职工类别
@ApiModelProperty("教职工类别")
private List<String> personTypes;
src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberCheckPageForm.java
+3 -3
View File
@@ -54,8 +54,8 @@ public class MemberCheckPageForm extends PageForm {
@ApiModelProperty("编制类别")
private List<String> preparedBys;
// 人员类型
@ApiModelProperty("人员类型")
// 教职工类别
@ApiModelProperty("教职工类别")
private List<String> personTypes;
@ApiModelProperty("年龄区间")
@@ -64,7 +64,7 @@ public class MemberCheckPageForm extends PageForm {
@ApiModelProperty("性别")
private List<String> sexTypes;
@ApiModelProperty("人员类型（会员、福利会员之类的）")
@ApiModelProperty("教职工类别（会员、福利会员之类的）")
private List<String> userTypes;
@ApiModelProperty("是否反选")
src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberInfoPageForm.java
+14 -1
View File
@@ -12,9 +12,13 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.nutz.dao.Cnd;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.lang.Lang;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
/**
* @version 1.0
@@ -55,7 +59,7 @@ public class MemberInfoPageForm extends PageForm {
@ApiModelProperty("编制类别")
private String preparedBy;
@ApiModelProperty("人员类型")
@ApiModelProperty("教职工类别")
private String personType;
@ApiModelProperty("人员类型数组")
@@ -88,6 +92,9 @@ public class MemberInfoPageForm extends PageForm {
@ApiModelProperty("工号结尾")
private String endLoginNames;
@ApiModelProperty("查询账号")
private List<String> userIds;
@ApiModelProperty("导出的数据")
private List<Map<String, String>> columns;
@@ -96,6 +103,12 @@ public class MemberInfoPageForm extends PageForm {
cnd = Cnd.NEW();
}
if (Lang.isNotEmpty(this.getUserIds())) {
List<String> userIds = Optional.ofNullable(this.getUserIds()).orElse(Collections.emptyList())
.stream().filter(StrUtil::isNotBlank).toList();
cnd.andEX(prefix + "id", "in", userIds);
}
if (StrUtil.isNotBlank(this.getSearchKeyword())) {
SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike(prefix + "username", this.getSearchKeyword());
src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberListVerificationPageForm.java
+2 -2
View File
@@ -34,13 +34,13 @@ public class MemberListVerificationPageForm extends PageForm {
@ApiModelProperty("单位id")
private String unitId;
@ApiModelProperty("人员类型")
@ApiModelProperty("教职工类别")
private String personType;
@ApiModelProperty("在职状态")
private String userState;
@ApiModelProperty("人事编制")
@ApiModelProperty("编制类别")
private String preparedBy;
@ApiModelProperty("变更类型")
src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberInfoServiceImpl.java
+1 -1
View File
@@ -225,7 +225,7 @@ public class MemberInfoServiceImpl extends BaseServiceImpl<Sys_user> implements
// exportEntities.add(new ExcelExportEntity("身份证号", "idCard", 30));
exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20));
exportEntities.add(new ExcelExportEntity("编制类别", "preparedBy", 20));
exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20));
exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20));
exportEntities.add(new ExcelExportEntity("所属工会", "unionName", 20));
exportEntities.add(new ExcelExportEntity("所属单位", "unitName", 30));
// exportEntities.add(new ExcelExportEntity("来校年月", "comeSchoolDate", 30));
src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberListVerificationServiceImpl.java
+2 -2
View File
@@ -531,8 +531,8 @@ public class MemberListVerificationServiceImpl extends BaseServiceImpl<MemberLis
exportEntities.add(new ExcelExportEntity("所属工会", "unionName", 20));
exportEntities.add(new ExcelExportEntity("所属单位", "unitName", 30));
exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20));
exportEntities.add(new ExcelExportEntity("人事编制", "preparedBy", 20));
exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20));
exportEntities.add(new ExcelExportEntity("编制类别", "preparedBy", 20));
exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20));
exportEntities.add(new ExcelExportEntity("是否会员", "member", 15));
exportEntities.add(new ExcelExportEntity("是否福利会员", "welfareMember", 15));
return exportEntities;
src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberModelWorkerServiceImpl.java
+1 -1
View File
@@ -107,7 +107,7 @@ public class MemberModelWorkerServiceImpl extends BaseServiceImpl<Sys_user> impl
exportEntities.add(new ExcelExportEntity("联系电话", "mobile", 20));
exportEntities.add(new ExcelExportEntity("身份证号", "idCard", 30));
exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20));
exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20));
exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20));
exportEntities.add(new ExcelExportEntity("所属工会", "unionName", 20));
exportEntities.add(new ExcelExportEntity("所属单位", "unitName", 30));
exportEntities.add(new ExcelExportEntity("是否为正式会员", "member", 10));
src/main/java/com/budwk/app/zhgh/staffmanage/member/vo/MemberImportVo.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class MemberImportVo {
@ExcelProperty("在职状态")
private String userState;
@ExcelProperty("人员类型")
@ExcelProperty("教职工类别")
private String personType;
@ExcelProperty("单位编号")
src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/model/MemberPaymentInfo.java
+1 -1
View File
@@ -92,7 +92,7 @@ public class MemberPaymentInfo extends BaseModel {
private String paymentMonth;
@Column
@Comment("人员类型")
@Comment("教职工类别")
@ColDefine(type = ColType.VARCHAR, width = 20)
private String personType;
src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/service/impl/MemberPaymentServiceImpl.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class MemberPaymentServiceImpl extends BaseServiceImpl<MemberPaymentInfo>
exportEntities.add(new ExcelExportEntity("联系电话", "mobile", 20));
// exportEntities.add(new ExcelExportEntity("身份证号", "idcard", 30));
exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20));
exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20));
exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20));
exportEntities.add(new ExcelExportEntity("所属工会", "unionname", 20));
exportEntities.add(new ExcelExportEntity("所属单位", "unitname", 30));
exportEntities.add(new ExcelExportEntity("是否缴费", "isPay", 10));
src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/param/SingleTeacherPageForm.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class SingleTeacherPageForm extends PageForm {
@ApiModelProperty("年龄范围")
private Integer[] age;
@ApiModelProperty("人员类型")
@ApiModelProperty("教职工类别")
private String personType;
@ApiModelProperty("在职状态")
src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java
+1 -1
View File
@@ -129,7 +129,7 @@ public class ThirtyTeachController {
entityList.add(new ExcelExportEntity("工会", "unionName", 20));
entityList.add(new ExcelExportEntity("单位", "unitName", 20));
entityList.add(new ExcelExportEntity("在职状态", "userState", 20));
entityList.add(new ExcelExportEntity("人员类型", "personType", 20));
entityList.add(new ExcelExportEntity("教职工类别", "personType", 20));
entityList.add(new ExcelExportEntity("荣誉证办理年月", "thirtyCertificateProcessingTime", 20));
ExportParams exportParams = new ExportParams();
exportParams.setType(ExcelType.XSSF);
src/main/java/com/budwk/app/zhgh/welfare/model/WelfareList.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class WelfareList extends BaseModel{
private String welfareUnionName;
@Column
@Comment("人员类型")
@Comment("教职工类别")
@ColDefine(type = ColType.VARCHAR)
private String personType;
src/main/java/com/budwk/app/zhgh/welfare/param/WelfareFilterUserPageForm.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class WelfareFilterUserPageForm extends PageForm {
@ApiModelProperty("单位名称")
private String unitName;
@ApiModelProperty("人员类型")
@ApiModelProperty("教职工类别")
private String[] personTypes;
@ApiModelProperty("编制类别")
src/main/java/com/budwk/app/zhgh/welfare/param/WelfareListPageForm.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class WelfareListPageForm extends PageForm {
@ApiModelProperty("单位名称")
private String unitName;
@ApiModelProperty("人员类型")
@ApiModelProperty("教职工类别")
private String[] personTypes;
@ApiModelProperty("编制类别")
src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java
+2 -2
View File
@@ -104,7 +104,7 @@ public class WelfareListServiceImpl extends BaseServiceImpl<WelfareList> impleme
List<ExcelExportEntity> exportEntities = new ArrayList<>();
exportEntities.add(new ExcelExportEntity("工号", "loginname", 20));
exportEntities.add(new ExcelExportEntity("姓名", "username", 20));
exportEntities.add(new ExcelExportEntity("人员类别", "personType", 20));
exportEntities.add(new ExcelExportEntity("教职工类别", "personType", 20));
exportEntities.add(new ExcelExportEntity("所在分工会", "unionname", 20));
exportEntities.add(new ExcelExportEntity("所在部门", "unitname", 20));
exportEntities.add(new ExcelExportEntity("份数", "selectNum", 20));
@@ -597,7 +597,7 @@ public class WelfareListServiceImpl extends BaseServiceImpl<WelfareList> impleme
entities.add(new ExcelExportEntity("姓名", "username", 20));
entities.add(new ExcelExportEntity("性别", "sex", 20));
entities.add(new ExcelExportEntity("出生日期", "birthday", 20));
entities.add(new ExcelExportEntity("人员类型", "personType", 20));
entities.add(new ExcelExportEntity("教职工类别", "personType", 20));
entities.add(new ExcelExportEntity("编制类别", "preparedBy", 20));
entities.add(new ExcelExportEntity("在职状态", "userState", 20));
entities.add(new ExcelExportEntity("所属工会", "welfareUnionName", 20));
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">

Some files were not shown because too many files have changed in this diff Show More