Merge branch 'dev-circle-seven-20200914' into 'release'

审核列表优化，code review:bo.dang



See merge request !220

src/components/yqrange/member-management/org.vue

@@ -260,7 +260,7 @@ export default {
       let administrativeIdItem = operationData.setAdministrativeId(
         this.formOrganization.administrativeIdList
       );
-      if (administrativeIdItem == "000_0"){
+      if (administrativeIdItem == "000_0" || administrativeIdItem == "000_0_0"){
         administrativeIdItem=""
       }
       let idType = localStorage.getItem("storageIdType");

src/views/yqrange/range-apply.vue

@@ -14,8 +14,7 @@
               <el-select
                 v-model="searchForm.status"
                 placeholder="全部审核状态"
-                size="small"
-                clearable>
+                size="small">
                 <el-option
                   v-for="item in statusList"
                   :key="item.value"
@@ -177,10 +176,6 @@
         openLoading(this);
         let params = this.searchForm;
 
-        if(this.searchForm.status == ""){
-          this.searchForm.status = -1;
-        }
-
         console.log('查询圈子')
         applyList(params).then((res) => {
           closeLoading(this);

src/views/yqrange/yq-range.vue

@@ -194,7 +194,7 @@ export default {
         this.showAllFlag = false;
         setTimeout(() => {
            this.getUserAuth();
-        },500)
+        },800)
       }
 
     },