Merge branch '消息提醒bug' into dev

src/views/components/resiSearch.vue

@@ -535,6 +535,9 @@ export default {
       {
           label: '志愿者',
           value: 'VOLUNTEER_FLAG'
+        },{
+          label: '网格长',
+          value: 'GRID_MANAGER_FLAG'
         },
         {
           label: '楼长',

src/views/modules/base/classification/index.vue

@@ -627,7 +627,28 @@
                             </div>
 
                         </div>
+                        <div class="item">
+                            <div class="item_category">
+                                <img src="@/assets/images/category/GRID_MANAGER_FLAG.png" alt />
+                                <div class="item_content">
+                                    <div class="item_row1"  @click="handelClickToResi('GRID_MANAGER_FLAG')">
+                                        <div class="row_left">网格长</div>
+                                        <div class="row_right">
+                                            <div class="text">{{ categoryList.gridManagerFlagCount || '--' }}</div>
+                                            <img src="@/assets/images/category/Enter.png" class="img" />
+                                        </div>
 
+                                    </div>
+                                    <div class="item_row2"  @click="handelClickTovirtualResi('GRID_MANAGER_FLAG')">
+                                        <div class="row_left">网格长(虚拟网格)</div>
+                                        <div class="row_right">
+                                            <div class="text">{{ categoryList.gridManagerFlagVirtualCount || '--' }}</div>
+                                            <img src="@/assets/images/category/Enter.png" class="img" />
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
                         <div class="item">
                             <div class="item_category" >
                                 <img src="@/assets/images/category/housemaster.png" alt />

src/views/modules/portrayal/jumin/cpts/staffTag.vue

@@ -142,6 +142,10 @@ export default {
                                 label: '志愿者',
                                 value: 'volunteerFlag'
                             },
+                            {
+                                label: '网格长',
+                                value: 'gridManagerFlag'
+                            },
                             {
                                 label: '楼长',
                                 value: 'buildingChiefFlag'
@@ -154,6 +158,7 @@ export default {
                                 label: '公益岗',
                                 value: 'publicWelfareFlag'
                             }
+                           
                         ]
                     },
                 ]
@@ -238,6 +243,7 @@ export default {
             updateValue('buildingChiefFlag', 4);
             updateValue('unitChiefFlag', 4);
             updateValue('publicWelfareFlag', 4);
+            updateValue('gridManagerFlag', 4);
             updateValue('deathFlag', 1);
         },
         handeleClickRadio(val) {