From be2c2abb4fe45940ab6c2c9bbc71f536a79cb7af Mon Sep 17 00:00:00 2001
From: "@jyuhsin" <729757837@qq.com>
Date: Tue, 4 Nov 2025 15:32:08 +0800
Subject: [PATCH] commit

---
 .../impl/MemberStatisticsServiceImpl.java     |  1 -
 .../statistics/comprehensive/queryForm.js     | 24 +++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java
index 7f2298e..0dcdb78 100644
--- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java
@@ -145,7 +145,6 @@ public class MemberStatisticsServiceImpl extends BaseServiceImpl<Sys_user> imple
                 	u.idCardType,
                 	u.idCard,
                 	u.mobile,
-                	u.welfareMobile,
                 	u.education,
                 	u.academicDegree,
                 	u.technicalTitle,
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 a04d064..b9a457a 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
@@ -72,7 +72,9 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
 	        
 	        <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-col class="query-row-content query-row-content-tag" 
+                        :style="{ height: personTypeExtend ? 'auto' : '24px', 'overflow-y': 'hidden' }"
+                >
 			        <el-tag
                             size="small"
 					        style="cursor: pointer;margin: 0;"
@@ -94,6 +96,13 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
 			                 type="success">全部
 			        </el-link>
 		        </el-col>
+                <el-col style="width: 40px">
+                    <el-link type="primary"
+                             :underline="false"
+                             @click="personTypeExtend = !personTypeExtend">
+                        {{personTypeExtend ? '收起' : '展开'}}
+                    </el-link>
+                </el-col>
 	        </el-row>
 	        
 	        <el-row type="flex" align="middle" class="query-row query-row-tag">
@@ -124,7 +133,9 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
 	        
 	        <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-col class="query-row-content query-row-content-tag"
+                        :style="{ height: userStateExtend ? 'auto' : '24px', 'overflow-y': 'hidden' }"
+                >
 			        <el-tag
                             size="small"
                             style="cursor: pointer;margin: 0;"
@@ -146,6 +157,13 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
 			                 type="success">全部
 			        </el-link>
 		        </el-col>
+                <el-col style="width: 40px">
+                    <el-link type="primary"
+                             :underline="false"
+                             @click="userStateExtend = !userStateExtend">
+                        {{userStateExtend ? '收起' : '展开'}}
+                    </el-link>
+                </el-col>
 	        </el-row>
 	        
 	        <el-row class="query-row" type="flex" align="middle">
@@ -394,6 +412,8 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
     store,
     data() {
         return {
+            personTypeExtend: false,
+            userStateExtend: false,
             pageForm: {
                 isUnit: "",
                 isUnion: "",