diff --git a/src/main/resources/static/components/plugins/h5/TableList.vue b/src/main/resources/static/components/plugins/h5/TableList.vue
index 894c8572..3f58bad9 100644
--- a/src/main/resources/static/components/plugins/h5/TableList.vue
+++ b/src/main/resources/static/components/plugins/h5/TableList.vue
@@ -12,8 +12,9 @@
@@ -47,14 +48,22 @@ module.exports = {
}
}
},
- json:{
+ json: {
type: Boolean,
default: false
},
- title: {
- type: String,
- default: ''
+ title: {
+ type: String,
+ default: ''
+ },
+ },
+ watch:{
+ page_form:{
+ handler(val) {
+ this.localPageForm = {...val}
},
+ immediate: true
+ }
},
data() {
return {
@@ -68,9 +77,9 @@ module.exports = {
methods: {
pageData() {
this.tableLoading = true
- this.localPageForm = {...this.page_form}
+ // this.localPageForm = {...this.page_form}
const loading = createListLoading()
- this.$axios.post(this.api, this.json ? ({pageForm:JSON.stringify(this.localPageForm)}) : this.localPageForm).then((res) => {
+ this.$axios.post(this.api, this.json ? ({pageForm: JSON.stringify(this.localPageForm)}) : this.localPageForm).then((res) => {
if (res.code === 0) {
this.tableData = this.tableData.concat(res.data.list)
this.localPageForm.totalCount = res.data.totalCount
@@ -92,19 +101,15 @@ module.exports = {
this.tableData = [];
this.pageData();
},
- onRefresh() {
- this.localPageForm.pageNumber = 1
- this.$emit('update:page_form', {...this.localPageForm});
- this.doSearch()
- },
+ onRefresh() {
+ this.localPageForm.pageNumber = 1
+ this.$emit('update:page_form', {...this.localPageForm});
+ this.doSearch()
+ },
},
- created() {
- // this.pageData();
- },
- mounted() {
- // 通知父组件准备好了
- this.$emit('ready');
- }
+ mounted() {
+ this.$emit('ready');
+ }
}
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/index.html
index 71cb4ca9..d4c6465f 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/index.html
+++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/index.html
@@ -18,7 +18,7 @@ layout("/layouts/platform_h5.html"){
-
+
{{row.typeName}}
@@ -118,10 +118,6 @@ layout("/layouts/platform_h5.html"){
},
doSearch() {
this.$refs.tableListRef.doSearch()
- // this.pageForm.pageNumber = 1
- // this.pageForm.totalCount = 0
- // this.tableData = []
- // this.pageData()
},
openRevoke(row) {
this.$dialog
@@ -150,10 +146,12 @@ layout("/layouts/platform_h5.html"){
}
})
})
+ },
+ onReady() {
+ this.listSession()
}
},
created() {
- this.listSession()
}
})
diff --git a/src/main/resources/views/platform/zhghh5/democratic/teachercongress/delegate/read/index.html b/src/main/resources/views/platform/zhghh5/democratic/teachercongress/delegate/read/index.html
index 01c926ec..28a80114 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/teachercongress/delegate/read/index.html
+++ b/src/main/resources/views/platform/zhghh5/democratic/teachercongress/delegate/read/index.html
@@ -33,13 +33,16 @@ layout("/layouts/platform_h5.html"){
-
-
+
{{row.userName}}
{{row.loginName}}
{{delegationOptions.find(v=>v.id===row.delegationId)?.name}}
- {{moreOptions.find(v=>v.title==='代表身份')?.options.find(v=>v.id===row.roleId)?.name}}
+
+ {{moreOptions.find(v=>v.title==='代表身份')?.options.find(v=>v.id===row.roleId)?.name}}
+
@@ -135,33 +138,15 @@ layout("/layouts/platform_h5.html"){
}
})
},
- pageData() {
- // this.tableLoading = true
- // this.$axios
- // .post("/platform/teacherCongress/delegate/read/pageData", {
- // pageForm: JSON.stringify(this.pageForm)
- // })
- // .then((resp) => {
- // this.tableData = this.tableData.concat(resp.data.list)
- // this.pageForm.totalCount = resp.data.totalCount
- // if (this.tableData.length >= this.pageForm.totalCount) {
- // this.tableFinished = true
- // } else {
- // this.pageForm.pageNumber++
- // }
- // this.tableLoading = false
- // })
- },
doSearch() {
this.pageForm.pageNumber = 1
this.pageForm.totalCount = 0
this.$refs.tableListRef.doSearch()
+ },
+ onReady() {
+ this.listRole()
+ this.listSession()
}
- },
- created() {
- // this.pageData()
- this.listRole()
- this.listSession()
}
})