diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwSjAudit.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwSjAudit.html
index 1a81260f..f7527e3a 100644
--- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwSjAudit.html
+++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwSjAudit.html
@@ -86,12 +86,12 @@ layout("/layouts/platform.html"){
否
-
-
-
-
-
-
+
+
+
+
+
+
@@ -166,11 +166,22 @@ layout("/layouts/platform.html"){
}
},
methods: {
- doSearch() {
- this.pageData()
+ async doSearch() {
+ await this.pageData()
const fullName = this.sessionOptions.find(v => v.id === this.pageForm.sessionId)?.fullName;
- this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName, this.pageForm.unionId,"JG")
+ await this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName, this.pageForm.unionId, "JG")
+ },
+ async pageData() {
+ try {
+ const resp = await this.$axios.post("/platform/teacherCongress/delegate/push/dwSjAudit/pageData", this.pageForm)
+ if (resp.code === 0) {
+ this.tableData = resp.data.list
+ this.pageForm.totalCount = resp.data.totalCount
+ }
+ } catch (e) {
+ console.log(e)
+ }
},
onBatchSubmit() {
this.$confirm('您确定要上报吗?', '提示', {
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 2fa69c61..844688f3 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
@@ -254,29 +254,28 @@ layout("/layouts/platform.html"){
isRead: false,
userId: null,
- // 当前分工会的最大推选人员
- maxPush: 0,
- // 剩余正式代表推选名额
- formalPush: 0
+ // 当前分工会的最大推选人员
+ maxPush: 0,
+ // 剩余正式代表推选名额
+ formalPush: 0
}
},
methods: {
- doPushFormal() {
- if (this.tableData.length >= this.maxPush) {
- this.$message.warning("当前正式代表已超过最大推选人员数,如需调整请在表格数据列中选中【删除】按钮")
- return
- }
+ doPushFormal() {
+ if (this.tableData.length >= this.maxPush) {
+ this.$message.warning("当前正式代表已超过最大推选人员数,如需调整请在表格数据列中选中【删除】按钮")
+ return
+ }
- this.$refs.pushFormalRef.onOpen(this.pageForm.sessionId, this.pageForm.unionId)
- },
- setMaxCount(data) {
- this.maxPush = data
- },
- doSearch() {
- this.pageData()
+ this.$refs.pushFormalRef.onOpen(this.pageForm.sessionId, this.pageForm.unionId)
+ },
+ setMaxCount(data) {
+ this.maxPush = data
+ },
+ async doSearch() {
+ await this.pageData()
const fullName = this.sessionOptions.find(v => v.id === this.pageForm.sessionId)?.fullName;
-
- this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName, this.pageForm.unionId)
+ await this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName, this.pageForm.unionId)
},
onView(row) {
this.$refs.guava.view(() => {
@@ -320,21 +319,20 @@ layout("/layouts/platform.html"){
}
})
},
- async pageData() {
- try {
- const resp = await this.$axios.post("/platform/teacherCongress/delegate/push/pageData", this.pageForm)
- if (resp.code === 0) {
- this.tableData = resp.data.list
- this.pageForm.totalCount = resp.data.totalCount
- this.formalPush = this.maxPush - this.tableData.length
- }
- } catch (e) {
- console.log(e)
- }
- }
+ async pageData() {
+ try {
+ const resp = await this.$axios.post("/platform/teacherCongress/delegate/push/pageData", this.pageForm)
+ if (resp.code === 0) {
+ this.tableData = resp.data.list
+ this.pageForm.totalCount = resp.data.totalCount
+ this.formalPush = this.maxPush - this.tableData.length
+ }
+ } catch (e) {
+ console.log(e)
+ }
+ }
},
created() {
- this.doSearch()
this.listUnion()
this.listSession()
}