From b49a53244241d841592ac7c92fa688f12887b0f4 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Thu, 18 Jun 2026 09:04:39 +0800 Subject: [PATCH] commit --- .../member/apply/common/commonQuery.js | 8 - .../member/change/common/commonQuery.js | 10 -- .../member/change/common/memberChange.js | 16 -- .../member/change/manage/index.html | 154 ------------------ .../member/change/record/index.html | 12 +- .../member/common/info/memberInfo.js | 2 - .../member/info/common/commonQuery.js | 10 -- .../member/info/common/memberAddForm.js | 14 +- .../member/info/datamanage/index.html | 2 +- .../staffmanage/member/info/group/index.html | 4 +- .../member/info/history/index.html | 12 +- .../staffmanage/member/info/input/index.html | 8 +- .../member/statistics/analysis/index.html | 82 +--------- .../statistics/comprehensive/index.html | 8 +- .../statistics/comprehensive/queryForm.js | 62 ------- .../member/statistics/summary/index.html | 82 +--------- 16 files changed, 10 insertions(+), 476 deletions(-) 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 586cb59..caeafbb 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 @@ -35,14 +35,6 @@ - - - - - - `, 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 b52712c..17dadd4 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 @@ -30,14 +30,6 @@ - - - - - - `, store, @@ -53,8 +45,6 @@ userStates: [], personTypes: [], preparedBys: [], - aidFundMemberUserType: '', - userAttribute: '', } } }, diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js index 89fd61f..d419c27 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js @@ -145,18 +145,6 @@ const MEMBER_CHANGE = { :disabled="allowFields('personType')" style="width: 100%"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 取消 - 确定 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 取消 - 确定 - - - {}) }, - openBatchEditUserAttribute() { - this.batchFormDataUserAttribute = {} - this.batchEditUserAttributeVisible = true - }, openBatchEditMember() { this.batchFormDataMember = {member: false, welfareMember: false} this.batchEditMemberVisible = true }, - openBatchEditAidFundType() { - this.batchFormDataAidFundType = {} - this.batchEditAidFundTypeVisible = true - }, openBatchEditUserState() { this.batchFormDataUserState = {} this.batchEditUserStateVisible = true @@ -739,23 +619,6 @@ layout("/layouts/platform.html"){ this.$set(this.unitMoveFormData, "unitName", "") } }, - async doBatchEditUserAttribute() { - const batch = this.checkUsers.map(v => { - return {id: v.id, userAttribute: v.userAttribute} - }) - this.batchEditLoading = true - const resp = await this.$axios.post("/platform/member/change/manage/batchUpdateUserAttribute", {users: JSON.stringify(batch)}) - if (resp.code === 0) { - this.$message.success(resp.msg) - this.pageData() - this.$refs.table.clearSelection() - this.batchEditUserAttributeVisible = false - this.checkUsers = [] - } else { - this.$message.error(resp.msg) - } - this.batchEditLoading = false - }, async doBatchEditMember() { const batch = this.checkUsers.map(v => { return {id: v.id, member: v.member, welfareMember: v.welfareMember} @@ -773,23 +636,6 @@ layout("/layouts/platform.html"){ } this.batchEditLoading = false }, - async doBatchEditAidFundType() { - const batch = this.checkUsers.map(v => { - return {id: v.id, aidFundMemberUserType: v.aidFundMemberUserType} - }) - this.batchEditLoading = true - const resp = await this.$axios.post("/platform/member/change/manage/batchUpdateAidFundType", {users: JSON.stringify(batch)}) - if (resp.code === 0) { - this.$message.success(resp.msg) - this.pageData() - this.$refs.table.clearSelection() - this.batchEditAidFundTypeVisible = false - this.checkUsers = [] - } else { - this.$message.error(resp.msg) - } - this.batchEditLoading = false - }, async doBatchEditUserState() { const batch = this.checkUsers.map(v => { return {id: v.id, userState: v.userState} diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/record/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/record/index.html index 8252178..ee1ec65 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/record/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/record/index.html @@ -38,14 +38,6 @@ layout("/layouts/platform.html"){ v-for="item in changeTypeData"> - - - - - - @@ -149,9 +141,7 @@ layout("/layouts/platform.html"){ unitId: "", userState: "", personType: "", - changeType: "", - aidFundMemberUserType: "", - userAttribute: "" + changeType: "" } } }, diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js b/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js index 124474b..eca30b3 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js @@ -82,8 +82,6 @@ const MEMBER_INFO = { {{ viewData.positionLevel }} {{ viewData.administrativePositionLevel }} - {{ viewData.aidFundMemberUserType }} - {{ viewData.userAttribute }} `, 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 093e124..fc406dc 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 @@ -45,14 +45,6 @@ - - - - - - `, store, @@ -76,8 +68,6 @@ userStates: [], personTypes: [], preparedBys: [], - aidFundMemberUserType: '', - userAttribute: '', } } }, diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/memberAddForm.js b/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/memberAddForm.js index f4c3eb3..862cb41 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/memberAddForm.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/memberAddForm.js @@ -102,18 +102,6 @@ style="width: 100%"> - - - - - - - - - - @@ -252,7 +240,7 @@ `, store, dicts: ["USER_NATION", "USER_POLITICAL", "USER_EDUCATION", "USER_ACADEMIC_DEGREE", "USER_CAMPUS", - "USER_STATE", "USER_PREPARED_BY_TYPE", "USER_PERSON_TYPE", "USER_MARRIAGE","AIDFUND_MEMBER_USER_TYPE","USER_ATTRIBUTE"], + "USER_STATE", "USER_PREPARED_BY_TYPE", "USER_PERSON_TYPE", "USER_MARRIAGE"], data() { return { formData: {}, 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 16b4275..8810108 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 @@ -291,7 +291,7 @@ layout("/layouts/platform.html"){ search(pageForm) { if (pageForm) { // 当前页的在职状态、人员类型使用标签数组筛选，公共查询组件回传的是字符串， - // 这里保留当前页数组，避免选择人员属性后把标签筛选状态覆盖掉。 + // 这里保留当前页数组，避免覆盖标签筛选状态。 const currentUserStates = this.pageForm.userStates const currentPersonTypes = this.pageForm.personTypes this.pageForm = {...this.pageForm, ...pageForm} 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 77518eb..41410a2 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 @@ -238,9 +238,7 @@ layout("/layouts/platform.html"){ // { 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: "aidFundMemberUserType", label: "人员分类", width: 120, sortable: true }, - // { prop: "userAttribute", label: "人员属性", width: 120, sortable: true }, + { prop: "unitName", label: "所属单位", 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 3508b24..cdc4473 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 @@ -46,12 +46,6 @@ layout("/layouts/platform.html"){ - - - - - - @@ -101,15 +95,13 @@ layout("/layouts/platform.html"){ new Vue({ el: "#app", mixins: [initTableMixins], - dicts: ["USER_STATE", "USER_PERSON_TYPE", "MEMBER_CHANGE_TYPE", "AIDFUND_MEMBER_USER_TYPE", "USER_ATTRIBUTE"], + dicts: ["USER_STATE", "USER_PERSON_TYPE", "MEMBER_CHANGE_TYPE"], data() { return { pageForm: { year: new Date().getFullYear() - 1 + "", memberSearchName: "", - memberSearchKeyWord: "", - aidFundMemberUserType: "", - userAttribute: "" + memberSearchKeyWord: "" }, userId: "", unions: [], 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 80353d5..9619edc 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 @@ -46,12 +46,6 @@ layout("/layouts/platform.html"){ - - - - - - @@ -108,7 +102,7 @@ layout("/layouts/platform.html"){ new Vue({ el: "#app", mixins: [initTableMixins], - dicts: ["USER_STATE", "USER_PERSON_TYPE", "MEMBER_CHANGE_TYPE","AIDFUND_MEMBER_USER_TYPE","USER_ATTRIBUTE"], + dicts: ["USER_STATE", "USER_PERSON_TYPE", "MEMBER_CHANGE_TYPE"], data() { return { pageForm: { diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/analysis/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/analysis/index.html index ba93ba4..3dc40fa 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/analysis/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/analysis/index.html @@ -80,56 +80,6 @@ layout("/layouts/platform.html"){ - - - 人员分类： - - - {{ item.name }} - - - 清空 - - 全部 - - - - - - 人员属性： - - - {{ item.name }} - - - 清空 - - 全部 - - - - - - @@ -211,13 +161,9 @@ layout("/layouts/platform.html"){ }, unions: [], units: [], - aidFundMemberUserTypeOptions: [], - userAttributeOptions: [], pageForm: { currentYear: moment().format("YYYY"), - queryType: "fgh", - userAttributes: [], - aidFundMemberUserTypes: [] + queryType: "fgh" }, fullTableData: [] }, @@ -239,18 +185,9 @@ layout("/layouts/platform.html"){ this.units = data }) } - this.$businessTool.getDictOptions("AIDFUND_MEMBER_USER_TYPE").then((data) => { - this.aidFundMemberUserTypeOptions = data - }) - this.$businessTool.getDictOptions("USER_ATTRIBUTE").then((data) => { - this.userAttributeOptions = data - }) }, pageData() { - // 统计接口按 JSON 字符串接收多选条件，这里统一在提交前做转换，保证人员分类和人员属性都能正确过滤。 const pageForm = clone(this.pageForm) - pageForm.aidFundMemberUserTypes = JSON.stringify(this.pageForm.aidFundMemberUserTypes) - pageForm.userAttributes = JSON.stringify(this.pageForm.userAttributes) this.$axios.post(loc() + "/pageData", pageForm).then((res) => { if (res.code === 0) { this.tableData = res.data @@ -258,23 +195,6 @@ layout("/layouts/platform.html"){ } }) }, - tagClick(key,code) { - if (key === "userAttributes") { - if (this.pageForm.userAttributes.includes(code)) { - this.pageForm.userAttributes.splice(this.pageForm.userAttributes.indexOf(code), 1) - } else { - this.pageForm.userAttributes.push(code) - } - } - if (key === "aidFundMemberUserTypes") { - if (this.pageForm.aidFundMemberUserTypes.includes(code)) { - this.pageForm.aidFundMemberUserTypes.splice(this.pageForm.aidFundMemberUserTypes.indexOf(code), 1) - } else { - this.pageForm.aidFundMemberUserTypes.push(code) - } - } - this.doSearch() - }, }, created() { this.initData() 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 2122b37..eed379f 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 @@ -162,9 +162,7 @@ layout("/layouts/platform.html"){ // { 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: "aidFundMemberUserType", label: "人员分类", width: 120, sortable: true }, - { prop: "userAttribute", label: "人员属性", width: 120, sortable: true }, + { prop: "unitName", label: "所属单位", 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 }, @@ -203,8 +201,6 @@ layout("/layouts/platform.html"){ pageForm.sexTypes = JSON.stringify(this.pageForm.sexTypes) pageForm.memberTypes = JSON.stringify(this.pageForm.memberTypes) pageForm.personTypes = JSON.stringify(this.pageForm.personTypes) - pageForm.aidFundMemberUserTypes = JSON.stringify(this.pageForm.aidFundMemberUserTypes) - pageForm.userAttributes = JSON.stringify(this.pageForm.userAttributes) pageForm.userStates = JSON.stringify(this.pageForm.userStates) const data = this.tableColumns.filter(item => this.checkedFields.includes(item.prop)).map(item => { return {prop: item.prop, label: item.label} @@ -228,8 +224,6 @@ layout("/layouts/platform.html"){ pageForm.sexTypes = JSON.stringify(this.pageForm.sexTypes) pageForm.memberTypes = JSON.stringify(this.pageForm.memberTypes) pageForm.personTypes = JSON.stringify(this.pageForm.personTypes) - pageForm.aidFundMemberUserTypes = JSON.stringify(this.pageForm.aidFundMemberUserTypes) - pageForm.userAttributes = JSON.stringify(this.pageForm.userAttributes) pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys) pageForm.memberStatus = JSON.stringify(this.pageForm.memberStatus) pageForm.userStates = JSON.stringify(this.pageForm.userStates) diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/queryForm.js b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/queryForm.js index b0fe13d..847face 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/queryForm.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/queryForm.js @@ -88,56 +88,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = { - - 人员分类： - - - {{ item.name }} - - - 清空 - - 全部 - - - - - - 人员属性： - - - {{ item.name }} - - - 清空 - - 全部 - - - - @@ -234,8 +184,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = { searchName: "username", personTypes: [], preparedBys: [], - aidFundMemberUserTypes: [], - userAttributes: [], userStates: [], memberStatus: [], year: moment().format("YYYY"), @@ -252,8 +200,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = { }, personTypeOptions: [], preparedByOptions: [], - aidFundMemberUserTypeOptions: [], - userAttributeOptions: [], userStateOptions: [], memberStatusOptions: [], unions: [], @@ -345,8 +291,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = { this.pageForm.sexTypes = [] this.pageForm.personTypes = [] this.pageForm.preparedBys = [] - this.pageForm.aidFundMemberUserTypes = [] - this.pageForm.userAttributes = [] this.pageForm.memberStatus = [] this.pageForm.userStates = [] this.pageForm.unionId = [] @@ -384,12 +328,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = { this.$businessTool.getDictOptions("USER_PREPARED_BY_TYPE").then((data) => { this.preparedByOptions = data }) - this.$businessTool.getDictOptions("AIDFUND_MEMBER_USER_TYPE").then((data) => { - this.aidFundMemberUserTypeOptions = data - }) - this.$businessTool.getDictOptions("USER_ATTRIBUTE").then((data) => { - this.userAttributeOptions = data - }) this.$businessTool.getDictOptions("USER_STATE").then((data) => { this.userStateOptions = data }) diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/summary/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/summary/index.html index 74aebba..8acec34 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/summary/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/summary/index.html @@ -80,56 +80,6 @@ layout("/layouts/platform.html"){ - - - 人员分类： - - - {{ item.name }} - - - 清空 - - 全部 - - - - - - 人员属性： - - - {{ item.name }} - - - 清空 - - 全部 - - - - - - @@ -173,14 +123,10 @@ layout("/layouts/platform.html"){ }, unions: [], units: [], - userAttributeOptions: [], pageForm: { currentYear: moment().format("YYYY"), - queryType: "fgh", - userAttributes: [], - aidFundMemberUserTypes: [] + queryType: "fgh" }, - aidFundMemberUserTypeOptions: [], }, methods: { doExport() {}, @@ -200,35 +146,9 @@ layout("/layouts/platform.html"){ this.units = data }) } - this.$businessTool.getDictOptions("AIDFUND_MEMBER_USER_TYPE").then((data) => { - this.aidFundMemberUserTypeOptions = data - }) - this.$businessTool.getDictOptions("USER_ATTRIBUTE").then((data) => { - this.userAttributeOptions = data - }) - }, - tagClick(key,code) { - if (key === "userAttributes") { - if (this.pageForm.userAttributes.includes(code)) { - this.pageForm.userAttributes.splice(this.pageForm.userAttributes.indexOf(code), 1) - } else { - this.pageForm.userAttributes.push(code) - } - } - if (key === "aidFundMemberUserTypes") { - if (this.pageForm.aidFundMemberUserTypes.includes(code)) { - this.pageForm.aidFundMemberUserTypes.splice(this.pageForm.aidFundMemberUserTypes.indexOf(code), 1) - } else { - this.pageForm.aidFundMemberUserTypes.push(code) - } - } - this.doSearch() }, pageData() { const pageForm = clone(this.pageForm) - // 统计接口按 JSON 字符串接收多选条件，这里把人员分类和人员属性统一成同一提交口径。 - pageForm.aidFundMemberUserTypes = JSON.stringify(this.pageForm.aidFundMemberUserTypes) - pageForm.userAttributes = JSON.stringify(this.pageForm.userAttributes) this.$axios.post(loc() + "/pageData", pageForm).then((res) => { if (res.code === 0) { this.tableData = res.data