提交

src/views/arrangement/pkgl.vue

@@ -258,7 +258,13 @@ export default {
      * @param row
      */
     handleDetail(row) {
+      if (new Date(row.date).getTime() < (new Date().getTime() - 1000*3600*24)) {
+        return this.$message.warning('排课管理中添加、编辑，时间只能当前时间之后')
+      }
       if (row.id) {
+        if (new Date(row.classTime).getTime() < (new Date().getTime() - 1000*3600*24)) {
+          return this.$message.warning('排课管理中添加、编辑，时间只能当前时间之后')
+        }
         this.title = '编辑'
         this.formData = JSON.parse(JSON.stringify(row))
       } else {

src/views/report/cqtj.vue

@@ -34,7 +34,7 @@
 
         <el-table :data="data"  style="width: 100%;overflow: auto;" size="medium" highlight-current-row>
           <el-table-column type="index" width="60" label="序号" align="center" />
-          <el-table-column prop="className" label="班级名称" align="center" />
+          <el-table-column prop="className" label="班级名称" align="center" :show-overflow-tooltip="true"/>
           <el-table-column prop="lessonName" label="课时" align="center" />
           <el-table-column prop="courseCode" label="课程代码" align="center" />
           <el-table-column prop="courseName" label="课程名称" align="center" />

src/views/vacation/jqgl.vue

@@ -53,11 +53,11 @@
 
         <el-table :data="data"  style="width: 100%;overflow: auto;" size="medium" highlight-current-row>
           <el-table-column type="index" width="60" label="序号" align="center" />
-          <el-table-column prop="studentNo" label="学员编号" align="center" />
-          <el-table-column prop="classCode" label="班级编号" align="center" />
+          <el-table-column prop="studentName" label="学员姓名" align="center" />
+          <el-table-column prop="className" label="班级名称" align="center" />
           <el-table-column prop="startTime" label="请假开始时间" align="center" />
           <el-table-column prop="endTime" label="请假结束时间" align="center" />
-          <el-table-column prop="remark" label="理由" align="center" />
+          <el-table-column prop="remark" label="请假类型" align="center" />
           <el-table-column label="操作" align="center" width="120">
             <template slot-scope="scope">
               <a-button type="primary" icon="edit" size="small" ghost @click="editClick(scope.row)">编辑</a-button>
@@ -105,10 +105,10 @@
                 <el-form-item label="学员姓名 :">
                   <el-select v-model="formData.studentNo" filterable placeholder="请选择或输入学员姓名" clearable style="width: 100%">
                     <el-option
-                        v-for="item in classStudentList"
-                        :key="item.studentNo"
-                        :label="item.studentName"
-                        :value="item.studentNo">
+                      v-for="item in classStudentList"
+                      :key="item.studentNo"
+                      :label="item.studentName"
+                      :value="item.studentNo">
                     </el-option>
                   </el-select>
                 </el-form-item>
@@ -138,15 +138,16 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row>
-              <el-form-item label="备注信息 :">
-                <el-input
-                  type="textarea"
-                  :autosize="{ minRows: 3}"
-                  placeholder="请输入备注信息"
-                  v-model="formData.remark">
-                </el-input>
-              </el-form-item>
+            <el-row type="flex" justify="space-between">
+              <el-col :span="11">
+                <el-form-item label="请假类型 :">
+                  <el-select v-model="formData.remark" filterable placeholder="请选择请假类型" clearable style="width: 100%">
+                    <el-option label="公休" value="公休"></el-option>
+                    <el-option label="值班" value="值班"></el-option>
+                    <el-option label="请假" value="请假"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-card>
         </el-form>
@@ -251,11 +252,11 @@ export default {
       this.classList = res.data.records 
     },
     changeClass(val) {
-       this.formData.studentNo = ''
-       this.classStudentList = []
-       if (val) {
-         this.getClassUser(val)
-       }
+      this.formData.studentNo = ''
+      this.classStudentList = []
+      if (val) {
+        this.getClassUser(val)
+      }
     },
     async getClassUser(classCode) {
       const { data: res } = await this.$axios.post('/jxUser/getClassUser', {classCode: classCode, pageNo: 1, pageSize: 999  })