diff --git a/src/saas/AppWalkask/AppWalkask.vue b/src/saas/AppWalkask/AppWalkask.vue
index 16415116..8eb82edb 100644
--- a/src/saas/AppWalkask/AppWalkask.vue
+++ b/src/saas/AppWalkask/AppWalkask.vue
@@ -27,7 +27,7 @@
-
走访人:{{ item.createUserName }}
+
走访人:
{{ item.createTime }}
diff --git a/src/saas/AppWalkask/selectType.vue b/src/saas/AppWalkask/selectType.vue
index 2290cd16..713f6423 100644
--- a/src/saas/AppWalkask/selectType.vue
+++ b/src/saas/AppWalkask/selectType.vue
@@ -18,7 +18,7 @@
-
{{ item.applicationName }}
+
{{ item.dictName }}
@@ -72,14 +72,15 @@ export default {
applicationName: '',
applicationId: '',
selectUser: {},
+ type: ''
}
},
- computed: {},
- watch: {},
onLoad() {
- this.getTypeList()
+ this.$dict.load('appSpecialTypeFive').then(() => {
+ this.typeList = this.$dict.getDict('appSpecialTypeFive')
+ console.log(this.typeList)
+ })
},
- onShow() {},
methods: {
userClick(row, index) {
if (this.userList[index].isChecked) {
@@ -93,16 +94,6 @@ export default {
this.selectUser = row
}
},
-
- getTypeList() {
- this.userList = []
- this.$http.post(`/app/appapplicationinfo/queryApplicationListByType?type=0&status=1`).then((res) => {
- if (res.code == 0) {
- this.typeList = res.data
- }
- })
- },
-
// getUser(data) {
// this.applicationId = data.id
// this.appId = data.id
@@ -110,23 +101,23 @@ export default {
// },
getUsers() {
- uni.showLoading({
- title: '加载中',
- })
- this.$http.post(`/app/appapplicationinfo/list?appId=${this.appId}¤t=${this.current}&size=${999}`, { searchParam: this.keyword }).then((res) => {
+ this.$http.post(`/app/appspecialadjustment/allList?size=20¤t=${this.current}`, { type: this.type }).then((res) => {
if (res.code == 0) {
+ if(this.current > res.data.total) {
+ return
+ }
res.data.records.map((item) => {
item.isChecked = false
})
uni.hideLoading()
- this.userList = res.data.records
+ this.userList = this.current > 1 ? [...this.userList, ...res.data.records] : res.data.records
}
})
},
submit() {
if (this.selectUser.id != null) {
- uni.$emit('goBack', { selectUser: this.selectUser, applicationName: this.applicationName, applicationId: this.applicationId })
+ uni.$emit('goBack', { selectUser: this.selectUser, applicationName: this.applicationName, applicationId: this.type })
uni.navigateBack()
} else {
return this.$u.toast('请选择人员')
@@ -134,9 +125,8 @@ export default {
},
toUserSelect(item) {
- this.applicationName = item.applicationName
- this.applicationId = item.id
- this.appId = item.id
+ this.applicationName = item.dictName
+ this.type = item.dictValue
this.getUsers()
this.showType = false
@@ -144,11 +134,10 @@ export default {
back() {
this.keyword = ''
- this.typeList = []
+ this.typeList = this.$dict.getDict('appSpecialTypeFive')
this.userList = []
this.applicationName = ''
this.showType = true
- this.getTypeList()
},
handerSearch(e) {
@@ -166,6 +155,10 @@ export default {
this.getUsers()
},
},
+ onReachBottom() {
+ this.current ++
+ this.getUsers()
+ }
}