0114 17:52

tabBUG修复

dist/static/css/chunk-2a30c7b4.9e091ba7.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-5fdfcc4c],.el-button--primary[data-v-5fdfcc4c]:active,.el-button--primary[data-v-5fdfcc4c]:focus,.el-button--primary[data-v-5fdfcc4c]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-5fdfcc4c] .el-date-editor.el-input,[data-v-5fdfcc4c] .el-select{width:100%!important}[data-v-5fdfcc4c] .el-form-item__content{font-size:14px!important;margin-right:5%}.infoWrap[data-v-5fdfcc4c]{margin-top:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.infoWrap .left[data-v-5fdfcc4c]{max-width:1000px;width:100%}.infoWrap .left h4[data-v-5fdfcc4c]{margin-bottom:20px}.infoWrap .right[data-v-5fdfcc4c]{margin-left:100px}.infoWrap .right .teacherIcon[data-v-5fdfcc4c]{width:150px;height:150px;border-radius:50%;overflow:hidden}.infoWrap .right .teacherIcon img[data-v-5fdfcc4c]{width:150px;height:150px}.salarySet h3[data-v-17b65938]{margin-top:10px;margin-bottom:10px;font-size:14px;color:#444;font-weight:400}.salarySet .tableList .left[data-v-17b65938],.salarySet .tableList .right[data-v-17b65938]{float:left}.salarySet .tableList .left[data-v-17b65938]{width:70%;margin-right:2%}.salarySet .tableList .right[data-v-17b65938]{width:56%;margin-left:2%}[data-v-17b65938] .el-table__body tr td:nth-child(3){border-right:1px solid #ebeef5}[data-v-17b65938] .el-input-group__append{background-color:#f5f7fa;color:#909399;vertical-align:middle;display:table-cell;position:relative;border:1px solid #dcdfe6;border-left:0}

dist/static/css/chunk-390f25e4.e7e53364.css

@@ -1 +0,0 @@
-.m-container[data-v-02d73a1e]{min-width:100%}.el-input[data-v-02d73a1e]{width:400px}[data-v-02d73a1e] .ql-editor{min-height:300px}.el-button--primary[data-v-02d73a1e],.el-button--primary[data-v-02d73a1e]:active,.el-button--primary[data-v-02d73a1e]:focus,.el-button--primary[data-v-02d73a1e]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-02d73a1e]{margin-top:40px}.el-col[data-v-02d73a1e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-02d73a1e]{width:200px;margin:0 20px}[data-v-02d73a1e] .el-tree-node__content{height:40px!important}[data-v-02d73a1e] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-02d73a1e]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-02d73a1e]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-02d73a1e]{width:120px;height:120px;display:block}.ivu-upload[data-v-02d73a1e]{display:none}

dist/static/css/chunk-5a181330.75aa5666.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-27357ee2],.el-button--primary[data-v-27357ee2]:active,.el-button--primary[data-v-27357ee2]:focus,.el-button--primary[data-v-27357ee2]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-27357ee2]{margin-top:40px}.el-col[data-v-27357ee2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-27357ee2]{width:200px;margin:0 20px}[data-v-27357ee2] .el-tree-node__content{height:40px!important}[data-v-27357ee2] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-27357ee2]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-27357ee2]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-27357ee2]{width:120px;height:120px;display:block}

dist/static/css/chunk-61864030.e3269571.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-560c6634],.el-button--primary[data-v-560c6634]:active,.el-button--primary[data-v-560c6634]:focus,.el-button--primary[data-v-560c6634]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-560c6634]{margin-top:40px}.el-col[data-v-560c6634]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-560c6634]{width:200px;margin:0 20px}[data-v-560c6634] .el-tree-node__content{height:40px!important}[data-v-560c6634] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-560c6634]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-560c6634]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-560c6634]{width:120px;height:120px;display:block}

dist/static/css/chunk-620eeec0.bd7ee01b.css

@@ -0,0 +1 @@
+.m-container[data-v-220d30c4]{min-width:100%}.el-input[data-v-220d30c4]{width:400px}[data-v-220d30c4] .ql-editor{min-height:300px}.el-button--primary[data-v-220d30c4],.el-button--primary[data-v-220d30c4]:active,.el-button--primary[data-v-220d30c4]:focus,.el-button--primary[data-v-220d30c4]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-220d30c4]{margin-top:40px}.el-col[data-v-220d30c4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-220d30c4]{width:200px;margin:0 20px}[data-v-220d30c4] .el-tree-node__content{height:40px!important}[data-v-220d30c4] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-220d30c4]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-220d30c4]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-220d30c4]{width:120px;height:120px;display:block}.ivu-upload[data-v-220d30c4]{display:none}

dist/static/css/chunk-679961d8.ce660743.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-70b81190],.el-button--primary[data-v-70b81190]:active,.el-button--primary[data-v-70b81190]:focus,.el-button--primary[data-v-70b81190]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-70b81190]{margin-top:40px}.el-col[data-v-70b81190]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-70b81190]{width:200px;margin:0 20px}[data-v-70b81190] .el-tree-node__content{height:40px!important}

dist/static/css/chunk-ace4125a.3c6ca848.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-e124187a],.el-button--primary[data-v-e124187a]:active,.el-button--primary[data-v-e124187a]:focus,.el-button--primary[data-v-e124187a]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-e124187a] .el-date-editor.el-input,[data-v-e124187a] .el-select{width:100%!important}[data-v-e124187a] .el-form-item__content{font-size:14px!important;margin-right:5%}.infoWrap[data-v-e124187a]{margin-top:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.infoWrap .left[data-v-e124187a]{max-width:1000px;width:100%}.infoWrap .left h4[data-v-e124187a]{margin-bottom:20px}.infoWrap .right[data-v-e124187a]{margin-left:100px}.infoWrap .right .teacherIcon[data-v-e124187a]{width:150px;height:150px;border-radius:50%;overflow:hidden}.infoWrap .right .teacherIcon img[data-v-e124187a]{width:150px;height:150px}.salarySet h3[data-v-83b406c0]{margin-top:10px;margin-bottom:10px;font-size:14px;color:#444;font-weight:400}.salarySet .tableList .left[data-v-83b406c0],.salarySet .tableList .right[data-v-83b406c0]{float:left}.salarySet .tableList .left[data-v-83b406c0]{width:70%;margin-right:2%}.salarySet .tableList .right[data-v-83b406c0]{width:56%;margin-left:2%}[data-v-83b406c0] .el-table__body tr td:nth-child(3){border-right:1px solid #ebeef5}[data-v-83b406c0] .el-input-group__append{background-color:#f5f7fa;color:#909399;vertical-align:middle;display:table-cell;position:relative;border:1px solid #dcdfe6;border-left:0}

dist/static/css/chunk-ad337250.b01e8767.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-60d3d21a],.el-button--primary[data-v-60d3d21a]:active,.el-button--primary[data-v-60d3d21a]:focus,.el-button--primary[data-v-60d3d21a]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-60d3d21a]{margin-top:40px}.el-col[data-v-60d3d21a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-60d3d21a]{width:200px;margin:0 20px}[data-v-60d3d21a] .el-tree-node__content{height:40px!important}

dist/static/css/chunk-d01d288a.af578b7f.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-9006ec52],.el-button--primary[data-v-9006ec52]:active,.el-button--primary[data-v-9006ec52]:focus,.el-button--primary[data-v-9006ec52]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-9006ec52]{margin-top:40px}.el-col[data-v-9006ec52]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-9006ec52]{width:200px;margin:0 20px}[data-v-9006ec52] .el-tree-node__content{height:40px!important}.moreRule[data-v-9006ec52]{background:#f0f0f0;position:relative}.moreRule .el-form-item__error[data-v-9006ec52]{color:#f56c6c;font-size:12px;line-height:1;position:absolute;left:120px;top:100%;margin-top:-21px}.add[data-v-9006ec52]{margin-bottom:22px;background:#f0f0f0;padding-bottom:22px}.moreRuleIn .el-form-item[data-v-9006ec52]{display:inline-block}.moreRuleIn .el-form-item[data-v-9006ec52]:first-child .el-form-item__content{margin-left:120px!important}.moreRuleIn .el-form-item[data-v-9006ec52] .el-form-item__content{margin-left:0!important}.max[data-v-9006ec52],.min[data-v-9006ec52]{display:inline-block;width:180px;text-align:center;margin-right:10px}

dist/static/css/chunk-de6d6f40.6d7b5fa3.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-43567e09],.el-button--primary[data-v-43567e09]:active,.el-button--primary[data-v-43567e09]:focus,.el-button--primary[data-v-43567e09]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-43567e09]{margin-top:40px}.el-col[data-v-43567e09]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-43567e09]{width:200px;margin:0 20px}[data-v-43567e09] .el-tree-node__content{height:40px!important}.moreRule[data-v-43567e09]{background:#f0f0f0;position:relative}.moreRule .el-form-item__error[data-v-43567e09]{color:#f56c6c;font-size:12px;line-height:1;position:absolute;left:120px;top:100%;margin-top:-21px}.add[data-v-43567e09]{margin-bottom:22px;background:#f0f0f0;padding-bottom:22px}.moreRuleIn .el-form-item[data-v-43567e09]{display:inline-block}.moreRuleIn .el-form-item[data-v-43567e09]:first-child .el-form-item__content{margin-left:120px!important}.moreRuleIn .el-form-item[data-v-43567e09] .el-form-item__content{margin-left:0!important}.max[data-v-43567e09],.min[data-v-43567e09]{display:inline-block;width:180px;text-align:center;margin-right:10px}

src/views/businessManager/shopManager/shopOperation.vue

@@ -165,24 +165,31 @@ export default {
     }
   },
   created () {
-    let query = this.$route.query
-    if (query.paramInfo) {
-      let paramInfo = JSON.parse(query.paramInfo)
-      this.pageType = paramInfo.type
-      this.id = paramInfo.id
-    }
-    if (query.search) {
-      this.Fsearch = query.search;
-    }
-    if (query.pageInfo) {
-      this.Frules = query.pageInfo
-    }
+    this.init()
+  },
+  activated () {
+    this.init()
   },
   mounted () {
-    this.getList()
-    this.getCatagory()
+
   },
   methods: {
+    init () {
+      let query = this.$route.query
+      if (query.paramInfo) {
+        let paramInfo = JSON.parse(query.paramInfo)
+        this.pageType = paramInfo.type
+        this.id = paramInfo.id
+      }
+      if (query.search) {
+        this.Fsearch = query.search;
+      }
+      if (query.pageInfo) {
+        this.Frules = query.pageInfo
+      }
+      this.getList()
+      this.getCatagory()
+    },
     onSubmit (formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
@@ -219,25 +226,55 @@ export default {
       this.$refs[formName].resetFields()
     },
     getList () {
-      if (this.pageType == 'create') return false
-      goodsSingleQuery(this.id).then(res => {
-        if (res.code == 200) {
-          let result = res.data
-          this.form = {
-            id: result.id,
-            brand: result.brand,
-            name: result.name,
-            type: result.type,
-            goodsCategoryId: result.goodsCategoryId,
-            specification: result.specification,
-            marketPrice: result.marketPrice,
-            groupPurchasePrice: result.groupPurchasePrice,
-            discountPrice: result.discountPrice,
-            image: result.image,
-            desc: result.desc
-          }
+      if (this.pageType == 'create') {
+        this.form = {
+          // brand: 'xxxl',
+          // name: '长号',
+          // type: 'INSTRUMENT',
+          // goodsCategoryId: 7,
+          // specification: 'xxxeed',
+          // marketPrice: 10000,
+          // groupPurchasePrice: 9000,
+          // discountPrice: 8000,
+          // image: null,
+          // desc: 'C调、法式键、曲列、E键、白铜按键、台湾镍白'
+          brand: null,
+          name: null,
+          type: null,
+          goodsCategoryId: null,
+          specification: null,
+          marketPrice: null,
+          groupPurchasePrice: null,
+          discountPrice: null,
+          image: null,
+          desc: null
         }
-      })
+        // console.log(this.$refs['form'])
+        if (this.$refs['form']) {
+          this.$refs['form'].resetFields();
+        }
+
+      } else {
+        goodsSingleQuery(this.id).then(res => {
+          if (res.code == 200) {
+            let result = res.data
+            this.form = {
+              id: result.id,
+              brand: result.brand,
+              name: result.name,
+              type: result.type,
+              goodsCategoryId: result.goodsCategoryId,
+              specification: result.specification,
+              marketPrice: result.marketPrice,
+              groupPurchasePrice: result.groupPurchasePrice,
+              discountPrice: result.discountPrice,
+              image: result.image,
+              desc: result.desc
+            }
+          }
+        })
+      }
+
     },
     getCatagory () {
       categoryListTree({

src/views/categroyManager/insideSetting/adminOperation.vue

@@ -56,9 +56,9 @@ export default {
   data () {
     return {
       organId: null,
-      pageType: this.$route.query.type,
-      id: this.$route.query.id,
-      page: this.$route.query.page,
+      pageType: null,
+      id: null,
+      page: null,
       isIndeterminate: false,
       data: [],
       defaultProps: {
@@ -76,9 +76,21 @@ export default {
     }
   },
   mounted () {
-    this.lookSilder()
+    this.init()
+  },
+  activated () {
+    this.init()
   },
   methods: {
+    init () {
+      this.pageType = this.$route.query.type
+      this.id = this.$route.query.id
+      this.page = this.$route.query.page
+      if (this.pageType == 'create') {
+
+      }
+      this.lookSilder()
+    },
     onSubmit () {
       let tempIds = this.$refs.tree.getCheckedKeys()
       let halfIds = this.$refs.tree.getHalfCheckedKeys()
@@ -119,7 +131,7 @@ export default {
         tempData = this.setTableData(silderList.data)
         this.data = tempData
       }
-
+      // console.log(this.pageType)
       if (this.pageType == 'update') {
         let roleInfo = await getRoleInfo({ id: this.id })
         if (roleInfo.code == 200) {
@@ -132,6 +144,8 @@ export default {
           roleData.menuIds = tSplice
           this.result = roleData
         }
+      } else {
+        this.onReSet()
       }
     },
     onTreeCheck () {

src/views/categroyManager/insideSetting/branchActiveOperation.vue

@@ -106,15 +106,13 @@
                      @change="onSubjectChange('search')"
                      v-model="result.subjectIds"
                      placeholder="请选择">
-            <el-option-group
-              v-for="(group, index) in subjectTreeList"
-              :key="index"
-              :label="group.label">
-              <el-option
-                v-for="(item, i) in group.options"
-                :key="i"
-                :label="item.label"
-                :value="item.value.toString()">
+            <el-option-group v-for="(group, index) in subjectTreeList"
+                             :key="index"
+                             :label="group.label">
+              <el-option v-for="(item, i) in group.options"
+                         :key="i"
+                         :label="item.label"
+                         :value="item.value.toString()">
               </el-option>
             </el-option-group>
           </el-select>
@@ -193,6 +191,13 @@ export default {
   mounted () {
     this.__init()
   },
+  activated () {
+    this.pageType = this.$route.query.type
+    this.id = this.$route.query.id
+    this.pageInfo = this.$route.query.pageInfo
+    this.searchForm = this.$route.query.searchForm
+    this.__init()
+  },
   methods: {
     async __init () {
       this.$refs.form.resetFields()
@@ -219,13 +224,13 @@ export default {
       }
 
       let subjectTree = await getSoundTree({ delFlag: 0, rows: 9999 })
-      if(subjectTree.code == 200) {
+      if (subjectTree.code == 200) {
         let subjectResult = subjectTree.data
         subjectResult.rows.forEach(element => {
           let tempElement = {}
           tempElement = { label: element.name, options: [] }
           // 判断子级声部是否为空
-          if(element.subjects) {
+          if (element.subjects) {
             element.subjects.forEach(subject => {
               tempElement.options.push({
                 value: subject.id,
@@ -264,13 +269,15 @@ export default {
             errorText: null
           }
         }
+      } else {
+        this.resetForm()
       }
     },
-    async onSubjectChange(type) {
+    async onSubjectChange (type) {
       let organId = this.result.organId
       let subject = this.result.subjectIds
       // 判断是否有分部和声部
-      if(subject.length <= 0 || !organId || organId == '') {
+      if (subject.length <= 0 || !organId || organId == '') {
         this.teacherList = []
         this.result.teacherId = []
         return
@@ -278,7 +285,7 @@ export default {
       let subjectIds = Object.assign([], subject).join(',')
       await findTeacherByOrganId({ organId: organId, subjectIds: subjectIds, jobNature: 'FULL_TIME' }).then(res => {
         if (res.code == 200) {
-          if(type != 'update') {
+          if (type != 'update') {
             this.teacherList = []
             this.result.teacherId = []
           }
@@ -291,8 +298,8 @@ export default {
         }
       })
     },
-    onCheckAll() { // 全选老师
-      if(this.teacherList.length <= 0) {
+    onCheckAll () { // 全选老师
+      if (this.teacherList.length <= 0) {
         return
       }
       this.result.teacherId = []

src/views/categroyManager/vipActiveList.vue

@@ -135,6 +135,7 @@
     </div>
     <el-dialog title='提示'
                width="60%"
+               :before-close='closeVipform'
                :visible.sync="dialogVisible">
       <div>
         <el-form :label-position="labelPosition"
@@ -617,11 +618,24 @@ export default {
       this.$refs['vipform'].validate((valid) => {
         if (valid) {
           // 验证通过
+          let coursesStartTime;
+          let coursesEndTime;
+          let startTime;
+          let endTime;
+          if (!this.resetForm.courseTime) {
+            coursesStartTime = null;
+            coursesEndTime = null;
+          }
+          if (!this.resetForm.activeTime) {
+            startTime = null;
+            endTime = null;
+            console.log(111)
+          }
           let id = this.activeId;
-          let coursesStartTime = this.resetForm.courseTime[0];
-          let coursesEndTime = this.resetForm.courseTime[1];
-          let startTime = this.resetForm.activeTime[0];
-          let endTime = this.resetForm.activeTime[1];
+          // let coursesStartTime = this.resetForm.courseTime[0] || null;
+          // let coursesEndTime = this.resetForm.courseTime[1] || null;
+          // let startTime = this.resetForm.activeTime[0] || null;
+          // let endTime = this.resetForm.activeTime[1] || null;
           let organId = this.resetForm.organ.join(',');
           let type = this.activeType;
           let vipGroupCategoryIdList = this.resetForm.stauts.join(',')
@@ -700,6 +714,11 @@ export default {
       let rules = JSON.stringify(this.rules)
       let searchForm = JSON.stringify(this.searchForm)
       this.$router.push({ path: '/vipClassSet/vipNewActive?type=create', query: { rules, searchForm } })
+    },
+    closeVipform () {
+      console.log(111)
+      this.$refs['vipform'].resetFields()
+      this.dialogVisible = false;
     }
   },
 }

src/views/contentManager/contentOperation.vue

@@ -177,7 +177,6 @@ export default {
     }
   },
   created () {
-    console.log(this.$route)
   },
   mounted () {
     this.init()
@@ -196,8 +195,11 @@ export default {
       }
       this.$refs['form'].resetFields();
     }
+    this.type = this.$route.query.type
+    this.pageType = this.$route.query.pageType
     this.init()
 
+
   },
   methods: {
     init () {

src/views/resetTeaming/components/resetSound.vue

@@ -357,19 +357,20 @@ export default {
                 // let price = sub.price
                 if (sub.kitGroupPurchaseTypeJson) {
                   let expectJson = JSON.parse(sub.kitGroupPurchaseTypeJson);
-
-                  if (expectJson && expectJson.FREE) {
+                  if (expectJson && expectJson.hasOwnProperty("FREE")) {
                     FREE = expectJson.FREE
                     isFREE = true
+
                   }
-                  if (expectJson && expectJson.LEASE) {
+                  if (expectJson && expectJson.hasOwnProperty("LEASE")) {
                     LEASE = expectJson.LEASE
                     isLEASE = true;
                   }
-                  if (expectJson && expectJson.GROUP) {
+                  if (expectJson && expectJson.hasOwnProperty("GROUP")) {
                     GROUP = expectJson.GROUP
                     isGROUP = true
                   }
+
                 }
                 fangshi.push({
                   shopName: sub.name,

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

@@ -192,6 +192,10 @@ export default {
   mounted () {
     this.__init()
   },
+  activated () {
+    this.pageType = this.$route.query.type
+    this.__init()
+  },
   methods: {
     __init () {
       // 获取课程形态 设置vip课酬

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

@@ -325,23 +325,31 @@ 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()
   },
+  activated () {
+    this.pageType = this.$route.query.type
+    this.teacherId = this.$route.query.teacherId
+    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
+      }
       branchQueryPage({ // 获取分部
         delFlag: 0,
         rows: 9999
       }).then(res => {
         if (res.code == 200 && res.data && res.data.rows) {
+          this.branchList = []
           res.data.rows.forEach(item => {
             this.branchList.push({
               label: item.name,

src/views/teacherManager/teacherOperation/index.vue

@@ -48,20 +48,28 @@ 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
-    }
-    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')
+    this.init()
+  },
+  activated () {
+    this.teacherId = this.$route.query.teacherId
+    this.pageType = this.$route.query.type
+    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
+      }
+      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')
+    },
     handleClick (val) {
       this.activeName = val.name
       this.activeStatus[val.name] = true

src/views/teamBuild/components/teamBaseInfo.vue

@@ -458,8 +458,6 @@ export default {
     this.init()
   },
   mounted () {
-
-
     // 获取分部下的员工
 
   },

src/views/teamBuild/components/teamSoundMoney.vue

@@ -514,15 +514,16 @@ export default {
                       if (sub.kitGroupPurchaseTypeJson) {
                         let expectJson = JSON.parse(sub.kitGroupPurchaseTypeJson);
 
-                        if (expectJson && expectJson.FREE) {
+                        if (expectJson && expectJson.hasOwnProperty("FREE")) {
                           FREE = expectJson.FREE
                           isFREE = true
+
                         }
-                        if (expectJson && expectJson.LEASE) {
+                        if (expectJson && expectJson.hasOwnProperty("LEASE")) {
                           LEASE = expectJson.LEASE
                           isLEASE = true;
                         }
-                        if (expectJson && expectJson.GROUP) {
+                        if (expectJson && expectJson.hasOwnProperty("GROUP")) {
                           GROUP = expectJson.GROUP
                           isGROUP = true
                         }

src/views/teamDetail/components/baseInfo.vue

@@ -123,33 +123,39 @@ export default {
     // 获取乐团基本信息
     // let teamid = '191014135135001';
     // this.creatQrCode();
-    getMusicGroup({
-      musicGroupId: this.teamid
-    }).then(res => {
-      if (res.code == 200) {
-        this.topForm.num = res.data.id;
-        // this.topForm.teacher = res.data.teamTeacherName;
-        this.topForm.teacher = res.data.educationalTeacherName;
-        this.topForm.boss = res.data.directorUserName;
-        this.topForm.cooperate = res.data.schoolName;
-        this.topForm.type = res.data.chargeTypeName;
-        this.topForm.section = res.data.organName;
-        this.topForm.add = res.data.address
-        // 差上课地点
-        this.$emit('getname', res.data.name)
-      }
-    })
-
-    // 根据乐团id获取乐团流程
-    getMusicGroupProcess({
-      musicGroupId: this.teamid
-    }).then(res => {
-      if (res.code == 200) {
-        this.processList = res.data;
-      }
-    })
+    this.init()
+  },
+  activated () {
+    this.init()
   },
   methods: {
+    init () {
+      getMusicGroup({
+        musicGroupId: this.teamid
+      }).then(res => {
+        if (res.code == 200) {
+          this.topForm.num = res.data.id;
+          // this.topForm.teacher = res.data.teamTeacherName;
+          this.topForm.teacher = res.data.educationalTeacherName;
+          this.topForm.boss = res.data.directorUserName;
+          this.topForm.cooperate = res.data.schoolName;
+          this.topForm.type = res.data.chargeTypeName;
+          this.topForm.section = res.data.organName;
+          this.topForm.add = res.data.address
+          // 差上课地点
+          this.$emit('getname', res.data.name)
+        }
+      })
+
+      // 根据乐团id获取乐团流程
+      getMusicGroupProcess({
+        musicGroupId: this.teamid
+      }).then(res => {
+        if (res.code == 200) {
+          this.processList = res.data;
+        }
+      })
+    },
     creatQrCode () {
       var qrcode = new QRCode(this.$refs.qrCodeUrl, {
         text: 'http://www.baidu.com',

src/views/teamDetail/components/classList.vue

@@ -181,6 +181,9 @@ export default {
   mounted () {
     this.getList();
   },
+  activated () {
+    this.getList();
+  },
   methods: {
     permission (str) {
       return permission(str)

src/views/teamDetail/components/courseList.vue

@@ -321,33 +321,33 @@ export default {
     pagination
   },
   mounted () {
-    this.getList();
-    // 获取所有老师
-    // findMusicGroupClassTeacher({ musicGroupId: this.teamid }).then(res => {
-    //   if (res.code == 200) {
-    //     this.teacherList = res.data;
-    //   }
-    // })
-    getTeacher().then(res => {
-      if (res.code == 200) {
-        this.teacherList = res.data;
-      }
-    })
-
-    // 获取班级列表
-    getMusicGroupAllClass({ musicGroupId: this.teamid }).then(res => {
-      if (res.code == 200) {
-        this.classList = res.data;
-      }
-    })
+    this.init()
+  },
+  activated () {
+    this.init()
   },
   methods: {
-    /**
-     *  courseStatus: '', // 课程类型
-        classStatus: '', // 课程状态
-        timer:[] // 时间
-     * 
-     */
+    init () {
+      this.getList();
+      // 获取所有老师
+      // findMusicGroupClassTeacher({ musicGroupId: this.teamid }).then(res => {
+      //   if (res.code == 200) {
+      //     this.teacherList = res.data;
+      //   }
+      // })
+      getTeacher().then(res => {
+        if (res.code == 200) {
+          this.teacherList = res.data;
+        }
+      })
+
+      // 获取班级列表
+      getMusicGroupAllClass({ musicGroupId: this.teamid }).then(res => {
+        if (res.code == 200) {
+          this.classList = res.data;
+        }
+      })
+    },
     search () {
       this.rules.page = 1;
       this.getList();

src/views/teamDetail/components/salaryList.vue

@@ -208,6 +208,9 @@ export default {
   mounted () {
     this.getList();
   },
+  activated () {
+    this.getList()
+  },
   methods: {
     search () {
       this.rules.page = 1;

src/views/teamDetail/components/studentList.vue

@@ -368,7 +368,9 @@
         </el-form-item>
         <el-form-item label="课程费用"
                       prop="courseFee">
-          <el-input v-model="maskForm.courseFee" type="number" @mousewheel.native.prevent
+          <el-input v-model="maskForm.courseFee"
+                    type="number"
+                    @mousewheel.native.prevent
                     placeholder="续费金额"></el-input>
         </el-form-item>
         <br>
@@ -445,10 +447,15 @@
             <el-form-item>
               <el-input v-model="maskForm.musicPrice"
                         placeholder="输入金额">
-                <el-select v-model="maskForm.kitGroupPurchaseType" style="width: 80px !important;" slot="prepend">
-                  <el-option label="免费" value="FREE"></el-option>
-                  <el-option label="团购" value="GROUP"></el-option>
-                  <el-option label="租赁" value="LEASE"></el-option>
+                <el-select v-model="maskForm.kitGroupPurchaseType"
+                           style="width: 80px !important;"
+                           slot="prepend">
+                  <el-option label="免费"
+                             value="FREE"></el-option>
+                  <el-option label="团购"
+                             value="GROUP"></el-option>
+                  <el-option label="租赁"
+                             value="LEASE"></el-option>
                 </el-select>
               </el-input>
             </el-form-item>
@@ -767,53 +774,56 @@ export default {
     }
   },
   mounted () {
-
-    // 获取汇总数据
-    getTeamStudentInfo({ musicGroupId: this.teamid }).then(res => {
-      if (res.code == 200) {
-        this.studentListInfo = res.data;
-      }
-    });
-    this.getList();
-    // 获取乐团内所有声部
-    findSound({ musicGroupId: this.teamid }).then(res => {
-      if (res.code == 200) {
-        this.soundList = res.data;
-      }
-    })
-
-    // getSubject().then(res => {
-    //   if (res.code == 200) {
-    //     this.soundList = res.data;
-    //   }
-    // })
-    // 获取乐团所有单技课班
-    // getSingleClass({ musicGroupId: this.teamid }).then(res => {
-    //   if (res.code == 200) {
-    //     this.signList = res.data;
-    //   }
-    // })
-    // 获取乐团所有合奏课
-    getMusicGroupAllClass({ musicGroupId: this.teamid }).then(res => {
-      if (res.code == 200) {
-        this.classList = res.data;
-        res.data.forEach(item => {
-          if (item.type == 'NORMAL') {
-            this.signList.push(item);
-          } else if (item.type == 'MIX') {
-            this.mixList.push(item);
-          } else if (item.type == 'HIGH') {
-            this.highList.push(item)
-          } else if (item.type == 'SNAP') {
-            this.snapList.push(item);
-          }
-        })
-      }
-    })
-
-
+    this.init()
+  },
+  activated () {
+    this.init()
   },
   methods: {
+    init () {
+      // 获取汇总数据
+      getTeamStudentInfo({ musicGroupId: this.teamid }).then(res => {
+        if (res.code == 200) {
+          this.studentListInfo = res.data;
+        }
+      });
+      this.getList();
+      // 获取乐团内所有声部
+      findSound({ musicGroupId: this.teamid }).then(res => {
+        if (res.code == 200) {
+          this.soundList = res.data;
+        }
+      })
+
+      // getSubject().then(res => {
+      //   if (res.code == 200) {
+      //     this.soundList = res.data;
+      //   }
+      // })
+      // 获取乐团所有单技课班
+      // getSingleClass({ musicGroupId: this.teamid }).then(res => {
+      //   if (res.code == 200) {
+      //     this.signList = res.data;
+      //   }
+      // })
+      // 获取乐团所有合奏课
+      getMusicGroupAllClass({ musicGroupId: this.teamid }).then(res => {
+        if (res.code == 200) {
+          this.classList = res.data;
+          res.data.forEach(item => {
+            if (item.type == 'NORMAL') {
+              this.signList.push(item);
+            } else if (item.type == 'MIX') {
+              this.mixList.push(item);
+            } else if (item.type == 'HIGH') {
+              this.highList.push(item)
+            } else if (item.type == 'SNAP') {
+              this.snapList.push(item);
+            }
+          })
+        }
+      })
+    },
     onMusicGroupExport () {
       let url = '/api-web/export/musicGroupStudent'
       let data = {

src/views/teamDetail/components/studentSignin.vue

@@ -117,25 +117,31 @@ export default {
     }
   },
   created () {
-    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.init()
   },
-  mounted () {
-    this.getList();
-    // 获取乐团所有班级
-    getMusicGroupAllClass({ musicGroupId: this.teamid }).then(res => {
-      if (res.code == 200) {
-        this.classList = res.data;
-      }
-    })
+  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
+      }
+    },
+    mounted () {
+      this.getList();
+      // 获取乐团所有班级
+      getMusicGroupAllClass({ musicGroupId: this.teamid }).then(res => {
+        if (res.code == 200) {
+          this.classList = res.data;
+        }
+      })
+    },
     search () {
       this.rules.page = 1;
       this.getList()

src/views/teamDetail/components/teacherList.vue

@@ -141,6 +141,14 @@ export default {
       }
     })
   },
+  activated () {
+    this.getList();
+    getAllClass({ musicGroupId: this.teamid }).then(res => {
+      if (res.code == 200) {
+        this.mixCourseList = res.data;
+      }
+    })
+  },
   methods: {
     search () {
       this.rules.page = 1;

src/views/teamDetail/components/teamTeacherRecord.vue

@@ -122,6 +122,10 @@ export default {
     // })
     this.getList()
   },
+  activated () {
+    this.teamId = this.$route.query.id;
+    this.getList()
+  },
   methods: {
     onCancel () {
       // window.history.back()

src/views/teamDetail/index.vue

@@ -101,6 +101,19 @@ export default {
   mounted () {
 
   },
+  activated () {
+    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
+    }
+  },
   methods: {
     handleClick (val) {
       this.activeIndex = val.name;