Merge branch 'Inspection' into online

src/views/resetTeaming/index.vue

@@ -35,7 +35,7 @@
                      v-if="permission('/resetTeaming/resetPayList')"
                      name="3">
           <resetPayList :baseInfo="baseInfo"
-                        v-if="activeIndex == 3"
+                        v-if="activeIndex == 3&&baseInfo"
                         @changeActive="handleClick" />
         </el-tab-pane>
         <el-tab-pane label="学校缴费设置"
@@ -43,7 +43,7 @@
                      v-if="permission('/resetTeaming/resetPayList')"
                      name="6">
           <resetPayListSchool :baseInfo="baseInfo"
-                              v-if="activeIndex == 6"
+                              v-if="activeIndex == 6&&baseInfo"
                               @changeActive="handleClick" />
         </el-tab-pane>
 
@@ -51,7 +51,7 @@
         lazy
                      v-if="permission('/resetTeaming/resetClass')"
                      name="5">
-          <resetClass v-if="activeIndex == 5"  :musicGroupInfo='musicGroupInfo'/>
+          <resetClass v-if="activeIndex == 5&&musicGroupInfo"  :musicGroupInfo='musicGroupInfo'/>
         </el-tab-pane>
         <!-- <el-tab-pane label="新增排课"
                      v-if="permission('/resetTeaming/coursePlan')"
@@ -79,6 +79,9 @@ import resetPayList from '@/views/resetTeaming/components/resetPayList'
 import resetPayListSchool from '@/views/resetTeaming/components/resetPayListSchool'
 import studentPayBase from '@/views/resetTeaming/components/studentPayBase'
 import { permission } from '@/utils/directivePage'
+import {
+  getTeamBaseInfo,
+} from "@/api/buildTeam";
 export default {
   components: { teamBaseInfo, resetSound, resetClass, resetPayList, resetPayListSchool, studentPayBase },
   name: 'resetTeaming',
@@ -112,16 +115,23 @@ export default {
     this.handleClick(obj)
     this.__init()
   },
-  activated () {
-    let obj = {}
-    obj.name = this.activeIndex
-    this.handleClick(obj)
-    this.__init()
-  },
+  // activated () {
+  //   let obj = {}
+  //   obj.name = this.activeIndex
+  //   this.handleClick(obj)
+  //   this.__init()
+  // },
   methods: {
     __init () {
       // this.activeIndex = sessionStorage.getItem('resetCode') || '1';
       this.teamid = this.$route.query.id;
+      if(this.$route.query.tabrouter !=1){
+        getTeamBaseInfo({ musicGroupId: this.teamid }).then(res=>{
+          if(res.code == 200){
+           this.getBaseInfo(res.data)
+          }
+        })
+      }
     },
     onCancel () {
       this.$router.push({ path: '/business/teamDetail' })

src/views/teamBuild/components/teamBaseInfo.vue

@@ -464,29 +464,6 @@ export default {
     };
   },
   created() {},
-  // activated() {
-  //   this.payList = {
-  //     school: {
-  //       ischeck: false,
-  //       value: "",
-  //       price: "",
-  //       chiose: "",
-  //     },
-  //     company: {
-  //       ischeck: false,
-  //       value: "",
-  //       price: "",
-  //       chiose: "",
-  //     },
-  //     student: {
-  //       ischeck: true,
-  //       chiose: "loop",
-  //     },
-  //     chioseMonth: [], // 选中的月份
-  //   };
-  //   this.init();
-  //   this.$forceUpdate();
-  // },
   mounted() {
     this.init();
     this.$forceUpdate();
@@ -550,10 +527,6 @@ export default {
         this.basdisabled = false;
       }
       if (
-        // this.teamStatus == "resetTeam" ||
-        // this.teamStatus == "teamDraft" ||
-        // this.teamStatus == "teamAudit" ||
-        // this.teamStatus == "look"
         this.$route.query.id
       ) {
         // 单团修改

src/views/teamDetail/components/baseInfo.vue

@@ -2,73 +2,6 @@
   <div class='basea-container'>
     <div class="baseTop">
       <div class="left">
-        <!-- <el-form :inline="true"
-                 class="form-list"
-                 label-width="110px"
-                 :model="topForm">
-          <el-form-item label="乐团编号">
-            <el-input v-model.trim="topForm.num"
-                      disabled></el-input>
-          </el-form-item>
-          <el-form-item label="乐团主管">
-            <el-input v-model.trim="topForm.teacher"
-                      disabled></el-input>
-          </el-form-item>
-          <el-form-item label="所属分部">
-            <el-input v-model.trim="topForm.section"
-                      disabled></el-input>
-
-          </el-form-item>
-          <el-form-item label="乐队指导">
-            <el-input v-model.trim="topForm.boss"
-                      disabled></el-input>
-          </el-form-item>
-               <el-form-item label="运营主管">
-            <el-input v-model.trim="topForm.teamTeacherName"
-                      disabled></el-input>
-          </el-form-item>
-               <el-form-item label="维修技师">
-            <el-input v-model.trim="topForm.repairUserName"
-                      disabled></el-input>
-          </el-form-item>
-
-          <el-form-item label="合作单位">
-            <el-input v-model.trim="topForm.cooperate"
-                      disabled></el-input>
-          </el-form-item>
-          <el-form-item label="机构类型">
-            <el-input v-model.trim="topForm.ownershipType"
-                      disabled></el-input>
-          </el-form-item>
-
-
-          <el-form-item label="收费类型">
-            <el-input v-model.trim="topForm.type"
-                      disabled></el-input>
-          </el-form-item>
-          <el-form-item label="缴费方式"
-                        prop="paymentPattern">
-            <el-select placeholder="缴费方式"
-                       style="width: 220px"
-                       clearable
-                       filterable
-                       disabled
-                       v-model.trim="topForm.paymentPattern">
-              <el-option :value="0"
-                         label="按月"></el-option>
-              <el-option :value="1"
-                         label="按季"></el-option>
-              <el-option :value="2"
-                         label="一次性"></el-option>
-            </el-select>
-          </el-form-item>
-            <el-form-item label="上课地点">
-            <el-input v-model.trim="topForm.add"
-                      type="textarea"
-                      disabled></el-input>
-          </el-form-item>
-
-        </el-form> -->
         <teambaseinfo />
         <div class="wrap">
               <el-button type="text"

src/views/teamDetail/index.vue

@@ -107,9 +107,13 @@ export default {
     },
     init () {
       // let teamInfo = this.$route.query;
-      this.status = this.$route.query.status;
+      this.$nextTick(res=>{
+        this.status = this.$route.query.status;
       this.teamid = this.$route.query.id;
       this.name = this.$route.query.name;
+      console.log(this.teamid)
+      })
+
       // 判断是否带缓存参数
     },
     handleClick (val) {