From fe250baef8ed3955dd5d9c899a1710cb1a8dd15d Mon Sep 17 00:00:00 2001
From: zhangrui <zr15972328402@163.com>
Date: Tue, 14 Jul 2026 14:35:17 +0800
Subject: [PATCH] 1

---
 .../member/apply/common/commonQuery.html      | 51 +++++++++++++++++++
 .../member/change/common/commonQuery.html     | 40 +++++++++++++++
 .../member/info/common/commonQuery.html       | 51 +++++++++++++++++++
 3 files changed, 142 insertions(+)
 create mode 100644 src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.html
 create mode 100644 src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.html
 create mode 100644 src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.html

diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.html
new file mode 100644
index 00000000..48786812
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.html
@@ -0,0 +1,51 @@
+<script type="text/x-template" id="member-apply-common-query-template">
+    <search @search="doSearch">
+        <search-item label="姓名/工号">
+            <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
+        </search-item>
+        <template v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN', 'BRANCH_UNION_CHAIRMAN'])">
+            <search-item label="所属工会">
+                <el-select
+                        @change="flushUnits"
+                        @clear="flushUnits"
+                        clearable
+                        filterable
+                        placeholder="请选择所属工会"
+                        style="width: 100%"
+                        v-model="pageForm.unionId"
+                >
+                    <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unions"></el-option>
+                </el-select>
+            </search-item>
+            <search-item label="所属单位">
+                <el-select clearable filterable placeholder="请选择所属单位" style="width: 100%" v-model="pageForm.unitId">
+                    <el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in units"></el-option>
+                </el-select>
+            </search-item>
+            <search-item label="在职状态">
+                <dict-select v-model="pageForm.userStates" placeholder="请选择在职状态" @change="doSearch"
+                             code="USER_STATE" multiple collapse-tags></dict-select>
+            </search-item>
+            <search-item label="人员类型">
+                <dict-select v-model="pageForm.personTypes" placeholder="请选择人员类型" @change="doSearch"
+                             code="USER_PERSON_TYPE" multiple collapse-tags></dict-select>
+            </search-item>
+            <!--
+            <search-item label="编制类别">
+                <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-if="userAttributeMultiple" v-model="pageForm.userAttributes" code="USER_ATTRIBUTE"
+                             multiple collapse-tags clearable style="width: 100%"></dict-select>
+                <dict-select v-else v-model="pageForm.userAttribute" code="USER_ATTRIBUTE"
+                             clearable style="width: 100%"></dict-select>
+            </search-item>
+        </template>
+    </search>
+</script>
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.html
new file mode 100644
index 00000000..56fa6003
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.html
@@ -0,0 +1,40 @@
+<script type="text/x-template" id="member-change-common-query-template">
+    <search @search="doSearch">
+        <search-item label="姓名/工号">
+            <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
+        </search-item>
+        <search-item label="所属工会">
+            <el-select @change="flushUnits" @clear="flushUnits" clearable filterable
+                       placeholder="请选择所属工会" style="width: 100%;" v-model="pageForm.unionId">
+                <el-option :key="item.id" :label="item.name" :value="item.id"
+                           v-for="item in unions"></el-option>
+            </el-select>
+        </search-item>
+        <search-item label="所属单位">
+            <el-select clearable filterable placeholder="请选择所属单位" style="width: 100%"
+                       v-model="pageForm.unitId">
+                <el-option :key="item.id" :label="item.name" :value="item.id"
+                           v-for="item in units"></el-option>
+            </el-select>
+        </search-item>
+        <search-item label="在职状态">
+            <dict-select v-model="pageForm.userStates" placeholder="请选择在职状态" @change="doSearch"
+                         code="USER_STATE" multiple collapse-tags></dict-select>
+        </search-item>
+        <search-item label="人员类型">
+            <dict-select v-model="pageForm.personTypes" placeholder="请选择人员类型" @change="doSearch"
+                         code="USER_PERSON_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-if="userAttributeMultiple" v-model="pageForm.userAttributes"
+                         placeholder="请选择人员属性" @change="doSearch" code="USER_ATTRIBUTE"
+                         multiple collapse-tags clearable></dict-select>
+            <dict-select v-else v-model="pageForm.userAttribute" placeholder="请选择人员属性"
+                         @change="doSearch" code="USER_ATTRIBUTE"></dict-select>
+        </search-item>
+    </search>
+</script>
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.html b/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.html
new file mode 100644
index 00000000..2464f42d
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.html
@@ -0,0 +1,51 @@
+<script type="text/x-template" id="member-info-common-query-template">
+    <search @search="doSearch">
+        <search-item label="姓名/工号">
+            <el-select
+                    clearable
+                    v-model="pageForm.userIds"
+                    filterable
+                    remote
+                    collapse-tags
+                    placeholder="请输入姓名或工号"
+                    :remote-method="queryUser"
+                    @change="doSearch"
+                    style="width: 100%"
+                    multiple
+            >
+                <el-option v-for="o in userList" :label="o.username + '(' + o.loginname + ')'" :value="o.id"
+                           :key="o.id"></el-option>
+            </el-select>
+        </search-item>
+        <search-item label="所属工会">
+            <el-select @change="handleUnionChange" @clear="handleUnionClear" clearable filterable
+                       placeholder="请选择所属工会" style="width: 100%;" v-model="pageForm.unionId">
+                <el-option :key="item.id" :label="item.name" :value="item.id"
+                           v-for="item in unions"></el-option>
+            </el-select>
+        </search-item>
+        <search-item label="所属单位">
+            <el-select clearable filterable placeholder="请选择所属单位" style="width: 100%"
+                       v-model="pageForm.unitId">
+                <el-option :key="item.id" :label="item.name" :value="item.id"
+                           v-for="item in units"></el-option>
+            </el-select>
+        </search-item>
+        <search-item label="在职状态" v-if="!query_disable">
+            <dict-select v-model="pageForm.userStates" placeholder="请选择在职状态" @change="doSearch"
+                         code="USER_STATE" multiple collapse-tags></dict-select>
+        </search-item>
+        <search-item label="人员类型" v-if="!query_disable">
+            <dict-select v-model="pageForm.personTypes" placeholder="请选择人员类型" @change="doSearch"
+                         code="USER_PERSON_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.userAttributes" placeholder="请选择人员属性" @change="doSearch"
+                         code="USER_ATTRIBUTE" multiple collapse-tags clearable></dict-select>
+        </search-item>
+    </search>
+</script>