From e7b24d3afb5708f745bcbbb28051883a8c2d652e Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Tue, 14 Oct 2025 14:15:20 +0800
Subject: [PATCH] commit

---
 .../delegationTwoPush/index.html              | 24 ++++++---
 .../delegationTwoPush/twoPushFormalDialog.js  |  4 +-
 .../executiveCommitteeMember/index.html       | 51 ++++++++++++-------
 3 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/index.html b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/index.html
index 892fccc1..acd1bb32 100644
--- a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/index.html
+++ b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/index.html
@@ -17,7 +17,7 @@ layout("/layouts/platform.html"){
                                 filterable
                                 placeholder="请选择教代会"
                                 style="width:100%;"
-                                @change="doSearch"
+                                @change="getAllDelegation(pageForm.teacherMeetId);doSearch()"
                         >
                             <el-option
                                     v-for="item in teacherMeets"
@@ -27,6 +27,13 @@ layout("/layouts/platform.html"){
                             ></el-option>
                         </el-select>
                     </search-item>
+                    <search-item label="代表团" >
+                        <el-select clearable filterable placeholder="代表团" style="width: 100%"
+                                   v-model="pageForm.delegationId">
+                            <el-option :key="item.id" :label="item.name" :value="item.id"
+                                       v-for="item in delegations"></el-option>
+                        </el-select>
+                    </search-item>
                     <search-item label="分工会">
                         <el-select clearable filterable placeholder="分工会" style="width: 100%"
                                    v-model="pageForm.unionId">
@@ -58,13 +65,14 @@ layout("/layouts/platform.html"){
                                      fixed
                                      type="index"
                                      width="50"></el-table-column>
-                    <el-table-column align="center" label="工号" prop="loginName"></el-table-column>
-                    <el-table-column align="center" label="姓名" prop="userName"></el-table-column>
-                    <el-table-column align="center" label="年龄" prop="age"></el-table-column>
-                    <el-table-column align="center" label="性别" prop="sex"></el-table-column>
-                    <el-table-column align="center" label="所属单位" prop="unitName"></el-table-column>
-                    <el-table-column align="center" label="所属工会" prop="unionName"></el-table-column>
-                    <el-table-column align="center" label="操作" width="100" fixed="right">
+                    <el-table-column label="工号" prop="loginName"></el-table-column>
+                    <el-table-column label="姓名" prop="userName"></el-table-column>
+                    <el-table-column label="年龄" prop="age"></el-table-column>
+                    <el-table-column label="性别" prop="sex"></el-table-column>
+                    <el-table-column label="所属单位" prop="unitName"></el-table-column>
+                    <el-table-column label="所属工会" prop="unionName"></el-table-column>
+                    <el-table-column label="代表团" prop="delegationName"></el-table-column>
+                    <el-table-column label="操作" width="100" fixed="right">
                         <template scope="{row}">
                             <el-button
                                     size="mini"
diff --git a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/twoPushFormalDialog.js b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/twoPushFormalDialog.js
index 0b8c499c..98e578b0 100644
--- a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/twoPushFormalDialog.js
+++ b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/twoPushFormalDialog.js
@@ -4,7 +4,7 @@ const DELEGATION_TWO_PUSH_FORMAL_DIALOG = {
             <el-dialog
                     :close-on-click-modal="false"
                     :visible.sync="dialogVisible"
-                    title="团长二次推选"
+                    title="团长最终投票"
                     width="70%"
 
             >
@@ -36,7 +36,7 @@ const DELEGATION_TWO_PUSH_FORMAL_DIALOG = {
                     </div>
                 </el-transfer>
                 <span slot="footer">
-                    <span style="color:red;font-size: 15px; display:flex;text-align: right;">推选名额：{{delegationQuotaCount}}个</span>
+                    <span style="color:red;font-size: 15px; display:flex;text-align: right;">投票名额：{{delegationQuotaCount}}个</span>
                     <span class="dialog-footer">
                         <el-button @click="dialogVisible = false">取 消</el-button>
                         <el-button type="primary" @click="onConfirm">确 定</el-button>
diff --git a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html
index 36e9f0c0..cdfc35bb 100644
--- a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html
+++ b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html
@@ -34,6 +34,13 @@ layout("/layouts/platform.html"){
                         ></el-option>
                     </el-select>
                 </search-item>
+                <search-item label="代表团" >
+                    <el-select clearable filterable placeholder="代表团" style="width: 100%"
+                               v-model="pageForm.delegationId">
+                        <el-option :key="item.id" :label="item.name" :value="item.id"
+                                   v-for="item in delegations"></el-option>
+                    </el-select>
+                </search-item>
                 <search-item label="所属工会">
                     <el-select clearable filterable placeholder="所属工会" style="width: 100%"
                                v-model="pageForm.unionId" @change="flushUnits" @clear="flushUnits">
@@ -76,15 +83,15 @@ layout("/layouts/platform.html"){
                                  fixed
                                  type="index"
                                  width="50"></el-table-column>
-                <el-table-column align="center" label="工号" prop="loginName"></el-table-column>
-                <el-table-column align="center" label="姓名" prop="userName"></el-table-column>
-                <el-table-column align="center" label="年龄" prop="age"></el-table-column>
-                <el-table-column align="center" label="性别" prop="sex"></el-table-column>
-                <el-table-column align="center" label="所属单位" prop="unitName"></el-table-column>
-                <el-table-column align="center" label="所属工会" prop="unionName"></el-table-column>
-                <el-table-column align="center" label="所属代表团" prop="delegationName"></el-table-column>
-                <el-table-column align="center" label="票数" prop="pushCount"></el-table-column>
-                <el-table-column align="center" label="操作" width="130" fixed="right">
+                <el-table-column label="工号" prop="loginName"></el-table-column>
+                <el-table-column label="姓名" prop="userName"></el-table-column>
+                <el-table-column label="年龄" prop="age"></el-table-column>
+                <el-table-column label="性别" prop="sex"></el-table-column>
+                <el-table-column label="所属单位" prop="unitName"></el-table-column>
+                <el-table-column label="所属工会" prop="unionName"></el-table-column>
+                <el-table-column label="所属代表团" prop="delegationName"></el-table-column>
+                <el-table-column label="票数" prop="pushCount"></el-table-column>
+                <el-table-column label="操作" width="130" fixed="right">
                     <template scope="{row}">
                         <el-button
                                 size="mini"
@@ -102,14 +109,14 @@ layout("/layouts/platform.html"){
         <el-dialog title="投票详情" :close-on-click-modal="false" :visible.sync="infoDialogVisible" top="50px"
                    width="60%">
             <el-table :data="chooseUserTableData" max-height="500">
-                <el-table-column align="center" header-align="center" label="序号" type="index" width="60px"></el-table-column>
-                <el-table-column align="center" header-align="center" prop="pushUserName" label="推选人"></el-table-column>
-                <el-table-column align="center" header-align="center" prop="pushLoginName" label="推选人工号"></el-table-column>
-                <el-table-column align="center" header-align="center" prop="sex" label="性别"></el-table-column>
-                <el-table-column align="center" header-align="center" prop="mobile" label="联系方式"></el-table-column>
-                <el-table-column align="center" header-align="center" prop="unitName" label="所属单位"></el-table-column>
-                <el-table-column align="center" header-align="center" prop="delegationName" label="所属代表团"></el-table-column>
-                <el-table-column align="center" header-align="center" prop="pushDate" label="推选时间">
+                <el-table-column label="序号" type="index" width="60px"></el-table-column>
+                <el-table-column prop="pushUserName" label="推选人"></el-table-column>
+                <el-table-column prop="pushLoginName" label="推选人工号"></el-table-column>
+                <el-table-column prop="sex" label="性别"></el-table-column>
+                <el-table-column prop="mobile" label="联系方式"></el-table-column>
+                <el-table-column prop="unitName" label="所属单位"></el-table-column>
+                <el-table-column prop="delegationName" label="所属代表团"></el-table-column>
+                <el-table-column prop="pushDate" label="推选时间">
                     <template #default="{row}">
                         {{ $moment(row.pushDate).format('YYYY-MM-DD') }}
                     </template>
@@ -137,6 +144,8 @@ layout("/layouts/platform.html"){
                 unitOptions: [],
                 chooseUserTableData: [],
                 infoDialogVisible: false,
+
+                delegations: []
             }
         },
         components: {},
@@ -177,11 +186,19 @@ layout("/layouts/platform.html"){
                         this.teacherMeets = resp.data
                         if (this.teacherMeets && this.teacherMeets.length > 0) {
                             this.$set(this.pageForm, 'teacherMeetId', this.teacherMeets[0].id)
+                            this.getAllDelegation(this.teacherMeets[0].id)
                             this.pageData()
                         }
                     }
                 })
             },
+            getAllDelegation(id) {
+                this.$axios.post("/platform/teacherCongress/common/listDelegation", {sessionId: id}).then(resp => {
+                    if (resp.code === 0) {
+                        this.delegations = resp.data
+                    }
+                })
+            },
         }
     })
 </script>