diff --git a/src/project/beta/AppGridManagement/AddUser.vue b/src/project/beta/AppGridManagement/AddUser.vue
index 52f25e7e..1bad91f6 100644
--- a/src/project/beta/AppGridManagement/AddUser.vue
+++ b/src/project/beta/AppGridManagement/AddUser.vue
@@ -21,7 +21,6 @@
*所属网格
-
{{selectGird.girdName}}
请选择

diff --git a/src/project/beta/AppGridManagement/SelectGird.vue b/src/project/beta/AppGridManagement/SelectGird.vue
index 06d66eef..2afef034 100644
--- a/src/project/beta/AppGridManagement/SelectGird.vue
+++ b/src/project/beta/AppGridManagement/SelectGird.vue
@@ -53,13 +53,15 @@ export default {
},
isGridMember() {
return this.user.girdCheckType > 0
- }
+ },
+ //是否是网格员申报
+ isApply: v => v.$route.query.formType == 2
},
onLoad(option) {
if (option.isFormMap) {
this.isFormMap = option.isFormMap
}
- this.isGridMember ? this.getAllGrids() : this.$u.toast('当前人员不是网格员或网格长')
+ this.isGridMember || this.isApply ? this.getAllGrids() : this.$u.toast('当前人员不是网格员或网格长')
},
methods: {
getAllGrids() {
@@ -67,6 +69,10 @@ export default {
let {girdMemberId} = this.user,
url = `/app/appgirdinfo/queryAppGirdInfoByGirdLevel`,
params = {girdMemberId}
+ if (this.isApply) {
+ url = `/app/appgirdinfo/listByInfo`
+ params = {}
+ }
if (this.isMyGirds) {
url = `/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser`
params = {}
@@ -81,7 +87,7 @@ export default {
},
treeInit(isClick) {
let last = uni.getStorageSync("lastSelectedGrid")
- if (!isClick && last) {
+ if (!isClick && last && !this.isApply) {
this.$http.post("/app/appgirdinfo/listFatherGirdInfo", null, {
params: {girdId: last}
}).then(res => {