Merge branch 'master' of http://git.dayaedu.com/molingzhide/dy-admin-manager

dist/static/css/chunk-18a66de1.f8584708.css

@@ -0,0 +1 @@
+.floor[data-v-5bb3e974]{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-5bb3e974]{background:#f85043;margin-left:164px}.floor .add[data-v-5bb3e974],.floor .remove[data-v-5bb3e974]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-5bb3e974]{background:#14928a;margin-left:20px}.studentMask[data-v-5bb3e974]{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-5bb3e974]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-5bb3e974]{margin-bottom:20px}.studentMask .left h4[data-v-5bb3e974]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-5bb3e974]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-5bb3e974]{padding-left:10px;line-height:25px}.studentMask .right .tableList[data-v-5bb3e974]{max-height:500px;overflow-y:auto}.el-date-editor.el-input[data-v-5bb3e974],.el-date-editor.el-input__inner[data-v-5bb3e974]{width:100px}

dist/static/css/chunk-4dd27246.0685f400.css

@@ -1 +0,0 @@
-.floor[data-v-8dd4a0ca]{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-8dd4a0ca]{background:#f85043;margin-left:164px}.floor .add[data-v-8dd4a0ca],.floor .remove[data-v-8dd4a0ca]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-8dd4a0ca]{background:#14928a;margin-left:20px}.studentMask[data-v-8dd4a0ca]{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-8dd4a0ca]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-8dd4a0ca]{margin-bottom:20px}.studentMask .left h4[data-v-8dd4a0ca]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-8dd4a0ca]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-8dd4a0ca]{padding-left:10px;line-height:25px}.studentMask .right .tableList[data-v-8dd4a0ca]{max-height:500px;overflow-y:auto}.el-date-editor.el-input[data-v-8dd4a0ca],.el-date-editor.el-input__inner[data-v-8dd4a0ca]{width:100px}

dist/static/css/chunk-f2673528.a1b2d5f1.css → dist/static/css/chunk-6318cce4.cded6dc5.css

@@ -1 +1 @@
-.setBtn[data-v-3b267e69]{width:120px;height:40px;line-height:40px;text-align:center;border-radius:4px;color:#fff;background-color:#444;cursor:pointer;margin:20px 0}.imc[data-v-3f537de2]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-3f537de2]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}
+.setBtn[data-v-3b267e69]{width:120px;height:40px;line-height:40px;text-align:center;border-radius:4px;color:#fff;background-color:#444;cursor:pointer;margin:20px 0}.imc[data-v-cc2f1568]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-cc2f1568]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}

dist/static/css/chunk-76b0ae86.39860240.css → dist/static/css/chunk-c53f7e5a.a7dcb92a.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-26fc51b4]{font-size:14px}.btnList[data-v-26fc51b4]{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;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-26fc51b4]{margin-right:15px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-4e8285df]{font-size:14px}.btnList[data-v-4e8285df]{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;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-4e8285df]{margin-right:15px}

dist/static/css/chunk-49e7e960.e23294e5.css → dist/static/css/chunk-d931d178.c12605f1.css

@@ -1 +1 @@
-.m-core[data-v-3bfcf84b]{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-3bfcf84b]{width:180px}.m-core h4[data-v-3bfcf84b]{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-3bfcf84b],.m-core .right[data-v-3bfcf84b],.m-core .vipLeft[data-v-3bfcf84b]{width:400px}.planList[data-v-3bfcf84b]{padding:0 25px}.planList .planTop[data-v-3bfcf84b]{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-3bfcf84b]{font-size:14px}.planList .planCore .row[data-v-3bfcf84b]{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-3bfcf84b]{width:87px}.okBtn[data-v-3bfcf84b]{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-cf4f40a0]{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-cf4f40a0]{width:180px}.m-core h4[data-v-cf4f40a0]{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-cf4f40a0],.m-core .right[data-v-cf4f40a0],.m-core .vipLeft[data-v-cf4f40a0]{width:400px}.planList[data-v-cf4f40a0]{padding:0 25px}.planList .planTop[data-v-cf4f40a0]{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-cf4f40a0]{font-size:14px}.planList .planCore .row[data-v-cf4f40a0]{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-cf4f40a0]{width:87px}.okBtn[data-v-cf4f40a0]{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/js/chunk-76f0f5c7.d7bf674f.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-76f0f5c7"],{a5ad4:function(n,e,t){"use strict";t.r(e);var c=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[n._v("\n  请假管理\n")])},u=[],a=t("2877"),l={},r=Object(a["a"])(l,c,u,!1,null,null,null);e["default"]=r.exports}}]);

src/utils/vueFilter.js

@@ -170,6 +170,15 @@ Vue.filter('attendanceType', value => {
   }
   return template[value]
 })
+// 考情签退
+Vue.filter('attendanceOutType', value => {
+  let template = {
+    0: "异常签退",
+    1: "正常签退",
+    3: "未签退"
+  }
+  return template[value]
+})
 
 // 上课类型
 Vue.filter('workType', value => {

src/views/buildVip/index.vue

@@ -4,7 +4,6 @@
       <el-page-header @back="onCancel"
                       content="VIP课申请"></el-page-header>
       <!-- <div class="squrt" /> -->
-
     </h2>
     <div class="m-core">
       <div class="vipLeft">
@@ -489,6 +488,12 @@ export default {
     // 如果有id则是修改  带出所有的数据 
     // 没有id 则是新增
     this.id = this.$route.query.id
+    if (this.$route.query.rules) {
+      this.rules = this.$route.query.rules
+    }
+    if (this.$route.query.searchForm) {
+      this.searchForm = this.$route.query.searchForm
+    }
     if (this.id) {
       // 发请求获取信息
       getVipGroupDetail({ vipGroupId: this.id }).then(res => {
@@ -504,10 +509,8 @@ export default {
       if (res.code == 200) {
         this.subjectList = res.data;
       }
-
     })
     // 获取所有老师的接口  根据声部id获取老师
-
     // 获取课程类型的接口
     vipGroupCategory({ organId: this.$store.getters.organ }).then(res => {
       if (res.code == 200) {
@@ -530,6 +533,9 @@ export default {
     },
     // 选择课程类型
     changeType (val) {
+      // 在这里清空默认课酬
+      this.rightForm.offlineCourse = '';
+      this.rightForm.onlineCourse = '';
       this.leftForm.activeType = '';
       for (let i in this.courseTypeList) {
         if (this.courseTypeList[i].id == val) {
@@ -942,7 +948,7 @@ export default {
         createVip(obj).then(res => {
           if (res.code == 200) {
             this.$message.success('恭喜您创建成功');
-            this.$router.go(-1);
+            this.$router.push({ path: '/business/vipList', query: { rules: this.rules, searchForm: this.searchForm } })
           }
         })
       } else {
@@ -956,6 +962,8 @@ export default {
     },
     setSection (val) {
       this.leftForm.section = '';
+      this.rightForm.offlineCourse = '';
+      this.rightForm.onlineCourse = '';
       getTeachSchool({ userId: val }).then(res => {
         if (res.code == 200) {
           this.scetionList = res.data;
@@ -963,7 +971,7 @@ export default {
       })
     },
     onCancel () {
-      this.$router.push('/business/vipList')
+      this.$router.push({ path: '/business/vipList', query: { rules: this.rules, searchForm: this.searchForm } })
     },
     setCourse () {
       //  

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

@@ -3,18 +3,21 @@
     <div class="tableWrap">
       <el-table :data='tableList'
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column label="乐团编号" prop="musicGroupId">
+        <el-table-column label="乐团编号"
+                         prop="musicGroupId">
         </el-table-column>
-        <el-table-column label="乐团名称" prop="musicGroupName">
+        <el-table-column label="乐团名称"
+                         prop="musicGroupName">
         </el-table-column>
-        <el-table-column label="老师类型" prop="jobType">
+        <el-table-column label="老师类型"
+                         prop="jobType">
           <template slot-scope="scope">
             {{ scope.row.jobNature | jobNature }}
           </template>
         </el-table-column>
         <el-table-column label="乐团职位">
           <template slot-scope="scope">
-            {{ scope.row.jobType | jobType }}
+            {{ scope.row.teacherRole | workType }}
           </template>
         </el-table-column>
         <el-table-column label="执教班级">
@@ -27,14 +30,15 @@
             {{ scope.row.status | musicGroupType }}
           </template>
         </el-table-column>
-        <el-table-column label="出勤次数" prop="attendanceNum">
+        <el-table-column label="出勤次数"
+                         prop="attendanceNum">
         </el-table-column>
       </el-table>
       <pagination :total="pageInfo.total"
-                :page.sync="pageInfo.page"
-                :limit.sync="pageInfo.limit"
-                :page-sizes="pageInfo.page_size"
-                @pagination="getList" />
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getList" />
     </div>
   </div>
 </template>
@@ -60,17 +64,17 @@ export default {
       }
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
   },
   methods: {
-    getList() {
-      getTeacherMusicClass({ 
+    getList () {
+      getTeacherMusicClass({
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         search: this.teacherId
       }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.tableList = res.data.rows
           this.pageInfo.total = res.data.total
         }

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

@@ -50,7 +50,7 @@
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column label="上课时间">
           <template slot-scope="scope">
-            {{ scope.row.classDate }} {{ scope.row.classTime }}
+            {{ scope.row.classDate }}
           </template>
         </el-table-column>
         <el-table-column label="班级名称"
@@ -74,11 +74,16 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="考勤状态">
+        <el-table-column label="签到">
           <template slot-scope="scope">
             {{ scope.row.signInStatus | attendanceType }}
           </template>
         </el-table-column>
+        <el-table-column label="签退">
+          <template slot-scope="scope">
+            {{ scope.row.signOutStatus | attendanceOutType }}
+          </template>
+        </el-table-column>
         <el-table-column label="老师课酬"
                          prop="actualSalary">
         </el-table-column>
@@ -256,6 +261,7 @@ export default {
         courseScheduleType: null,
         signInStatus: null
       }
+      this.getList();
     }
   }
 }

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

@@ -66,9 +66,15 @@
                            label="课程名称">
           </el-table-column>
           <el-table-column align='center'
-                           label="签到状态">
+                           label="签到">
             <template slot-scope="scope">
-              {{ scope.row.status | attendanceType }}
+              {{ scope.row.signInStatus | attendanceType }}
+            </template>
+          </el-table-column>
+          <el-table-column align='center'
+                           label="签退">
+            <template slot-scope="scope">
+              {{ scope.row.signOutStatus | attendanceOutType }}
             </template>
           </el-table-column>
           <el-table-column align='center'

src/views/teamBuild/components/teamSoundMoney.vue

@@ -485,7 +485,12 @@ export default {
               obj.musicGroupSubjectGoodsGroups.push(some);
             }
           })
-
+          let depositFee;
+          if (active.fangshi == 'LEASE') {
+            depositFee = active.fangshiprice;
+          } else {
+            depositFee = 0;
+          }
           // 添加声部
           let item = {
             expectedStudentNum: active.jihua,
@@ -493,7 +498,7 @@ export default {
             kitGroupPurchaseType: active.fangshi,
             subName: active.sound,
             subjectId: active.id,
-            depositFee: active.fangshiprice // depositFee  只有租赁才有
+            depositFee// depositFee  只有租赁才有
           }
           obj.musicGroupSubjectPlans.push(item);
         })
@@ -545,13 +550,19 @@ export default {
             }
           })
           // 添加声部
+          let depositFee;
+          if (active.fangshi == 'LEASE') {
+            depositFee = active.fangshiprice;
+          } else {
+            depositFee = 0;
+          }
           let item = {
             expectedStudentNum: active.jihua,
             fee: active.yuji,
             kitGroupPurchaseType: active.fangshi,
             subName: active.sound,
             subjectId: active.id,
-            depositFee: active.fangshiprice // depositFee  只有租赁才有
+            depositFee: depositFee // depositFee  只有租赁才有
           }
           obj.musicGroupSubjectPlans.push(item);
         })

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

@@ -103,7 +103,7 @@
       </div>
       <div class="right">
         <div class="newBand"
-             style='float:right'
+             style='float:left'
              @click="multipleReset">批量修改</div>
         <el-table :data='tableList'
                   style="width: 1060px"

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

@@ -296,16 +296,23 @@ export default {
 
     },
     removeClass (row) {
-      for (let i in this.tableList) {
-        if (this.tableList[i].moid == row.moid) {
-          this.tableList.splice(i, 1);
-          return
+      console.log(row.moid)
+      if (row.moid) {
+        for (let i in this.tableList) {
+          if (this.tableList[i].moid == row.moid) {
+            this.tableList.splice(i, 1);
+            return
+          }
         }
-        if (this.tableList[i].id == row.id) {
-          this.tableList.splice(i, 1);
-          return
+      } else {
+        for (let i in this.tableList) {
+          if (this.tableList[i].id == row.id) {
+            this.tableList.splice(i, 1);
+            return
+          }
         }
       }
+
     },
     addClass () {
       if (this.isSetSalary) {

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

@@ -272,6 +272,18 @@ export default {
 
     }
   },
+  watch: {
+    classVisible (val) {
+      if (!val) {
+        this.classVisible = false;
+        this.maskList.subjectCheckList = [];
+        this.studentsGroup = [];
+        this.activeStudents = [];
+        this.$refs['className'].resetFields();
+        this.getSingleClass();
+      }
+    }
+  },
   mounted () {
     sessionStorage.setItem('setStep', 0)
     getTeamRecruit({ musicGroupId: this.teamid }).then(res => {
@@ -519,7 +531,6 @@ export default {
       this.$refs['teacherForm'].validate(res => {
         if (res) {
           // 发请求
-
           checkAllStudent({ musicGroupId: this.teamid, teacherId: this.teacherForm.name, improventClassesNum: this.hightNum }).then(res => {
             if (res.code == 200) {
               this.$refs['teacherForm'].resetFields()
@@ -535,7 +546,8 @@ export default {
 
       });
     },
-  }
+  },
+
 }
 </script>
 <style lang="scss" scoped>

src/views/teamDetail/components/courseList.vue

@@ -58,7 +58,7 @@
         <el-table-column align='center'
                          label="时间">
           <template slot-scope="scope">
-            {{ scope.row.classDate }} {{ scope.row.startClassTime ? scope.row.startClassTime.substr(0, 5) : '' }}
+            {{ scope.row.classDate }} {{ scope.row.startClassTime ? scope.row.startClassTime.substr(0, 5) : '' }}-{{ scope.row.endClassTime ? scope.row.endClassTime.substr(0, 5) : '' }}
           </template>
         </el-table-column>
         <el-table-column align='center'
@@ -97,10 +97,10 @@
           </template>
         </el-table-column>
         <el-table-column align='center'
-                         label="老师签出">
+                         label="老师签退">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.signOutStatus | attendanceType}}
+              {{ scope.row.signOutStatus | attendanceOutType}}
             </div>
           </template>
         </el-table-column>
@@ -175,7 +175,7 @@
                           v-model="maskForm.startTime"
                           :picker-options="{
                             start: '06:30',
-                            step: '00:15',
+                            step: '00:05',
                             end: '23:30'
                             }">
           </el-time-select>
@@ -186,7 +186,7 @@
                           v-model="maskForm.endTime"
                           :picker-options="{
                             start: '06:30',
-                            step: '00:15',
+                            step: '00:05',
                             end: '23:30',
                             minTime: maskForm.startTime
                           }">

src/views/teamDetail/components/resetClass.vue

@@ -247,6 +247,16 @@
                :rules="teacherRules"
                label-position='right'
                label-width="100px;">
+        <el-form-item label="合奏班"
+                      v-if='!isTemporary'
+                      prop="mixClassGroupId">
+          <el-select v-model="teacherForm.mixClassGroupId">
+            <el-option v-for="(item,index) in maxClassList"
+                       :label="item.name"
+                       :key="index"
+                       :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="主教老师"
                       prop='coreTeacher'>
           <el-select v-model="teacherForm.coreTeacher"
@@ -318,7 +328,7 @@
                             v-model="item.startClassTime"
                             :picker-options="{
                                start: '08:30',
-                               step: '00:15',
+                               step: '00:05',
                                end: '18:30'
             }">
             </el-time-select>
@@ -327,7 +337,7 @@
                             v-model="item.endClassTime"
                             :picker-options="{
                               start: '08:30',
-                              step: '00:15',
+                              step: '00:05',
                               end: '18:30'
             }">
             </el-time-select>
@@ -389,13 +399,15 @@ export default {
         courseType: '',
         courseTime: '',
         checked: false,
-        courseNum: ''
+        courseNum: '',
+        mixClassGroupId: ''
       },
       teacherRules: {
         coreTeacher: [{ required: true, message: '请选择主教老师' }],
         courseType: [{ required: true, message: '请选择上课类型' }],
         courseTime: [{ required: true, message: '请选择开始时间' }],
-        courseNum: [{ required: true, message: '请输入排课次数' }]
+        courseNum: [{ required: true, message: '请输入排课次数' }],
+        mixClassGroupId: [{ required: true, message: '请选择合奏班' }]
       },
       weekList: [{
         week: '',
@@ -441,11 +453,11 @@ export default {
     // 2.根据合奏班获取所有的单技班
     // 3.根据乐团id 查询 此乐团所有的合奏班
     // 4.获取当年的所有节假日
-    // getAllClass({ musicGroupId: this.teamid }).then(res => {
-    //   if (res.code == 200) {
-    //     this.maxClassList = res.data;
-    //   }
-    // })
+    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])
@@ -701,11 +713,17 @@ export default {
         if (this.weekList[i].id == item.id) {
           this.weekList.splice(i, 1)
         }
-
       }
     },
     // 提交临时班的信息
     submitTemporary (type) {
+      // 参数是一样  type为1 新增临时班
+      // type为2  新增单技班
+      if (type == 1) {
+        this.isTemporary = true;
+      } else {
+        this.isTemporary = false;
+      }
       this.$refs['teacherForm'].validate(item => {
         if (item) {
           let week = this.weekList;
@@ -719,7 +737,7 @@ export default {
           for (let i in this.teacherForm.assistant) {
             classGroupTeacherMapperList.push({ userId: this.teacherForm.assistant[i], teacherRole: 'TEACHING' })
           }
-          let mixClassGroupId = this.activeMixClass;
+          let mixClassGroupId = this.teacherForm.mixClassGroupId;
           let musicGroupId = this.teamid;
           let startDate = this.teacherForm.courseTime;
           let courseType = this.teacherForm.courseType;
@@ -728,13 +746,6 @@ export default {
             return item.userId;
           })
           let holiday = this.teacherForm.checked;
-          /**
-           *  this.weekList.push({
-        week: '',
-        startTime: '',
-        endTime: '',
-           * 
-           */
           let courseList = [];
           for (let i in this.weekList) {
             courseList.push(this.weekList[i])
@@ -743,10 +754,11 @@ export default {
             this.$message.error('新增班级至少排一节课')
             return
           }
+
           let obj = {
             classGroupName,
-            classGroupTeacherMapperList,
             mixClassGroupId,
+            classGroupTeacherMapperList,
             musicGroupId,
             startDate,
             courseType,
@@ -762,7 +774,7 @@ export default {
                 this.$message.success('修改成功')
                 this.infoVisible = false;
                 this.studentVisible = false;
-                this.getList(this.activeMixClass);
+                this.getList();
               }
             })
           } else if (type == 2) {
@@ -772,7 +784,7 @@ export default {
                 this.$message.success('修改成功');
                 this.infoVisible = false;
                 this.studentVisible = false;
-                this.getList(this.activeMixClass);
+                this.getList();
               }
             })
           }

src/views/teamDetail/components/studentSignin.vue

@@ -14,8 +14,8 @@
         <el-form-item label='开课时间'>
           <el-date-picker v-model="searchForm.times"
                           type="datetimerange"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          format="yyyy-MM-dd HH:mm:ss"
                           range-separator="至"
                           start-placeholder="开始日期"
                           end-placeholder="结束日期">

src/views/teamDetail/components/teamTeacherRecord.vue

@@ -3,7 +3,8 @@
     <h2>
       <!-- <div class='squrt'></div>
       {{name}} -->
-      <el-page-header @back="onCancel" :content="name"></el-page-header>
+      <el-page-header @back="onCancel"
+                      :content="name"></el-page-header>
     </h2>
     <p style="margin-bottom:20px;">老师上课记录</p>
     <!-- 搜索类型 -->
@@ -69,7 +70,7 @@
                          label="签退">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.signOutStatus|attendanceType}}
+              {{ scope.row.signOutStatus|attendanceOutType}}
             </div>
           </template>
         </el-table-column>
@@ -121,7 +122,7 @@ export default {
     this.getList()
   },
   methods: {
-    onCancel() {
+    onCancel () {
       // window.history.back()
       let params = this.$route.query
       this.$router.push({

src/views/teamDetail/teamList.vue

@@ -139,16 +139,17 @@
               <div>
                 <el-button type="text"
                            v-if="scope.row.status == 'PREPARE'"
-                           @click="gotoImprovement(scope.row)">基础技能班设置</el-button>
+                           @click="gotoImprovement(scope.row)">基础技能班</el-button>
                 <el-button type="text"
                            v-if="scope.row.status == 'PREPARE'" v-permission="'/teamDetailedList'"
                            @click="gotodetailList(scope.row)">发放清单</el-button>
                 <el-button type="text"
-                           v-if="scope.row.status == 'PROGRESS' ||  scope.row.status == 'PAUSE'"
+                           v-if="scope.row.status == 'PROGRESS' ||  scope.row.status == 'PAUSE'||scope.row.status == 'APPLY'|| scope.row.status == 'PAY'"
                            @click="lookTeamDetail(scope.row)">查看</el-button>
                 <el-button type="text"
-                           v-if="scope.row.status != 'PROGRESS' && scope.row.status != 'CANCELED'  && scope.row.status != 'PAUSE'"
+                           v-if="scope.row.status != 'PROGRESS' && scope.row.status != 'CANCELED'  && scope.row.status != 'PAUSE' && scope.row.status != 'APPLY'&& scope.row.status != 'PAY'"
                            @click="lookTeamDetail(scope.row)">编辑</el-button>
+
                 <el-button v-if="scope.row.status == 'PREPARE'" v-permission="'musicGroup/action'"
                            @click="startTeam(scope.row)"
                            type="text">确认成团</el-button>

src/views/vipClass/vipDetail/components/teacherRecord.vue

@@ -89,7 +89,6 @@
         <el-table-column align='center'
                          label="上课学员数"
                          prop="attendanceNum">
-
         </el-table-column>
         <el-table-column align='center'
                          prop="status"

src/views/vipClass/vipDetail/index.vue

@@ -1,6 +1,10 @@
 <template>
   <div class='m-container'>
-    <h2>{{ className }}</h2>
+
+    <h2>
+      <el-page-header @back="onCancel"
+                      :content="className"></el-page-header>
+    </h2>
     <div class="m-core">
       <!-- navMenu -->
       <el-tabs v-model="activeName"
@@ -8,7 +12,8 @@
                @tab-click="handleClick">
         <el-tab-pane label="基本信息"
                      name="1">
-          <vipBase v-if="activeName == 1" @getName='getName' />
+          <vipBase v-if="activeName == 1"
+                   @getName='getName' />
         </el-tab-pane>
         <el-tab-pane label="教学记录"
                      name="2">
@@ -37,7 +42,17 @@ export default {
   data () {
     return {
       activeName: '1',
-      className: ''
+      className: '',
+      rules: null,
+      searchForm: null
+    }
+  },
+  mounted () {
+    if (this.$route.query.rules) {
+      this.rules = this.$route.query.rules
+    }
+    if (this.$route.query.searchForm) {
+      this.searchForm = this.$route.query.searchForm
     }
   },
   methods: {
@@ -47,11 +62,11 @@ export default {
     },
     getName (val) {
       this.className = val;
+    },
+    onCancel () {
+      this.$router.push({ path: '/business/vipList', query: { rules: this.rules, searchForm: this.searchForm } })
     }
-  },
-  mounted () {
-
-  },
+  }
 }
 </script>
 <style lang="scss">

src/views/vipClass/vipList.vue

@@ -215,6 +215,16 @@ export default {
       },
     }
   },
+  created () {
+    if (this.$route.query.rules) {
+      this.rules = this.$route.query.rules;
+      // console.log(this.$route.query.rules)
+    }
+    if (this.$route.query.searchForm) {
+      this.searchForm = this.$route.query.searchForm;
+      // console.log(this.$route.query.rules)
+    }
+  },
   mounted () {
     getEmployeeOrgan().then(res => {
       if (res.code == 200) {
@@ -257,7 +267,7 @@ export default {
     },
     // 跳转到vip详情
     gotoVipDetail (id) {
-      this.$router.push({ path: '/business/vipDetail', query: { id } })
+      this.$router.push({ path: '/business/vipDetail', query: { id, rules: this.rules, searchForm: this.searchForm } })
     },
     closeVip (scope) {
       let id = scope.row.id;
@@ -270,11 +280,11 @@ export default {
       })
     },
     gotoBuildVip () {
-      this.$router.push({ path: '/business/buildVip' })
+      this.$router.push({ path: '/business/buildVip', query: { rules: this.rules, searchForm: this.searchForm } })
     },
     // 修改vip
     resetVip (id) {
-      this.$router.push({ path: '/business/vipReset', query: { id } })
+      this.$router.push({ path: '/business/vipReset', query: { id, rules: this.rules, searchForm: this.searchForm } })
     }
 
   },

src/views/vipClass/vipReset.vue

@@ -50,6 +50,20 @@
                          width="150"
                          prop="endClassTimeStr">
         </el-table-column>
+        <el-table-column label="课程类型"
+                         width="150"
+                         align="center">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.teachMode | teachMode }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="教学点"
+                         align="center"
+                         width="300"
+                         prop="schoolName">
+        </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <div>
@@ -91,7 +105,7 @@
                           v-model="maskForm.startTime"
                           :picker-options="{
                             start: '06:30',
-                            step: '00:15',
+                            step: '00:05',
                             end: '23:30'
                             }">
           </el-time-select>
@@ -102,12 +116,21 @@
                           v-model="maskForm.endTime"
                           :picker-options="{
                             start: '06:30',
-                            step: '00:15',
+                            step: '00:05',
                             end: '23:30',
                             minTime: maskForm.startTime
                           }">
           </el-time-select>
         </el-form-item>
+        <el-form-item label="教学地点"
+                      v-if='maskForm.teachMode == "OFFLINE"'>
+          <el-select v-model="maskForm.address">
+            <el-option v-for="(item,index) in schoolList"
+                       :key="index"
+                       :value="item.id"
+                       :label="item.name"></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer"
            class="dialog-footer">
@@ -142,7 +165,7 @@
               <el-time-select v-model="scope.row.startClassTimeStr"
                               :picker-options="{
                                 start: '06:30',
-                                step: '00:15',
+                                step: '00:05',
                                 end: '23:30'
                               }"
                               placeholder="选择时间">
@@ -185,6 +208,7 @@
 </template>
 <script>
 import { resetCourse } from '@/api/buildTeam'
+import { getSchool } from '@/api/systemManage'
 import pagination from '@/components/Pagination/index'
 import { findVipGroupCourseSchedules, bathDelete, appendVipGroupCourseSchedules } from '@/api/vipSeting'
 export default {
@@ -203,7 +227,9 @@ export default {
         date: '',
         startTime: '',
         endTime: '',
-        id: ''
+        id: '',
+        address: '',
+        teachMode: ''
       },
       rules: {
         // 分页规则
@@ -217,13 +243,27 @@ export default {
         startTime: [{ required: true, message: '请选择上课开始时间', trigger: 'blur' },],
         endTime: [{ required: true, message: '请选择上课结束时间', trigger: 'blur' },],
       },
+      schoolList: [],
+      Frules: null,
+      FsearchForm: null
     }
   },
   created () {
     this.vipid = this.$route.query.id;
+    if (this.$route.query.rules) {
+      this.Frules = this.$route.query.rules
+    }
+    if (this.$route.query.searchForm) {
+      this.FsearchForm = this.$route.query.searchForm
+    }
   },
   mounted () {
     this.getList();
+    getSchool({ organId: this.$store.getters.organ }).then(res => {
+      if (res.code == 200) {
+        this.schoolList = res.data;
+      }
+    })
   },
   methods: {
     getList () {
@@ -238,13 +278,15 @@ export default {
       )
     },
     goBack () {
-      this.$router.go(-1)
+      this.$router.push({ path: '/business/vipList', query: { rules: this.Frules, searchForm: this.FsearchForm } })
     },
     resetClass (row) {
       this.maskForm.date = row.classDate;
       this.maskForm.startTime = row.startClassTimeStr;
       this.maskForm.endTime = row.endClassTimeStr;
       this.maskForm.id = row.id;
+      this.maskForm.address = row.schoolId
+      this.maskForm.teachMode = row.teachMode
       // 修改课时
       this.courseVisible = true;
     },
@@ -257,7 +299,8 @@ export default {
         startClassTimeStr: this.maskForm.startTime,
         endClassTimeStr: this.maskForm.endTime,
         id: this.maskForm.id,
-        classDate: this.maskForm.date
+        classDate: this.maskForm.date,
+        schoolId: this.maskForm.address || null
       }
       resetCourse(obj).then(res => {
         if (res.code == 200) {

vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '大雅后台管理系统' // page title
 // let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
-let target = 'http://47.99.212.176:8000' // 测试服
-// let target = 'http://192.168.3.48:8080' // 乔
+// let target = 'http://47.99.212.176:8000' // 测试服
+let target = 'http://192.168.3.48:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**