01/17 14:44

提交测试

dist/static/css/chunk-1348e40c.8e6461d5.css

@@ -0,0 +1 @@
+.floor[data-v-0414fdf4]{padding-right: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:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-0414fdf4]{background:#f85043;margin-left:164px}.floor .add[data-v-0414fdf4],.floor .remove[data-v-0414fdf4]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-0414fdf4]{background:#14928a;margin-left:20px}.studentMask[data-v-0414fdf4]{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}.studentMask .left[data-v-0414fdf4]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-0414fdf4]{margin-bottom:20px}.studentMask .left h4[data-v-0414fdf4]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-0414fdf4]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-0414fdf4]{padding-left:10px;line-height:25px}.studentMask .right[data-v-0414fdf4]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-0414fdf4]{max-height:500px;overflow-y:auto}.resetClassForm[data-v-0414fdf4] .el-date-editor.el-input,.resetClassForm[data-v-0414fdf4] .el-date-editor.el-input__inner{width:180px!important}[data-v-0414fdf4] .el-date-editor.el-input,[data-v-0414fdf4] .el-date-editor.el-input__inner{width:100px!important}

dist/static/css/chunk-be41ce56.a698c5bd.css → dist/static/css/chunk-33fd6bb7.2bd2531c.css

@@ -1 +1 @@
-.m-core[data-v-3fea3bc2]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-3fea3bc2]{width:180px}.m-core h4[data-v-3fea3bc2]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-3fea3bc2],.m-core .right[data-v-3fea3bc2],.m-core .vipLeft[data-v-3fea3bc2]{width:400px}.planList[data-v-3fea3bc2]{padding:0 25px}.planList .planTop[data-v-3fea3bc2]{height:40px;line-height:40px;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:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-3fea3bc2]{font-size:14px}.planList .planCore .row[data-v-3fea3bc2]{width:100%;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:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-3fea3bc2]{width:87px}.okBtn[data-v-3fea3bc2]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}
+.m-core[data-v-07b656d3]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-07b656d3]{width:180px}.m-core h4[data-v-07b656d3]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-07b656d3],.m-core .right[data-v-07b656d3],.m-core .vipLeft[data-v-07b656d3]{width:400px}.planList[data-v-07b656d3]{padding:0 25px}.planList .planTop[data-v-07b656d3]{height:40px;line-height:40px;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:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-07b656d3]{font-size:14px}.planList .planCore .row[data-v-07b656d3]{width:100%;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:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-07b656d3]{width:87px}.okBtn[data-v-07b656d3]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}

dist/static/css/chunk-eb022496.34c43786.css

@@ -1 +0,0 @@
-.floor[data-v-1a0a7dcc]{padding-right: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:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-1a0a7dcc]{background:#f85043;margin-left:164px}.floor .add[data-v-1a0a7dcc],.floor .remove[data-v-1a0a7dcc]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-1a0a7dcc]{background:#14928a;margin-left:20px}.studentMask[data-v-1a0a7dcc]{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}.studentMask .left[data-v-1a0a7dcc]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-1a0a7dcc]{margin-bottom:20px}.studentMask .left h4[data-v-1a0a7dcc]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-1a0a7dcc]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-1a0a7dcc]{padding-left:10px;line-height:25px}.studentMask .right[data-v-1a0a7dcc]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-1a0a7dcc]{max-height:500px;overflow-y:auto}.resetClassForm[data-v-1a0a7dcc] .el-date-editor.el-input,.resetClassForm[data-v-1a0a7dcc] .el-date-editor.el-input__inner{width:180px!important}[data-v-1a0a7dcc] .el-date-editor.el-input,[data-v-1a0a7dcc] .el-date-editor.el-input__inner{width:100px!important}

src/views/buildVip/index.vue

@@ -1077,9 +1077,22 @@ export default {
         // 新增
         createVip(obj).then(res => {
           if (res.code == 200) {
-            // if(res.msg == '')
-            this.$message.success('恭喜您创建成功');
-            this.$router.push({ path: '/business/vipList', query: { rules: this.rules, searchForm: this.searchForm } })
+            if (res.data == 'ING') {
+              this.$confirm('课程提交成功，已提交运营主管审批,审批通过后，课程后创建成功！', '提示', {
+                confirmButtonText: '确定',
+                type: 'warning'
+              }).then(() => {
+                this.$message({
+                  type: 'success',
+                  message: '删除成功!'
+                });
+              })
+            } else {
+
+              this.$message.success('恭喜您创建成功');
+              this.$router.push({ path: '/business/vipList', query: { rules: this.rules, searchForm: this.searchForm } })
+            }
+
           }
         })
       } else {

src/views/resetTeaming/components/resetSound.vue

@@ -329,25 +329,31 @@ export default {
     }
   },
   mounted () {
-    // 获取声部信息
-    this.teamid = this.$route.query.id
-
-    sessionStorage.setItem('resetCode', '2');
-    // 获取所有声部
-    getSoundTree().then(res => {
-      if (res.code == 200) {
-        this.soundList = res.data.rows;
-        // // 生成动态的checkList
-        for (let key in this.soundList) {
-          this.$set(this.soundLists, key, [])
-        }
-        this.getSound();
-      }
-
-    })
 
+    this.init()
+  },
+  activated () {
+    this.init()
   },
   methods: {
+    init () {
+      // 获取声部信息
+      this.teamid = this.$route.query.id
+
+      sessionStorage.setItem('resetCode', '2');
+      // 获取所有声部
+      getSoundTree().then(res => {
+        if (res.code == 200) {
+          this.soundList = res.data.rows;
+          // // 生成动态的checkList
+          for (let key in this.soundList) {
+            this.$set(this.soundLists, key, [])
+          }
+          this.getSound();
+        }
+
+      })
+    },
     changeList (e) {
     },
     getSound () {
@@ -709,7 +715,7 @@ export default {
           str += `团购:减免金额${val[i].mode['GROUP']}\n`
         }
         if (val[i].mode.isLEASE) {
-          str += `租赁:${val[i].mode.depositFee},减免金额${val[i].mode['FREE']}\n`
+          str += `租赁:${val[i].mode.depositFee},减免金额${val[i].mode['LEASE']}\n`
         }
       }
       // if (val == 'FREE') {

src/views/teamBuild/components/teamSoundMoney.vue

@@ -1119,7 +1119,7 @@ export default {
           str += `团购:团购价${val[i].mode['price']},减免金额${val[i].mode['GROUP']}\n`
         }
         if (val[i].mode.isLEASE) {
-          str += `租赁:${val[i].mode.depositFee},减免金额${val[i].mode['FREE']}\n`
+          str += `租赁:${val[i].mode.depositFee},减免金额${val[i].mode['LEASE']}\n`
         }
       }
       // if (val == 'FREE') {

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

@@ -363,35 +363,42 @@ export default {
     }
   },
   created () {
-    this.teamid = this.$route.query.id;
-    sessionStorage.setItem('resetCode', 3)
-    sessionStorage.setItem('setStep', 2)
-    this.type = this.$route.query.type || '';
+    this.init()
   },
   mounted () {
-    // 根据乐团id 查询 此乐团所有的合奏班
-    getAllClass({ musicGroupId: this.teamid }).then(res => {
-      if (res.code == 200) {
-        this.maxClassList = res.data;
-      }
-    })
-    let year = new Date().getFullYear();
-    getHoliday({ year }).then(res => {
-      if (res.code == 200) {
-        let data = JSON.parse(res.data);
-        this.holidayList = Object.keys(data[year])
-        // console.log(this.holidayList)
-      }
-    })
-    // axios.post('/jiari/', qs.stringify({ d: year })).then(res => {
-    //   if (res) {
-    //     this.holidayList = Object.keys(res.data[year])
-    //   }
 
-    // })
 
   },
+  activated () {
+    this.init()
+  },
   methods: {
+    init () {
+      this.teamid = this.$route.query.id;
+      sessionStorage.setItem('resetCode', 3)
+      sessionStorage.setItem('setStep', 2)
+      this.type = this.$route.query.type || '';
+      // 根据乐团id 查询 此乐团所有的合奏班
+      getAllClass({ musicGroupId: this.teamid }).then(res => {
+        if (res.code == 200) {
+          this.maxClassList = res.data;
+        }
+      })
+      let year = new Date().getFullYear();
+      getHoliday({ year }).then(res => {
+        if (res.code == 200) {
+          let data = JSON.parse(res.data);
+          this.holidayList = Object.keys(data[year])
+          // console.log(this.holidayList)
+        }
+      })
+      // axios.post('/jiari/', qs.stringify({ d: year })).then(res => {
+      //   if (res) {
+      //     this.holidayList = Object.keys(res.data[year])
+      //   }
+
+      // })
+    },
     changeCheckCard (val) {
     },
     changeTimer (item) {

src/views/teamDetail/components/resetClass.vue

@@ -743,77 +743,84 @@ export default {
     }
   },
   created () {
-    this.teamid = this.$route.query.id;
-    // 根据乐团id获取乐团所属分部
-    getTeamBaseInfo({ musicGroupId: this.teamid }).then(res => {
-      if (res.code == 200) {
-        this.organId = res.data.musicGroup.organId
-        getTeacher({ organId: this.organId }).then(res => {
-          if (res.code == 200) {
-            this.cooperationList = res.data;
-            this.teacherList = res.data;
-          }
-        })
 
-        // queryEmployByOrganId({ organId: this.organId, rows: 10000 }).then(res => {
-        //   if (res.code == 200) {
+    this.init()
+  },
+  activated () {
+    this.init()
+  },
+  mounted () {
 
-        //   }
-        // })
+  },
+  methods: {
+    init () {
+      this.teamid = this.$route.query.id;
+      // 根据乐团id获取乐团所属分部
+      getTeamBaseInfo({ musicGroupId: this.teamid }).then(res => {
+        if (res.code == 200) {
+          this.organId = res.data.musicGroup.organId
+          getTeacher({ organId: this.organId }).then(res => {
+            if (res.code == 200) {
+              this.cooperationList = res.data;
+              this.teacherList = res.data;
+            }
+          })
 
-      }
-    })
+          // queryEmployByOrganId({ organId: this.organId, rows: 10000 }).then(res => {
+          //   if (res.code == 200) {
 
-  },
-  mounted () {
-    sessionStorage.setItem('resetCode', 3)
-    // // 获取乐团下未分班的单技班
-    // findNoClassSingle({ musicGroupId: this.teamid }).then(res => {
-    //   if (res.code == 200) {
-    //     this.singleList = res.data;
-    //   }
-    // })
-    // getMusicGroupStuNoClassType
-    // 获取合奏班下
-    // 1.获取乐团下所有的合奏班
-    // 2.根据合奏班获取所有的单技班
-    // 3.根据乐团id 查询 此乐团所有的合奏班
-    // 4.获取当年的所有节假日
-    getAllClass({ musicGroupId: this.teamid }).then(res => {
-      if (res.code == 200) {
-        this.maxClassList = res.data;
-      }
-    })
-    // let year = new Date().getFullYear();
-    // axios.post('/jiari/', qs.stringify({ d: year })).then(res => {
-    //   this.holidayList = Object.keys(res.data[year])
-    // })
-    // getNoClassStudentAll({ musicGroupId: this.teamid }).then(res => {
-    // })
+          //   }
+          // })
 
+        }
+      })
+      sessionStorage.setItem('resetCode', 3)
+      // // 获取乐团下未分班的单技班
+      // findNoClassSingle({ musicGroupId: this.teamid }).then(res => {
+      //   if (res.code == 200) {
+      //     this.singleList = res.data;
+      //   }
+      // })
+      // getMusicGroupStuNoClassType
+      // 获取合奏班下
+      // 1.获取乐团下所有的合奏班
+      // 2.根据合奏班获取所有的单技班
+      // 3.根据乐团id 查询 此乐团所有的合奏班
+      // 4.获取当年的所有节假日
+      getAllClass({ musicGroupId: this.teamid }).then(res => {
+        if (res.code == 200) {
+          this.maxClassList = res.data;
+        }
+      })
+      // let year = new Date().getFullYear();
+      // axios.post('/jiari/', qs.stringify({ d: year })).then(res => {
+      //   this.holidayList = Object.keys(res.data[year])
+      // })
+      // getNoClassStudentAll({ musicGroupId: this.teamid }).then(res => {
+      // })
 
-    // 获取默认乐团内的所有班
-    this.changeMixClass()
-    // 根据乐团id获取乐团的所有声部
-    findSound({ musicGroupId: this.teamid }).then(res => {
-      if (res.code == 200) {
-        this.soundList = res.data
-      }
-    })
 
-    // 获取分部所有老师
-    // findMusicGroupClassTeacher({
-    //   musicGroupId: this.teamid
-    // }).then(res => {
-    //   if (res.code == 200) {
-    //     this.teacherList = res.data
-    //   }
-    // })
-    // 获取分部所有老师
-    // 助教是从员工表里选
+      // 获取默认乐团内的所有班
+      this.changeMixClass()
+      // 根据乐团id获取乐团的所有声部
+      findSound({ musicGroupId: this.teamid }).then(res => {
+        if (res.code == 200) {
+          this.soundList = res.data
+        }
+      })
 
-  },
-  methods: {
+      // 获取分部所有老师
+      // findMusicGroupClassTeacher({
+      //   musicGroupId: this.teamid
+      // }).then(res => {
+      //   if (res.code == 200) {
+      //     this.teacherList = res.data
+      //   }
+      // })
+      // 获取分部所有老师
+      // 助教是从员工表里选
+
+    },
     recourse (row) {
       this.weekList = [{
         week: '',

vue.config.js

@@ -19,10 +19,10 @@ 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://192.168.3.48:8080' // 乔
+let target = 'http://192.168.3.48:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**