Merge branch 'online' into LAO_MO

dist/static/css/chunk-77d97730.52d59aff.css → dist/static/css/chunk-1db50a70.f75339f3.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}.titlewrap[data-v-43d9c028]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.titlewrap[data-v-43d9c028],.wrap[data-v-43d9c028]{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}.wrap div[data-v-43d9c028]{margin-right: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}.titlewrap[data-v-4069c78e]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.titlewrap[data-v-4069c78e],.wrap[data-v-4069c78e]{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}.wrap div[data-v-4069c78e]{margin-right:20px}

src/api/buildTeam.js

@@ -1093,3 +1093,13 @@ export function getStuAndTeaReview(data) {
   })
 }
 
+// 网管课有效期调整
+export function updateCoursesExpireDate(data) { 
+  return request({
+    url: api + '/courseSchedule/updateCoursesExpireDate',
+    method: 'post',
+    data: qs.stringify(data)
+  })
+}
+
+

src/utils/validate.js

@@ -29,11 +29,11 @@ export function isvalidPhone(str) {
 export function vaildStudentUrl() {
   let url = window.location.href
   let returnUrl = ''
-  if(/test/.test(url)) { // test环境
+  if (/test/.test(url)) { // test环境
     returnUrl = 'http://mstutest.dayaedu.com'
-  } else if(/dev/.test(url)) { // dev 环境
+  } else if (/dev/.test(url)) { // dev 环境
     returnUrl = 'http://mstudev.dayaedu.com'
-  } else if(/online/.test(url)) { //线上
+  } else if (/online/.test(url)) { //线上
     returnUrl = 'https://mstuonline.dayaedu.com'
   } else { // 默认dev环境
     returnUrl = 'http://mstudev.dayaedu.com'
@@ -45,14 +45,69 @@ export function vaildStudentUrl() {
 export function vaildTeacherUrl() {
   let url = window.location.href
   let returnUrl = ''
-  if(/test/.test(url)) { // test环境
+  if (/test/.test(url)) { // test环境
     returnUrl = 'http://mteatest.dayaedu.com'
-  } else if(/dev/.test(url)) {// dev 环境
+  } else if (/dev/.test(url)) { // dev 环境
     returnUrl = 'http://mteadev.dayaedu.com'
-  } else if(/online/.test(url)) {//线上
+  } else if (/online/.test(url)) { //线上
     returnUrl = 'https://mteaonline.dayaedu.com'
   } else { // 默认dev环境
     returnUrl = 'http://mteadev.dayaedu.com'
   }
   return returnUrl
 }
+
+
+export function nextMonthLastDay(year, month) { //日期显示为次月最后一天
+  // var time = date ? new Date(date) : new Date();
+  // var year = time.getFullYear();
+  // //var year = 1900; //用于测试
+  // var month = time.getMonth() + 2;
+  if (month > 12) {
+
+    month = month - 12;
+
+    year = year + 1;
+
+  }
+
+  var day = nextMonthDay(year, month);
+
+  return [year, month, day];
+
+}
+
+function nextMonthDay(year, month) { //判断每月多少天
+
+  var day31 = [1, 3, 5, 7, 8, 10, 12];
+
+  var day30 = [4, 6, 9, 11];
+
+  if (day31.indexOf(month) > -1) {
+
+    return 31;
+
+  } else if (day30.indexOf(month) > -1) {
+
+    return 30;
+
+  } else {
+
+    if (isLeapYear(year)) {
+
+      return 29;
+
+    } else {
+
+      return 28;
+
+    }
+
+  }
+
+}
+
+function isLeapYear(year) { //判断是否为闰年
+  return (year % 4 == 0) && (year % 100 != 0 || year % 400 == 0);
+
+}

src/views/accompanyManager/accompanys.vue

@@ -27,10 +27,11 @@
         v-permission="'courseSchedule/batchUpdateCourseSchedule'"
         @click="adjustment"
       >批量调整</div>
-      <!-- <div class="newBand"
+
+      <div class="newBand"
         v-permission="'courseSchedule/updateCoursesExpireDate'"
-        @click="onCourseExpireDate"
-      >有效期调整</div> -->
+        @click="expireVisible = true"
+      >有效期调整</div>
     </div>
     
     <div class="tableWrap">
@@ -92,28 +93,24 @@
             <div>
               <el-button
                 type="text"
-                v-permission="'courseSchedule/classStartDateAdjust'"
-                v-show="!scope.row.isSettlement"
+                v-if="!scope.row.isSettlement && permission('courseSchedule/classStartDateAdjust')"
                 @click="resetClass(scope.row)"
               >调整</el-button>
               <el-button
                 type="text"
-                v-permission="'accompanys/remove'"
-                v-show="!scope.row.isSettlement && scope.row.status == 'NOT_START'"
+                v-if="!scope.row.isSettlement && scope.row.status == 'NOT_START' && permission('accompanys/remove')"
                 @click="removeClass(scope.row)"
               >删除</el-button>
               <el-button
-                v-permission="'courseSchedule/practiceCourseTeacherAdjust'"
                 type="text"
-                v-show="scope.row.status == 'NOT_START'&&courseType!='TRIAL'"
+                v-if="scope.row.status == 'NOT_START'&&courseType!='TRIAL'&& permission('courseSchedule/practiceCourseTeacherAdjust')"
                 @click="resetTeacher(scope.row)"
               >更换老师</el-button>
-              <!-- <el-button v-if="scope.row.status == 'OVER' && !scope.row.settlementTime && permission('teacherAttendance/updateTeacherAttendance', '/teamCourseList')" type="text" @click="onMarkAttendance(scope.row)"
-              >补考勤</el-button> -->
+              <el-button v-if="scope.row.status == 'OVER' && scope.row.isSettlement == 0 && permission('teacherAttendance/updateTeacherAttendance', '/accompanys')" type="text" @click="onMarkAttendance(scope.row)"
+              >补考勤</el-button>
               <el-button
                 type="text"
-                v-permission="'accompanys/cleanAttendance'"
-                v-show="!scope.row.isSettlement"
+                v-if="!scope.row.isSettlement && permission('accompanys/cleanAttendance')"
                 @click="clearAttend(scope.row)"
               >清除考勤</el-button>
             </div>
@@ -128,6 +125,31 @@
         @pagination="getList"
       />
     </div>
+    <el-dialog title="有效期调整" width="400px" :before-close="expireClose" :visible.sync="expireVisible">
+      <el-form
+        :model="expireForm"
+        ref="expireForm"
+        :rules="expireRules"
+        label-position="right"
+        label-width="80px;"
+        :inline="true">
+        <el-form-item label="课程结束时间" prop="coursesExpireDate">
+          <el-date-picker
+            v-model.trim="expireForm.coursesExpireDate"
+            style="width:200px!important;"
+            type="date"
+            :picker-options="bigin"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期"
+          ></el-date-picker>
+        </el-form-item >
+        <div style="padding-left: 15px; color: red;">课程结束时间不得早于，{{ expireForm.tempCoursesExpireDate }}</div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="expireVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitExpireDate">确 定</el-button>
+      </div>
+    </el-dialog>
     <el-dialog title="补考勤" width="400px" :visible.sync="markAttendance.status">
       <el-form>
         <el-form-item label="签到状态">{{ markAttendance.dataInfo.isSignIn | attendanceType }}</el-form-item>
@@ -364,6 +386,7 @@
 <script>
 import pagination from "@/components/Pagination/index";
 import { permission } from "@/utils/directivePage";
+import { nextMonthLastDay } from "@/utils/validate";
 import {
   findPracticeGroupCourseSchedules,
   practiceCourseAdjus,
@@ -376,13 +399,16 @@ import {
   getPracticeApplySubjects,
   batchUpdateCourseSchedule,
   findEducationUsers,
-  updateTeacherAttendance
+  updateTeacherAttendance,
+  superFindCourseSchedules,
+  updateCoursesExpireDate
 } from "@/api/buildTeam";
 import {
   vipCourseAdjust,
   batchAppendVipGroupCourses,
   bathDelete
 } from "@/api/vipSeting";
+// import { start } from 'repl';
 export default {
   components: {
     pagination
@@ -392,6 +418,7 @@ export default {
       adjustmentName: "",
       isaddCourse: false,
       adjustmentVisible: false,
+      expireVisible: false,
       isMultiple: true,
       name: "网管课程组",
       courseVisible: false,
@@ -427,6 +454,13 @@ export default {
         fee: ""
       },
       startTime: null,
+      expireForm: {
+        coursesExpireDate: null,
+        tempCoursesExpireDate: null
+      },
+      expireRules: {
+        coursesExpireDate: [{ required: true, message: "请选择课程结束时间", trigger: "blur" }]
+      },
       maskRules: {
         date: [{ required: true, message: "请选择上课时间", trigger: "blur" }],
         // startTime: [{ required: true, message: '请选择上课开始时间', trigger: 'blur' },],
@@ -478,12 +512,12 @@ export default {
       activeList: [],
       educationList: [],
       timers: null,
-      courseExpireDate: null, // 结束时间
       markAttendance: {
         // 考勤状态
         status: false,
         dataInfo: {}
       },
+      bigin: this.beginDate()
     };
   },
   mounted() {
@@ -539,7 +573,20 @@ export default {
               this.courseData[0].coursesStartDate.substring(0, 10) +
               "至" +
               this.courseData[0].coursesExpireDate.substring(0, 10);
-            this.courseExpireDate = this.courseData[0].coursesExpireDate.substring(0, 10);
+            this.expireForm.coursesExpireDate = this.courseData[0].coursesExpireDate.substring(0, 10);
+            let originalStartDate = this.courseData[0].coursesStartDate ? new Date(this.courseData[0].coursesStartDate) : new Date()
+            let buyMonths = this.courseData[0].buyMonths
+            let lastDayNum = nextMonthLastDay(originalStartDate.getFullYear(), (originalStartDate.getMonth() + buyMonths + 1))
+            if(lastDayNum[2] >= originalStartDate.getDate()) {
+              originalStartDate.setMonth(originalStartDate.getMonth() + buyMonths)
+            } else {
+              originalStartDate = new Date(lastDayNum.join('-'))
+            }
+
+            
+            originalStartDate.setDate(originalStartDate.getDate() - 1)
+            let overTime = originalStartDate.getFullYear() + '-' + (originalStartDate.getMonth() + 1) + '-' + originalStartDate.getDate()
+            this.expireForm.tempCoursesExpireDate = overTime
           }
         }
       });
@@ -547,6 +594,40 @@ export default {
     permission(str, parent) {
       return permission(str, parent);
     },
+    beginDate () {
+      let self = this
+      return {
+        disabledDate (time) {
+          if (self.expireForm.tempCoursesExpireDate) {
+            return new Date(self.expireForm.tempCoursesExpireDate).getTime() > time.getTime()
+          } else {
+            return time.getTime() >= Date.now()
+            //开始时间不选时，结束时间最大值小于等于当天
+          }
+        }
+      }
+    },
+    submitExpireDate() {
+      this.$refs.expireForm.validate(some => {
+        if (some) {
+          updateCoursesExpireDate({
+            practiceGroupId: this.practiceId,
+            coursesExpireDate: this.expireForm.coursesExpireDate
+          }).then(res => {
+            if (res.code == 200) {
+              this.$message.success("有效期修改成功")
+              this.expireVisible = false
+              this.getCourseGroup()
+            } else {
+              this.$message.error(res.msg)
+            }
+          })
+        } else {
+          return;
+        }
+      });
+      
+    },
     onMarkAttendance(item) {
       // 补考勤
       this.markAttendance = {
@@ -603,6 +684,13 @@ export default {
       };
       this.$refs["maskForm"].resetFields();
     },
+    expireClose() {
+      this.expireVisible = false;
+      this.expireForm = {
+        coursesExpireDate: null
+      };
+      this.$refs["expireForm"].resetFields();
+    },
     submitResetClass() {
       //   endClassTimeStr: this.maskForm.endTime,
       if (!this.startTime) {

src/views/operateManager/serverIndexDetail.vue

@@ -29,7 +29,7 @@
           </div>
           <div class="textWrap">
             <p class="title">是否点评 : </p>
-            <p class="contant">{{item.isSubmit?'是':'否'}}</p>
+            <p class="contant">{{item.isReplied?'是':'否'}}</p>
           </div>
         </div>
         <div class="m-row"
@@ -75,7 +75,7 @@
                   <el-input type="textarea"
                             :disabled='true'
                             :rows="3"
-                            :value="111"
+                            :value="item.content"
                             style="font-size:16px"
                             placeholder="老师布置的作业"></el-input>
                 </div>
@@ -199,11 +199,11 @@ export default {
     goBack () {
       this.$router.push({ path: '/operateManager/serverIndexList', query: { search: this.Fsearch, rules: this.Frules } })
     },
-    getComment (item,index,subIndex) {
+    getComment (item, index, subIndex) {
       // 数据处理
       if (item.up) {
-          item.up = false;
-          this.$forceUpdate()
+        item.up = false;
+        this.$forceUpdate()
         // item.up = false;
       } else {
         let extra;