fix：福利模块所有页面去除三级单位、人员属性字段

src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java

@@ -735,7 +735,6 @@ public class WelfareListServiceImpl extends BaseServiceImpl<WelfareList> impleme
         entities.add(new ExcelExportEntity("在职状态", "userState", 20));
         entities.add(new ExcelExportEntity("所属工会", "welfareUnionName", 20));
         entities.add(new ExcelExportEntity("所属单位", "welfareUnitName", 20));
-        entities.add(new ExcelExportEntity("三级单位", "threeUnitName", 20));
         entities.add(new ExcelExportEntity("备注", "remark", 20));
 
         // 设置导出参数

src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js

@@ -62,7 +62,7 @@ const filterUser = {
                     </search-item>
 
                     <search-item label="所属单位">
-                        <el-select @change="unitChange" clearable filterable
+                        <el-select clearable filterable
                                    placeholder="请选择所属单位" style="width: 100%"
                                    v-model="pageForm.unitId">
                             <el-option
@@ -74,17 +74,6 @@ const filterUser = {
                         </el-select>
                     </search-item>
 
-                    <search-item label="三级单位">
-                        <el-select clearable filterable placeholder="请先选择所属单位" style="width: 100%"
-                                   v-model="pageForm.threeUnitId">
-                            <el-option
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                                v-for="item in threeUnitOptions">
-                            </el-option>
-                        </el-select>
-                    </search-item>
 
                     <search-item label="人员类型：">
                         <dict-select clearable code="USER_PERSON_TYPE"
@@ -94,13 +83,6 @@ const filterUser = {
                                      v-model="pageForm.personTypes"></dict-select>
                     </search-item>
 
-                    <search-item label="人员属性：">
-                        <dict-select clearable code="USER_ATTRIBUTE"
-                                     multiple
-                                     collapse-tags
-                                     placeholder="请选择人员属性"
-                                     v-model="pageForm.userAttributes"></dict-select>
-                    </search-item>
 
                     <search-item label="在职状态：">
                         <dict-select clearable code="USER_STATE"
@@ -169,14 +151,11 @@ const filterUser = {
                 userStates: [],
                 personTypes: [],
                 preparedBys: [],
-                userAttributes: [],
+                unitId: null
-                unitId: null,
-                threeUnitId: null
             },
             sexOptions: ["男", "女"],
             unionOptions: [],
             unitOptions: [],
-            threeUnitOptions: [],
             tableColumns: [
                 { prop: "loginname", label: "工号" },
                 { prop: "username", label: "姓名" },
@@ -185,8 +164,7 @@ const filterUser = {
                 { prop: "personType", label: "人员类型", sortable: true },
                 { prop: "userState", label: "在职状态", sortable: true },
                 { prop: "unionName", label: "所属工会", sortable: true },
-                { prop: "unitName", label: "所属单位", sortable: true },
+                { prop: "unitName", label: "所属单位", sortable: true }
-                { prop: "threeUnitName", label: "三级单位", sortable: true }
             ]
         }
     },
@@ -208,35 +186,12 @@ const filterUser = {
             this.$set(this.pageForm, "birthMonths", [])
             this.$set(this.pageForm, "unionId", null)
             this.$set(this.pageForm, "unitId", null)
-            this.$set(this.pageForm, "threeUnitId", null)
-            this.threeUnitOptions = []
             this.$set(this.pageForm, "personTypes", [])
             this.$set(this.pageForm, "preparedBys", [])
-            this.$set(this.pageForm, "userAttributes", [])
             this.$set(this.pageForm, "userStates", [])
             this.$set(this.pageForm, "isMember", null)
         },
 
-        // 所属单位改变后，仅加载该单位直属的三级单位，避免跨单位筛选。
-        unitChange(unitId) {
-            this.$set(this.pageForm, "threeUnitId", null)
-            this.threeUnitOptions = []
-            if (!unitId) {
-                return
-            }
-            this.$axios.post("/platform/sys/unit/child", { pid: unitId })
-                .then((res) => {
-                    if (res.code === 0) {
-                        this.threeUnitOptions = res.data || []
-                    } else {
-                        this.$message.error(res.msg || "三级单位查询失败")
-                    }
-                })
-                .catch(() => {
-                    this.$message.error("三级单位查询失败，请稍后重试")
-                })
-        },
-
         pageData() {
             this.tableLoading = true
             this.$axios

src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html

@@ -65,10 +65,6 @@ layout("/layouts/platform.html"){
 		            <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>
 

src/main/resources/views/platform/zhgh/welfare/welfareUser/addUser.js

@@ -63,7 +63,7 @@ const addUser = {
                     </search-item>
 
                     <search-item label="所属单位">
-                        <el-select @change="unitChange" clearable
+                        <el-select clearable
                                    filterable
                                    placeholder="请选择所属单位" style="width: 100%"
                                    v-model="pageForm.unitId">
@@ -76,17 +76,6 @@ const addUser = {
                         </el-select>
                     </search-item>
 
-                    <search-item label="三级单位">
-                        <el-select clearable filterable placeholder="请先选择所属单位" style="width: 100%"
-                                   v-model="pageForm.threeUnitId">
-                            <el-option
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                                v-for="item in threeUnitOptions">
-                            </el-option>
-                        </el-select>
-                    </search-item>
 
                     <search-item label="人员类型：">
                         <dict-select clearable code="USER_PERSON_TYPE"
@@ -96,13 +85,6 @@ const addUser = {
                                      v-model="pageForm.personTypes"></dict-select>
                     </search-item>
 
-                    <search-item label="人员属性：">
-                        <dict-select clearable code="USER_ATTRIBUTE"
-                                     multiple
-                                     collapse-tags
-                                     placeholder="请选择人员属性"
-                                     v-model="pageForm.userAttributes"></dict-select>
-                    </search-item>
 
                     <search-item label="在职状态：">
                         <dict-select clearable code="USER_STATE"
@@ -171,9 +153,7 @@ const addUser = {
                 birthMonths: [],
                 unionId: null,
                 unitId: null,
-                threeUnitId: null,
                 personTypes: [],
-                userAttributes: [],
                 preparedBys: [],
                 userStates: [],
                 isMember: null
@@ -181,7 +161,6 @@ const addUser = {
             sexOptions: ["男", "女"],
             unionOptions: [],
             unitOptions: [],
-            threeUnitOptions: [],
             tableColumns: [
                 { prop: "loginname", label: "工号" },
                 { prop: "username", label: "姓名" },
@@ -190,8 +169,7 @@ const addUser = {
                 { prop: "personType", label: "人员类型", sortable: true },
                 { prop: "userState", label: "在职状态", sortable: true },
                 { prop: "unionName", label: "所属工会", sortable: true },
-                { prop: "unitName", label: "所属单位", sortable: true },
+                { prop: "unitName", label: "所属单位", sortable: true }
-                { prop: "threeUnitName", label: "三级单位", sortable: true }
             ]
         }
     },
@@ -213,10 +191,7 @@ const addUser = {
             this.$set(this.pageForm, "birthMonths", [])
             this.$set(this.pageForm, "unionId", null)
             this.$set(this.pageForm, "unitId", null)
-            this.$set(this.pageForm, "threeUnitId", null)
-            this.$set(this, "threeUnitOptions", [])
             this.$set(this.pageForm, "personTypes", [])
-            this.$set(this.pageForm, "userAttributes", [])
             this.$set(this.pageForm, "preparedBys", [])
             this.$set(this.pageForm, "userStates", [])
             this.$set(this.pageForm, "isMember", null)
@@ -224,7 +199,6 @@ const addUser = {
 
         async unionIdChange(val) {
             this.$set(this.pageForm, "unitId", null)
-            this.unitChange(null)
             if (val) {
                 this.$set(this, "unitOptions", await this.$businessTool.listUnit(val))
             } else {
@@ -232,26 +206,6 @@ const addUser = {
             }
         },
 
-        // 所属单位改变后，仅加载该单位直属的三级单位，避免跨单位筛选。
-        unitChange(unitId) {
-            this.$set(this.pageForm, "threeUnitId", null)
-            this.$set(this, "threeUnitOptions", [])
-            if (!unitId) {
-                return
-            }
-            this.$axios.post("/platform/sys/unit/child", { pid: unitId })
-                .then((res) => {
-                    if (res.code === 0) {
-                        this.$set(this, "threeUnitOptions", res.data || [])
-                    } else {
-                        this.$message.error(res.msg || "三级单位查询失败")
-                    }
-                })
-                .catch(() => {
-                    this.$message.error("三级单位查询失败，请稍后重试")
-                })
-        },
-
         pageData() {
             this.tableLoading = true
             this.$axios

src/main/resources/views/platform/zhgh/welfare/welfareUser/index.html

@@ -81,26 +81,12 @@ layout("/layouts/platform.html"){
                             collapse-tags
                             placeholder="请选择所属单位"
                             style="width: 100%"
-                            @change="unitIdsChange"
                             v-model="pageForm.unitIds"
                         >
                             <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
                         </el-select>
                     </search-item>
 
-                    <search-item label="三级单位">
-                        <el-select
-                            clearable
-                            filterable
-                            multiple
-                            collapse-tags
-                            placeholder="请先选择所属单位"
-                            style="width: 100%"
-                            v-model="pageForm.threeUnitIds"
-                        >
-                            <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in threeUnitOptions"></el-option>
-                        </el-select>
-                    </search-item>
 
                     <search-item label="人员类型：">
                         <dict-select
@@ -128,10 +114,6 @@ layout("/layouts/platform.html"){
 		                <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.userAttributes" placeholder="请选择人员属性" @change="doSearch"
-		                             code="USER_ATTRIBUTE" clearable multiple collapse-tags></dict-select>
-	                </search-item>
 
                     <!--                    <search-item label="所选福利：">-->
                     <!--                        <el-select clearable placeholder="请选择所选福利" style="width: 100%" v-model="pageForm.optionId">-->
@@ -283,7 +265,6 @@ layout("/layouts/platform.html"){
                 },
                 unionOptions: [],
                 unitOptions: [],
-                threeUnitOptions: [],
                 sexOptions: ["男", "女"],
                 projectSelectOptions: [],
                 tableColumns: [
@@ -295,7 +276,6 @@ layout("/layouts/platform.html"){
                     { prop: "userState", label: "在职状态", sortable: true },
                     { prop: "welfareUnionName", label: "所属工会", sortable: true },
                     { prop: "welfareUnitName", label: "所属单位", sortable: true },
-                    { prop: "threeUnitName", label: "三级单位", sortable: true },
                     { prop: "remark", label: "备注", sortable: true }
                 ],
 
@@ -423,32 +403,6 @@ layout("/layouts/platform.html"){
                     this.doSearch()
                 })
             },
-            // 根据已选所属单位查询直属三级单位，筛选项只保留当前所属单位范围内的数据。
-            async unitIdsChange(unitIds) {
-                this.$set(this.pageForm, "threeUnitIds", [])
-                this.$set(this, "threeUnitOptions", [])
-                if (!unitIds || unitIds.length === 0) {
-                    return
-                }
-                try {
-                    const responses = await Promise.all(unitIds.map((unitId) => this.$axios.post("/platform/sys/unit/child", { pid: unitId })))
-                    const failedResponse = responses.find((res) => res.code !== 0)
-                    if (failedResponse) {
-                        this.$message.error(failedResponse.msg || "三级单位查询失败")
-                        return
-                    }
-                    const optionMap = {}
-                    responses.forEach((res) => {
-                        const options = res.data || []
-                        options.forEach((item) => {
-                            optionMap[item.id] = item
-                        })
-                    })
-                    this.$set(this, "threeUnitOptions", Object.keys(optionMap).map((id) => optionMap[id]))
-                } catch (e) {
-                    this.$message.error("三级单位查询失败，请稍后重试")
-                }
-            },
             pageData() {
                 this.tableLoading = true
                 this.$axios