Merge remote-tracking branch 'origin/dev-liveSix-20200817' into dev-liveSix-20200817

src/components/yqrange/mebman.vue

@@ -7,7 +7,7 @@
         <span class="text inlin" @click="goBalck">黑名单</span>
       </el-col>
       <el-col :span="4" class="mm-r">
-        <span class="text" @click="goManger" v-if="role">设置管理员</span>
+        <span class="text" @click="goManger" v-if="role == 1">设置管理员</span>
       </el-col>
     </el-row>
     <div class="member-main">
@@ -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>
@@ -90,7 +93,18 @@ export default {
       this.$router.push(`/blacklist-manage?circleId=${this.circleId}&circleName=${this.circleName}`)
     },
     getRole() {
-      this.role = localStorage.getItem("highMainManager") || localStorage.getItem("mainManager") || (localStorage.getItem("storageIdType") == 1 ? 1 : 0)
+      if (localStorage.getItem("highMainManager") == 1 || localStorage.getItem("mainManager") == 1 || localStorage.getItem("storageIdType") == 1) {
+        this.role = 1
+        console.log('===================显示=================');
+        console.log(this.role);
+      } else {
+        this.role = 0
+        console.log('===================不显示=================');
+        console.log(this.role);
+      }
+    },
+    refreshRenYuan() {
+      this.$refs.renyaun.initRange()
     }
   }
 }

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

@@ -390,16 +390,18 @@ export default {
     flex-direction: column;
     .hcd {
       flex: 1;
-      overflow: hidden;
+      overflow: hiddongen;
        .tag-list {
         margin-top: 20px;
         margin-bottom: 40px;
-        display: table-caption;
         overflow-y: scroll;
         max-height: 500px;
         &::-webkit-scrollbar{
           width: 2px !important;
         }
+        .el-tag{
+          margin-right:10px;
+        }
       }
     }
    

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
@@ -411,8 +412,9 @@ export default {
       this.dialogOrg = false
     },
     addOrg() {
-     this.dialogOrg = false
-     this.initRange()
+      this.dialogOrg = false
+      this.searchOrganization()
+      this.$emit('refreshRenYuan')
     }
   }
 }

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

@@ -270,6 +270,7 @@ export default {
             message: '删除成功!'
           });
           this.deleteVisible = false
+          this.formOrganization.pageNum = 1;
           this.getList()
         }).catch(() => {
           this.$message.error('删除失败，请稍后重试');

src/views/education/edit-custom.vue

@@ -19,7 +19,7 @@
             <el-step title="选择学员范围">3</el-step>
           </el-steps>
         </el-col>
-        <div>
+        <div style="white-space: nowrap">
           <div v-if="!canNext" class="dis-btn">下一步</div>
           <el-button class="dis-btn-b" v-if="active != 0 && projectStatus == 1 && isPreview != 1" size="small" @click="save">暂存</el-button>
           <el-button class="dis-btn-b" v-if="active !== 2 && canNext" size="small" type="primary" @click="nextStep">下一步</el-button>
@@ -463,6 +463,8 @@ export default {
         // 查看时，点击下一步直接跳
         if (vm.isPreview == 1) {
           vm.active = 2;
+          this.getCircleList();
+          this.getCircleData();
           return;
         }
         // 调用项目信息中的下一步操作

src/views/education/edit-manager.vue

@@ -1962,19 +1962,20 @@ export default {
         //暂存步骤2
         if (this.formData.scopeType == 1) {
           //小生态暂存
-          if (this.formEcology.ecology == "") {
-            vm.$message.info("完成");
-          } else {
-            let req = {};
-            req.ecology = [];
-            req.ecology[0] = this.formEcology.ecology;
-            vm
-              .POST("portal/scope/v1/" + this.projectId + "/organization", req)
-              .then(res => {
-                //console.log('设定小生态范围',res);
-                vm.$message.info(res.message);
-              });
-          }
+          // if (this.formEcology.ecology == "") {
+          //   vm.$message.info("完成");
+          // } else {
+          //   let req = {};
+          //   req.ecology = [];
+          //   req.ecology[0] = this.formEcology.ecology;
+          //   vm
+          //     .POST("portal/scope/v1/" + this.projectId + "/organization", req)
+          //     .then(res => {
+          //       //console.log('设定小生态范围',res);
+          //       vm.$message.info(res.message);
+          //     });
+          // }
+          this.sendCircleData('storage');
           return;
         }
         if (this.tagsRegion.length == 0) {
@@ -2124,7 +2125,7 @@ export default {
           //     }
           //   });
           // 设定小圈范围
-          this.sendCircleData();
+          this.sendCircleData('next');
           return;
         }
         if (this.idType == 1) {
@@ -3345,13 +3346,15 @@ export default {
         });
     },
     // 提交、修改圈子数据
-    sendCircleData() {
+    sendCircleData(type = 'next') {
       const { microecologyId, groupType, groupIds } = this.formCircle;
       if (!microecologyId) {
-        vm.$message({
-          type: "info",
-          message: "请选择关联小圈"
-        });
+        if (type == 'next') {
+          vm.$message({
+            type: "info",
+            message: "请选择关联小圈"
+          });
+        }
         return;
       }
       const postData = {
@@ -3364,9 +3367,16 @@ export default {
       vm.POST("portal/portalMicroEcology/relation/saveOrUpdate", postData).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
-          this.active++;
-          this.stepData = [false, false, true];
-          this.tagDrop();
+          if (type == 'next') {
+            this.active++;
+            this.stepData = [false, false, true];
+            this.tagDrop();
+          } else if (type == 'storage') {
+            vm.$message({
+              type: "success",
+              message: "暂存成功"
+            });
+          }
         }
       });
     },

src/views/yqrange/admin-manage.vue

@@ -244,7 +244,7 @@ export default {
       });
       }
       if (row.roleId == 1) {
-            this.$confirm(`确定要将管理员员“${row.name}”降为普通成员？`, '提示', {
+            this.$confirm(`确定要将管理员“${row.name}”降为普通成员？`, '提示', {
         confirmButtonText: '确 定',
         cancelButtonText: '取消',
         type: 'warning',

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,14 +478,14 @@ 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]);
         }
       }
       return newArr;
     },
-    //删除已选中的tag 
+    //删除已选中的tag
     handleClose(item) {
       this.selectOrganization([],item)
       this.$refs.multipleOrganization.toggleRowSelection(item);
@@ -536,6 +539,9 @@ export default {
         display: table-caption;
         overflow-y: scroll;
         max-height: 500px;
+        &::-webkit-scrollbar() {
+          width: 2px !important;
+        }
       }
     }