11

11

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

@@ -154,6 +154,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="时间段"
+                      v-if="raiseVisible"
                       prop="startTime">
           <el-time-select placeholder="起始时间"
                           value-format='HH:mm:ss'
@@ -165,6 +166,7 @@
                           }">
           </el-time-select>
           <el-time-select placeholder="结束时间"
+                          v-if="raiseVisible"
                           v-model="maskForm.endTime"
                           value-format='HH:mm:ss'
                           :picker-options="{

src/views/teamBuild/teamSeting/index.vue

@@ -155,8 +155,8 @@ export default {
       if (this.$route.query.rules) {
         this.Frules = this.$route.query.rules
       }
-
-      this.activeIndex = sessionStorage.getItem('setStep') || 0;
+      //sessionStorage.getItem('setStep') ||
+      this.activeIndex = 0;
       getTeamBaseInfo({ musicGroupId: this.id }).then(res => {
         if (res.code == 200) {
           this.chargeTypeId = res.data.musicGroup.chargeTypeId;

src/views/teamDetail/componentCourse/studentWork.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-form :inline="true">
-      <el-form-item label="应到学生数">
+      <el-form-item label="应交学生数">
         <!-- <el-input disabled
                   :value="studentNum"></el-input> -->
         <div class="inputStyle">{{  studentNum}}</div>

src/views/teamDetail/components/courseList.vue

@@ -144,9 +144,15 @@
           <template slot-scope="scope">
             <div>
               <!-- OVER -->
-              <el-button v-if="scope.row.courseScheduleStatus == 'OVER' && permission('courseSchedule/classStartDateAdjust1')" type="text" @click="resetClass(scope.row)">调整</el-button>
-              <el-button v-if="scope.row.courseScheduleStatus == 'NOT_START' && permission('courseSchedule/classStartDateAdjust')" type="text" @click="resetClass(scope.row)">调整</el-button>
-              <el-button v-if="scope.row.courseScheduleStatus == 'NOT_START' && permission('courseSchedule/bathDelete')" type="text" @click="removeSingleClass(scope.row)">删除</el-button>
+              <el-button v-if="scope.row.courseScheduleStatus == 'OVER' && permission('courseSchedule/classStartDateAdjust1')"
+                         type="text"
+                         @click="resetClass(scope.row)">调整</el-button>
+              <el-button v-if="scope.row.courseScheduleStatus == 'NOT_START' && permission('courseSchedule/classStartDateAdjust')"
+                         type="text"
+                         @click="resetClass(scope.row)">调整</el-button>
+              <el-button v-if="scope.row.courseScheduleStatus == 'NOT_START' && permission('courseSchedule/bathDelete')"
+                         type="text"
+                         @click="removeSingleClass(scope.row)">删除</el-button>
             </div>
           </template>
         </el-table-column>
@@ -200,6 +206,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="开始时间"
+                      v-if="courseVisible"
                       prop="startTime">
           <el-time-select placeholder="起始时间"
                           v-model="maskForm.startTime"
@@ -211,6 +218,7 @@
           </el-time-select>
         </el-form-item>
         <el-form-item label="结束时间"
+                      v-if="courseVisible"
                       prop="endTime">
           <el-time-select placeholder="结束时间"
                           v-model="maskForm.endTime"
@@ -285,22 +293,22 @@ export default {
         teacher: '',
         assistant: '',
         date: '',
+        id: '',
         startTime: '',
-        endTime: '',
-        id: ''
+        endTime: ''
       },
       maskRules: {
         teacher: [{ required: true, message: '请选择主教老师名称', trigger: 'blur' },],
         date: [{ required: true, message: '请选择上课时间', trigger: 'blur' },],
-        startTime: [{ required: true, message: '请选择上课开始时间', trigger: 'blur' },],
-        endTime: [{ required: true, message: '请选择上课结束时间', trigger: 'blur' },],
+        // startTime: [{ required: true, message: '请选择上课开始时间', trigger: 'blur' },],
+        // endTime: [{ required: true, message: '请选择上课结束时间', trigger: 'blur' },],
       },
       teacherList: [],
       classList: [],
       activeCourseList: [],
       timerMask: {
         timer: ''
-      }
+      },
     }
 
   },
@@ -364,6 +372,7 @@ export default {
       })
     },
     resetClass (row) {
+
       this.maskForm.teacher = parseInt(row.masterTeacherId);
       this.maskForm.assistant = []
       for (let i in row.teachingTeachers) {
@@ -372,11 +381,13 @@ export default {
         }
       }
       this.maskForm.date = row.classDate;
-      this.maskForm.startTime = row.startClassTimeStr;
-      this.maskForm.endTime = row.endClassTimeStr;
+      this.$set(this.maskForm, 'startTime', row.startClassTimeStr.substring(0, 5))
+      // this.maskForm.startTime = row.startClassTimeStr;
+      this.maskForm.endTime = row.endClassTimeStr.substring(0, 5);
       this.maskForm.id = row.courseScheduleId;
-      // 修改课时
       this.courseVisible = true;
+      // 修改课时
+
       // let obj = {
       //   actualTeacherId: this.maskForm.teacher,
       //   classDate: this.maskForm.date,
@@ -429,6 +440,10 @@ export default {
       });
     },
     submitResetClass () {
+      if (!this.startTime || !this.endTime) {
+        this.$message.error('请填写开始时间或结束时间')
+        return
+      }
       this.$confirm('是否确定?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -458,6 +473,15 @@ export default {
     },
     handleClose () {
       this.courseVisible = false;
+      this.maskForm = {
+        teacher: '',
+        assistant: '',
+        date: '',
+        id: '',
+        startTime: '',
+        endTime: ''
+      },
+        console.log(this.maskForm.startTime)
       this.$refs['maskForm'].resetFields()
     },
     handleSelectionChange (val) {

src/views/teamDetail/teamCourseList.vue

@@ -207,7 +207,13 @@
         <el-form-item label="课程类型">
           <!-- <el-input :value="maskForm.type |classType"
                     disabled></el-input> -->
-          <div class="inputStyle">{{maskForm.type |classType}}</div>
+          <div class="inputStyle">{{maskForm.type|coursesType}}</div>
+        </el-form-item>
+        <!-- courseScheduleStatus -->
+        <el-form-item label="课程状态">
+          <!-- <el-input :value="maskForm.type |classType"
+                    disabled></el-input> -->
+          <div class="inputStyle">{{maskForm.status | coursesStatus}}</div>
         </el-form-item>
         <el-form-item label="签到时间">
           <!-- <el-input v-model=" maskForm.signInTime"
@@ -243,6 +249,7 @@
         </el-form-item>
       </el-form>
       <el-tabs v-model="activeName"
+               v-if="maskForm.status != 'NOT_START'"
                type="card"
                @tab-click="handleClick">
         <el-tab-pane label="点名"
@@ -416,7 +423,7 @@ export default {
     lookDetail (row) {
       this.maskForm = row
       this.activeName = 'first'
-      console.log(row)
+      // console.log(row)
       this.classVisible = true;
     },
     handleClick (tab, event) {

vue.config.js

@@ -21,8 +21,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.27: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://admin.dayaedu.com' // 测试服
+// let target = 'http://192.168.3.48:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**