feat: 信息查询加姓名查询

src/main/resources/views/platform/sys/data/user/query.html

@@ -8,6 +8,9 @@ layout("/layouts/platform.html"){
             <search-item label="工号">
                 <el-input placeholder="请输入工号" clearable v-model="pageForm.zgh" @keyup.enter.native="doSearch"></el-input>
             </search-item>
+            <search-item label="姓名">
+                <el-input placeholder="请输入姓名" clearable v-model="pageForm.xm" @keyup.enter.native="doSearch"></el-input>
+            </search-item>
             <el-button slot="actions" icon="el-icon-refresh-left" :disabled="tableLoading" @click="resetSearch">重置</el-button>
         </search>
     </el-card>
@@ -30,7 +33,7 @@ layout("/layouts/platform.html"){
         data() {
             return {
                 pageDataUrl: "/platform/sys/data/user/query/queryData",
-                pageForm: { zgh: "" },
+                pageForm: { zgh: "", xm: "" },
                 columns: [
                     { key: "ZGH", label: "工号", alias: "ID" },
                     { key: "XM", label: "姓名", alias: "" },
@@ -64,6 +67,7 @@ layout("/layouts/platform.html"){
         methods: {
             resetSearch() {
                 this.pageForm.zgh = ""
+                this.pageForm.xm = ""
                 this.doSearch()
             },
             formatValue(value) {

src/main/resources/views/platform/zhgh/club/infoManage/manage/clubRegisterImport.js

@@ -10,7 +10,7 @@ const CLUB_REGISTER_IMPORT_TEMPLATE = {
                     <h4>1. 下载并填写模板</h4>
                     <el-button type="primary" plain size="small" icon="el-icon-download" @click="download" :disabled="loading">下载模板及参数说明</el-button>
                     <p><strong>必填：</strong>名称、类型编码、成立日期、会长和秘书长工号、至少3名发起人工号。</p>
-                    <p><strong>人员：</strong>会长和秘书长各1人，副职选填。多人工号用逗号分隔，理事人员不能重复。</p>
+                    <p><strong>人员：</strong>会长和秘书长各至少填1人，副会长和副秘书长选填。同一职务的多个工号用英文逗号（,）分隔，理事人员不能重复。</p>
                     <p><strong>选填：</strong>协会编码留空自动生成；联系人、会费、介绍、缩略图及附件等详见模板。</p>
                     <p class="club-register-import-muted">协会类型来自系统字典，模板内附当前类型对照表。</p>
                 </section>

src/main/resources/views/platform/zhgh/club/infoManage/manage/schoolClubManage.js

@@ -22,14 +22,14 @@ const SCHOOL_CLUB_MANAGE_TEMPLATE = {
             <el-card shadow="never" class="mt10 club-manage-list-card">
                 <table-tool label="协会列表">
                     <template slot="content">
-                        <el-button v-if="$auth.hasRole('SYSADMIN')" type="primary" size="small" icon="el-icon-upload2"
-                                   @click="openImport">批量导入协会</el-button>
                         <!-- 一级节点展示协会总览时，引导用户从左侧树选择协会查看详细信息。 -->
                         <span v-if="parentNode.currentTreeNode && parentNode.currentTreeNode.level === 1"
                               style="display: block; text-align: center; color: #f56c6c;">
                             温馨提醒：选择左侧树中的某个协会，可查询该协会的详细信息。
                         </span>
                     </template>
+                    <el-button v-if="$auth.hasRole('SYSADMIN')" type="primary" size="small" icon="el-icon-upload2"
+                               @click="openImport">批量导入协会</el-button>
                 </table-tool>
                 <el-table v-loading="tableLoading" :data="tableData" :height="tableHeight"
                           row-key="id" ref="tableRef">