c-zhouhf1/zhgh_hgu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
c-zhouhf1
2025-11-25 19:18:07 +08:00
parent f49054ac92
commit 21e24ef703
21 changed files with 643 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/manage/index.html
+48 -18
View File
@@ -10,21 +10,25 @@ layout("/layouts/platform.html"){
</search-item>
<search-item label="教代会">
<el-select v-model="pageForm.sessionId" @change="sessionChange">
<el-option v-for="item in sessionOptions" :label="item.fullName" :value="item.id" :key="item.id"></el-option>
<el-option v-for="item in sessionOptions" :label="item.fullName" :value="item.id"
:key="item.id"></el-option>
</el-select>
</search-item>
<search-item label="代表团">
<el-select v-model="pageForm.delegationId" filterable @change="delegationChange" clearable style="width: 100%">
<el-select v-model="pageForm.delegationId" filterable @change="delegationChange" clearable
style="width: 100%">
<el-option v-for="i in delegationOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</search-item>
<search-item label="所属工会">
<el-select placeholder="请选择所属工会" v-model="pageForm.unionId" filterable @change="listUnit" clearable style="width: 100%">
<el-select placeholder="请选择所属工会" v-model="pageForm.unionId" filterable @change="listUnit"
clearable style="width: 100%">
<el-option v-for="i in unionOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</search-item>
<search-item label="所属单位">
<el-select placeholder="请选择所属单位" v-model="pageForm.unitId" filterable clearable style="width: 100%">
<el-select placeholder="请选择所属单位" v-model="pageForm.unitId" filterable clearable
style="width: 100%">
<el-option v-for="i in unitOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</search-item>
@@ -38,20 +42,29 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<table-tool>
<el-button size="small" type="primary" icon="el-icon-plus" @click="excelImportDialog = true">导入代表</el-button>
<el-button size="small" type="primary" icon="el-icon-plus" @click="$refs.addFormRef.onOpen(pageForm.sessionId,pageForm.delegationId)">新增代表</el-button>
<el-button size="small" type="primary" icon="el-icon-plus" @click="doAllocateDelegation">
根据单位分配代表团
</el-button>
<el-button size="small" type="primary" icon="el-icon-plus" @click="excelImportDialog = true">导入代表
</el-button>
<el-button size="small" type="primary" icon="el-icon-plus"
@click="$refs.addFormRef.onOpen(pageForm.sessionId,pageForm.delegationId)">新增代表
</el-button>
<el-button
size="small"
type="danger"
icon="el-icon-delete"
@click="batchDelete()"
:disabled="$refs.tableRef && $refs.tableRef.selection.length===0"
size="small"
type="danger"
icon="el-icon-delete"
@click="batchDelete()"
:disabled="$refs.tableRef && $refs.tableRef.selection.length===0"
>
批量删除
</el-button>
<el-button size="small" type="primary" icon="el-icon-plus" @click="$refs.adjustFormRef.onOpen(pageForm.sessionId)">代表调整</el-button>
<el-button size="small" type="primary" icon="el-icon-plus"
@click="$refs.adjustFormRef.onOpen(pageForm.sessionId)">代表调整
</el-button>
</table-tool>
<el-table :data="tableData" @sort-change="pageOrder" header-align="center" row-key="id" ref="tableRef" style="width: 100%">
<el-table :data="tableData" @sort-change="pageOrder" header-align="center" row-key="id" ref="tableRef"
style="width: 100%">
<el-table-column type="selection" width="55" reserve-selection fixed="left"></el-table-column>
<el-table-column type="index" width="55" label="序号" :index="indexMethod" fixed="left"></el-table-column>
<el-table-column label="工号" prop="loginName" fixed="left"></el-table-column>
@@ -61,19 +74,22 @@ layout("/layouts/platform.html"){
<el-table-column label="联系方式" prop="mobile"></el-table-column>
<el-table-column label="代表团" prop="delegationId" width="150" show-overflow-tooltip sortable>
<template scope="{row}">
<dict-tag :options="delegationOptions" :value="row.delegationId" option_value="id" option_label="name"></dict-tag>
<dict-tag :options="delegationOptions" :value="row.delegationId" option_value="id"
option_label="name"></dict-tag>
</template>
</el-table-column>
<el-table-column label="所属工会" prop="unionName" show-overflow-tooltip sortable></el-table-column>
<el-table-column label="所属单位" prop="unitName" show-overflow-tooltip sortable></el-table-column>
<el-table-column label="届次" prop="sessionId">
<template scope="{row}">
<dict-tag :options="sessionOptions" :value="row.sessionId" option_value="id" option_label="fullName"></dict-tag>
<dict-tag :options="sessionOptions" :value="row.sessionId" option_value="id"
option_label="fullName"></dict-tag>
</template>
</el-table-column>
<el-table-column label="代表身份" prop="roleId" sortable>
<template scope="{row}">
<dict-tag :options="roleOptions" :value="row.roleId" option_value="id" option_label="name"></dict-tag>
<dict-tag :options="roleOptions" :value="row.roleId" option_value="id"
option_label="name"></dict-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="200">
@@ -139,6 +155,20 @@ layout("/layouts/platform.html"){
}
},
methods: {
doAllocateDelegation() {
this.$confirm("确定要一键给没有代表团的代表，根据单位所在代表团设置代表团吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "info"
}).then(() => {
this.$axios.post(loc() + "/doAllocateDelegation", {sessionId: this.pageForm.sessionId}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.doSearch()
}
})
})
},
sessionChange() {
this.pageForm.delegationId = null
this.delegationOptions = []
@@ -154,7 +184,7 @@ layout("/layouts/platform.html"){
listDelegation() {
this.delegationOptions = []
this.pageForm.delegationId = null
this.$axios.post("/platform/teacherCongress/common/listDelegation", { sessionId: this.pageForm.sessionId }).then((res) => {
this.$axios.post("/platform/teacherCongress/common/listDelegation", {sessionId: this.pageForm.sessionId}).then((res) => {
if (res.code === 0) {
this.delegationOptions = res.data
}
@@ -184,7 +214,7 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消",
type: "info"
}).then(() => {
this.$axios.post(loc() + "/delete", { data: JSON.stringify({ ids: ids }) }).then((res) => {
this.$axios.post(loc() + "/delete", {data: JSON.stringify({ids: ids})}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.doSearch()
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html
+2 -2
View File
@@ -147,7 +147,7 @@ layout("/layouts/platform.html"){
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="工代会代表" prop="isGdh" min-width="100">
<!-- <el-table-column label="工代会代表" prop="isGdh" min-width="100">
<template v-slot="{row}">
<el-checkbox
v-if="row"
@@ -155,7 +155,7 @@ layout("/layouts/platform.html"){
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
</el-table-column>-->
<el-table-column label="代表类型" prop="representativeType" show-overflow-tooltip
width="100"></el-table-column>
<el-table-column prop="taskName" label="当前节点" width="120" fixed="right"></el-table-column>
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-statistics-table.js
+142
View File
@@ -0,0 +1,142 @@
<!--#include('auditInfo.js'){}#-->
const PushStatisticsTable = {
template: /*language=HTML*/ `
<div>
<el-table
ref="tableRef"
:data="tableData"
row-key="id"
@sort-change="pageOrder"
>
<el-table-column type="index" width="55" label="序号" :index="indexMethod"
fixed="left"></el-table-column>
<el-table-column label="姓名" prop="userName" width="100" fixed="left"></el-table-column>
<el-table-column label="年龄" prop="age" width="80"></el-table-column>
<el-table-column label="性别" prop="sex" width="80" fixed="left"></el-table-column>
<el-table-column label="职务" prop="position" min-width="100"></el-table-column>
<el-table-column label="职称" prop="professionalTitle" min-width="100"></el-table-column>
<el-table-column label="校级领导" prop="schoolLeader" min-width="100">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.schoolLeader"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="高级职称" prop="seniorTeacher" width="80">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.seniorTeacher"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="中级职称及以下" prop="intermediateBelow" width="120">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.intermediateBelow"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="干部" prop="cadre" width="80">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.cadre"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="工人" prop="worker" width="80">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.worker"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="教代会代表" prop="isJdh" min-width="100">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.isJdh"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<!-- <el-table-column label="工代会代表" prop="isGdh" min-width="100">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.isGdh"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>-->
<el-table-column label="代表类型" prop="representativeType" show-overflow-tooltip
width="100"></el-table-column>
<el-table-column prop="taskName" label="当前节点" width="120" fixed="right"></el-table-column>
<el-table-column prop="instanceState" label="流程状态" fixed="right">
<template slot-scope="{row}">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
size="small"></enum-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="100">
<template slot-scope="{row}">
<el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
</template>
</el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
<el-dialog :close-on-click-modal="false"
append-to-body
:visible.sync="viewDialog"
title="查看"
top="50px"
width="60%">
<div style="max-height: 75vh;overflow-y: auto">
<audit-info ref="auditInfoRef">
</audit-info>
</div>
</el-dialog>
</div>
`,
mixins: [initTableMixins],
data() {
return {
pageForm: {},
pageDataUrl:"/platform/teacherCongress/delegate/push/statistics/pageData",
viewDialog:false,
}
},
components: {
'audit-info': auditInfo
},
methods: {
openView(row) {
this.$set(this.pageForm, "sessionId", row.sessionId)
this.$set(this.pageForm, "unionId", row.unionId)
this.pageData()
},
onView(row){
this.viewDialog=true
this.$nextTick(()=>{
this.$refs.auditInfoRef.onOpen(row)
})
/* setTimeout(()=>{
this.$refs.auditInfoRef.onOpen(row)
},1000)*/
}
}
}
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/statistics.html
+119
View File
@@ -0,0 +1,119 @@
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="教代会">
<el-select v-model="pageForm.sessionId">
<el-option v-for="item in sessionOptions" :label="item.fullName" :value="item.id"
:key="item.id"></el-option>
</el-select>
</search-item>
<search-item label="分工会">
<el-select v-model="pageForm.unionId" filterable clearable style="width: 100%">
<el-option v-for="i in unionOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</search-item>
</search>
</el-card>
<el-card shadow="never">
<table-tool>
</table-tool>
<el-table
ref="tableRef"
:data="tableData"
row-key="id"
>
<el-table-column type="index" width="55" label="序号" :index="indexMethod"
fixed="left"></el-table-column>
<el-table-column prop="unionName" label="工会名称"></el-table-column>
<el-table-column prop="allocationNum" label="名额分配人数(领导)">
<template slot-scope="{row}">
{{row.allocationNum}}
<template v-if="row.schoolLeadersUserName">（{{row.schoolLeadersUserName}}）</template>
</template>
</el-table-column>
<el-table-column prop="unionPushCount" label="分工会推选人数"></el-table-column>
<el-table-column prop="sjWshCount" label="党委书记未审核数量"></el-table-column>
<el-table-column label="操作">
<template slot-scope="{row}">
<el-button type="primary" size="mini" @click="onView(row)">查看推选情况</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<template #view>
<push-statistics-table ref="pushStatisticsTable"></push-statistics-table>
</template>
</guava>
</div>
<script>
<!--#include('push-statistics-table.js'){}#-->
new Vue({
el: '#app',
mixins: [initTableMixins],
data() {
return {
sessionOptions: [],
unionOptions: [],
}
},
components: {
"push-statistics-table": PushStatisticsTable
},
methods: {
onView(row) {
this.$refs.guava.view(() => {
this.$refs.pushStatisticsTable.openView(row)
})
},
listUnion() {
this.$businessTool.listUnion().then((res) => {
this.unionOptions = res
})
},
listSession() {
this.$axios.post("/platform/teacherCongress/common/listSession").then((res) => {
if (res.code === 0) {
this.sessionOptions = res.data
if (this.sessionOptions && this.sessionOptions.length > 0) {
this.pageForm.sessionId = this.sessionOptions[0].id
this.doSearch()
}
}
})
},
doSearch() {
this.getData()
},
getData() {
this.$axios.post("/platform/teacherCongress/delegate/push/statistics/getData", this.pageForm).then((res) => {
if (res.code === 0) {
this.tableData = res.data
}
})
}
},
created() {
this.listSession()
this.listUnion()
}
})
</script>
<!--#
}
#-->
src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/quotaAllocation/index.html
+7 -3
View File
@@ -22,7 +22,8 @@ layout("/layouts/platform.html"){
</el-select>
</search-item>
<search-item label="所属工会">
<el-select clearable filterable placeholder="请选择所属工会" style="width: 100%" v-model="pageForm.unionId">
<el-select 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 unionOptions"></el-option>
</el-select>
@@ -44,15 +45,18 @@ layout("/layouts/platform.html"){
<el-table-column type="index" width="50" :index="indexMethod" label="序号"></el-table-column>
<el-table-column prop="unionName" label="工会名称"></el-table-column>
<el-table-column prop="memberCount" label="会员人数"></el-table-column>
<!-- <el-table-column prop="dbCount" label="代表人数"></el-table-column>-->
<!-- <el-table-column prop="dbCount" label="代表人数"></el-table-column>-->
<el-table-column prop="allocationNum" label="名额分配人数"></el-table-column>
<el-table-column prop="seniorTeaNum" label="高级职称代表数"></el-table-column>
<el-table-column prop="intermediateBelowNum" label="中级职称及以下代表数"></el-table-column>
<el-table-column prop="cadreNum" label="干部代表数"></el-table-column>
<el-table-column prop="workerNum" label="工人代表数"></el-table-column>
<!-- <el-table-column prop="ordinaryTeaNum" label="专任教师代表数"></el-table-column>-->
<!-- <el-table-column prop="ordinaryTeaNum" label="专任教师代表数"></el-table-column>-->
<el-table-column prop="femaleNum" label="女代表数"></el-table-column>
<el-table-column prop="less45Num" label="45岁以下代表数"></el-table-column>
<el-table-column prop="schoolLeadersUserName" label="分配校领导">
</el-table-column>
</el-table>
</el-card>
src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/quotaAllocation/manualAllocationDialog.js
+41 -2
View File
@@ -184,6 +184,25 @@ const MANUAL_ALLOCATION_DIALOG = {
></el-input-number>
</template>
</el-table-column>
<el-table-column prop="schoolLeadersLoginName" label="分配校领导">
<template slot-scope="{row}">
<el-select
v-model="row.schoolLeadersLoginName"
filterable
remote
reserve-keyword
placeholder="请输入姓名查询"
:remote-method="schoolLeaderRemoteMethod"
style="width: 100%">
<el-option
v-for="item in schoolLeaders"
:key="item.loginname"
:label="item.username+'('+item.loginname+')'"
:value="item.loginname">
</el-option>
</el-select>
</template>
</el-table-column>
</el-table>
<el-row class="mt20" justify="end" type="flex">
@@ -213,7 +232,8 @@ const MANUAL_ALLOCATION_DIALOG = {
{label: "工人代表数", value: "workerNum"},
{label: "女代表数", value: "femaleNum"},
{label: "45岁以下代表数", value: "less45Num"},
]
],
schoolLeaders: []
}
},
methods: {
@@ -225,6 +245,10 @@ const MANUAL_ALLOCATION_DIALOG = {
sums[index] = '占代表总数的';
return;
}
if (index === 10) {
sums[index] = '';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value))) {
if (index === 2) {
@@ -259,7 +283,6 @@ const MANUAL_ALLOCATION_DIALOG = {
}, 0);
sums[index] = ((part / total) * 100).toFixed(2) + ' %'
console.log(((part / total) * 100).toFixed(2))
}
} else {
sums[index] = null;
@@ -342,6 +365,20 @@ const MANUAL_ALLOCATION_DIALOG = {
v.allocationNum = (num === 0 ? 1 : num)
this.$forceUpdate()
},
schoolLeaderRemoteMethod(query) {
if (query !== "") {
$.get("/open/common/userOptions", {query}).then((res) => {
this.schoolLeaders = res.data
})
}
},
getSchoolLeaders() {
this.$axios.post('/platform/teacherCongress/prepare/quotaAllocation/getSchoolLeaders', {sessionId: this.sessionId}).then(resp => {
if (resp.code === 0) {
this.schoolLeaders = resp.data
}
})
},
getUnionUsers() {
this.$axios.post('/platform/teacherCongress/prepare/quotaAllocation/getUnionLimit', {sessionId: this.sessionId}).then(resp => {
if (resp.code === 0) {
@@ -356,6 +393,8 @@ const MANUAL_ALLOCATION_DIALOG = {
this.unionUserNumOneKeyRatio = 0
this.settingsType = "allocationNum"
this.getUnionUsers()
this.getSchoolLeaders()
}
}
}