Merge branch 'online' into LAO_MO

dist/static/css/chunk-471740c4.4bf9d3a2.css

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

dist/static/css/chunk-6aa762dc.a9172c87.css

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

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

@@ -159,6 +159,7 @@
           <el-time-select placeholder="起始时间"
                           value-format='HH:mm:ss'
                           v-model.trim="maskForm.startTime"
+                          @change="changeStartTime"
                           :picker-options="{
                             start: '04:30',
                             step: '00:05',
@@ -418,6 +419,9 @@ export default {
         }
       })
 
+    },
+    changeStartTime () {
+      this.maskForm.endTime = '';
     }
   },
   filters: {

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

@@ -113,133 +113,114 @@
     <el-dialog :visible.sync="newClassVisible"
                width="700px"
                title="新增班级">
-     <el-form
-        :model="newClassForm"
-        :inline="true"
-        label-width="100px"
-        ref="newClassForm"
-        class="newClassForm"
-      >
-        <el-form-item
-          label="班级名称"
-          :rules="[{ required: true, message: '请输入班级姓名',trigger: 'blur'}]"
-          prop="className"
-        >
-          <el-input style="width:180px;" v-model="newClassForm.className"></el-input>
+      <el-form :model="newClassForm"
+               :inline="true"
+               label-width="100px"
+               ref="newClassForm"
+               class="newClassForm">
+        <el-form-item label="班级名称"
+                      :rules="[{ required: true, message: '请输入班级姓名',trigger: 'blur'}]"
+                      prop="className">
+          <el-input style="width:180px;"
+                    v-model="newClassForm.className"></el-input>
         </el-form-item>
-        <el-form-item
-          label="班级类型"
-          :rules="[{ required: true, message: '请输入班级人数',trigger: 'blur'}]"
-          prop="type"
-        >
-          <el-select v-model.trim="newClassForm.type" clearable @change="chioseHightype">
-            <el-option
-              v-for="(item,index) in classTypeList"
-              :key="index"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
+        <el-form-item label="班级类型"
+                      :rules="[{ required: true, message: '请输入班级人数',trigger: 'blur'}]"
+                      prop="type">
+          <el-select v-model.trim="newClassForm.type"
+                     clearable
+                     @change="chioseHightype">
+            <el-option v-for="(item,index) in classTypeList"
+                       :key="index"
+                       :label="item.label"
+                       :value="item.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="主教老师"
-          prop="bishop"
-          :rules="[{ required: true, message: '请选择主教老师',trigger: 'blur'}]"
-        >
-          <el-select placeholder="请选择主教老师" v-model="newClassForm.bishop" clearable filterable>
-            <el-option
-              v-for="(item,index) in teacherList"
-              :label="item.realName"
-              :value="item.id"
-              :key="index"
-            ></el-option>
+        <el-form-item label="主教老师"
+                      prop="bishop"
+                      :rules="[{ required: true, message: '请选择主教老师',trigger: 'blur'}]">
+          <el-select placeholder="请选择主教老师"
+                     v-model="newClassForm.bishop"
+                     clearable
+                     filterable>
+            <el-option v-for="(item,index) in teacherList"
+                       :label="item.realName"
+                       :value="item.id"
+                       :key="index"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="预计招生数"
-          prop="expectStudentNum"
-          :rules="[{ required: true, message: '请输入预计招生数',trigger: 'blur'},{pattern:/[3-5]/,message:'班级人数必须为3-5人',trigger: 'blur'}]"
-          v-if=" newClassForm.type == 'HIGH_ONLINE'"
-        >
-          <el-input
-            style="width:180px;"
-            type="number"
-            @mousewheel.native.prevent
-            v-model="newClassForm.expectStudentNum"
-          ></el-input>
+        <el-form-item label="预计招生数"
+                      prop="expectStudentNum"
+                      :rules="[{ required: true, message: '请输入预计招生数',trigger: 'blur'},{pattern:/[3-5]/,message:'班级人数必须为3-5人',trigger: 'blur'}]"
+                      v-if=" newClassForm.type == 'HIGH_ONLINE'">
+          <el-input style="width:180px;"
+                    type="number"
+                    @mousewheel.native.prevent
+                    v-model="newClassForm.expectStudentNum"></el-input>
         </el-form-item>
-        <el-form-item
-          label="预计招生数"
-          prop="expectStudentNum"
-          type="number"
-          :rules="[{ required: true, message: '请输入预计招生数',trigger: 'blur'}]"
-          @mousewheel.native.prevent
-          v-else
-        >
-          <el-input style="width:180px;" v-model="newClassForm.expectStudentNum"></el-input>
+        <el-form-item label="预计招生数"
+                      prop="expectStudentNum"
+                      type="number"
+                      :rules="[{ required: true, message: '请输入预计招生数',trigger: 'blur'}]"
+                      @mousewheel.native.prevent
+                      v-else>
+          <el-input style="width:180px;"
+                    v-model="newClassForm.expectStudentNum"></el-input>
         </el-form-item>
-        <el-form-item label="助教老师" v-if=" newClassForm.type != 'HIGH_ONLINE'" prop="teaching">
-          <el-select
-            placeholder="请选择助教老师"
-            v-model="newClassForm.teaching"
-            @change="setAssistant1"
-            clearable
-            multiple
-            filterable
-          >
-            <el-option
-              v-for="(item,index) in teacherList"
-              :label="item.realName"
-              :value="item.id"
-              :key="index"
-            ></el-option>
+        <el-form-item label="助教老师"
+                      v-if=" newClassForm.type != 'HIGH_ONLINE'"
+                      prop="teaching">
+          <el-select placeholder="请选择助教老师"
+                     v-model="newClassForm.teaching"
+                     @change="setAssistant1"
+                     clearable
+                     multiple
+                     filterable>
+            <el-option v-for="(item,index) in teacherList"
+                       :label="item.realName"
+                       :value="item.id"
+                       :key="index"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="声部"
-          prop="subjectIdList"
-          :rules="[{ required: true, message: '请选择声部',trigger: 'blur'}]"
-          v-if="newClassForm.type =='HIGH' || newClassForm.type =='NORMAL'"
-          :key="'HIGH'"
-        >
-          <el-select v-model="newClassForm.subjectIdList" clearable multiple >
-            <el-option
-              v-for="(item,index) in soundList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+        <el-form-item label="声部"
+                      prop="subjectIdList"
+                      :rules="[{ required: true, message: '请选择声部',trigger: 'blur'}]"
+                      v-if="newClassForm.type =='HIGH' || newClassForm.type =='NORMAL'"
+                      :key="'HIGH'">
+          <el-select v-model="newClassForm.subjectIdList"
+                     clearable
+                     multiple>
+            <el-option v-for="(item,index) in soundList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="可报名声部"
-          prop="memo"
-          :rules="[{ required: true, message: '请选择可报名声部',trigger: 'blur'}]"
-          v-if="newClassForm.type == 'HIGH_ONLINE'"
-        >
-          <el-select v-model.trim="newClassForm.memo" multiple clearable>
-            <el-option
-              v-for="(item,index) in soundList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+        <el-form-item label="可报名声部"
+                      prop="memo"
+                      :rules="[{ required: true, message: '请选择可报名声部',trigger: 'blur'}]"
+                      v-if="newClassForm.type == 'HIGH_ONLINE'">
+          <el-select v-model.trim="newClassForm.memo"
+                     multiple
+                     clearable>
+            <el-option v-for="(item,index) in soundList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="声部"
-          prop="subjectId"
-          :rules="[{ required: true, message: '请选择线上声部',trigger: 'blur'}]"
-          v-if="newClassForm.type == 'HIGH_ONLINE'" class="higheSelect"
-           :key="'HIGH_ONLINE'"
-        >
-          <el-select v-model="newClassForm.subjectId" clearable >
-            <el-option
-              v-for="(item,index) in soundList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+        <el-form-item label="声部"
+                      prop="subjectId"
+                      :rules="[{ required: true, message: '请选择线上声部',trigger: 'blur'}]"
+                      v-if="newClassForm.type == 'HIGH_ONLINE'"
+                      class="higheSelect"
+                      :key="'HIGH_ONLINE'">
+          <el-select v-model="newClassForm.subjectId"
+                     clearable>
+            <el-option v-for="(item,index) in soundList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -473,6 +454,7 @@
                          :label="item.label"
                          :value="item.value"></el-option>
             </el-select>
+            <!-- 老师调整 -->
             <span>开始时间</span>
             <el-time-select placeholder
                             v-model.trim="item.startClassTime"
@@ -482,8 +464,7 @@
                                end: '23:55'
             }"></el-time-select>
             <span>结束时间</span>
-            <el-time-select placeholder
-                            v-model.trim="item.endClassTime"
+            <el-time-select v-model="item.endClassTime"
                             :picker-options="{
                               start: '04:30',
                               step: '00:05',
@@ -594,6 +575,7 @@
                          :value="item.value"></el-option>
             </el-select>
             <span>开始时间</span>
+            <!--        -->
             <el-time-select placeholder
                             v-model.trim="item.startClassTime"
                             :picker-options="{
@@ -692,7 +674,7 @@ export default {
         className: null,
         type: null,
         subjectIdList: [],
-        subjectId:'',
+        subjectId: '',
         expectStudentNum: null,
         bishop: null,
         teaching: [],
@@ -832,7 +814,7 @@ export default {
         }
       });
     },
-    newClassHight() {
+    newClassHight () {
       this.$refs["newClassForm"].validate(res => {
         if (res) {
           let obj = {};
@@ -1492,18 +1474,18 @@ export default {
         }
       ];
     },
-    chioseHightype(val){  
-       this.$set(this.newClassForm,'subjectIdList',[])
-        this.newClassForm.subjectId = ''
-      if(val == 'HIGH_ONLINE'){
+    chioseHightype (val) {
+      this.$set(this.newClassForm, 'subjectIdList', [])
+      this.newClassForm.subjectId = ''
+      if (val == 'HIGH_ONLINE') {
         this.newClassForm.teaching = []
-         
-      }else {
-        this.newClassForm.memo = [] 
-      
+
+      } else {
+        this.newClassForm.memo = []
+
 
       }
-      
+
     }
   },
   filters: {
@@ -1529,7 +1511,7 @@ export default {
       }
       return num;
     },
-     
+
   },
   watch: {
     newClassVisible (val) {
@@ -1538,7 +1520,7 @@ export default {
           className: null,
           type: null,
           subjectIdList: [],
-          subjectId:'',
+          subjectId: '',
           expectStudentNum: null,
           bishop: null,
           teaching: null,

src/views/teamDetail/components/courseList.vue

@@ -249,6 +249,7 @@
                       prop="startTime">
           <el-time-select placeholder="起始时间"
                           v-model.trim="maskForm.startTime"
+                          @change="changeStartTime"
                           :picker-options="{
                             start: '04:30',
                             step: '00:05',
@@ -827,6 +828,9 @@ export default {
           );
         })
         .catch(() => { });
+    },
+    changeStartTime () {
+      this.maskForm.endTime = '';
     }
   },
   filters: {

src/views/workBenchManager/journal/leaveOperation.vue

@@ -60,7 +60,8 @@
             <p>结束时间: {{ showMessage.endTime | dateForMinFormat }}</p>
             <p>备注: {{ showMessage.remark }}</p>
           </div>
-          <div class="leaverecord" v-if="showMessage.vipCourse.length > 0">
+          <div class="leaverecord"
+               v-if="showMessage.vipCourse.length > 0">
             <el-table :data="showMessage.vipCourse"
                       style="width: 100%"
                       :header-cell-style="{background:'#EDEEF0',color:'#444'}">
@@ -85,22 +86,26 @@
                 </template>
               </el-table-column>
               <el-table-column label="调整后日期">
-                <template slot-scope="scope" v-if="scope.row.before.type == 'VIP'">
+                <template slot-scope="scope"
+                          v-if="scope.row.before.type == 'VIP'">
                   {{ scope.row.after.classDate | formatTimer }}
                 </template>
               </el-table-column>
               <el-table-column label="调整后时间">
-                <template slot-scope="scope" v-if="scope.row.before.type == 'VIP'">
+                <template slot-scope="scope"
+                          v-if="scope.row.before.type == 'VIP'">
                   {{ scope.row.after.startClassTime | getFormatTime(scope.row.after.endClassTime) }}
                 </template>
               </el-table-column>
             </el-table>
           </div>
-          <div class="leaverecord" v-if="showMessage.musicGroupCourse.length > 0">
+          <div class="leaverecord"
+               v-if="showMessage.musicGroupCourse.length > 0">
             <el-table :data="showMessage.musicGroupCourse"
                       style="width: 100%; padding-top: 10px;"
                       :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-              <el-table-column label="乐团编号" prop="before.musicGroupId"
+              <el-table-column label="乐团编号"
+                               prop="before.musicGroupId"
                                width="100px">
               </el-table-column>
               <el-table-column label="类型"
@@ -175,6 +180,7 @@
         <el-form-item label="开始时间"
                       prop="startTime">
           <el-time-select placeholder="起始时间"
+                          @change="changeStartTime"
                           v-model.trim="maskForm.startTime"
                           :picker-options="{
                             start: '04:30',
@@ -393,11 +399,11 @@ export default {
         if (res.code == 200) {
           this.showRight = true
           if (res.data.coursesScheduleJson) {
-            let tempJson = JSON.parse(res.data.coursesScheduleJson) 
+            let tempJson = JSON.parse(res.data.coursesScheduleJson)
             let musicGroupCourse = []
             let vipCourse = []
             tempJson.forEach(item => {
-              if(item.before.type == 'VIP') {
+              if (item.before.type == 'VIP') {
                 vipCourse.push(item)
               } else {
                 musicGroupCourse.push(item)
@@ -412,6 +418,9 @@ export default {
           this.$message.error(res.msg)
         }
       })
+    },
+    changeStartTime () {
+      this.maskForm.endTime = '';
     }
   },
   filters: {