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

@@ -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">

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) {
+        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") {
+          if (type == 'next') {
             this.active++;
             this.stepData = [false, false, true];
             this.tagDrop();
+          } else if (type == 'storage') {
+            vm.$message({
+              type: "success",
+              message: "暂存成功"
+            });
+          }
         }
       });
     },