1219 18:06

111

src/api/buildTeam.js

@@ -755,11 +755,20 @@ export function getMusicGroupAllClass (data) {
 }
 
 // 乐团【报名中、缴费中】 学生详情列表导出
-export function studentApplyDetailExport(data) {
+export function studentApplyDetailExport (data) {
   return request({
     // url: api + '/studentRegistration/queryStudentApplyDetailExport',
     url: api + '/export/studentApplyDetailExport',
     method: 'post',
     data: qs.stringify(data)
   })
+}
+
+// 清空班级课表 classGroup/delClassNoStartCourse
+export function clearClassCourse (data) {
+  return request({
+    url: api + '/classGroup/delClassNoStartCourse',
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }

src/utils/request.js

@@ -32,8 +32,6 @@ class DonMessage {
   }
 }
 
-// ... 
-
 Vue.use(ElementUI)
 // 命名根据需要，DonMessage只是在文章中使用
 Vue.prototype.$message = new DonMessage()
@@ -92,7 +90,7 @@ service.interceptors.request.use(
     // do something before request is sent
     showFullScreenLoading()
     if (store.getters.token) {
-      // let each request carry token
+      // let each request carry token 
       // ['X-Token'] is a custom headers key
       // please modify it according to the actual situation
       config.headers['Authorization'] = getToken()

src/views/studentManager/studentList.vue

@@ -33,8 +33,10 @@
                      v-model="searchForm.isActive"
                      clearable
                      placeholder="是否激活">
-            <el-option label="是" value="true"></el-option>
-            <el-option label="否" value="false"></el-option>
+            <el-option label="是"
+                       value="true"></el-option>
+            <el-option label="否"
+                       value="false"></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item>
@@ -146,7 +148,7 @@
                      filterable
                      v-model="studentForm.sex"
                      clearable
-                     placeholder="请选择分部">
+                     placeholder="请选择性别">
             <el-option :value="0"
                        label="女"></el-option>
             <el-option :value="1"

src/views/teamDetail/components/resetClass.vue

@@ -66,11 +66,10 @@
             </template>
           </el-table-column>
           <el-table-column align='center'
-                           label="是否排课">
+                           label="当前课次">
             <template slot-scope="scope">
               <div>
-                <p v-if="scope.row.totalClassTimes > 0"> 是</p>
-                <p v-if="scope.row.totalClassTimes <= 0"> 否</p>
+                {{scope.row.currentClassTimes+'/'+ scope.row.totalClassTimes}}
               </div>
             </template>
           </el-table-column>
@@ -100,7 +99,24 @@
                   </div>
                   <!-- v-if="scope.row.type !='MIX'" -->
                   <el-button type="text"
-                             slot="reference">删除</el-button>
+                             slot="reference">删除班级</el-button>
+                </el-popover>
+
+                <el-popover placement="top"
+                            width="160"
+                            :ref="scope.$index">
+                  <p>是否清空课表?</p>
+                  <div style="text-align: right; margin: 0">
+                    <el-button size="mini"
+                               type="text"
+                               @click="scope._self.$refs[scope.$index].doClose()">取消</el-button>
+                    <el-button type="primary"
+                               size="mini"
+                               @click="clearCourse(scope)">确定</el-button>
+                  </div>
+                  <!-- v-if="scope.row.type !='MIX'" -->
+                  <el-button type="text"
+                             slot="reference">清空课表</el-button>
                 </el-popover>
               </div>
             </template>
@@ -333,6 +349,7 @@
         <el-form-item label="排课起始时间"
                       prop="courseTime">
           <el-date-picker v-model="teacherForm.courseTime"
+                          :picker-options="pickerOptions"
                           style="width:200px!important;"
                           type="date"
                           value-format="yyyy-MM-dd"
@@ -424,7 +441,7 @@
                  :key="index">
               {{ item.name }}
               <el-button type='text'
-                         @click="removeSiginforMix(item)">删除</el-button>
+                         @click="removeSiginforMix(item)">删除班级</el-button>
             </div>
           </div>
         </div>
@@ -615,7 +632,7 @@
   </div>
 </template>
 <script>
-import { getAllClass, getAllSignClassandTeacher, getAllSignClass, removeSingleClass, getNoClassStudentAll, findSound, teamSoundStudent, findMusicGroupClassTeacher, revisionClassGroup, revisionAddClassGroup, getEmployeeOrgan, getTeacher, findNoClassSingle, getMusicGroupStuNoClassType, classGroupUpdate, getTeamBaseInfo } from '@/api/buildTeam'
+import { getAllClass, getAllSignClassandTeacher, getAllSignClass, removeSingleClass, getNoClassStudentAll, findSound, teamSoundStudent, findMusicGroupClassTeacher, revisionClassGroup, revisionAddClassGroup, getEmployeeOrgan, getTeacher, findNoClassSingle, getMusicGroupStuNoClassType, classGroupUpdate, getTeamBaseInfo, clearClassCourse } from '@/api/buildTeam'
 import { getClassAllStudent, removeStudents, addStudents } from '@/api/studentManager'
 import { queryEmployByOrganId } from '@/api/systemManage'
 
@@ -624,6 +641,11 @@ import qs from 'qs'
 export default {
   data () {
     return {
+      pickerOptions: {
+        disabledDate (time) {
+          return time.getTime() < new Date().getTime()
+        }
+      },
       teamid: '',
       topForm: {
         classType: ''
@@ -924,6 +946,23 @@ export default {
       this.activeListStudent = this.objArrayRemoval(this.activeListStudent, 'userId');
       // 将其填入选中的学生
     },
+    clearCourse (scope) {
+      clearClassCourse({ classGroupId: scope.row.id }).then(res => {
+        if (res.code == 200) {
+          this.$message.success('清除成功')
+          scope._self.$refs[scope.$index].doClose();
+          // 重新请求列表
+          this.getList(this.activeMixClass);
+        } else {
+          this.$message.error(res.msg)
+          scope._self.$refs[scope.$index].doClose();
+        }
+
+      }).catch(res => {
+        scope._self.$refs[scope.$index].doClose();
+      })
+      // 清空课表
+    },
     // 删除班级
     removeClass (scope) {
       removeSingleClass({ classGroupId: scope.row.id }).then(res => {

src/views/vipClass/vipReset.vue

@@ -273,6 +273,7 @@
         <el-form-item label="排课起始时间"
                       prop="courseTime">
           <el-date-picker v-model="adjustmentForm.courseTime"
+                          :picker-options="pickerOptions"
                           style="width:200px!important;"
                           type="date"
                           value-format="yyyy-MM-dd"
@@ -368,6 +369,11 @@ export default {
   },
   data () {
     return {
+      pickerOptions: {
+        disabledDate (time) {
+          return time.getTime() < new Date().getTime()
+        }
+      },
       addrVisible: false,
       adjustmentVisible: false,
       addCourseVisible: false,
@@ -435,7 +441,8 @@ export default {
       activeList: [],
       // 改版加课
       isaddCourse: false,
-      adjustmentName: ''
+      adjustmentName: '',
+
     }
   },
   created () {

vue.config.js

@@ -17,9 +17,9 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // http://47.99.212.176:8000 
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
-// let target = 'http://testadm.dayaedu.com/' //勇哥迁库
+let target = 'http://testadm.dayaedu.com/' //勇哥迁库
 // 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://47.99.212.176:8000' // 测试服
 // let target = 'http://192.168.3.48:8080' // 乔