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

---
 .../statistics/comprehensive/queryForm.js     | 520 +++++++++---------
 1 file changed, 267 insertions(+), 253 deletions(-)

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 b9a457a..8144f23 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
@@ -1,259 +1,272 @@
 const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
     template: /*language=HTML*/ `
         <el-card shadow="never">
-	        <el-row type="flex" align="middle" class="query-row">
-		        <el-col class="query-row-title">年&emsp;&emsp;度：</el-col>
-		        <el-col class="query-row-content" :span="12">
-			        <el-row style="margin-left: 3px">
-				        <el-date-picker @change="doSearch()"
-				                        style="width: 85%"
-				                        :picker-options="pickerOptions"
-				                        v-model="pageForm.year"
-				                        type="year"
-				                        value-format="yyyy"
-				                        placeholder="选择年" :clearable="false">
-				        </el-date-picker>
-				        <el-link type="primary" style="margin-left: 10px"
-				                 :underline="false"
-				                 @click="setNowYear();doSearch()">
-					        本年
-				        </el-link>
-			        </el-row>
-		        </el-col>
-		        <el-col class="query-row-title">姓名/工号：</el-col>
-		        <el-col class="query-row-content" :span="12">
-			        <el-row style="width: 92%">
-				        <el-input placeholder="请输入内容" clearable v-model="pageForm.searchKeyword"></el-input>
-			        </el-row>
-		        </el-col>
-	        </el-row>
-	        
-	        <el-row type="flex" align="middle" class="query-row">
-		        <el-col class="query-row-content">
-			        <el-row>
-				        <el-col :span="12">
-					        <span>所属工会：</span>
-					        <el-select placeholder="所属工会" v-model="pageForm.unionId"
-					                   clearable multiple style="margin-left: 33px;width: 80%"
-					                   @change="flushUnits();doSearch()"
-					                   @clear="flushUnits();doSearch()"
-					                   filterable>
-						        <el-option v-for="item in unions" :label="item.name"
-						                   :value="item.id"></el-option>
-					        </el-select>
-				        </el-col>
-				        <el-col :span="12">
-					        <span>所属单位：</span>
-					        <el-select placeholder="所属单位" v-model="pageForm.unitId"
-					                   clearable multiple style="margin-left: 33px;width: 80%" filterable>
-						        <el-option v-for="item in units" :label="item.name"
-						                   :value="item.id"></el-option>
-					        </el-select>
-				        </el-col>
-			        </el-row>
-		        </el-col>
-	        </el-row>
-	        
-	        <el-row class="query-row">
-		        <el-col class="query-row-title">性别：</el-col>
-		        <el-col class="query-row-content query-row-content-tag">
-			        <el-tag
-					        :effect="pageForm.sexTypes.includes(item.name)?'dark':'plain'"
-					        :key="item.code"
-					        :type="item.name"
-					        @click="tagClick('sexTypes',item.name)"
-                            size="small"
-                            style="cursor: pointer;margin: 0;"
-					        v-for="item in sexTypeOptions">
-				        {{ item.name }}
-			        </el-tag>
-		        </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" 
-                        :style="{ height: personTypeExtend ? 'auto' : '24px', 'overflow-y': 'hidden' }"
-                >
-			        <el-tag
-                            size="small"
-					        style="cursor: pointer;margin: 0;"
-					        v-for="item in personTypeOptions"
-					        :key="item.code"
-					        :type="item.name"
-					        :effect="pageForm.personTypes.includes(item.name)?'dark':'plain'"
-					        @click="tagClick('personTypes',item.name)">
-				        {{ item.name }}
-			        </el-tag>
-			        
-			        <el-link type="danger"
-			                 v-if="personTypeOptions.length&&pageForm.personTypes.length"
-			                 :underline="false"
-			                 @click="pageForm.personTypes=[];doSearch()">清空
-			        </el-link>
-			        <el-link :underline="false"
-			                 @click="pageForm.personTypes=personTypeOptions.map(p=>p.code);doSearch()"
-			                 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">
-		        <el-col class="query-row-title">人事编制：</el-col>
-		        <el-col class="query-row-content query-row-content-tag">
-			        <el-tag
-                            size="small"
-                            style="cursor: pointer;margin: 0;"
-					        v-for="item in preparedByOptions"
-					        :key="item.code"
-					        :type="item.name"
-					        :effect="pageForm.preparedBys.includes(item.name)?'dark':'plain'"
-					        @click="tagClick('preparedBys',item.name)">
-				        {{ item.name }}
-			        </el-tag>
-			        
-			        <el-link type="danger"
-			                 v-if="preparedByOptions.length&&pageForm.preparedBys.length"
-			                 :underline="false"
-			                 @click="pageForm.preparedBys=[];doSearch()">清空
-			        </el-link>
-			        <el-link :underline="false"
-			                 @click="pageForm.preparedBys=preparedByOptions.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"
-                        :style="{ height: userStateExtend ? 'auto' : '24px', 'overflow-y': 'hidden' }"
-                >
-			        <el-tag
-                            size="small"
-                            style="cursor: pointer;margin: 0;"
-					        v-for="item in userStateOptions"
-					        :key="item.code"
-					        :type="item.name"
-					        :effect="pageForm.userStates.includes(item.name)?'dark':'plain'"
-					        @click="tagClick('userStates',item.name)">
-				        {{ item.name }}
-			        </el-tag>
-			        
-			        <el-link type="danger"
-			                 v-if="userStateOptions.length&&pageForm.userStates.length"
-			                 :underline="false"
-			                 @click="pageForm.userStates=[];doSearch()">清空
-			        </el-link>
-			        <el-link :underline="false"
-			                 @click="pageForm.userStates=userStateOptions.map(p=>p.code);doSearch()"
-			                 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">
-		        <el-col class="query-row-title">出生日期：</el-col>
-		        <el-col class="query-row-content">
-			        <el-date-picker
-					        v-model="pageForm.startDate"
-					        type="date"
-					        @change="determineStartDate"
-					        placeholder="选择开始日期">
-			        </el-date-picker>
-			        <el-date-picker
-					        v-model="pageForm.endDate"
-					        type="date"
-					        @change="determineEndDate"
-					        placeholder="选择结束日期">
-			        </el-date-picker>
-		        </el-col>
-	        </el-row>
-	        
-	        <el-row class="query-row" type="flex" align="middle">
-		        <el-col class="query-row-title">入会日期：</el-col>
-		        <el-col class="query-row-content">
-			        <el-date-picker
-					        v-model="pageForm.startJoinDate"
-					        type="date"
-					        @change="determineStartDate"
-					        placeholder="选择开始日期">
-			        </el-date-picker>
-			        <el-date-picker
-					        v-model="pageForm.endJoinDate"
-					        type="date"
-					        @change="determineEndDate"
-					        placeholder="选择结束日期">
-			        </el-date-picker>
-		        </el-col>
-	        </el-row>
-	        
-	        <el-row class="query-row" type="flex" align="middle">
-		        <el-col class="query-row-title">离会日期：</el-col>
-		        <el-col class="query-row-content">
-			        <el-date-picker
-					        v-model="pageForm.startLeaveDate"
-					        type="date"
-					        @change="determineStartDate"
-					        placeholder="选择开始日期">
-			        </el-date-picker>
-			        <el-date-picker
-					        v-model="pageForm.endLeaveDate"
-					        type="date"
-					        @change="determineEndDate"
-					        placeholder="选择结束日期">
-			        </el-date-picker>
-		        </el-col>
-	        </el-row>
-	        
-	        <el-row class="query-row" type="flex" align="middle">
-		        <el-col class="query-row-title">年龄范围：</el-col>
-		        <el-col class="query-row-content">
-			        <el-row type="flex" style="align-items: center">
-				        <el-col :span="15">
-					        <el-slider
-							        v-model="pageForm.age"
-							        range
-							        show-stops
-							        :max="100">
-					        </el-slider>
-				        </el-col>
-				        <el-col :span="9" class="pl20">
-					        当前范围：{{ pageForm.age }}
-				        </el-col>
-			        </el-row>
-		        </el-col>
-	        </el-row>
-	        
-	        <el-row type="flex" align="middle" class="query-row">
-		        <el-col class="query-row-title">模糊查询：</el-col>
-		        <el-col class="query-row-content">
-			        <member-cnd @cnd="(v)=>pageForm={...pageForm,...v}"></member-cnd>
-		        </el-col>
-	        </el-row>
-	        
-	        <el-row class="query-row" style="justify-content: end">
-		        <el-checkbox v-model="pageForm.reverseSelection" label="是否反选" border
-		                     @change="doSearch"
-		                     class="reverseCheckBox"></el-checkbox>
-		        <el-button type="danger" icon="el-icon-circle-close" @click="doReset">重置
-		        </el-button>
-		        <el-button type="primary" icon="el-icon-search" @click="doSearch">搜索</el-button>
-	        </el-row>
+            <div :style="{ height: rootExtend ? 'auto' : '60px', 'overflow-y': 'hidden' }">
+                <el-row type="flex" align="middle" class="query-row">
+                    <el-col class="query-row-title">年&emsp;&emsp;度：</el-col>
+                    <el-col class="query-row-content" :span="12">
+                        <el-row style="margin-left: 3px">
+                            <el-date-picker @change="doSearch()"
+                                            style="width: 85%"
+                                            :picker-options="pickerOptions"
+                                            v-model="pageForm.year"
+                                            type="year"
+                                            value-format="yyyy"
+                                            placeholder="选择年" :clearable="false">
+                            </el-date-picker>
+                            <el-link type="primary" style="margin-left: 10px"
+                                     :underline="false"
+                                     @click="setNowYear();doSearch()">
+                                本年
+                            </el-link>
+                        </el-row>
+                    </el-col>
+                    <el-col class="query-row-title">姓名/工号：</el-col>
+                    <el-col class="query-row-content" :span="12">
+                        <el-row style="width: 92%">
+                            <el-input placeholder="请输入内容" clearable v-model="pageForm.searchKeyword"></el-input>
+                        </el-row>
+                    </el-col>
+                </el-row>
+
+                <el-row type="flex" align="middle" class="query-row">
+                    <el-col class="query-row-content">
+                        <el-row>
+                            <el-col :span="12">
+                                <span>所属工会：</span>
+                                <el-select placeholder="所属工会" v-model="pageForm.unionId"
+                                           clearable multiple style="margin-left: 33px;width: 80%"
+                                           @change="flushUnits();doSearch()"
+                                           @clear="flushUnits();doSearch()"
+                                           filterable>
+                                    <el-option v-for="item in unions" :label="item.name"
+                                               :value="item.id"></el-option>
+                                </el-select>
+                            </el-col>
+                            <el-col :span="12">
+                                <span>所属单位：</span>
+                                <el-select placeholder="所属单位" v-model="pageForm.unitId"
+                                           clearable multiple style="margin-left: 33px;width: 80%" filterable>
+                                    <el-option v-for="item in units" :label="item.name"
+                                               :value="item.id"></el-option>
+                                </el-select>
+                            </el-col>
+                        </el-row>
+                    </el-col>
+                </el-row>
+
+                <el-row class="query-row">
+                    <el-col class="query-row-title">性别：</el-col>
+                    <el-col class="query-row-content query-row-content-tag">
+                        <el-tag
+                                :effect="pageForm.sexTypes.includes(item.name)?'dark':'plain'"
+                                :key="item.code"
+                                :type="item.name"
+                                @click="tagClick('sexTypes',item.name)"
+                                size="small"
+                                style="cursor: pointer;margin: 0;"
+                                v-for="item in sexTypeOptions">
+                            {{ item.name }}
+                        </el-tag>
+                    </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"
+                            :style="{ height: personTypeExtend ? 'auto' : '24px', 'overflow-y': 'hidden' }"
+                    >
+                        <el-tag
+                                size="small"
+                                style="cursor: pointer;margin: 0;"
+                                v-for="item in personTypeOptions"
+                                :key="item.code"
+                                :type="item.name"
+                                :effect="pageForm.personTypes.includes(item.name)?'dark':'plain'"
+                                @click="tagClick('personTypes',item.name)">
+                            {{ item.name }}
+                        </el-tag>
+
+                        <el-link type="danger"
+                                 v-if="personTypeOptions.length&&pageForm.personTypes.length"
+                                 :underline="false"
+                                 @click="pageForm.personTypes=[];doSearch()">清空
+                        </el-link>
+                        <el-link :underline="false"
+                                 @click="pageForm.personTypes=personTypeOptions.map(p=>p.code);doSearch()"
+                                 type="success">全部
+                        </el-link>
+                    </el-col>
+                    <el-col style="width: 50px">
+                        <el-link type="primary"
+                                 :underline="false"
+                                 @click="personTypeExtend = !personTypeExtend">
+                            <span v-if="!personTypeExtend">展开<i class="el-icon-caret-bottom"></i></span>
+                            <span v-if="personTypeExtend">收起<i class="el-icon-caret-top"></i></span>
+                        </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
+                                size="small"
+                                style="cursor: pointer;margin: 0;"
+                                v-for="item in preparedByOptions"
+                                :key="item.code"
+                                :type="item.name"
+                                :effect="pageForm.preparedBys.includes(item.name)?'dark':'plain'"
+                                @click="tagClick('preparedBys',item.name)">
+                            {{ item.name }}
+                        </el-tag>
+
+                        <el-link type="danger"
+                                 v-if="preparedByOptions.length&&pageForm.preparedBys.length"
+                                 :underline="false"
+                                 @click="pageForm.preparedBys=[];doSearch()">清空
+                        </el-link>
+                        <el-link :underline="false"
+                                 @click="pageForm.preparedBys=preparedByOptions.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"
+                            :style="{ height: userStateExtend ? 'auto' : '24px', 'overflow-y': 'hidden' }"
+                    >
+                        <el-tag
+                                size="small"
+                                style="cursor: pointer;margin: 0;"
+                                v-for="item in userStateOptions"
+                                :key="item.code"
+                                :type="item.name"
+                                :effect="pageForm.userStates.includes(item.name)?'dark':'plain'"
+                                @click="tagClick('userStates',item.name)">
+                            {{ item.name }}
+                        </el-tag>
+
+                        <el-link type="danger"
+                                 v-if="userStateOptions.length&&pageForm.userStates.length"
+                                 :underline="false"
+                                 @click="pageForm.userStates=[];doSearch()">清空
+                        </el-link>
+                        <el-link :underline="false"
+                                 @click="pageForm.userStates=userStateOptions.map(p=>p.code);doSearch()"
+                                 type="success">全部
+                        </el-link>
+                    </el-col>
+                    <el-col style="width: 50px">
+                        <el-link type="primary"
+                                 :underline="false"
+                                 @click="userStateExtend = !userStateExtend">
+                            <span v-if="!userStateExtend">展开<i class="el-icon-caret-bottom"></i></span>
+                            <span v-if="userStateExtend">收起<i class="el-icon-caret-top"></i></span>
+                        </el-link>
+                    </el-col>
+                </el-row>
+
+                <el-row class="query-row" type="flex" align="middle">
+                    <el-col class="query-row-title">出生日期：</el-col>
+                    <el-col class="query-row-content">
+                        <el-date-picker
+                                v-model="pageForm.startDate"
+                                type="date"
+                                @change="determineStartDate"
+                                placeholder="选择开始日期">
+                        </el-date-picker>
+                        <el-date-picker
+                                v-model="pageForm.endDate"
+                                type="date"
+                                @change="determineEndDate"
+                                placeholder="选择结束日期">
+                        </el-date-picker>
+                    </el-col>
+                </el-row>
+
+                <el-row class="query-row" type="flex" align="middle">
+                    <el-col class="query-row-title">入会日期：</el-col>
+                    <el-col class="query-row-content">
+                        <el-date-picker
+                                v-model="pageForm.startJoinDate"
+                                type="date"
+                                @change="determineStartDate"
+                                placeholder="选择开始日期">
+                        </el-date-picker>
+                        <el-date-picker
+                                v-model="pageForm.endJoinDate"
+                                type="date"
+                                @change="determineEndDate"
+                                placeholder="选择结束日期">
+                        </el-date-picker>
+                    </el-col>
+                </el-row>
+
+                <el-row class="query-row" type="flex" align="middle">
+                    <el-col class="query-row-title">离会日期：</el-col>
+                    <el-col class="query-row-content">
+                        <el-date-picker
+                                v-model="pageForm.startLeaveDate"
+                                type="date"
+                                @change="determineStartDate"
+                                placeholder="选择开始日期">
+                        </el-date-picker>
+                        <el-date-picker
+                                v-model="pageForm.endLeaveDate"
+                                type="date"
+                                @change="determineEndDate"
+                                placeholder="选择结束日期">
+                        </el-date-picker>
+                    </el-col>
+                </el-row>
+
+                <el-row class="query-row" type="flex" align="middle">
+                    <el-col class="query-row-title">年龄范围：</el-col>
+                    <el-col class="query-row-content">
+                        <el-row type="flex" style="align-items: center">
+                            <el-col :span="15">
+                                <el-slider
+                                        v-model="pageForm.age"
+                                        range
+                                        show-stops
+                                        :max="100">
+                                </el-slider>
+                            </el-col>
+                            <el-col :span="9" class="pl20">
+                                当前范围：{{ pageForm.age }}
+                            </el-col>
+                        </el-row>
+                    </el-col>
+                </el-row>
+
+                <el-row type="flex" align="middle" class="query-row">
+                    <el-col class="query-row-title">模糊查询：</el-col>
+                    <el-col class="query-row-content">
+                        <member-cnd @cnd="(v)=>pageForm={...pageForm,...v}"></member-cnd>
+                    </el-col>
+                </el-row>
+
+                <el-row class="query-row" style="justify-content: end">
+                    <el-checkbox v-model="pageForm.reverseSelection" label="是否反选" border
+                                 @change="doSearch"
+                                 class="reverseCheckBox"></el-checkbox>
+                    <el-button type="danger" icon="el-icon-circle-close" @click="doReset">重置
+                    </el-button>
+                    <el-button type="primary" icon="el-icon-search" @click="doSearch">搜索</el-button>
+                </el-row>
+            </div>
+
+            <div class="mt10" style="text-align: center;">
+                <el-link type="primary"
+                         :underline="false"
+                         @click="rootExtend = !rootExtend">
+                    <span v-if="!rootExtend" style="font-weight: bold">展开<i class="el-icon-caret-bottom"></i></span>
+                    <span v-if="rootExtend" style="font-weight: bold">收起<i class="el-icon-caret-top"></i></span>
+                </el-link>
+            </div>
             
             
             <!--<search @search="doSearch">
@@ -414,6 +427,7 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
         return {
             personTypeExtend: false,
             userStateExtend: false,
+            rootExtend: false,
             pageForm: {
                 isUnit: "",
                 isUnion: "",