From e1a99feb28bd6e10d8f9910074d4bacd51cb84a5 Mon Sep 17 00:00:00 2001 From: zhangrui Date: Wed, 15 Apr 2026 14:07:30 +0800 Subject: [PATCH] 1 --- .../apply/MemberApplyMineController.java | 1 + .../info/MemberInfoInputController.java | 16 ++++++++++++++- .../param/pageform/MemberApplyPageForm.java | 6 ++++++ .../param/pageform/MemberInfoPageForm.java | 5 +++++ .../service/impl/MemberManageServiceImpl.java | 4 ++++ .../apply/branchunionapproval/index.html | 2 +- .../member/apply/common/commonQuery.js | 16 +++++++++++---- .../staffmanage/member/apply/mine/index.html | 2 +- .../apply/schoolunionapproval/index.html | 2 +- .../member/apply/submit/index.html | 17 +++++++++------- .../member/change/branchunionaudit/index.html | 2 +- .../member/change/common/commonQuery.js | 8 ++++---- .../member/change/manage/index.html | 12 +++++------ .../staffmanage/member/change/mine/index.html | 2 +- .../member/change/schoolunionaudit/index.html | 2 +- .../member/change/submit/index.html | 13 ++++++------ .../member/info/batchmake/index.html | 2 +- .../member/info/common/commonQuery.js | 8 ++++---- .../member/info/datamanage/index.html | 2 +- .../staffmanage/member/info/group/index.html | 6 +++--- .../member/info/history/index.html | 2 +- .../staffmanage/member/info/input/index.html | 20 +++++++++++++++++-- .../statistics/comprehensive/index.html | 4 ++-- .../zhghh5/dayofficework/qsv/index.html | 1 - 24 files changed, 106 insertions(+), 49 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyMineController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyMineController.java index a1c4d235..1da0cf62 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyMineController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyMineController.java @@ -97,6 +97,7 @@ public class MemberApplyMineController { LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10 LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + LEFT JOIN vw_user u on info.userId=u.id $condition """); Cnd cnd = Cnd.NEW(); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoInputController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoInputController.java index f1aec67e..2e86941c 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoInputController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/info/MemberInfoInputController.java @@ -7,6 +7,7 @@ import com.budwk.app.base.result.Result; import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.sys.models.Sys_union; import com.budwk.app.sys.models.Sys_user; +import com.budwk.app.zhgh.staffmanage.member.models.MemberChangeRecord; import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberInfoPageForm; import com.budwk.app.zhgh.staffmanage.member.service.MemberInfoService; import org.apache.poi.ss.usermodel.Workbook; @@ -75,6 +76,19 @@ public class MemberInfoInputController { } } - + @At + @POST + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("member.info.input") + @SLog(tag = "人员补录", msg = "删除会员") + public Result doDelete(String id, String userId) { + try { + memberInfoService.dao().delete(MemberChangeRecord.class, id); + memberInfoService.dao().delete(Sys_user.class, userId); + return Result.success("删除成功"); + } catch (Exception e) { + return Result.error(e.getMessage()); + } + } } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberApplyPageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberApplyPageForm.java index 9a70a625..051166ec 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberApplyPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberApplyPageForm.java @@ -30,6 +30,10 @@ public class MemberApplyPageForm extends PageForm { private List preparedBys; + private String aidFundMemberUserType; //人员分类 + + private String userAttribute; //人员属性 + public static void buildSearch(Cnd cnd, MemberApplyPageForm pageForm) { if (cnd == null) { cnd = Cnd.NEW(); @@ -45,5 +49,7 @@ public class MemberApplyPageForm extends PageForm { cnd.andEX("info.userState","in",pageForm.getUserStates()); cnd.andEX("info.personType","in",pageForm.getPersonTypes()); cnd.andEX("info.preparedBy","in",pageForm.getPreparedBys()); + cnd.andEX("u.aidFundMemberUserType","=",pageForm.getAidFundMemberUserType()); + cnd.andEX("u.userAttribute","=",pageForm.getUserAttribute()); } } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberInfoPageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberInfoPageForm.java index 3c2396b5..271f5339 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberInfoPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberInfoPageForm.java @@ -1,5 +1,6 @@ package com.budwk.app.zhgh.staffmanage.member.param.pageform; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.param.PageForm; @@ -115,6 +116,10 @@ public class MemberInfoPageForm extends PageForm { cnd = Cnd.NEW(); } + if(ObjectUtil.isNotEmpty(this.year)) { + cnd.and("year(applyDateTime)", "=", this.getYear()); + } + if (Lang.isNotEmpty(this.getUserIds())) { List userIds = Optional.ofNullable(this.getUserIds()).orElse(Collections.emptyList()) .stream().filter(StrUtil::isNotBlank).toList(); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java index bbcea506..302f4dbc 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java @@ -218,8 +218,12 @@ public class MemberManageServiceImpl extends BaseServiceImpl implement List dictList = sysDictService.getSubListByCode("ALLOW_CHANGE_FIELDS"); Set allowChangeFieldNames = dictList.stream().map(Sys_dict::getCode).collect(Collectors.toSet()); allowChangeFieldNames.add("member"); + allowChangeFieldNames.add("aidFundMemberUserType"); + allowChangeFieldNames.add("userAttribute"); Map dictMap = dictList.stream().collect(Collectors.toMap(Sys_dict::getCode, Sys_dict::getName)); dictMap.put("member", "会员状态"); + dictMap.put("aidFundMemberUserType", "人员分类"); + dictMap.put("userAttribute", "人员属性"); return NutMap.NEW().addv("allowChangeFieldNames", allowChangeFieldNames).addv("dictMap", dictMap); } diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html index f994cf05..fcd83796 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html @@ -103,7 +103,7 @@ layout("/layouts/platform.html"){ { prop: "userName", label: "姓名", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, // { prop: "personType", label: "教职工类别", sortable: true }, - { prop: "preparedBy", label: "编制类别", sortable: true }, + // { prop: "preparedBy", label: "编制类别", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, // { prop: "sign", label: "签字" }, diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js index 0f99169d..da81b45e 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js @@ -31,9 +31,17 @@ const COMMON_QUERY = { - - + + + + + + + + + @@ -41,7 +49,7 @@ const COMMON_QUERY = { store, mixins: [initTableMixins], data() { - return{ + return { unions: [], units: [], pageForm: { diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html index 1ed94e3e..c15b5a63 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html @@ -86,7 +86,7 @@ layout("/layouts/platform.html"){ { prop: "userName", label: "姓名", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, // { prop: "personType", label: "教职工类别", sortable: true }, - { prop: "preparedBy", label: "编制类别", sortable: true }, + // { prop: "preparedBy", label: "编制类别", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, // { prop: "sign", label: "签字" }, diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html index b85f0721..f8db9ec9 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html @@ -121,7 +121,7 @@ layout("/layouts/platform.html"){ { prop: "userName", label: "姓名", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, { prop: "personType", label: "教职工类别", sortable: true }, - { prop: "preparedBy", label: "编制类别", sortable: true }, + // { prop: "preparedBy", label: "编制类别", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, { prop: "sign", label: "签字" }, diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html index c902dba8..5dd9f6f7 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html @@ -102,12 +102,12 @@ layout("/layouts/platform.html"){ style="width: 100%"> --> - - - - - + + + + + + - + + + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/branchunionaudit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/branchunionaudit/index.html index f2994cc7..641ab471 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/branchunionaudit/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/branchunionaudit/index.html @@ -95,7 +95,7 @@ layout("/layouts/platform.html"){ { prop: "sex", label: "性别", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, { prop: "personType", label: "教职工类别", sortable: true }, - { prop: 'preparedBy', label: '编制类别', sortable: true }, + // { prop: 'preparedBy', label: '编制类别', sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, { prop: "changeTypes", label: "变更类型", sortable: true, width: 200 }, diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js index 9d57d8cc..21269146 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js @@ -26,10 +26,10 @@ const COMMON_QUERY = { - - - + + + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html index a73e50d7..e7807859 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html @@ -34,10 +34,10 @@ layout("/layouts/platform.html"){ - - - + + + + @@ -549,12 +549,12 @@ layout("/layouts/platform.html"){ { prop: "political", label: "政治面貌", width: 120, sortable: true}, { prop: "userState", label: "在职状态", width: 120, sortable: true }, { prop: "personType", label: "教职工类别", width: 120, sortable: true, checked: 0 }, - { prop: "preparedBy", label: "编制类别", width: 120, sortable: true }, + // { prop: "preparedBy", label: "编制类别", width: 120, sortable: true }, { prop: "postDoctoralJoinDate", label: "进站时间", sortable: true, checked: 0 }, { prop: "unionName", label: "所属工会", width: 120, sortable: true }, { prop: "unitName", label: "所属单位", width: 120, sortable: true }, - { prop: "userAttribute", label: "人员属性", width: 120, sortable: true }, { prop: "aidFundMemberUserType", label: "人员分类", width: 120, sortable: true }, + { prop: "userAttribute", label: "人员属性", width: 120, sortable: true }, { prop: "idCardType", label: "证件类型", width: 120, sortable: true, checked: 0 }, { prop: "idCard", label: "证件号码", width: 120, sortable: true, checked: 0 }, { prop: "marriage", label: "婚姻状况", width: 120, sortable: true, checked: 0 }, diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/mine/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/mine/index.html index a80ae0e4..567b7ac5 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/mine/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/mine/index.html @@ -69,7 +69,7 @@ layout("/layouts/platform.html"){ { prop: "sex", label: "性别", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, { prop: "personType", label: "教职工类别", sortable: true }, - { prop: "preparedBy", label: "编制类别", sortable: true }, + // { prop: "preparedBy", label: "编制类别", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, { prop: "changeTypes", label: "变更类型", sortable: true, width: 200 }, diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/schoolunionaudit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/schoolunionaudit/index.html index 41df1442..b4dce48e 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/schoolunionaudit/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/schoolunionaudit/index.html @@ -97,7 +97,7 @@ layout("/layouts/platform.html"){ { prop: "sex", label: "性别", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, { prop: "personType", label: "教职工类别", sortable: true }, - { prop: 'preparedBy', label: '编制类别', sortable: true }, + // { prop: 'preparedBy', label: '编制类别', sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, { prop: "changeTypes", label: "变更类型", sortable: true, width: 200 }, diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html index b2b40a4c..1e88122a 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html @@ -142,12 +142,13 @@ layout("/layouts/platform.html"){ :disabled="allowFields('personType')" style="width: 100%"> - - - - - + + + + + + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/info/batchmake/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/info/batchmake/index.html index 4a14d51d..9b3e4e81 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/info/batchmake/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/info/batchmake/index.html @@ -59,7 +59,7 @@ layout("/layouts/platform.html"){ { prop: "sex", label: "性别", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, { prop: "personType", label: "教职工类别", sortable: true }, - { prop: "preparedBy", label: "编制类别", sortable: true }, + // { prop: "preparedBy", label: "编制类别", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, ], diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.js b/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.js index c12d7be6..bdb30368 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.js @@ -41,10 +41,10 @@ const COMMON_QUERY = { - - - + + + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/info/datamanage/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/info/datamanage/index.html index 0ca3a336..24a1b27f 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/info/datamanage/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/info/datamanage/index.html @@ -208,7 +208,7 @@ layout("/layouts/platform.html"){ { prop: "sex", label: "性别", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, { prop: "personType", label: "教职工类别", sortable: true }, - { prop: "preparedBy", label: "编制类别", sortable: true }, + // { prop: "preparedBy", label: "编制类别", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, ], diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/info/group/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/info/group/index.html index 12d49502..c6deda60 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/info/group/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/info/group/index.html @@ -28,7 +28,7 @@ layout("/layouts/platform.html"){
全选 - 反选 +
@@ -127,12 +127,12 @@ layout("/layouts/platform.html"){ { prop: "political", label: "政治面貌", width: 120, sortable: true}, { prop: "userState", label: "在职状态", width: 120, sortable: true }, { prop: "personType", label: "教职工类别", width: 120, sortable: true, checked: 0 }, - { prop: "preparedBy", label: "编制类别", width: 120, sortable: true }, + // { prop: "preparedBy", label: "编制类别", width: 120, sortable: true }, { prop: "postDoctoralJoinDate", label: "进站时间", sortable: true, checked: 0 }, { prop: "unionName", label: "所属工会", width: 120, sortable: true }, { prop: "unitName", label: "所属单位", width: 120, sortable: true }, - { prop: "userAttribute", label: "人员属性", width: 120, sortable: true }, { prop: "aidFundMemberUserType", label: "人员分类", width: 120, sortable: true }, + { prop: "userAttribute", label: "人员属性", width: 120, sortable: true }, { prop: "idCardType", label: "证件类型", width: 120, sortable: true, checked: 0 }, { prop: "idCard", label: "证件号码", width: 120, sortable: true, checked: 0 }, { prop: "marriage", label: "婚姻状况", width: 120, sortable: true, checked: 0 }, diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/info/history/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/info/history/index.html index 11577bc7..cd6cff53 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/info/history/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/info/history/index.html @@ -129,7 +129,7 @@ layout("/layouts/platform.html"){ { prop: "mobile", label: "联系电话" }, { prop: "userState", label: "在职状态", sortable: true }, { prop: "personType", label: "教职工类别", sortable: true }, - { prop: "preparedBy", label: "编制类别", sortable: true }, + // { prop: "preparedBy", label: "编制类别", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true } ] diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/info/input/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/info/input/index.html index c0f455e9..a5b4abcd 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/info/input/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/info/input/index.html @@ -86,9 +86,10 @@ layout("/layouts/platform.html"){ :prop="column.prop" :sortable="column.sortable" > - + @@ -173,7 +174,22 @@ layout("/layouts/platform.html"){ if (this.pageForm.unionId) { this.units = await this.$businessTool.listUnit(this.pageForm.unionId) } - } + }, + doDelete(row){ + this.$confirm("您确定要删除吗？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "info" + }).then(() => { + this.$axios.post('/platform/member/info/input/doDelete', {id: row.id, userId: row.userId}).then(res => { + if (res.code === 0) { + this.$message.success(res.msg); + this.doSearch() + } + }) + }) + + } }, created() { this.pageData() diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html index b540abc1..b0aadae9 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html @@ -159,12 +159,12 @@ layout("/layouts/platform.html"){ { prop: "political", label: "政治面貌", width: 120, sortable: true}, { prop: "userState", label: "在职状态", width: 120, sortable: true }, { prop: "personType", label: "教职工类别", width: 120, sortable: true, checked: 0 }, - { prop: "preparedBy", label: "编制类别", width: 120, sortable: true }, + // { prop: "preparedBy", label: "编制类别", width: 120, sortable: true }, { prop: "postDoctoralJoinDate", label: "进站时间", sortable: true, checked: 0 }, { prop: "unionName", label: "所属工会", width: 120, sortable: true }, { prop: "unitName", label: "所属单位", width: 120, sortable: true }, - { prop: "userAttribute", label: "人员属性", width: 120, sortable: true }, { prop: "aidFundMemberUserType", label: "人员分类", width: 120, sortable: true }, + { prop: "userAttribute", label: "人员属性", width: 120, sortable: true }, { prop: "idCardType", label: "证件类型", width: 120, sortable: true, checked: 0 }, { prop: "idCard", label: "证件号码", width: 120, sortable: true, checked: 0 }, { prop: "marriage", label: "婚姻状况", width: 120, sortable: true, checked: 0 }, diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/qsv/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/qsv/index.html index 27a74761..4df8a1c4 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/qsv/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/qsv/index.html @@ -62,7 +62,6 @@ layout("/layouts/platform_h5.html"){ }, async onEnter(item) { - debugger if (item.groupId) { const { code,