网格管理

src/apps/AppGridManagement/AddGird.vue

@@ -12,13 +12,24 @@
       <div class="label">
         <span class="tips"></span>网格长
       </div>
-      <div class="value" @click="toAddUser('manage')">请选择<img src="./components/img/right-icon.png" alt="" /></div>
+      <div class="value" @click="toAddUser('manage')">
+        
+        <span v-if="form.girdMemberManageList.length">
+          <span v-for="(item, index) in form.girdMemberManageList" :key="index"><span v-if="index>0">,</span>{{item.name}}</span>
+        </span>
+        <span style="color:#999;" v-else>请选择</span>
+        <img src="./components/img/right-icon.png" alt="" /></div>
     </div>
     <div class="item-flex">
       <div class="label">
         <span class="tips"></span>网格员
       </div>
-      <div class="value" @click="toAddUser('Member')">请选择<img src="./components/img/right-icon.png" alt="" /></div>
+      <div class="value" @click="toAddUser('Member')">
+        <span v-if="form.girdMemberList.length">
+          <span v-for="(item, index) in form.girdMemberList" :key="index"><span v-if="index>0">,</span>{{item.name}}</span>
+        </span>
+        <span style="color:#999;" v-else>请选择</span>
+        <img src="./components/img/right-icon.png" alt="" /></div>
     </div>
     <div class="footer" @click="confirm">确认添加</div>
   </div>
@@ -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()
         }
       })
 

src/apps/AppGridManagement/Organization.vue

@@ -24,7 +24,7 @@
       <div class="right">
         <div class="name">{{item.name}} 
           <span class="gird">{{item.checkType == 2 ? '网格长' : '网格员'}}</span>
-          <span class="family-btn" @click="linkTo('./FamilyList')">责任家庭 ></span>
+          <span class="family-btn" @click="linkTo(`./FamilyList?girdId=${item.id}`)">责任家庭 ></span>
         </div>
         <p>{{item.girdName}} </p>
       </div>

src/apps/AppGridManagement/SelectUser.vue

@@ -41,10 +41,11 @@ export default {
       selectUserList: [],
       userList: [],
       name: '',
+      current: 1
     }
   },
-  onLoad(option) {
+  onLoad() {
-    this.selectUserList = option.selectUserList
+    this.selectUserList = uni.getStorageSync('selectUserList')
     this.getList()
   },
   methods: {

src/apps/AppGridManagement/SetGird.vue

@@ -30,7 +30,7 @@
       <div>添加网格</div>
     </div>
 
-     <u-popup v-model="show" mode="bottom" border-radius="14">
+     <u-popup v-model="show" mode="bottom" border-radius="14" height="1000">
       <div class="popup">
         <div class="bg"></div>
         <div class="title">{{ form.girdName }}</div>