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

两委委员会推选，分工会推选

Browse Source
This commit is contained in:
=
2025-11-16 17:16:09 +08:00
parent 6f9f3bd1b4
commit 63b7814e71
10 changed files with 113 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationOnePush/onePushFormalDialog.js
+2 -2
View File
@@ -4,7 +4,7 @@ const DELEGATION_ONE_PUSH_FORMAL_DIALOG = {
<el-dialog
:close-on-click-modal="false"
:visible.sync="dialogVisible"
title="团长推选委员"
title="分工会推选委员"
width="70%"
>
@@ -24,7 +24,7 @@ const DELEGATION_ONE_PUSH_FORMAL_DIALOG = {
<div slot-scope="{ option }">
<div class="transfer-item">
<div class="transfer-item-name">{{ option.userName }} - {{ option.loginName
}} - {{option.unitName}}
}} - {{option.unitName}} - {{option.unionName}}
</div>
<div class="transfer-item-details">
<span class="detail-item">
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/twoPushFormalDialog.js
+4 -4
View File
@@ -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;">投票名额：{{committeeQuotaCount}}个</span>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="onConfirm">确 定</el-button>
@@ -53,7 +53,7 @@ const DELEGATION_TWO_PUSH_FORMAL_DIALOG = {
rightChecked: [],
attendanceRightChecked: [],
teacherMeetId: null,
delegationQuotaCount: 0
committeeQuotaCount: 0
}
},
methods: {
@@ -70,7 +70,7 @@ const DELEGATION_TWO_PUSH_FORMAL_DIALOG = {
data.userData.forEach(v => {
this.userData.push({userId: v.userId, ...v})
})
this.delegationQuotaCount = data.delegationQuotaCount
this.committeeQuotaCount = data.committeeQuotaCount
this.dialogVisible = true
} else {
this.$message.error(msg)
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeConfig/index.html
+13 -13
View File
@@ -32,9 +32,9 @@ layout("/layouts/platform.html"){
style="width: 100%"></el-input-number>
</el-form-item>
<el-form-item prop="delegationQuotaCount" label="代表团推荐总数">
<el-input-number v-model="formData.delegationQuotaCount"
placeholder="请填写代表团推荐名额总数" style="width: 100%"></el-input-number>
<el-form-item prop="unionQuotaCount" label="分工会推荐总数">
<el-input-number v-model="formData.unionQuotaCount"
placeholder="请填写分工会推荐名额总数" style="width: 100%"></el-input-number>
</el-form-item>
<el-form-item prop="committeeQuotaCount" label="委员会预选人数">
<el-input-number v-model="formData.committeeQuotaCount"
@@ -63,8 +63,8 @@ layout("/layouts/platform.html"){
></el-date-picker>
</el-form-item>
</el-form>
<table-tool label="代表团名额分配"></table-tool>
<el-table :data="formData.delegationQuotaList" show-summar size="mini" max-height="500">
<table-tool label="分工会名额分配"></table-tool>
<el-table :data="formData.unionQuotaList" show-summar size="mini" max-height="500">
<el-table-column
align="center"
header-align="center"
@@ -108,20 +108,20 @@ layout("/layouts/platform.html"){
mixins: [initTableMixins],
data() {
return {
teacherMeets:[],
teacherMeets: [],
pageForm: {
sessionId: ''
},
tableColumns: [
{prop: 'delegationName', label: '代表团名称', sortable: true},
{prop: 'dbCount', label: '代表人数', sortable: true},
{prop: 'unionName', label: '分工会名称', sortable: true},
{prop: 'memberCount', label: '代表人数', sortable: true},
{prop: 'quotaCount', label: '分配人数', sortable: true}
],
formData: {},
formRules: {
prepareGroupQuotaCount: [{required: true, message: '必填', trigger: ['blur']}],
committeeQuotaCount: [{required: true, message: '必填', trigger: ['blur']}],
delegationQuotaCount: [{required: true, message: '必填', trigger: ['blur']}],
unionQuotaCount: [{required: true, message: '必填', trigger: ['blur']}],
firstTime: [{required: true, message: '必填', trigger: ['blur']}],
secondTime: [{required: true, message: '必填', trigger: ['blur']}]
}
@@ -154,9 +154,9 @@ layout("/layouts/platform.html"){
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
const total = this.formData.delegationQuotaList.reduce((sum, item) => sum + (item.quotaCount || 0), 0)
if (total > this.formData.delegationQuotaCount) {
this.$message.warning('各代表团名额分配数之和不能超过' + this.formData.delegationQuotaCount)
const total = this.formData.unionQuotaList.reduce((sum, item) => sum + (item.quotaCount || 0), 0)
if (total > this.formData.unionQuotaCount) {
this.$message.warning('各分工会名额分配数之和不能超过' + this.formData.unionQuotaCount)
return
}
if (this.formData.firstTime && this.formData.firstTime.length > 1) {
@@ -168,7 +168,7 @@ layout("/layouts/platform.html"){
this.$set(this.formData, 'secondEndTime', this.formData.secondTime[1])
}
this.$set(this.formData, 'teacherMeetId', this.pageForm.sessionId)
this.$set(this.formData, 'delegationQuotaList', JSON.stringify(this.formData.delegationQuotaList))
this.$set(this.formData, 'unionQuotaList', JSON.stringify(this.formData.unionQuotaList))
const resp = await this.$axios.post('/platform/executiveCommittee/executiveCommitteeConfig/onHandle', this.formData)
if (resp.code === 0) {
await this.fetchConfig()