04/11 111

11

dist/static/css/chunk-3607d7c6.43ef1418.css → dist/static/css/chunk-56cdf336.7fb471ea.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}.schoolCell[data-v-5770365a]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-5770365a] .el-textarea.is-disabled .el-textarea__inner{color:#333}.schoolCell[data-v-500f476a]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-500f476a] .el-textarea.is-disabled .el-textarea__inner{color:#333}
+.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}.schoolCell[data-v-3be728ac]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-3be728ac] .el-textarea.is-disabled .el-textarea__inner{color:#333}.schoolCell[data-v-500f476a]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-500f476a] .el-textarea.is-disabled .el-textarea__inner{color:#333}

src/views/afterSchoolManager/afterSchoolList.vue

@@ -61,11 +61,19 @@
           :header-cell-style="{background:'#EDEEF0',color:'#444'}"
           :data="tableList"
         >
-          <el-table-column align="center" prop="createTime" label="布置时间"></el-table-column>
+          <el-table-column align="center" prop="createTime" label="布置时间">
+              <template slot-scope="scope">
+              {{scope.row.createTime | dateForMinFormat}}
+            </template>
+          </el-table-column>
           <el-table-column align="center" prop="title" label="训练标题"></el-table-column>
           <el-table-column align="center" prop="organName" label="分部"></el-table-column>
           
-          <el-table-column align="center" prop="expireDate" label="截止时间"></el-table-column>
+          <el-table-column align="center" prop="expireDate" label="截止时间">
+              <template slot-scope="scope">
+              {{scope.row.expireDate | dateForMinFormat}}
+            </template>
+          </el-table-column>
           <el-table-column align="center" prop="teacherName" label="老师姓名">
             <template slot-scope="scope">
               <div v-if="scope.row.teacher">

src/views/afterSchoolManager/afterSchoolTeach.vue

@@ -323,8 +323,13 @@ export default {
     getNowDateAndSunday(time) {
       let timestamp = new Date(time.replace(/-/g, "/")).getTime();
       let serverDate = new Date(time);
+      
+      let num = 7 - serverDate.getDay();
+      if(num == 7){
+        num = 0
+      }
       let sundayTiem =
-        timestamp + (7 - serverDate.getDay()) * 24 * 60 * 60 * 1000;
+        timestamp + (num * 24 * 60 * 60 * 1000);
       let SundayData = new Date(sundayTiem);
       //年
       let tomorrowY = SundayData.getFullYear(); //月