diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushServiceImpl.java index 2fb55cd7..7c4de573 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushServiceImpl.java @@ -195,6 +195,7 @@ public class TeacherCongressDelegatePushServiceImpl extends BaseServiceImpl否 - - - - - - + + + diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html index 9edfce40..5959c371 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html @@ -188,7 +188,9 @@ layout("/layouts/platform.html"){ 删除 @@ -262,7 +264,7 @@ layout("/layouts/platform.html"){ }, methods: { doPushFormal() { - if (this.tableData.length >= this.maxPush) { + if (this.pageForm.totalCount >= this.maxPush) { this.$message.warning("当前正式代表已超过最大推选人员数,如需调整请在表格数据列中选中【删除】按钮") return } @@ -276,7 +278,7 @@ layout("/layouts/platform.html"){ await this.pageData() const fullName = this.sessionOptions.find(v => v.id === this.pageForm.sessionId)?.fullName; await this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName, this.pageForm.unionId) - this.formalPush = this.maxPush - this.tableData.length + this.formalPush = this.maxPush - this.pageForm.totalCount }, onView(row) { this.$refs.guava.view(() => { @@ -326,7 +328,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.tableData = resp.data.list this.pageForm.totalCount = resp.data.totalCount - + } } catch (e) { console.log(e)