commit

src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js

@@ -35,14 +35,6 @@
 <!--				    <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.aidFundMemberUserType" code="AIDFUND_MEMBER_USER_TYPE"
-				                 style="width: 100%"></dict-select>
-			    </search-item>
-			    <search-item label="人员属性">
-				    <dict-select v-model="pageForm.userAttribute" code="USER_ATTRIBUTE"
-				                 style="width: 100%"></dict-select>
-			    </search-item>
 		    </template>
 	    </search>
     `,

src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js

@@ -30,14 +30,6 @@
 <!--			    <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.aidFundMemberUserType" placeholder="请选择人员分类" @change="doSearch"
-			                 code="AIDFUND_MEMBER_USER_TYPE"></dict-select>
-		    </search-item>
-		    <search-item label="人员属性">
-			    <dict-select v-model="pageForm.userAttribute" placeholder="请选择人员属性" @change="doSearch"
-			                 code="USER_ATTRIBUTE"></dict-select>
-		    </search-item>
 	    </search>
     `,
     store,
@@ -53,8 +45,6 @@
                 userStates: [],
                 personTypes: [],
                 preparedBys: [],
-                aidFundMemberUserType: '',
-                userAttribute: '',
             }
         }
     },

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%"></dict-select>
 				        </el-form-item>
 			        </el-descriptions-item>
-				    <el-descriptions-item label="人员属性">
-				        <el-form-item prop="userAttribute">
-					        <dict-select v-model="formData.userAttribute" code="USER_ATTRIBUTE"
-					                     style="width: 100%"></dict-select>
-				        </el-form-item>
-				    </el-descriptions-item>
-				    <el-descriptions-item label="人员分类">
-				        <el-form-item prop="aidFundMemberUserType">
-					        <dict-select v-model="formData.aidFundMemberUserType" code="AIDFUND_MEMBER_USER_TYPE"
-					                      style="width: 100%"></dict-select>
-				        </el-form-item>
-				    </el-descriptions-item>
 			        
 			        <template v-if="formData.userState == '退休'">
 				        <el-descriptions-item label="退休日期">
@@ -455,8 +443,6 @@ const MEMBER_CHANGE = {
                     userState,
                     personType,
                     preparedBy,
-                    userAttribute,
-                    aidFundMemberUserType,
                     idCard,
                     mobile,
                     email,
@@ -482,8 +468,6 @@ const MEMBER_CHANGE = {
                 this.$set(this.formData, "userState", userState)
                 this.$set(this.formData, "personType", personType)
                 this.$set(this.formData, "preparedBy", preparedBy)
-                this.$set(this.formData, "userAttribute", userAttribute)
-                this.$set(this.formData, "aidFundMemberUserType", aidFundMemberUserType)
                 this.$set(this.formData, "unitName", unit ? unit.name : null)
                 this.$set(this.formData, "unitId", unit ? unit.id : null)
                 this.$set(this.formData, "unionName", union ? union.name : null)

src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html

@@ -38,14 +38,6 @@ layout("/layouts/platform.html"){
 <!--				    <dict-select v-model="pageForm.preparedBy" placeholder="请选择编制类别" @change="doSearch"-->
 <!--				                 code="USER_PREPARED_BY_TYPE"></dict-select>-->
 <!--			    </search-item>-->
-			    <search-item label="人员分类">
-				    <dict-select v-model="pageForm.aidFundMemberUserType" placeholder="请选择人员分类" @change="doSearch"
-				                 code="AIDFUND_MEMBER_USER_TYPE"></dict-select>
-			    </search-item>
-			    <search-item label="人员属性">
-				    <dict-select v-model="pageForm.userAttribute" placeholder="请选择人员属性" @change="doSearch"
-				                 code="USER_ATTRIBUTE"></dict-select>
-			    </search-item>
 			    <search-item label="更新日期">
 				    <el-date-picker :picker-options="pickerOptions" @change="changeDateRangeChange"
 				                    align="right" end-placeholder="结束日期" format="yyyy-MM-dd"
@@ -63,16 +55,6 @@ layout("/layouts/platform.html"){
 				    设置会员
 			    </el-button>
 
-			    <el-button :disabled="!checkUsers.length" @click="openBatchEditAidFundType" class="ml5" icon="el-icon-edit"
-			               size="small" type="primary">
-				    设置人员分类
-			    </el-button>
-
-			    <el-button :disabled="!checkUsers.length" @click="openBatchEditUserAttribute" class="ml5" icon="el-icon-edit"
-			               size="small" type="primary">
-				    设置人员属性
-			    </el-button>
-
 			    <el-button :disabled="!checkUsers.length" @click="openBatchEditUserState" class="ml5" icon="el-icon-edit"
 			               size="small" type="primary">
 				    设置在职状态
@@ -230,49 +212,6 @@ layout("/layouts/platform.html"){
 		   <member-all-change ref="memberAllChangeRef"></member-all-change>
 	    </template>
 
-        <el-drawer
-                :before-close="handleClose"
-                :visible.sync="batchEditUserAttributeVisible"
-                size="1000px" title="批量设置人员属性">
-            <el-timeline style="margin-right: 40px">
-                <el-timeline-item placement="top" timestamp="">
-                    <el-form :model="batchFormDataUserAttribute" label-width="100px" ref="batchFormUserAttribute">
-                        <el-row :gutter="60">
-                            <el-col :span="12">
-                                <el-form-item label="人员属性">
-                                    <dict-select
-                                            @change="checkUsers.map(v => $set(v, 'userAttribute', batchFormDataUserAttribute.userAttribute))"
-                                            clearable code="USER_ATTRIBUTE"
-                                            placeholder="请选择人员属性"
-                                            style="width: 300px"
-                                            v-model="batchFormDataUserAttribute.userAttribute"></dict-select>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                    </el-form>
-                </el-timeline-item>
-                <el-timeline-item placement="top" timestamp="">
-                    <el-table :data="checkUsers" class="vi-table" height="70vh" row-key="id" style="width: 100%">
-                        <el-table-column align="center" header-align="center" label="工号" prop="loginname" show-overflow-tooltip></el-table-column>
-                        <el-table-column align="center" header-align="center" label="姓名" prop="username" show-overflow-tooltip></el-table-column>
-                        <el-table-column align="center" header-align="center" label="所属单位" prop="unitName" show-overflow-tooltip></el-table-column>
-                        <el-table-column align="center" header-align="center" label="所属工会" prop="unionName" show-overflow-tooltip></el-table-column>
-                        <el-table-column align="center" header-align="center" label="人员属性" prop="userAttribute" show-overflow-tooltip width="300px">
-                            <template scope="{row}">
-                                <dict-select clearable code="USER_ATTRIBUTE" placeholder="请选择人员属性" style="width: 200px"
-                                             v-model="row.userAttribute"></dict-select>
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                </el-timeline-item>
-            </el-timeline>
-
-            <span style="position: absolute;bottom: 20px;right: 20px">
-                <el-button @click="batchEditUserAttributeVisible = false;checkUsers=[];$refs.table.clearSelection()">取消</el-button>
-                <el-button :loading="batchEditLoading" @click="doBatchEditUserAttribute" type="primary">确定</el-button>
-            </span>
-        </el-drawer>
-
         <el-drawer
                 :before-close="handleClose"
                 :visible.sync="batchEditMemberVisible"
@@ -330,49 +269,6 @@ layout("/layouts/platform.html"){
             </span>
         </el-drawer>
 
-        <el-drawer
-                :before-close="handleClose"
-                :visible.sync="batchEditAidFundTypeVisible"
-                size="1000px" title="批量设置人员分类">
-            <el-timeline style="margin-right: 40px">
-                <el-timeline-item placement="top" timestamp="">
-                    <el-form :model="batchFormDataAidFundType" label-width="100px" ref="batchFormAidFundType">
-                        <el-row :gutter="60">
-                            <el-col :span="12">
-                                <el-form-item label="人员分类">
-                                    <dict-select
-                                            @change="checkUsers.map(v => $set(v, 'aidFundMemberUserType', batchFormDataAidFundType.aidFundMemberUserType))"
-                                            clearable code="AIDFUND_MEMBER_USER_TYPE"
-                                            placeholder="请选择人员分类"
-                                            style="width: 300px"
-                                            v-model="batchFormDataAidFundType.aidFundMemberUserType"></dict-select>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                    </el-form>
-                </el-timeline-item>
-                <el-timeline-item placement="top" timestamp="">
-                    <el-table :data="checkUsers" class="vi-table" height="70vh" row-key="id" style="width: 100%">
-                        <el-table-column align="center" header-align="center" label="工号" prop="loginname" show-overflow-tooltip></el-table-column>
-                        <el-table-column align="center" header-align="center" label="姓名" prop="username" show-overflow-tooltip></el-table-column>
-                        <el-table-column align="center" header-align="center" label="所属单位" prop="unitName" show-overflow-tooltip></el-table-column>
-                        <el-table-column align="center" header-align="center" label="所属工会" prop="unionName" show-overflow-tooltip></el-table-column>
-                        <el-table-column align="center" header-align="center" label="人员分类" prop="aidFundMemberUserType" show-overflow-tooltip width="300px">
-                            <template scope="{row}">
-                                <dict-select clearable code="AIDFUND_MEMBER_USER_TYPE" placeholder="请选择人员分类" style="width: 200px"
-                                             v-model="row.aidFundMemberUserType"></dict-select>
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                </el-timeline-item>
-            </el-timeline>
-
-            <span style="position: absolute;bottom: 20px;right: 20px">
-                <el-button @click="batchEditAidFundTypeVisible = false;checkUsers=[];$refs.table.clearSelection()">取消</el-button>
-                <el-button :loading="batchEditLoading" @click="doBatchEditAidFundType" type="primary">确定</el-button>
-            </span>
-        </el-drawer>
-
         <el-drawer
                 :before-close="handleClose"
                 :visible.sync="batchEditUserStateVisible"
@@ -513,22 +409,16 @@ layout("/layouts/platform.html"){
                 changed: 2,
                 isMember: 1,
                 changeTypes: [],
-                aidFundMemberUserType: "",
-                userAttribute: "",
             },
             unions: [],
             units: [],
             id: "",
             checkUsers: [],
             batchEditLoading: false,
-            batchEditUserAttributeVisible: false,
             batchEditMemberVisible: false,
-            batchEditAidFundTypeVisible: false,
             batchEditUserStateVisible: false,
             unitMoveVisible: false,
-            batchFormDataUserAttribute: {},
             batchFormDataMember: {member: false, welfareMember: false},
-            batchFormDataAidFundType: {},
             batchFormDataUserState: {},
             unitMoveFormData: {
                 unitId: "",
@@ -553,8 +443,6 @@ layout("/layouts/platform.html"){
 		        { 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: "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 },
@@ -685,18 +573,10 @@ layout("/layouts/platform.html"){
                     this.$refs.table.clearSelection()
                 }).catch(() => {})
             },
-            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}

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"></el-option>
                         </el-select>
                     </search-item>
-                    <search-item label="人员分类">
-                        <dict-select v-model="pageForm.aidFundMemberUserType" placeholder="请选择人员分类" @change="doSearch"
-                                     code="AIDFUND_MEMBER_USER_TYPE"></dict-select>
-                    </search-item>
-                    <search-item label="人员属性">
-                        <dict-select v-model="pageForm.userAttribute" placeholder="请选择人员属性" @change="doSearch"
-                                     code="USER_ATTRIBUTE"></dict-select>
-                    </search-item>
                 </search>
             </el-card>
 
@@ -149,9 +141,7 @@ layout("/layouts/platform.html"){
                     unitId: "",
                     userState: "",
                     personType: "",
-                    changeType: "",
+                    changeType: ""
-                    aidFundMemberUserType: "",
-                    userAttribute: ""
                 }
             }
         },

src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js

@@ -82,8 +82,6 @@ const MEMBER_INFO = {
                 <el-descriptions-item label="岗级">{{ viewData.positionLevel }}</el-descriptions-item>
                 <el-descriptions-item label="行政岗级">{{ viewData.administrativePositionLevel }}</el-descriptions-item>
 
-                <el-descriptions-item label="人员分类">{{ viewData.aidFundMemberUserType }}</el-descriptions-item>
-                <el-descriptions-item label="人员属性">{{ viewData.userAttribute }}</el-descriptions-item>
             </el-descriptions>
         </div>
     `,

src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.js

@@ -45,14 +45,6 @@
 <!--			    <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.aidFundMemberUserType" placeholder="请选择人员分类" @change="doSearch"
-			                 code="AIDFUND_MEMBER_USER_TYPE"></dict-select>
-		    </search-item>
-		    <search-item label="人员属性">
-			    <dict-select v-model="pageForm.userAttribute" placeholder="请选择人员属性" @change="doSearch"
-			                 code="USER_ATTRIBUTE"></dict-select>
-		    </search-item>
 	    </search>
     `,
     store,
@@ -76,8 +68,6 @@
                 userStates: [],
                 personTypes: [],
                 preparedBys: [],
-                aidFundMemberUserType: '',
-                userAttribute: '',
             }
         }
     },

src/main/resources/views/platform/zhgh/staffmanage/member/info/common/memberAddForm.js

@@ -102,18 +102,6 @@
                                          style="width: 100%"></dict-select>
                         </el-form-item>
                     </el-descriptions-item>
-                    <el-descriptions-item label="人员属性">
-                        <el-form-item prop="userAttribute">
-                            <dict-select v-model="formData.userAttribute" code="USER_ATTRIBUTE"
-                                         style="width: 100%"></dict-select>
-                        </el-form-item>
-                    </el-descriptions-item>
-                    <el-descriptions-item label="人员分类">
-                        <el-form-item prop="aidFundMemberUserType">
-                            <dict-select v-model="formData.aidFundMemberUserType" code="AIDFUND_MEMBER_USER_TYPE"
-                                         style="width: 100%"></dict-select>
-                        </el-form-item>
-                    </el-descriptions-item>
 <!--                    <el-descriptions-item label="编制类别">-->
 <!--                        <el-form-item prop="preparedBy">-->
 <!--                            <dict-select v-model="formData.preparedBy" code="USER_PREPARED_BY_TYPE"-->
@@ -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: {},

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}

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: "unitName", label: "所属单位",  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 },

src/main/resources/views/platform/zhgh/staffmanage/member/info/history/index.html

@@ -46,12 +46,6 @@ layout("/layouts/platform.html"){
                     <search-item label="人员类型">
                         <dict-select v-model="pageForm.personType" placeholder="请选择人员类型" @change="doSearch" code="USER_PERSON_TYPE"></dict-select>
                     </search-item>
-                    <search-item label="人员分类">
-                        <dict-select v-model="pageForm.aidFundMemberUserType" placeholder="请选择人员分类" @change="doSearch" code="AIDFUND_MEMBER_USER_TYPE"></dict-select>
-                    </search-item>
-                    <search-item label="人员属性">
-                        <dict-select v-model="pageForm.userAttribute" placeholder="请选择人员属性" @change="doSearch" code="USER_ATTRIBUTE"></dict-select>
-                    </search-item>
                 </search>
             </el-card>
 
@@ -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: "",
+                    memberSearchKeyWord: ""
-                    aidFundMemberUserType: "",
-                    userAttribute: ""
                 },
                 userId: "",
                 unions: [],

src/main/resources/views/platform/zhgh/staffmanage/member/info/input/index.html

@@ -46,12 +46,6 @@ layout("/layouts/platform.html"){
                     <search-item label="人员类型">
                         <dict-select v-model="pageForm.personType" placeholder="请选择人员类型" @change="doSearch" code="USER_PERSON_TYPE"></dict-select>
                     </search-item>
-                    <search-item label="人员分类">
-                        <dict-select v-model="pageForm.aidFundMemberUserType" placeholder="请选择人员分类" @change="doSearch" code="AIDFUND_MEMBER_USER_TYPE"></dict-select>
-                    </search-item>
-                    <search-item label="人员属性">
-                        <dict-select v-model="pageForm.userAttribute" placeholder="请选择人员属性" @change="doSearch" code="USER_ATTRIBUTE"></dict-select>
-                    </search-item>
                 </search>
             </el-card>
 
@@ -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: {

src/main/resources/views/platform/zhgh/staffmanage/member/statistics/analysis/index.html

@@ -80,56 +80,6 @@ layout("/layouts/platform.html"){
                 </search>
             </el-card>
 	        
-	        <el-card shadow="never">
-		        <el-row type="flex" align="middle" class="query-row query-row-tag">
-			        <el-col class="query-row-title">人员分类：</el-col>
-			        <el-col class="query-row-content query-row-content-tag">
-				        <el-tag
-						        class="query-tag-item"
-						        v-for="item in aidFundMemberUserTypeOptions"
-						        :key="item.code"
-						        :effect="pageForm.aidFundMemberUserTypes.includes(item.code)?'dark':'plain'"
-						        @click="tagClick('aidFundMemberUserTypes',item.code)">
-					        {{ item.name }}
-				        </el-tag>
-                        <span class="query-tag-actions">
-                            <el-link type="danger"
-                                     v-if="aidFundMemberUserTypeOptions.length&&pageForm.aidFundMemberUserTypes.length"
-                                     :underline="false"
-                                     @click="pageForm.aidFundMemberUserTypes=[];doSearch()">清空
-                            </el-link>
-                            <el-link :underline="false"
-                                     @click="pageForm.aidFundMemberUserTypes=aidFundMemberUserTypeOptions.map(p=>p.code);doSearch()"
-                                     type="success">全部
-                            </el-link>
-                        </span>
-			        </el-col>
-		        </el-row>
-		        <el-row type="flex" align="middle" class="query-row query-row-tag">
-			        <el-col class="query-row-title">人员属性：</el-col>
-			        <el-col class="query-row-content query-row-content-tag">
-				        <el-tag class="query-tag-item"
-                               v-for="item in userAttributeOptions"
-                               :key="item.code"
-                               :effect="pageForm.userAttributes.includes(item.code)?'dark':'plain'"
-                               @click="tagClick('userAttributes',item.code)">
-					        {{ item.name }}
-				        </el-tag>
-                        <span class="query-tag-actions">
-                            <el-link type="danger"
-                                     v-if="userAttributeOptions.length&&pageForm.userAttributes.length"
-                                     :underline="false"
-                                     @click="pageForm.userAttributes=[];doSearch()">清空
-                            </el-link>
-                            <el-link :underline="false"
-                                     @click="pageForm.userAttributes=userAttributeOptions.map(p=>p.code);doSearch()"
-                                     type="success">全部
-                            </el-link>
-                        </span>
-			        </el-col>
-		        </el-row>
-	        </el-card>
-
             <el-card shadow="never" class="mt10">
                 <table-tool label="会员分析"></table-tool>
                 <el-table :data="tableData" show-summary>
@@ -211,13 +161,9 @@ layout("/layouts/platform.html"){
             },
             unions: [],
             units: [],
-	        aidFundMemberUserTypeOptions: [],
-	        userAttributeOptions: [],
             pageForm: {
                 currentYear: moment().format("YYYY"),
-                queryType: "fgh",
+                queryType: "fgh"
-	            userAttributes: [],
-	            aidFundMemberUserTypes: []
             },
             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()

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: "unitName", label: "所属单位", 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 },
@@ -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)

src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/queryForm.js

@@ -88,56 +88,6 @@ 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-content query-row-content-tag">
-			        <el-tag
-					        style="margin-right: 10px;cursor: pointer"
-					        v-for="item in aidFundMemberUserTypeOptions"
-					        :key="item.code"
-					        :type="item.name"
-					        :effect="pageForm.aidFundMemberUserTypes.includes(item.code)?'dark':'plain'"
-					        @click="tagClick('aidFundMemberUserTypes',item.code)">
-				        {{ item.name }}
-			        </el-tag>
-			        
-			        <el-link type="danger"
-			                 v-if="aidFundMemberUserTypeOptions.length&&pageForm.aidFundMemberUserTypes.length"
-			                 :underline="false"
-			                 @click="pageForm.aidFundMemberUserTypes=[];doSearch()">清空
-			        </el-link>
-			        <el-link :underline="false"
-			                 @click="pageForm.aidFundMemberUserTypes=aidFundMemberUserTypeOptions.map(p=>p.code);doSearch()"
-			                 type="success">全部
-			        </el-link>
-		        </el-col>
-	        </el-row>
-	        
-	        <el-row type="flex" align="middle" class="query-row query-row-tag">
-		        <el-col class="query-row-title">人员属性：</el-col>
-		        <el-col class="query-row-content query-row-content-tag">
-			        <el-tag
-					        style="margin-right: 10px;cursor: pointer"
-					        v-for="item in userAttributeOptions"
-					        :key="item.code"
-					        :type="item.name"
-					        :effect="pageForm.userAttributes.includes(item.code)?'dark':'plain'"
-					        @click="tagClick('userAttributes',item.code)">
-				        {{ item.name }}
-			        </el-tag>
-			        
-			        <el-link type="danger"
-			                 v-if="userAttributeOptions.length&&pageForm.userAttributes.length"
-			                 :underline="false"
-			                 @click="pageForm.userAttributes=[];doSearch()">清空
-			        </el-link>
-			        <el-link :underline="false"
-			                 @click="pageForm.userAttributes=userAttributeOptions.map(p=>p.code);doSearch()"
-			                 type="success">全部
-			        </el-link>
-		        </el-col>
-	        </el-row>
-	        
 	        <el-row type="flex" align="middle" class="query-row">
 		        <el-col class="query-row-content">
 			        <el-row>
@@ -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
             })

src/main/resources/views/platform/zhgh/staffmanage/member/statistics/summary/index.html

@@ -80,56 +80,6 @@ layout("/layouts/platform.html"){
 
             </el-card>
 
-            <el-card shadow="never" class="mt10">
-	            <el-row type="flex" align="middle" class="query-row query-row-tag">
-		            <el-col class="query-row-title">人员分类：</el-col>
-		            <el-col class="query-row-content query-row-content-tag">
-			            <el-tag
-					            class="query-tag-item"
-					            v-for="item in aidFundMemberUserTypeOptions"
-					            :key="item.code"
-					            :effect="pageForm.aidFundMemberUserTypes.includes(item.code)?'dark':'plain'"
-					            @click="tagClick('aidFundMemberUserTypes',item.code)">
-				            {{ item.name }}
-			            </el-tag>
-                        <span class="query-tag-actions">
-                            <el-link type="danger"
-                                     v-if="aidFundMemberUserTypeOptions.length&&pageForm.aidFundMemberUserTypes.length"
-                                     :underline="false"
-                                     @click="pageForm.aidFundMemberUserTypes=[];doSearch()">清空
-                            </el-link>
-                            <el-link :underline="false"
-                                     @click="pageForm.aidFundMemberUserTypes=aidFundMemberUserTypeOptions.map(p=>p.code);doSearch()"
-                                     type="success">全部
-                            </el-link>
-                        </span>
-		            </el-col>
-	            </el-row>
-                <el-row type="flex" align="middle" class="query-row query-row-tag">
-                    <el-col class="query-row-title">人员属性：</el-col>
-                    <el-col class="query-row-content query-row-content-tag">
-                        <el-tag class="query-tag-item"
-                                                           v-for="item in userAttributeOptions"
-                                                           :key="item.code"
-                                                           :effect="pageForm.userAttributes.includes(item.code)?'dark':'plain'"
-                                                           @click="tagClick('userAttributes',item.code)">
-                            {{ item.name }}
-                        </el-tag>
-                        <span class="query-tag-actions">
-                            <el-link type="danger"
-                                     v-if="userAttributeOptions.length&&pageForm.userAttributes.length"
-                                     :underline="false"
-                                     @click="pageForm.userAttributes=[];doSearch()">清空
-                            </el-link>
-                            <el-link :underline="false"
-                                     @click="pageForm.userAttributes=userAttributeOptions.map(p=>p.code);doSearch()"
-                                     type="success">全部
-                            </el-link>
-                        </span>
-                    </el-col>
-                </el-row>
-            </el-card>
-
             <el-card shadow="never" class="mt10">
                 <table-tool label="会员统计"></table-tool>
                 <el-table :data="tableData" show-summary>
@@ -173,14 +123,10 @@ layout("/layouts/platform.html"){
             },
             unions: [],
             units: [],
-            userAttributeOptions: [],
             pageForm: {
                 currentYear: moment().format("YYYY"),
-                queryType: "fgh",
+                queryType: "fgh"
-                userAttributes: [],
-	            aidFundMemberUserTypes: []
             },
-	        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