-
+
{{ item.applicationName }}
@@ -38,10 +38,9 @@
-
+
{{ e.name }}
-
-
+
{{ e.idNumber && e.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1******$2') }}
@@ -71,6 +70,7 @@ export default {
current: 1,
showType: true,
applicationName: '',
+ applicationId: '',
selectUser: {},
}
},
@@ -104,9 +104,22 @@ export default {
})
},
- getUser(data) {
- this.$http.post(`/app/appapplicationinfo/list?appId=${data.id}¤t=${this.current}&size=${999}`, { searchParam: this.keyword }).then((res) => {
+ // getUser(data) {
+ // this.applicationId = data.id
+ // this.appId = data.id
+ // this.getUsers()
+ // },
+
+ getUsers() {
+ uni.showLoading({
+ title: '加载中',
+ })
+ this.$http.post(`/app/appapplicationinfo/list?appId=${this.appId}¤t=${this.current}&size=${999}`, { searchParam: this.keyword }).then((res) => {
if (res.code == 0) {
+ uni.showToast({
+ title: '加载完毕',
+ icon: 'none',
+ })
res.data.records.map((item) => {
item.isChecked = false
})
@@ -116,15 +129,21 @@ export default {
},
submit() {
- uni.$emit('goBack', { selectUser: this.selectUser, applicationName: this.applicationName })
- uni.navigateBack()
- // uni.navigateTo({ url: `./add` })
+ if (this.selectUser.id != null) {
+ uni.$emit('goBack', { selectUser: this.selectUser, applicationName: this.applicationName, applicationId: this.applicationId })
+ uni.navigateBack()
+ } else {
+ return this.$u.toast('请选择人员')
+ }
},
toUserSelect(item) {
this.applicationName = item.applicationName
+ this.applicationId = item.id
+ this.appId = item.id
+ this.getUsers()
+
this.showType = false
- this.getUser(item)
},
back() {
@@ -137,17 +156,18 @@ export default {
},
handerSearch(e) {
- if (this.showType) {
+ if (!this.showType) {
this.keyword = e
this.current = 1
- this.getUser()
+ // this.getUser()
+ this.getUsers()
}
},
handerClear() {
this.keyword = ''
this.current = 1
- this.getUser()
+ this.getUsers()
},
},
}
@@ -163,6 +183,7 @@ export default {
}
.header-middle {
+ padding-bottom: 140px;
.hint {
padding: 0 20px 0 32px;
height: 112px;
@@ -191,7 +212,7 @@ export default {
height: 74px;
border-radius: 8px;
}
- .right {
+ .rightes {
width: 100%;
display: flex;
justify-content: space-between;
@@ -238,21 +259,21 @@ export default {
}
}
- .right {
+ .rights {
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
margin-left: 32px;
border-bottom: 1px solid #e4e5e6;
+ padding-right: 40px;
.applicationNames {
font-size: 36px;
font-weight: 500;
color: #333333;
}
- .imgs {
- width: 40px;
- height: 40px;
+ .idNumbers {
+ color: #666;
}
}
}
diff --git a/src/sass/AppAskForm/AddForm.vue b/src/sass/AppAskForm/AddForm.vue
index de5d7352..d6528359 100644
--- a/src/sass/AppAskForm/AddForm.vue
+++ b/src/sass/AppAskForm/AddForm.vue
@@ -192,11 +192,6 @@ export default {
}
})
},
-
- onShow () {
- localStorage.removeItem("toFiledConfig")
- },
-
methods: {
toSetting() {
let {formConfig} = this
diff --git a/src/sass/AppAskForm/FiledConfig.vue b/src/sass/AppAskForm/FiledConfig.vue
index d16fddfe..69a31bed 100644
--- a/src/sass/AppAskForm/FiledConfig.vue
+++ b/src/sass/AppAskForm/FiledConfig.vue
@@ -146,9 +146,12 @@ import {components} from './components/config'
export default {
data() {
- let params = localStorage.getItem("toFiledConfig")
- params && (params = JSON.parse(params))
- params.config = params.index > -1 ? params.filed : components.filter(v => v.type === params.filedType)[0]
+ let params = localStorage.getItem("toFiledConfig") || {}
+ if (params) {
+ params = JSON.parse(params)
+ params.config = params.index > -1 ? params.filed : JSON.parse(JSON.stringify(components.filter(v => v.type === params.filedType)[0]))
+ localStorage.removeItem("toFiledConfig")
+ }
return {
...params,
isShowType: false,
@@ -250,7 +253,7 @@ export default {
this.config.options.splice(index, 1)
},
- back() {
+ back() {
uni.navigateBack({})
},