Merge branch 'master' into permission_small

dist/static/css/chunk-06232610.4af8a1ea.css

@@ -0,0 +1 @@
+.m-container .m-wrap[data-v-22955bb9]{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;width:100%}.m-container .m-wrap .newBand[data-v-22955bb9]{margin:0 5px 0 50px}.m-container .m-wrap .el-tooltip.micon[data-v-22955bb9]{width:20px;height:20px;position:relative;top:12px}[data-v-22955bb9] .el-input__icon.el-icon-date{height:40px!important}

dist/static/css/chunk-0c55ad4d.079cefc9.css

@@ -1 +0,0 @@
-.m-container .el-date-editor--daterange.el-input,.m-container .el-date-editor--daterange.el-input__inner,.m-container .el-date-editor--timerange.el-input,.m-container .el-date-editor--timerange.el-input__inner{width:400px}.m-container .subTitle{width:1203px;height:40px;line-height:40px;background-color:#fefceb;padding:0 25px;-webkit-box-sizing:border-box;box-sizing:border-box;font-size:16px;color:#474747;margin-bottom:20px}

dist/static/css/chunk-0e8e579a.6663f0cb.css

@@ -0,0 +1 @@
+.m-container[data-v-0469c7e5]{min-width:100%}.el-input[data-v-0469c7e5]{width:400px}[data-v-0469c7e5] .ql-editor{min-height:300px}.el-button--primary[data-v-0469c7e5],.el-button--primary[data-v-0469c7e5]:active,.el-button--primary[data-v-0469c7e5]:focus,.el-button--primary[data-v-0469c7e5]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-0469c7e5]{margin-top:40px}.el-col[data-v-0469c7e5]{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-0469c7e5]{width:200px;margin:0 20px}[data-v-0469c7e5] .el-tree-node__content{height:40px!important}[data-v-0469c7e5] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-0469c7e5]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-0469c7e5]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-0469c7e5]{width:120px;height:120px;display:block}.ivu-upload[data-v-0469c7e5]{display:none}

dist/static/css/chunk-2d7dcba3.e75fbfc5.css → dist/static/css/chunk-1d391e04.641b676e.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}.newBand[data-v-0e893f52]{display:inline-block;margin-right:10px}.right-code .title[data-v-0e893f52]{font-size:18px;text-align:center;padding-bottom:8px}
+.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}

dist/static/css/chunk-839e6186.fb1ecb02.css → dist/static/css/chunk-1f992393.d46ab528.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}.tr-cotainer{margin-top:20px}.teacherInfo .infoWrap[data-v-d4dc7046]{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}.teacherInfo .infoWrap .left[data-v-d4dc7046]{max-width:1000px;width:100%}.teacherInfo .infoWrap .left h4[data-v-d4dc7046]{margin-bottom:20px}.teacherInfo .infoWrap .right[data-v-d4dc7046]{margin-left:100px}.teacherInfo .infoWrap .right .teacherIcon[data-v-d4dc7046]{width:150px;height:150px;border-radius:50%;overflow:hidden}.teacherInfo .infoWrap .right .teacherIcon img[data-v-d4dc7046]{width:150px;height:150px}[data-v-d4dc7046] .el-form-item{width:100%}[data-v-d4dc7046] .el-date-editor.el-input,[data-v-d4dc7046] .el-select{width:100%!important}[data-v-d4dc7046] .el-form-item__content{font-size:14px!important;margin-right:5%}.courseInfo h4{margin-bottom:20px}.courseInfo .tableMargin{margin-top:20px}
+.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}.tr-cotainer{margin-top:20px}.teacherInfo .infoWrap[data-v-48910c02]{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}.teacherInfo .infoWrap .left[data-v-48910c02]{max-width:1000px;width:100%}.teacherInfo .infoWrap .left h4[data-v-48910c02]{margin-bottom:20px}.teacherInfo .infoWrap .right[data-v-48910c02]{margin-left:100px}.teacherInfo .infoWrap .right .teacherIcon[data-v-48910c02]{width:150px;height:150px;border-radius:50%;overflow:hidden}.teacherInfo .infoWrap .right .teacherIcon img[data-v-48910c02]{width:150px;height:150px}[data-v-48910c02] .el-form-item{width:100%}[data-v-48910c02] .el-date-editor.el-input,[data-v-48910c02] .el-select{width:100%!important}[data-v-48910c02] .el-form-item__content{font-size:14px!important;margin-right:5%}.courseInfo h4{margin-bottom:20px}.courseInfo .tableMargin{margin-top:20px}

dist/static/css/chunk-765128ed.04f90b06.css → dist/static/css/chunk-2455a54e.45428825.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}.inputStyle[data-v-6aa153a0]{width:100px;text-align:center}.title[data-v-0eb05fc4]{margin-bottom:20px}.amap-demo[data-v-0eb05fc4]{height:300px}.inputStyle[data-v-63cd9bec]{width:100px;text-align:center}.work[data-v-63cd9bec]{margin-bottom:30px;font-size:16px}.visible[data-v-208e06f1]{visibility:hidden}.cl-container .topFrom[data-v-208e06f1]{margin:20px 30px 0}.cl-container .topFrom .classlist[data-v-208e06f1]{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}.cl-container .topFrom .classlist ul li[data-v-208e06f1]{list-style:none}.cl-container .searchForm[data-v-208e06f1]{margin:0 30px}.btnWraps[data-v-208e06f1]{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}.btnWraps div[data-v-208e06f1]{margin-right:20px}.inputStyle[data-v-208e06f1]{width:180px}.red[data-v-208e06f1]{color:red}.exportBtn[data-v-208e06f1]{background:#13817a}
+.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}.inputStyle[data-v-29a2e64d]{width:100px;text-align:center}.title[data-v-0eb05fc4]{margin-bottom:20px}.amap-demo[data-v-0eb05fc4]{height:300px}.inputStyle[data-v-63cd9bec]{width:100px;text-align:center}.work[data-v-63cd9bec]{margin-bottom:30px;font-size:16px}.visible[data-v-42f04595]{visibility:hidden}.cl-container .topFrom[data-v-42f04595]{margin:20px 30px 0}.cl-container .topFrom .classlist[data-v-42f04595]{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}.cl-container .topFrom .classlist ul li[data-v-42f04595]{list-style:none}.cl-container .searchForm[data-v-42f04595]{margin:0 30px}.btnWraps[data-v-42f04595]{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}.btnWraps div[data-v-42f04595]{margin-right:20px}.inputStyle[data-v-42f04595]{width:180px}.red[data-v-42f04595]{color:red}.exportBtn[data-v-42f04595]{background:#13817a}

dist/static/css/chunk-472fd29e.bb8be262.css

@@ -0,0 +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}.newBand[data-v-66194512]{display:inline-block;margin-right:10px}.right-code .title[data-v-66194512]{font-size:18px;text-align:center;padding-bottom:8px}

dist/static/css/chunk-62eb283a.efa99728.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-c596aedc],.el-button--primary[data-v-c596aedc]:active,.el-button--primary[data-v-c596aedc]:focus,.el-button--primary[data-v-c596aedc]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-c596aedc]{margin-top:40px}.el-col[data-v-c596aedc]{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-c596aedc]{width:200px;margin:0 20px}[data-v-c596aedc] .el-tree-node__content{height:40px!important}[data-v-c596aedc] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-c596aedc]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-c596aedc]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-c596aedc]{width:120px;height:120px;display:block}

dist/static/css/chunk-72ec620f.66d0e918.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-5597a914],.el-button--primary[data-v-5597a914]:active,.el-button--primary[data-v-5597a914]:focus,.el-button--primary[data-v-5597a914]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-5597a914]{margin-top:40px}.el-col[data-v-5597a914]{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-5597a914]{width:200px;margin:0 20px}[data-v-5597a914] .el-tree-node__content{height:40px!important}[data-v-5597a914] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-5597a914]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-5597a914]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-5597a914]{width:120px;height:120px;display:block}

dist/static/css/chunk-773cf9df.9d91c34e.css

@@ -1 +0,0 @@
-.m-container[data-v-193782e6]{min-width:100%}.el-input[data-v-193782e6]{width:400px}[data-v-193782e6] .ql-editor{min-height:300px}.el-button--primary[data-v-193782e6],.el-button--primary[data-v-193782e6]:active,.el-button--primary[data-v-193782e6]:focus,.el-button--primary[data-v-193782e6]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-193782e6]{margin-top:40px}.el-col[data-v-193782e6]{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-193782e6]{width:200px;margin:0 20px}[data-v-193782e6] .el-tree-node__content{height:40px!important}[data-v-193782e6] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-193782e6]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-193782e6]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-193782e6]{width:120px;height:120px;display:block}.ivu-upload[data-v-193782e6]{display:none}

src/api/buildTeam.js

@@ -915,7 +915,7 @@ export function updateStudentAttendances (data) {
   })
 }
 
-// 获取陪练课列表
+// 获取网管课列表
 export function practiceGroupManage (data) {
   return request({
     url: api + '/practiceGroupManage/queryAll',
@@ -924,7 +924,7 @@ export function practiceGroupManage (data) {
   })
 }
 
-// 获取陪练课程组
+// 获取网管课程组
 export function findPracticeGroupCourseSchedules(data) {
   return request({
     url: api + '/practiceGroupManage/findPracticeGroupCourseSchedules',
@@ -933,7 +933,7 @@ export function findPracticeGroupCourseSchedules(data) {
   })
 }
 
-// 陪练课调整
+// 网管课调整
 // courseSchedule/practiceCourseAdjus
 export function practiceCourseAdjus(data) {
   return request({
@@ -943,7 +943,7 @@ export function practiceCourseAdjus(data) {
   })
 }
 
-// 陪练课程组老师修改
+// 网管课程组老师修改
 export function practiceGroupTeacherAdjust(data) {
   return request({
     url: api + '/courseSchedule/practiceGroupTeacherAdjust',
@@ -951,11 +951,20 @@ export function practiceGroupTeacherAdjust(data) {
     data: qs.stringify(data)
   })
 }
-// 陪练课老师修改
+// 网管课老师修改
 export function practiceCourseTeacherAdjust(data) {
   return request({
     url: api + '/courseSchedule/practiceCourseTeacherAdjust',
     method: 'post',
     data: qs.stringify(data)
   })
+}
+
+// 清除考情记录
+export function cleanAttendance(data) {
+  return request({
+    url: api + '/courseSchedule/cleanAttendance',
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }

src/api/generalSettings.js

@@ -19,3 +19,12 @@ export function sysConfigUpdate(data) {
     })
 }
 
+
+// 报表中心导出课酬
+export function exportTeacherSalary(data) {
+    return request({
+        url: api + '/export/teacherSalary',
+        method: 'post',
+        data: qs.stringify(data)
+    })
+}

src/api/systemManage.js

@@ -296,4 +296,33 @@ export function findTeacherByOrganId(data) {
     method: 'get',
     params: data
   })
-}
+}
+
+// 获取版本控制列表
+export function appVersionInfo(data) {
+  return request({
+    url: api + '/appVersionInfo/list',
+    method: 'get',
+    params: data
+  })
+}
+
+// 新增版本管理
+export function addAppVersionInfo(data) {
+  return request({
+    url: api + '/appVersionInfo/add',
+    method: 'post',
+    data: qs.stringify(data)
+  })
+}
+
+// 修改版本管理
+export function resetAppVersionInfo(data) {
+  return request({
+    url: api + '/appVersionInfo/update',
+    method: 'post',
+    data: qs.stringify(data)
+  })
+}
+
+// 

src/api/teacherManager.js

@@ -162,7 +162,7 @@ export function getTeacherBySubject (data) {
     params: data
   })
 }
-// 获取老师陪练课信息 
+// 获取老师网管课信息 
 export function teacherFreeTime (data) {
   return request({
     url: api + '/teacherFreeTime/query',
@@ -171,7 +171,7 @@ export function teacherFreeTime (data) {
   })
 }
 
-// 修改陪练课信息 /teacherFreeTime/updateSet
+// 修改网管课信息 /teacherFreeTime/updateSet
 export function resetTeacherFreeTime (data) {
   return request({
     url: api + '/teacherFreeTime/updateSet',
@@ -179,3 +179,21 @@ export function resetTeacherFreeTime (data) {
      data:qs.stringify(data)
   })
 }
+
+// 查询默认网管课课酬 teacherDefaultPracticeGroupSalary/queryByTeacherId
+export function teacherDefaultPracticeGroupSalary (data) {
+  return request({
+    url: api + '/teacherDefaultPracticeGroupSalary/queryPageByTeacherId',
+    method: 'get',
+    params: data
+  })
+}
+
+// 修改网管课课酬
+export function PracticeGroupSalaryUpdate (data) {
+  return request({
+    url: api + '/teacherDefaultPracticeGroupSalary/update',
+    method: 'post',
+     data
+  })
+}

src/router/index.js

@@ -238,9 +238,11 @@ export const asyncRoutes = {
   teamCourseList: () => import('@/views/teamDetail/teamCourseList'),
   // 运营预警
   operationalList: () => import('@/views/operationalEarly/operationalList'),
-  // 陪练课列表
+  // 网管课列表
   accompanyList:()=> import('@/views/accompanyManager/accompanyList'),
-  // 陪练课详情
-  accompanys:()=> import('@/views/accompanyManager/accompanys')
+  // 网管课详情
+  accompanys:()=> import('@/views/accompanyManager/accompanys'),
+  // 版本控制
+  editionList:()=> import('@/views/editionManager/editionList')
 }
 export default router

src/utils/directive.js

@@ -17,9 +17,11 @@ Vue.directive('permission', {
                 el.parentNode && el.parentNode.removeChild(el)
             }
         } else{
-            if(!permission.includes(value.parent) && !permission.includes(value.child)) {
-                el.parentNode && el.parentNode.removeChild(el)
+            if(permission.includes(value.parent) && permission.includes(value.child)) {
+                
                 // el.style.display = 'none'
+            }else{
+                el.parentNode && el.parentNode.removeChild(el)
             }
         }
         

src/utils/searchArray.js

@@ -8,11 +8,10 @@ const courseType = [
   { label: 'VIP课', value: 'VIP' },
   { label: '试听课', value: 'DEMO' },
   { label: '综合课', value: 'COMPREHENSIVE' },
-  { label: '练习课', value: 'PRACTICE' },
   { label: '启蒙课', value: 'ENLIGHTENMENT' },
   { label: '集训课', value: 'TRAINING' },
   { label: '课堂课', value: 'CLASSROOM' },
-  { label: '陪练课', value: 'PRACTICE' }
+  { label: '网管课', value: 'PRACTICE' }
 ]
 
 // 考勤状态
@@ -52,6 +51,9 @@ const orderStatus = [
   { value: "SMALL_CLASS_TO_BUY", label: "VIP购买" },
   { value: "SPORADIC", label: "零星收费" },
   { value: "LUCK", label: "福袋活动" },
+  { value: "PRACTICE", label: "网管课" },
+  { value: "PRACTICE_GROUP_BUY", label: "付费网管课" }, 
+  
 ]
 
 // 交易状态

src/utils/vueFilter.js

@@ -86,7 +86,7 @@ Vue.filter('coursesType', (value) => {
     TRAINING_SINGLE: '集训单技课',
     TRAINING_MIX: '集训合奏课',
     CLASSROOM: '课堂课',
-    PRACTICE:'陪练课'
+    PRACTICE:'网管课'
   }
   return template[value]
 })
@@ -189,7 +189,6 @@ Vue.filter('workType', value => {
   }
   return template[value]
 })
-
 // 交易类型
 Vue.filter('orderType', value => {
   let template = {
@@ -198,7 +197,10 @@ Vue.filter('orderType', value => {
     OTHER: "其他",
     SMALL_CLASS_TO_BUY: "VIP购买",
     SPORADIC: '零星收费',
-    LUCK: "福袋活动"
+    LUCK: "福袋活动",
+    PRACTICE:'网管课',
+    PRACTICE_GROUP_BUY:'网管课购买'
+
   }
   return template[value]
 })
@@ -360,4 +362,17 @@ Vue.filter('paymentChannelStatus', value => {
     BALANCE: "余额"
   }
   return template[value]
+})
+
+// edition
+Vue.filter('editionFilter', value => {
+  let template = {
+    'ios-teacher':'苹果-老师端',
+        'ios-student':'苹果-学生端',
+        'ios-education':'苹果-教务端',
+        'android-teacher':'安卓-老师端',
+        'android-student':'安卓-学生端',
+        'android-education':'安卓-教务端',
+  }
+  return template[value]
 })

src/views/accompanyManager/accompanyList.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class="squrt"></div>陪练课列表
+      <div class="squrt"></div>网管课列表
     </h2>
   
     <div class="m-core">

src/views/accompanyManager/accompanys.vue

@@ -193,7 +193,7 @@ export default {
   data() {
     return {
       isMultiple: true,
-      name: "陪练课程组",
+      name: "网管课程组",
       courseVisible: false,
       teacherVisible: false,
       Frules: null,
@@ -230,7 +230,8 @@ export default {
       teacherForm: {
         teacher: null
       },
-      courseOption:null
+      courseOption:null,
+      coursesExpireDate:null
     };
   },
   created() {
@@ -333,6 +334,7 @@ export default {
       this.startTime = row.startClassTimeStr;
       // this.maskForm.endTime = row.endClassTimeStr;
       this.maskForm.id = row.id;
+      this.coursesExpireDate = row.coursesExpireDate;
       // 修改课时
       this.courseVisible = true;
     },
@@ -400,7 +402,8 @@ export default {
         disabledDate: time => {
           // if (self.leftForm.courseStart) {
             // let date = new Date(self.leftForm.courseStart.replace(/-/, "/"));
-            let date = new Date('2020-3-31'.replace(/-/, "/"))
+            // coursesExpireDate
+            let date = new Date(this.coursesExpireDate.replace(/-/, "/"))
             
             return time.getTime() > date.getTime();
           // }