diff --git a/src/apps/AppGridManagement/AddGird.vue b/src/apps/AppGridManagement/AddGird.vue
index a65ad1bf..805a4c5d 100644
--- a/src/apps/AppGridManagement/AddGird.vue
+++ b/src/apps/AppGridManagement/AddGird.vue
@@ -12,13 +12,24 @@
网格长
- 请选择

+
+
+
+ ,{{item.name}}
+
+
请选择
+

网格员
-
请选择

+
+
+ ,{{item.name}}
+
+
请选择
+

@@ -29,7 +40,10 @@ export default {
data() {
return {
id: '',
- form: {},
+ form: {
+ girdMemberManageList: [],
+ girdMemberList: []
+ },
detailInfo: {},
fromType: 'add', //add新增 edit编辑,
addUserType: 'manage', //manage网格长 Member管理员
@@ -40,6 +54,7 @@ export default {
},
onLoad(option) {
this.id = option.id
+ this.fromType = option.fromType
this.getDetail()
uni.$on('selectUser', res => {
if(this.addUserType == 'manage') {
@@ -71,15 +86,17 @@ export default {
}else {
selectUserList = this.form.girdMemberList
}
- uni.navigateTo({url: `./SelectUser?selectUserList=${selectUserList}`})
+ uni.setStorageSync('selectUserList', selectUserList)
+ uni.navigateTo({url: `./SelectUser`})
},
confirm() {
if(!this.form.girdName){
return this.$u.toast('请输入网格名称')
}
- this.$http.post(`/app/appgirdinfo/addOrUpdate`).then((res) => {
+ this.$http.post(`/app/appgirdinfo/addOrUpdate`, this.form).then((res) => {
if (res.code == 0) {
- this.form = res.data
+ this.
+ uni.navigateBack()
}
})
diff --git a/src/apps/AppGridManagement/Organization.vue b/src/apps/AppGridManagement/Organization.vue
index d4b7d4ac..edfb5e22 100644
--- a/src/apps/AppGridManagement/Organization.vue
+++ b/src/apps/AppGridManagement/Organization.vue
@@ -24,7 +24,7 @@
{{item.name}}
{{item.checkType == 2 ? '网格长' : '网格员'}}
- 责任家庭 >
+ 责任家庭 >
{{item.girdName}}
diff --git a/src/apps/AppGridManagement/SelectUser.vue b/src/apps/AppGridManagement/SelectUser.vue
index 2c861d7b..12665f4b 100644
--- a/src/apps/AppGridManagement/SelectUser.vue
+++ b/src/apps/AppGridManagement/SelectUser.vue
@@ -41,10 +41,11 @@ export default {
selectUserList: [],
userList: [],
name: '',
+ current: 1
}
},
- onLoad(option) {
- this.selectUserList = option.selectUserList
+ onLoad() {
+ this.selectUserList = uni.getStorageSync('selectUserList')
this.getList()
},
methods: {
diff --git a/src/apps/AppGridManagement/SetGird.vue b/src/apps/AppGridManagement/SetGird.vue
index b0c2d160..073cdb8e 100644
--- a/src/apps/AppGridManagement/SetGird.vue
+++ b/src/apps/AppGridManagement/SetGird.vue
@@ -30,7 +30,7 @@
添加网格
-
+