Merge branch '1122' into dev

src/views/modules/communityService/labelConfig/index.vue

@@ -52,8 +52,8 @@
     </div>5
     <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
       destroy-on-close width="954px" top="5vh" class="dialog-h" @closed="diaClose">
-      <!-- <add-form v-if="formShow" ref="Config_form" :row-obj="rowObj" @dialogCancle="addFormCancle"
+      <add-form v-if="formShow" ref="Config_form" :row-obj="rowObj" @dialogCancle="addFormCancle"
-        @dialogOk="addFormOk"></add-form> -->
+        @dialogOk="addFormOk"></add-form>
     </el-dialog>
   </div>
 </template>
@@ -71,7 +71,7 @@ export default {
       },
       tableData: [],
       pageNo: 1,
-      pageSize:window.localStorage.getItem('pageSize') || 20,
+      pageSize: 20,
       tableLoading: true,
       total: 0,
       searchH: 115,