Merge branch 'dev-yqLive-20200611' of...

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

src/views/yqrange/create-range.vue

@@ -17,12 +17,14 @@
           <el-button v-if="active>=1" size="small" type="primary" @click="complete">完成</el-button>
         </el-col>
       </el-row>
-      <div class="first-step" v-if="active == 0">
+      <div class="first-step" v-if="active === 0">
         <p class="p-title">基础信息</p>
-
         <base-info :formData="formData" @returnTypeData="returnTypeData">
         </base-info>
       </div>
+      <div class="second-step" v-else-if="active === 1">
+        <organzation></organzation>
+        </div>
     </div>
   </div>
 </template>
@@ -30,11 +32,13 @@
   let vm = null;
   import BreadCrumb from "@/components/breadcrumb.vue";
   import BaseInfo from '@/components/yqrange/baseinfo.vue';
+  import Organzation from '@/components/yqrange/organzation.vue';
   export default {
     name: "create-range",
     components: {
       BreadCrumb,
-      BaseInfo
+      BaseInfo,
+      Organzation
     },
     data() {
       return {
@@ -70,7 +74,6 @@
         console.log("add");
       } else {
         console.log("edit");
-        this.stepData = [false, true, false];
       }
 
     },
@@ -87,6 +90,7 @@
           this.commitQuanziInfo();
         } else {
           console.log("edit");
+          this.active = 1
           this.stepData = [false, true];
         }
       },

src/views/yqrange/edit-range.vue

@@ -511,6 +511,7 @@
         this.updatedTree = true;
       },
       getTreeCheck() {
+      debugger
         //重构归并树
         let checkedTree = operationData.getSimpleCheckedNodes(
           this.$refs.tree.store

src/views/yqrange/live-manage.vue

@@ -142,6 +142,10 @@
       editLive(row) {
         this.$router.push({
           path: '/create-live',
+          query: {
+            // rtcId: "1"
+            rtcId: row.id
+          }
         })
       },
       //删除直播

src/views/yqrange/yq-range.vue

@@ -153,16 +153,13 @@ export default {
     },
     //编辑
     editRange(row) {
-      // let enterType = 2;//1:add 2 edit
-      // this.$router.push({
-      //   path: `/create-range?enterType`,
-      //   query:{
-      //     id:row.id,
-      //     enterType:enterType
-      //   }
-      // })
+      let enterType = 2;//1:add 2 edit
       this.$router.push({
-        path:'/edit-range'
+        path: `/create-range?enterType`,
+        query:{
+          id:row.id,
+          enterType:enterType
+        }
       })
     },
     //解散圈子