01/15

tab 测试

src/store/modules/permission.js

@@ -61,6 +61,7 @@ function recursionRouter (arr) {
       //   }
       // }
       arr[i].hid == 0 ? obj.hidden = false : obj.hidden = true
+
       obj.path = arr[i].path;
       obj.meta = { 'title': arr[i].name, 'icon': arr[i].icon, 'noCache': arr[i].keepAlive }
       if (arr[i].sysMenus && arr[i].sysMenus.length > 0) {

src/views/categroyManager/insideSetting/branchActiveOperation.vue

@@ -203,6 +203,7 @@ export default {
       this.$refs.form.resetFields()
       let vipGroupCategoryList = await vipGroupCategory({ page: 1, rows: 9999 })
       if (vipGroupCategoryList.code == 200) {
+        this.vipGroupCategoryList = []
         vipGroupCategoryList.data.forEach(item => {
           this.vipGroupCategoryList.push({
             label: item.name,
@@ -213,6 +214,7 @@ export default {
 
       let branchList = await getEmployeeOrgan({ delFlag: 0, rows: 9999 })
       if (branchList.code == 200) {
+        this.branchList = []
         branchList.data.forEach(item => {
           let tempArr = {}
           tempArr = {

src/views/categroyManager/insideSetting/branchManager.vue

@@ -299,6 +299,15 @@ export default {
     },
     onFormClose (formName) { // 关闭弹窗重置验证
       // this.$refs[formName].clearValidate()
+      this.form = {
+        id: null,
+        name: null, // 教学点名称
+        linkman: null, // 来源
+        job: null,  // 费用
+        mobileNo: null,
+        // ownershipType: null,
+        organId: null
+      }
       this.$refs[formName].resetFields()
     }
   }

src/views/teacherManager/teacherDetail/components/courseInfo.vue

@@ -88,6 +88,7 @@ export default {
     }
   },
   activated () {
+    this.teacherId = this.$route.query.teacherId
     this.getList()
     this.musicGroupStatus = musicGroupStatus
   },

src/views/teacherManager/teacherDetail/components/courseInfo1.vue

@@ -112,6 +112,7 @@ export default {
     }
   },
   activated () {
+    this.teacherId = this.$route.query.teacherId
     this.vipGroupStatus = vipGroupStatus;
     this.getList()
   },

src/views/teacherManager/teacherDetail/components/courseInfo2.vue

@@ -52,6 +52,7 @@ export default {
     this.getList()
   },
   activated () {
+    this.teacherId = this.$route.query.teacherId
     this.getList()
   },
   methods: {

src/views/teacherManager/teacherDetail/components/leaveRecord.vue

@@ -95,6 +95,7 @@ export default {
     this.getList()
   },
   activated () {
+    this.teacherId = this.$route.query.teacherId
     this.getList()
   },
   methods: {

src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -224,6 +224,7 @@ export default {
     }
   },
   activated () {
+    this.teacherId = this.$route.query.teacherId
     this.getList()
     sumTeacherNoPay({ teacherId: this.teacherId }).then(res => {
       if (res.code == 200) {

src/views/teacherManager/teacherDetail/components/teacherInfo.vue

@@ -174,7 +174,8 @@ export default {
     }
   },
   activated () {
-    // this.teacherGet()
+    this.teacherId = this.$route.query.teacherId
+    this.teacherGet()
     // console.log(this.$route.query.teacherId);
   },
   mounted () {

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -182,12 +182,7 @@ export default {
     }
   },
   created () {
-    if (this.$route.query.search) {
-      this.Fsearch = this.$route.query.search;
-    }
-    if (this.$route.query.rules) {
-      this.Frules = this.$route.query.rules
-    }
+
   },
   mounted () {
     this.__init()
@@ -198,6 +193,12 @@ export default {
   },
   methods: {
     __init () {
+      if (this.$route.query.search) {
+        this.Fsearch = this.$route.query.search;
+      }
+      if (this.$route.query.rules) {
+        this.Frules = this.$route.query.rules
+      }
       // 获取课程形态 设置vip课酬
       findTeacherDefaultSalary({ userId: this.teacherId }).then(res => {
         if (res.code == 200 && res.data.length > 0) {

src/views/teacherManager/teacherOperation/index.vue

@@ -12,14 +12,14 @@
                      :disabled="isCreate"
                      name="0">
           <teacherOperation @onTeacher="onTeacher"
-                            v-if="activeStatus[0]" />
+                            v-if="activeName=='0'" />
         </el-tab-pane>
         <el-tab-pane label="课酬设置"
                      v-if="salaryStatus"
                      name="1"
                      :disabled="isTeacher">
           <salarySet :teacherId="teacherId"
-                     v-if="activeStatus[1]" />
+                     v-if="activeName=='1'" />
         </el-tab-pane>
         <!-- v-permission="pageType == 'create' ? '/teacherAdd/salarySeting' : '/teacherUpdate/saraySeting'" -->
       </el-tabs>
@@ -49,11 +49,14 @@ export default {
   },
   mounted () {
     this.init()
+
   },
   activated () {
+    this.activeName = null
     this.teacherId = this.$route.query.teacherId
     this.pageType = this.$route.query.type
     this.init()
+    this.activeName = '0'
   },
   methods: {
     init () {
@@ -66,7 +69,6 @@ export default {
       if (this.teacherId) {
         this.isTeacher = false
       }
-
       this.salaryStatus = permission(this.pageType == 'create' ? '/teacherAdd/salarySeting' : '/teacherUpdate/saraySeting')
       this.baseInfoStatus = permission(this.pageType == 'create' ? '/teacherAdd/baseInfo' : '/teacherUpdate/baseInfo')
     },

src/views/teamBuild/teamSeting/components/setImprovement.vue

@@ -160,21 +160,27 @@ export default {
     }
   },
   mounted () {
-    this.teamid = this.$route.query.id;
-    if (this.$route.query.search) {
-      this.Fsearch = this.$route.query.search;
-    }
-    if (this.$route.query.rules) {
-      this.Frules = this.$route.query.rules
-    }
-    this.getList();
-    teamSoundStudent({ musicGroupId: this.teamid }).then(res => {
-      if (res.code == 200) {
-        this.studentList = res.data;
-      }
-    })
+    this.init()
+  },
+  activated () {
+    this.init()
   },
   methods: {
+    init () {
+      this.teamid = this.$route.query.id;
+      if (this.$route.query.search) {
+        this.Fsearch = this.$route.query.search;
+      }
+      if (this.$route.query.rules) {
+        this.Frules = this.$route.query.rules
+      }
+      this.getList();
+      teamSoundStudent({ musicGroupId: this.teamid }).then(res => {
+        if (res.code == 200) {
+          this.studentList = res.data;
+        }
+      })
+    },
     onApply () {
       this.$confirm('您确定开启报名吗?', '提示', {
         confirmButtonText: '确定',

src/views/teamBuild/teamSeting/index.vue

@@ -132,30 +132,10 @@ export default {
     }
   },
   created () {
-    this.id = this.$route.query.id;
-    // 判断是否带缓存参数
-    if (this.$route.query.search) {
-      this.Fsearch = this.$route.query.search;
-    }
-    if (this.$route.query.rules) {
-      this.Frules = this.$route.query.rules
-    }
-
-    this.activeIndex = sessionStorage.getItem('setStep') || 0;
-    getTeamBaseInfo({ musicGroupId: this.id }).then(res => {
-      if (res.code == 200) {
-        this.chargeTypeId = res.data.musicGroup.chargeTypeId;
-        this.name = res.data.musicGroup.name;
-        sessionStorage.setItem('chargeTypeId', this.chargeTypeId);
-        sessionStorage.setItem('createTeamOrgnId', res.data.musicGroup.organId)
-      }
-    })
-    // 获取是否设置课酬
-    checkSetSalary({ musicGroupId: this.id }).then(res => {
-      if (res.code == 200) {
-        this.isSetSalary = res.data;
-      }
-    })
+    this.init()
+  },
+  activated () {
+    this.init()
   },
   beforeDestroy () {
     sessionStorage.setItem('setStep', 0)
@@ -166,6 +146,32 @@ export default {
     // 根据乐团id 获取乐团信息
   },
   methods: {
+    init () {
+      this.id = this.$route.query.id;
+      // 判断是否带缓存参数
+      if (this.$route.query.search) {
+        this.Fsearch = this.$route.query.search;
+      }
+      if (this.$route.query.rules) {
+        this.Frules = this.$route.query.rules
+      }
+
+      this.activeIndex = sessionStorage.getItem('setStep') || 0;
+      getTeamBaseInfo({ musicGroupId: this.id }).then(res => {
+        if (res.code == 200) {
+          this.chargeTypeId = res.data.musicGroup.chargeTypeId;
+          this.name = res.data.musicGroup.name;
+          sessionStorage.setItem('chargeTypeId', this.chargeTypeId);
+          sessionStorage.setItem('createTeamOrgnId', res.data.musicGroup.organId)
+        }
+      })
+      // 获取是否设置课酬
+      checkSetSalary({ musicGroupId: this.id }).then(res => {
+        if (res.code == 200) {
+          this.isSetSalary = res.data;
+        }
+      })
+    },
     gotoNav (val) {
       this.activeIndex = val;
     },

src/views/teamDetail/componentCourse/classList.vue

@@ -50,12 +50,7 @@ import { getClassList, coursePostpone } from '@/api/buildTeam'
 import { permission } from '@/utils/directivePage'
 export default {
   name: 'tclassList',
-  props: {
-    teamid: {
-      type: String,
-      required: true
-    },
-  },
+  props: ['teamid'],
   data () {
     return {
       searchLsit: [],
@@ -76,10 +71,14 @@ export default {
   components: {
     pagination
   },
+  activated () {
+    this.getList();
+  },
   mounted () {
     this.getList();
   },
   methods: {
+
     permission (str) {
       return permission(str)
     },

src/views/teamDetail/components/baseInfo.vue

@@ -119,11 +119,9 @@ export default {
     // 获取乐团基本信息
     // let teamid = '191014135135001';
     // this.creatQrCode();
-    console.log(this.teamid + 'mounted')
     this.init()
   },
   activated () {
-    console.log(this.teamid + 'activated')
     this.init()
   },
   methods: {

src/views/teamDetail/index.vue

@@ -106,7 +106,6 @@ export default {
       if (this.$route.query.rules) {
         this.Frules = this.$route.query.rules
       }
-      console.log(this.teamid)
       this.activeIndex = '1'
     },
     handleClick (val) {

src/views/teamDetail/indexCourse.vue

@@ -16,12 +16,12 @@
                @tab-click="handleClick">
         <el-tab-pane label="班级详情"
                      name="1">
-          <classList v-if="activeIndex == 1"
+          <classList v-if="activeIndex == '1'"
                      :teamid='teamid' />
         </el-tab-pane>
         <el-tab-pane label="课表详情"
                      name="2">
-          <courseList v-if="activeIndex == 2"
+          <courseList v-if="activeIndex == '2'"
                       :teamid='teamid' />
         </el-tab-pane>
       </el-tabs>
@@ -49,22 +49,27 @@ export default {
   created () {
     // this.teamid = '191014135135001';
     // 191015094822001
-    let teamInfo = this.$route.query;
-    this.status = this.$route.query.status;
-    this.teamid = teamInfo.id;
-    this.name = teamInfo.name;
-    // 判断是否带缓存参数
-    if (this.$route.query.search) {
-      this.Fsearch = this.$route.query.search;
-    }
-    if (this.$route.query.rules) {
-      this.Frules = this.$route.query.rules
-    }
+    this.init()
   },
-  mounted () {
-
+  activated () {
+    this.activeIndex = null
+    this.init()
+    this.activeIndex = '1'
   },
   methods: {
+    init () {
+      let teamInfo = this.$route.query;
+      this.status = this.$route.query.status;
+      this.teamid = teamInfo.id;
+      this.name = teamInfo.name;
+      // 判断是否带缓存参数
+      if (this.$route.query.search) {
+        this.Fsearch = this.$route.query.search;
+      }
+      if (this.$route.query.rules) {
+        this.Frules = this.$route.query.rules
+      }
+    },
     handleClick (val) {
       this.activeIndex = val.name;
     },

src/views/teamDetail/teamCourseList.vue

@@ -166,7 +166,6 @@
                            prop="teacherName"
                            label="指导老师">
           </el-table-column>
-
           <!-- <el-table-column align='center'
                            label="详情">
             <template slot-scope="scope">

src/views/teamDetail/teamDetailedList.vue

@@ -89,20 +89,26 @@ export default {
     }
   },
   mounted () {
-    if (this.$route.query.search) {
-      this.Fsearch = this.$route.query.search;
-    }
-    if (this.$route.query.rules) {
-      this.Frules = this.$route.query.rules
-    }
-    this.teamid = this.$route.query.id;
-    getTeamDetailList({ musicGroupId: this.teamid }).then(res => {
-      if (res.code == 200) {
-        this.tableList = res.data ? res.data : [];
-      }
-    })
+    this.init()
+  },
+  activated () {
+    this.init()
   },
   methods: {
+    init () {
+      if (this.$route.query.search) {
+        this.Fsearch = this.$route.query.search;
+      }
+      if (this.$route.query.rules) {
+        this.Frules = this.$route.query.rules
+      }
+      this.teamid = this.$route.query.id;
+      getTeamDetailList({ musicGroupId: this.teamid }).then(res => {
+        if (res.code == 200) {
+          this.tableList = res.data ? res.data : [];
+        }
+      })
+    },
     onCancel () {
       this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
     },

vue.config.js

@@ -19,9 +19,9 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://testadm.dayaedu.com/' //test环境
 // let target = 'http://192.168.3.27:8000' // 箭河
-let target = 'http://192.168.3.28:8000' //邹璇
+// let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:18000' //勇哥
-// let target = 'http://admin.dayaedu.com' // 测试服
+let target = 'http://admin.dayaedu.com' // 测试服
 // let target = 'http://192.168.3.48:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {