diff --git a/src/saas/AppHealthUp/AppHealthUp.vue b/src/saas/AppHealthUp/AppHealthUp.vue
index 6a706194..59b9cee7 100644
--- a/src/saas/AppHealthUp/AppHealthUp.vue
+++ b/src/saas/AppHealthUp/AppHealthUp.vue
@@ -153,13 +153,14 @@ export default {
tabList: [{ name: '健康上报'},{ name: '上报统计'}],
currentTabs: 0,
form: {temperature: '', touchInFourteen: '', health: []},
- isUpload: false,
+ isUpload: true,
weekList: ['一', '二', '三', '四', '五', '六', '日'],
dayList: [],
month: '',
selectDay: '',
healthInfo: {},
isAdmin: false, //是否网格长
+ girdMemberId: '',
}
},
computed: {
@@ -253,7 +254,7 @@ export default {
this.currentTabs = index
},
toOther() {
- uni.navigateTo({ url: './OtherUser'})
+ uni.navigateTo({ url: `./OtherUser?girdMemberId=${this.girdMemberId}`})
},
isGirdUser() {
this.isAdmin = false
@@ -261,6 +262,7 @@ export default {
if (res.code == 0) {
if (res.data.checkType == 2) {
this.isAdmin = true
+ this.girdMemberId = res.data.girdMemberId
}
}
})
diff --git a/src/saas/AppHealthUp/OtherUser.vue b/src/saas/AppHealthUp/OtherUser.vue
index a5597355..ee901626 100644
--- a/src/saas/AppHealthUp/OtherUser.vue
+++ b/src/saas/AppHealthUp/OtherUser.vue
@@ -2,18 +2,19 @@
-
+
-
+
-

李轶
+

{{item.name}}
- 今日已上报

+
{{item.status == 1 ? '今日已上报' : '今日未上报'}}
+
@@ -26,22 +27,48 @@ export default {
data() {
return {
keyword: '',
+ current: 1,
+ girdMemberId: '',
+ list: []
}
},
computed: {
...mapState(['user']),
},
- onLoad() {
-
+ onLoad(option) {
+ this.girdMemberId = option.girdMemberId
+ this.getUserList()
},
onShow() {
document.title = '其他成员'
},
methods: {
- toOtherSta() {
- uni.navigateTo({ url: './OtherStatistics'})
+ toOtherSta(id) {
+ uni.navigateTo({ url: `./OtherStatistics?id=${id}`})
},
+ handerClear() {
+ this.keyword = ''
+ this.getListInit()
+ },
+ getListInit() {
+ this.current = 1
+ this.getUserList()
+ },
+ getUserList() {
+ this.$http.post(`/app/appepidemichealthreport/other-report?girdMemberId=${this.girdMemberId}&name=${this.keyword}&size=20¤t=${this.current}`).then((res) => {
+ if (res.code == 0) {
+ if (this.current > 1 && this.current > res.data.pages) {
+ return
+ }
+ this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+ }
+ })
+ }
},
+ onReachBottom() {
+ this.current ++
+ this.getUserList()
+ }
}
@@ -91,7 +118,6 @@ uni-page-body{
.emptyWrap {
- background: #f5f5f5;
margin: 0;
}
::v-deep .emptyText{
diff --git a/src/saas/AppMailList/myAddList.vue b/src/saas/AppMailList/myAddList.vue
index 3355b007..e57cefa9 100644
--- a/src/saas/AppMailList/myAddList.vue
+++ b/src/saas/AppMailList/myAddList.vue
@@ -16,7 +16,7 @@

-
您还未添加便民通讯录
点击新增按钮试试吧
+
您还未添加通讯录
点击新增按钮试试吧