From 9d4bd598f893752e39038600bc277aed7dddefc9 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 14 Jan 2022 17:09:19 +0800
Subject: [PATCH] 26761

---
 packages/2.0.5/AppGridMember/components/add.vue | 7 ++++++-
 packages/wechat/AppConference/detail.vue        | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/2.0.5/AppGridMember/components/add.vue b/packages/2.0.5/AppGridMember/components/add.vue
index 234a6ce0..fce3d46b 100644
--- a/packages/2.0.5/AppGridMember/components/add.vue
+++ b/packages/2.0.5/AppGridMember/components/add.vue
@@ -196,7 +196,7 @@
               </template>
               <template v-if="editTwo==false">
                 <ai-wrapper label-width="120px" :columnsNumber="2" style="margin-top: 16px;">
-                  <ai-info-item label="责任网格：" style="width: 100%;"><span >{{forms.girdInfoListStr}}</span></ai-info-item>
+                  <ai-info-item label="责任网格：" style="width: 100%;"><span v-html="girdInfoStr || '-'"></span></ai-info-item>
                   <ai-info-item label="是否特殊网格员："><span >{{forms.isGirdMember==1?'是':'否'}}</span></ai-info-item>
                   <ai-info-item label="特殊网格员：" v-if="forms.isGirdMember==1"><span >{{dict.getLabel('girdMemberType', forms.girdMemberType)}}</span></ai-info-item>
                   <ai-info-item label="政治面貌："><span >{{dict.getLabel('politicsStatus', forms.politicsStatus)}}</span></ai-info-item>
@@ -276,6 +276,7 @@ export default {
         },
         checkedKeys: [],
       },
+      girdInfoStr: '',
       photoList: [],
       title: "添加网格员",
       editOne: false,
@@ -449,6 +450,10 @@ export default {
               userId: res.data.id
             }]
             this.photoList = [{ url: this.forms.photo }];
+            
+            res.data.girdInfoList.forEach((e, index) => {
+              this.girdInfoStr = this.girdInfoStr + `${e.checkType === '1' ? '网格员' : '网格长'}-${e.girdName}&emsp;`
+            })
           }
         });
     },
diff --git a/packages/wechat/AppConference/detail.vue b/packages/wechat/AppConference/detail.vue
index a76d8036..16c533c0 100644
--- a/packages/wechat/AppConference/detail.vue
+++ b/packages/wechat/AppConference/detail.vue
@@ -316,7 +316,6 @@ export default {
 
           });
         } else {
-          console.log('error submit!!');
           return false;
         }
       });