Merge branch 'dev-liveSix-20200817' of...

Merge branch 'dev-liveSix-20200817' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-liveSix-20200817

src/components/yqrange/mebman.vue

@@ -16,12 +16,15 @@
         :circleId='circleId'
         :roleType='roleType'
         @setOrgTotal="setOrgTotal"
+        @refreshRenYuan='refreshRenYuan'
+        ref='org'
       ></org>
       <renyaun
         v-show="tab == 2"
         :circleId='circleId'
         :roleType='roleType'
         @setPleTotal="setPleTotal"
+        ref='renyaun'
       ></renyaun>
     </div>
   </div>
@@ -91,6 +94,9 @@ export default {
     },
     getRole() {
       this.role = localStorage.getItem("highMainManager") || localStorage.getItem("mainManager") || (localStorage.getItem("storageIdType") == 1 ? 1 : 0)
+    },
+    refreshRenYuan() {
+      this.$refs.renyaun.initRange()
     }
   }
 }

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

@@ -208,7 +208,7 @@ export default {
       let idType = localStorage.getItem("storageIdType");
       getprovinces(idType).then(res => {
         closeLoading(this);
-        if (res.code == "000000") {
+        if (res.code == "000000" && res.data) {
           if (idType == 1) {
             vm.optionsRegion = operationData.setRegionOption2(
             res.data.provinceList
@@ -390,6 +390,7 @@ export default {
           });
           this.deleteVisible = false
           this.searchOrganization()
+          this.$emit('refreshRenYuan')
         }
       }).catch(() => {
          this.deleteVisible = false
@@ -412,7 +413,8 @@ export default {
     },
     addOrg() {
       this.dialogOrg = false
-     this.initRange()
+      this.searchOrganization()
+      this.$emit('refreshRenYuan')
     }
   }
 }

src/views/yqrange/blacklist-manage.vue

@@ -73,7 +73,7 @@
       top="5vh"
       :before-close="handleClose"
     >
-      <checkBlackList :circleId="circleId" @addOrg="addOrg" @handleClose="handleClose"></checkBlackList>
+      <checkBlackList v-if="dialogBlackList" :circleId="circleId" @addOrg="addOrg" @handleClose="handleClose"></checkBlackList>
       <!-- :roleType="roleType" -->
     </el-dialog>
   </div>
@@ -112,9 +112,8 @@ export default {
   },
   created() {
     vm = this;
-    // this.circleId = this.$route.query.id;
-    this.circleId = 131;
-    // this.circleId = this.$route.query.circleId;
+    // this.circleId = 131;
+    this.circleId = this.$route.query.circleId;
     this.idType = localStorage.getItem("storageIdType");
     this.circleName = this.$route.query.circleName;
     this.curmbSecond = "圈子管理-" + this.circleName;

src/views/yqrange/checkBlackList.vue

@@ -171,6 +171,7 @@ export default {
 
             this.tableOrganization = res.data.peoplesDtoList;
             this.totalOrganization = res.data.total;
+            this.initOrganizationStatus();
           } else {
             // vm.$message.info(res.message);
             // vm.$message.info("操作失败，请重试");
@@ -184,6 +185,7 @@ export default {
       console.log("clear() enter")
       clearBlackListCacheOrg(this.circleId)
       .then(()=>{
+        this.search();
       })
       .catch((err=>{console.log(err)}))
     },
@@ -411,6 +413,7 @@ export default {
     },
      //机构table中勾选一个
     selectOrganization(selection, row) {
+      console.log("selectOrganization() : " + row.name)
       this.selectionList = selection;
       let flag = false;
       for (let i = 0; i < selection.length; i++) {
@@ -437,7 +440,7 @@ export default {
     },
     selectableTableList(row, index) {
       // if (this.status4Flag == 1) {
-      if (row.status == 2) {
+      if (row.status == 2 || !(row.roleId == null || row.roleId == 0)) {
         return false;
       }
       return true;
@@ -475,7 +478,7 @@ export default {
       let hashTable = {};
       let newArr = [];
       for(let i=0,l=arr.length;i<l;i++) {
-        if(!hashTable[arr[i].id]) {
+        if(!hashTable[arr[i].id] && arr[i].status != 2) {
           hashTable[arr[i].id] = true;
           newArr.push(arr[i]);
         }
@@ -536,6 +539,9 @@ export default {
         display: table-caption;
         overflow-y: scroll;
         max-height: 500px;
+        &::-webkit-scrollbar() {
+          width: 2px !important;
+        }
       }
     }