diff --git a/src/apps/AppFourNeighbor/Add.vue b/src/apps/AppFourNeighbor/Add.vue index 75da680d..3b2f92f8 100644 --- a/src/apps/AppFourNeighbor/Add.vue +++ b/src/apps/AppFourNeighbor/Add.vue @@ -5,7 +5,7 @@ *党员信息
- +
diff --git a/src/apps/AppFourNeighbor/AppFourNeighbor.vue b/src/apps/AppFourNeighbor/AppFourNeighbor.vue index 83ce8eda..8409e034 100644 --- a/src/apps/AppFourNeighbor/AppFourNeighbor.vue +++ b/src/apps/AppFourNeighbor/AppFourNeighbor.vue @@ -161,6 +161,11 @@ export default { color: #333; line-height: 44px; margin-bottom: 32px; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + text-overflow: hidden; } .info{ font-size: 26px; diff --git a/src/components/pages/selectParty.vue b/src/components/pages/selectParty.vue index fe9cb1ab..e069f1ae 100644 --- a/src/components/pages/selectParty.vue +++ b/src/components/pages/selectParty.vue @@ -57,22 +57,32 @@ export default { }, methods: { getList() { - this.$http.post(`/app/appparty/list`, null, { + var url = this.$route.query.isFourParty ? '/app/appparty/listByFourParty?size=999' : '/app/appparty/list' + this.$http.post(url, null, { params: { current: this.current, size: 20, areaId: this.user.areaId, - con: this.name + con: this.name, + name: this.name } }).then(res => { if (res?.data) { - res.data.records.forEach(e => { - e.isCheck = this.selected.includes(e.idNumber) - }) if (this.current > 1 && this.current > res.data.pages) { return } - this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records + if(this.$route.query.isFourParty) { + res.data.forEach(e => { + e.isCheck = this.selected.includes(e.idNumber) + }) + this.list = this.current > 1 ? [...this.list, ...res.data] : res.data + }else { + res.data.records.forEach(e => { + e.isCheck = this.selected.includes(e.idNumber) + }) + this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records + } + } }) },