04/10 19:44

111

src/utils/vueFilter.js

@@ -122,6 +122,20 @@ Vue.filter('formatTimer', (value) => {
     return value
   }
 })
+Vue.filter('timerForMinFormat', (value) => {
+  if (value) {
+    return value.substring(0,5)
+  } else {
+    return value
+  }
+})
+Vue.filter('dateForMinFormat', (value) => {
+  if (value) {
+    return value.substring(0,16)
+  } else {
+    return value
+  }
+})
 
 // 时间处理
 Vue.filter('timer', (value) => {

src/views/accompanyManager/accompanys.vue

@@ -66,8 +66,16 @@
             <div>{{scope.row.isSettlement?'已结算':'未结算'}}</div>
           </template>
         </el-table-column>
-        <el-table-column label="开始时间" align="center" prop="startClassTimeStr"></el-table-column>
-        <el-table-column label="结束时间" align="center" prop="endClassTimeStr"></el-table-column>
+        <el-table-column label="开始时间" align="center" prop="startClassTimeStr">
+           <template slot-scope="scope">
+            <div>{{ scope.row.startClassTimeStr |  timerForMinFormat}}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="结束时间" align="center" prop="endClassTimeStr">
+           <template slot-scope="scope">
+            <div>{{ scope.row.endClassTimeStr | timerForMinFormat}}</div>
+          </template>
+        </el-table-column>
         <!-- <el-table-column label="教学点" align="center" prop="schoolName">
           <template slot-scope="scope">
             <div>{{scope.row.schoolName?scope.row.schoolName:'网络教室'}}</div>

src/views/afterSchoolManager/afterSchoolTeach.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="m-core">
     <div class="m-core">
-      <el-form :inline="true" :model="searchForm" >
+      <el-form :inline="true" :model="searchForm">
         <el-form-item>
           <el-input
             v-model.trim="searchForm.search"
@@ -44,7 +44,7 @@
             v-model.trim="searchForm.timer"
             style="width:400px;"
             type="daterange"
-             :picker-options="{
+            :picker-options="{
         firstDayOfWeek: 1
     }"
             value-format="yyyy-MM-dd"
@@ -70,8 +70,20 @@
           :header-cell-style="{background:'#EDEEF0',color:'#444'}"
           :data="tableList"
         >
-          <el-table-column align="center" prop="createTime" label="布置时间" width="150"></el-table-column>
-          <el-table-column align="center" prop="expireDate" label="截止时间" width="150"></el-table-column>
+          <el-table-column align="center" prop="createTime" label="布置时间" width="150">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.createTime | dateForMinFormat}}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="expireDate" label="截止时间" width="150">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.createTime | dateForMinFormat}}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center" prop="title" label="训练标题">
             <template slot-scope="scope">
               <div>
@@ -136,20 +148,20 @@ export default {
   components: { pagination },
   data() {
     return {
-        tableList:[],
-        searchForm:{
-            timer:[],
-            search:null,
-            status:null,
-        },
-        organList:[],
-          rules: {
+      tableList: [],
+      searchForm: {
+        timer: [],
+        search: null,
+        status: null
+      },
+      organList: [],
+      rules: {
         // 分页规则
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
-      },
+      }
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -162,7 +174,7 @@ export default {
     onReSet() {},
 
     onExport() {},
-    search(){}
+    search() {}
   }
 };
 </script>

src/views/businessManager/orderManager/backMoney.vue

@@ -43,8 +43,14 @@
         <el-table :data='tableList'
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
           <el-table-column align='center'
+            width="150"
                            prop="createTime"
                            label="申请时间">
+                           <template slot-scope="scope">
+                             <div>
+                               {{scope.row.createTime | dateForMinFormat}}
+                             </div>
+                           </template>
           </el-table-column>
           <el-table-column align='center'
                            prop="orderNo"

src/views/businessManager/orderManager/expend.vue

@@ -37,6 +37,11 @@
           <el-table-column align='center'
                            prop="createTime"
                            label="申请时间">
+                            <template slot-scope="scope">
+                             <div>
+                               {{scope.row.createTime | dateForMinFormat}}
+                             </div>
+                           </template>
           </el-table-column>
           <el-table-column align='center'
                            prop="user.realName"

src/views/evaluateManager/evaluateDetail.vue

@@ -33,7 +33,7 @@
             <div class="cardWrapleft">
               <p class="title">课程信息</p>
               <el-divider></el-divider>
-              <p class="row">评价时间：{{commitWrap.time }}</p>
+              <p class="row">评价时间：{{commitWrap.time | dateForMinFormat}}</p>
               <p class="row">老师: {{commitWrap.teacher}}</p>
               <p class="row">声部:{{ commitWrap.soundName }}</p>
               <p class="row">训练次数:{{ commitWrap.count }}</p>

src/views/journal/journalItem.vue

@@ -27,7 +27,7 @@
            v-for="(item, index) in dataList"
            :key="index">
         <!-- <h6 class="type">审批</h6> -->
-        <h4 class="name">系统消息 <span class='time'>{{ item.createOn }}</span>
+        <h4 class="name">系统消息 <span class='time'>{{ item.createOn| dateForMinFormat}}</span>
           <div class="dot"
                v-if="item.readStatus == 0"></div>
         </h4>

src/views/journal/leaveOperation.vue

@@ -22,7 +22,7 @@
            v-for="(item, index) in dataList"
            :key="index">
         <!-- <h6 class="type"></h6> -->
-        <h4 class="name">请假处理<span class='time'>{{ item.createOn }}</span>
+        <h4 class="name">请假处理<span class='time'>{{ item.createOn|dateForMinFormat }}</span>
           <div class="dot"
                v-if="item.readStatus == 0"></div>
         </h4>
@@ -56,8 +56,8 @@
           <p class="subMsg">发至 <span class='san'></span> <span style="margin-left:30px">我</span></p>
           <div class="textWrap">
             <p>审批事项: 请假</p>
-            <p>开始时间: {{ showMessage.startTime }}</p>
-            <p>结束时间: {{ showMessage.endTime }}</p>
+            <p>开始时间: {{ showMessage.startTime | dateForMinFormat }}</p>
+            <p>结束时间: {{ showMessage.endTime | dateForMinFormat }}</p>
             <p>备注: {{ showMessage.remark }}</p>
           </div>
           <div class="leaverecord" v-if="showMessage.vipCourse.length > 0">

src/views/journal/musicGroup.vue

@@ -24,7 +24,7 @@
         <!-- <h6 class="type"></h6> -->
         <h4 class="name">
           {{ item.memo.type == 'VIPGROUP' ? '学员退课' : '学生退团' }}
-          <span class='time'>{{ item.createOn }}</span>
+          <span class='time'>{{ item.createOn | dateForMinFormat}}</span>
           <div class="dot"
                v-if="item.readStatus == 0"></div>
         </h4>
@@ -52,7 +52,7 @@
               <el-tag v-if="showMessage.studentApplyRefunds.status == 'REJECT'"
                       type="danger"
                       effect="plain">已拒绝</el-tag>
-              <span class="time">时间: {{ showMessage.studentApplyRefunds.createTime }}</span>
+              <span class="time">时间: {{ showMessage.studentApplyRefunds.createTime | dateForMinFormat}}</span>
             </h3>
           </el-col>
         </el-row>

src/views/journal/studentComplain.vue

@@ -22,7 +22,7 @@
            v-for="(item, index) in dataList"
            :key="index">
         <!-- <h6 class="type"></h6> -->
-        <h4 class="name">学生申诉<span class='time'>{{ item.createOn }}</span>
+        <h4 class="name">学生申诉<span class='time'>{{ item.createOn | dateForMinFormat }}</span>
           <div class="dot"
                v-if="item.readStatus == 0"></div>
         </h4>
@@ -48,7 +48,7 @@
             <el-tag v-if="showMessage.complaints.status == 'REJECT'"
                     type="danger"
                     effect="plain">已拒绝</el-tag>
-            <span class="time">发起投诉时间: {{ showMessage.courseSchedule.createTime }}</span>
+            <span class="time">发起投诉时间: {{ showMessage.courseSchedule.createTime | dateForMinFormat}}</span>
           </h3>
         </el-col>
       </el-row>

src/views/journal/vipApply.vue

@@ -22,7 +22,7 @@
            v-for="(item, index) in dataList"
            :key="index">
         <!-- <h6 class="type"></h6> -->
-        <h4 class="name">VIP申请审核<span class='time'>{{ item.createOn }}</span>
+        <h4 class="name">VIP申请审核<span class='time'>{{ item.createOn | dateForMinFormat}}</span>
           <div class="dot"
                v-if="item.readStatus == 0"></div>
         </h4>
@@ -55,7 +55,7 @@
           <!-- <span class="subMsg">发至 <span class='san'></span> <span style="margin-left:30px">我</span></p> -->
           <div class="textWrap">
             <p>审批事项: VIP申请</p>
-            <p>开始时间: {{ showMessage.createTime }}</p>
+            <p>开始时间: {{ showMessage.createTime | dateForMinFormat }}</p>
           </div>
           <div class="leaverecord">
             <el-form :inline="true"

src/views/studentManager/components/studentCashout.vue

@@ -8,6 +8,9 @@
         </el-table-column>
         <el-table-column label=申请时间
                          prop="createTime">
+                          <template slot-scope="scope">
+            {{ scope.row.createTime | dateForMinFormat }}
+          </template>
         </el-table-column>
         <el-table-column label=提现金额
                          prop="amount">

src/views/studentManager/components/studentOutList.vue

@@ -55,14 +55,17 @@
         <el-table-column label="开课时间"
                          align='center'
                          prop="firstClassesStartTime">
+                         <template slot-scope="scope">
+            {{ scope.row.firstClassesStartTime | dateForMinFormat }}
+          </template>
         </el-table-column>
-        <el-table-column label="当前课次"
+        <!-- <el-table-column label="当前课次"
                          align='center'
                          prop="currentClassTimes">
           <template slot-scope="scope">
             {{ scope.row.currentClassTimes }}/{{ scope.row.totalClassTimes }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <pagination :total="pageInfo.total"
                   :page.sync="pageInfo.page"

src/views/studentManager/components/studentRecord.vue

@@ -69,8 +69,12 @@
     <div class="tableWrap">
       <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column align="center" prop="courseScheduleId" label="课程编号"></el-table-column>
-        <el-table-column align="center" prop="courseDate" width="150" label="上课时间"></el-table-column>
-        <el-table-column align="center" prop="courseEndDate" label="下课时间" width="150"></el-table-column>
+        <el-table-column align="center" prop="courseDate" width="150" label="上课时间">
+           <template slot-scope="scope">{{ scope.row.courseDate | dateForMinFormat }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="courseEndDate" label="下课时间" width="150">
+           <template slot-scope="scope">{{ scope.row.courseEndDate | dateForMinFormat }}</template>
+        </el-table-column>
         <el-table-column align="center" label="星期几">
           <template slot-scope="scope">{{ scope.row.courseDate | formatWeek }}</template>
         </el-table-column>

src/views/studentManager/components/studentVip.vue

@@ -1,6 +1,6 @@
 
 <template>
-  <div class='studentvip'>
+  <div class="studentvip">
     <!-- <div class="topCard">
       <div class="cardItem" @click="onCheckCourse(item)" :class="[item.id == checkIndex ? 'active' : '']"
        v-for="(item, index) in courseList" :key="index">
@@ -23,100 +23,68 @@
           </div>
         </div>
       </div>
-    </div> -->
+    </div>-->
     <!-- 搜索类型 -->
-    <el-form :inline="true"
-             class="searchForm"
-             v-model.trim="searchForm">
+    <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
       <el-form-item>
-        <el-input placeholder="课程名称"
-                  @keyup.enter.native='onSearch'
-                  v-model.trim="searchForm.classGroupName"></el-input>
+        <el-input
+          placeholder="课程名称"
+          @keyup.enter.native="onSearch"
+          v-model.trim="searchForm.classGroupName"
+        ></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button @click="onSearch"
-                   type="danger">搜索</el-button>
+        <el-button @click="onSearch" type="danger">搜索</el-button>
       </el-form-item>
     </el-form>
 
     <div class="tableWrap">
-      <el-table :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-                :data='tableList'>
-        <el-table-column label="VIP编号"
-                         align='center'
-                         prop='vipGroupId'>
+      <el-table :header-cell-style="{background:'#EDEEF0',color:'#444'}" :data="tableList">
+        <el-table-column label="VIP编号" align="center" prop="vipGroupId"></el-table-column>
+        <el-table-column label="VIP课名称" align="center" prop="vipGroupName"></el-table-column>
+        <el-table-column label="VIP课状态" align="center">
+          <template slot-scope="scope">{{ scope.row.vipGroupStatus | vipCourseStatus }}</template>
         </el-table-column>
-        <el-table-column label="VIP课名称"
-                         align='center'
-                         prop="vipGroupName">
+        <el-table-column label="指导老师" align="center" prop="teacherName"></el-table-column>
+        <el-table-column label="班级人数" align="center" prop="studentNum"></el-table-column>
+        <el-table-column label="活动方案" align="center" prop="activeName"></el-table-column>
+        <el-table-column label="开课时间" width="150" align="center" prop="courseStartDate">
+          <template slot-scope="scope">{{ scope.row.courseStartDate | dateForMinFormat }}</template>
         </el-table-column>
-        <el-table-column label="VIP课状态"
-                         align='center'>
-          <template slot-scope="scope">
-            {{ scope.row.vipGroupStatus | vipCourseStatus }}
-          </template>
-        </el-table-column>
-        <el-table-column label="指导老师"
-                         align='center'
-                         prop="teacherName">
-        </el-table-column>
-        <el-table-column label="班级人数"
-                         align='center'
-                         prop="studentNum">
+        <el-table-column label="当前课次" align="center" prop="currentClassTimes">
+          <template
+            slot-scope="scope"
+          >{{ scope.row.currentClassTimes }}/{{ scope.row.totalClassTimes }}</template>
         </el-table-column>
-        <el-table-column label="活动方案"
-                         align='center'
-                         prop="activeName">
-        </el-table-column>
-        <el-table-column label="开课时间"
-                         align='center'
-                         prop="courseStartDate">
-        </el-table-column>
-        <el-table-column label="当前课次"
-                         align='center'
-                         prop="currentClassTimes">
+        <el-table-column label="操作" align="center">
           <template slot-scope="scope">
-            {{ scope.row.currentClassTimes }}/{{ scope.row.totalClassTimes }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作"
-                         align='center'>
-          <template slot-scope="scope">
-            <el-button @click="onCourse(scope.row)"
-                       v-permission="'studentManage/findStudentVipGroups'"
-                       type="text">课表</el-button>
+            <el-button
+              @click="onCourse(scope.row)"
+              v-permission="'studentManage/findStudentVipGroups'"
+              type="text"
+            >课表</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination :total="pageInfo.total"
-                  :page.sync="pageInfo.page"
-                  :limit.sync="pageInfo.limit"
-                  :page-sizes="pageInfo.page_size"
-                  @pagination="getCourseList" />
+      <pagination
+        :total="pageInfo.total"
+        :page.sync="pageInfo.page"
+        :limit.sync="pageInfo.limit"
+        :page-sizes="pageInfo.page_size"
+        @pagination="getCourseList"
+      />
 
-      <el-dialog :title="dialogTitle"
-                 :visible.sync="dialogTableVisible">
+      <el-dialog :title="dialogTitle" :visible.sync="dialogTableVisible">
         <el-table :data="gridData">
-          <el-table-column prop="courseDate"
-                           label="时间"
-                           align='center'
-                           width="150"></el-table-column>
-          <el-table-column prop="classGroupName"
-                           label="课程名称"
-                           align='center'
-                           width="200"></el-table-column>
-          <el-table-column label="课程类型"
-                           align='center'>
-            <template slot-scope="scope">
-              {{ scope.row.teachMode == 'ONLINE' ? '线上' : '线下' }}
-            </template>
+          <el-table-column prop="courseDate" label="时间" align="center" width="150">
+               <template slot-scope="scope">{{ scope.row.courseDate | dateForMinFormat }}</template>
+          </el-table-column>
+          <el-table-column prop="classGroupName" label="课程名称" align="center" width="200"></el-table-column>
+          <el-table-column label="课程类型" align="center">
+            <template slot-scope="scope">{{ scope.row.teachMode == 'ONLINE' ? '线上' : '线下' }}</template>
           </el-table-column>
-          <el-table-column prop="courseStatus"
-                           align='center'
-                           label="课程状态">
-            <template slot-scope="scope">
-              {{ scope.row.courseStatus |coursesStatus }}
-            </template>
+          <el-table-column prop="courseStatus" align="center" label="课程状态">
+            <template slot-scope="scope">{{ scope.row.courseStatus |coursesStatus }}</template>
           </el-table-column>
         </el-table>
       </el-dialog>
@@ -124,12 +92,16 @@
   </div>
 </template>
 <script>
-import pagination from '@/components/Pagination/index'
-import { findStudentVipGroups, findStudentVipGroupClass, findStudentCourses } from '@/api/studentManager'
+import pagination from "@/components/Pagination/index";
+import {
+  findStudentVipGroups,
+  findStudentVipGroupClass,
+  findStudentCourses
+} from "@/api/studentManager";
 export default {
-  name: 'studentvip',
+  name: "studentvip",
   components: { pagination },
-  data () {
+  data() {
     return {
       searchForm: {
         studentId: null,
@@ -147,51 +119,54 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      dialogTitle: '',
+      dialogTitle: "",
       gridData: [],
-      userId: ''
-    }
+      userId: ""
+    };
   },
-  created () {
+  created() {
     this.userId = this.$route.query.userId || null;
   },
-  mounted () {
-    this.searchForm.studentId = this.$route.query.userId
-    this.getCourseList()
+  mounted() {
+    this.searchForm.studentId = this.$route.query.userId;
+    this.getCourseList();
   },
   activated() {
-    this.userId = this.$route.query.userId || null
-    this.searchForm.studentId = this.$route.query.userId
-    this.getCourseList()
+    this.userId = this.$route.query.userId || null;
+    this.searchForm.studentId = this.$route.query.userId;
+    this.getCourseList();
   },
   methods: {
     // onCheckCourse(item) {
     //   this.checkIndex = item.id
     //   this.getList()
     // },
-    getCourseList () {
-      let params = this.searchForm
-      params.rows = this.pageInfo.limit
-      params.page = this.pageInfo.page
+    getCourseList() {
+      let params = this.searchForm;
+      params.rows = this.pageInfo.limit;
+      params.page = this.pageInfo.page;
       findStudentVipGroupClass(params).then(res => {
         if (res.code == 200) {
-          this.tableList = res.data.rows
-          this.pageInfo.total = res.data.total
+          this.tableList = res.data.rows;
+          this.pageInfo.total = res.data.total;
         }
-      })
+      });
     },
-    onCourse (row) {
-      findStudentVipGroups({ vipGroupId: row.vipGroupId, studentId: this.userId }).then(res => {
-        this.dialogTitle = row.vipGroupName
+    onCourse(row) {
+      findStudentVipGroups({
+        vipGroupId: row.vipGroupId,
+        studentId: this.userId
+      }).then(res => {
+        this.dialogTitle = row.vipGroupName;
         if (res.code == 200) {
-          this.gridData = res.data.rows
-          this.dialogTableVisible = true
+          this.gridData = res.data.rows;
+          this.dialogTableVisible = true;
         }
-      })
+      });
     },
-    onSearch () {
-      this.pageInfo.page = 1
-      this.getCourseList()
+    onSearch() {
+      this.pageInfo.page = 1;
+      this.getCourseList();
     }
     // getList() {
     //   findStudentCourses({
@@ -206,7 +181,7 @@ export default {
     //   })
     // }
   }
-}
+};
 </script>
 <style lang="scss">
 .studentvip {

src/views/studentManager/components/teamAndcourse.vue

@@ -1,103 +1,80 @@
 <template>
   <div>
     <div class="tabTopWrap">
-      <el-table :data='musicGroupInfo'
-                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column align='center'
-                         prop="musicGroupId"
-                         label="乐团编号">
+      <el-table :data="musicGroupInfo" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column align="center" prop="musicGroupId" label="乐团编号"></el-table-column>
+        <el-table-column align="center" prop="joinMusicGroupDate" label="入团时间">
+          <template slot-scope="scope">{{ scope.row.joinMusicGroupDate | dateForMinFormat }}</template>
         </el-table-column>
-        <el-table-column align='center'
-                         prop="joinMusicGroupDate"
-                         label="入团时间">
+        <el-table-column align="center" prop="musicGroupName" label="乐团名称"></el-table-column>
+        <el-table-column align="center" label="乐团状态">
+          <template slot-scope="scope">{{ scope.row.musicGroupStatus | musicGroupType }}</template>
         </el-table-column>
-        <el-table-column align='center'
-                         prop="musicGroupName"
-                         label="乐团名称">
+        <el-table-column align="center" prop="subjectName" label="专业"></el-table-column>
+        <el-table-column align="center" prop label="乐器来源">
+          <template slot-scope="scope">{{ scope.row.kitPurchaseMethod | instrumentType }}</template>
         </el-table-column>
-        <el-table-column align='center'
-                         label="乐团状态">
-          <template slot-scope="scope">
-            {{ scope.row.musicGroupStatus | musicGroupType }}
-          </template>
-        </el-table-column>
-        <el-table-column align='center'
-                         prop="subjectName"
-                         label="专业">
-        </el-table-column>
-        <el-table-column align='center'
-                         prop=""
-                         label="乐器来源">
-          <template slot-scope="scope">
-            {{ scope.row.kitPurchaseMethod | instrumentType }}
-          </template>
+        <el-table-column align="center" label="学员状态">
+          <template slot-scope="scope">{{ scope.row.userMusicGroupStatus | musicGroupStudentType }}</template>
         </el-table-column>
-        <el-table-column align='center'
-                         label="学员状态">
+        <el-table-column align="center" label="所选乐器">
           <template slot-scope="scope">
-            {{ scope.row.userMusicGroupStatus | musicGroupStudentType }}
-          </template>
-        </el-table-column>
-        <el-table-column align='center'
-                         label="所选乐器">
-          <template slot-scope="scope">
-            <span v-for="good in scope.row.userGoodsDtos"
-                  :key="good.goodsId">
-              {{ good.goodsName | joinArray(',') }}
-            </span>
+            <span
+              v-for="good in scope.row.userGoodsDtos"
+              :key="good.goodsId"
+            >{{ good.goodsName | joinArray(',') }}</span>
             {{ scope.row.kitPurchaseMethod == 'LEASE' ? '(租赁：' + scope.row.depositFee + ')' : '' }}
           </template>
         </el-table-column>
-        <el-table-column align='center'
-                         label="操作">
+        <el-table-column align="center" label="操作">
           <template slot-scope="scope">
-            <el-button @click="onCourse(scope.row)"
-                       v-permission="'studentManage/findStudentCourses'"
-                       type="text">排课详情</el-button>
+            <el-button
+              @click="onCourse(scope.row)"
+              v-permission="'studentManage/findStudentCourses'"
+              type="text"
+            >排课详情</el-button>
           </template>
         </el-table-column>
       </el-table>
     </div>
     <!-- 搜索类型 -->
-    <el-form v-if="coursesShow"
-             :inline="true"
-             class="searchForm"
-             v-model.trim="searchForm">
+    <el-form v-if="coursesShow" :inline="true" class="searchForm" v-model.trim="searchForm">
       <el-form-item>
-        <el-select v-model.trim="searchForm.classGroupType"
-                   clearable
-                   filterable
-                   placeholder="课程类型">
-          <el-option v-for="(item, index) in courseArray"
-                     :key="index"
-                     :label="item.label"
-                     :value="item.value"></el-option>
+        <el-select v-model.trim="searchForm.classGroupType" clearable filterable placeholder="课程类型">
+          <el-option
+            v-for="(item, index) in courseArray"
+            :key="index"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model.trim="searchForm.courseStatus"
-                   clearable
-                   filterable
-                   placeholder="课程状态">
-          <el-option v-for="(item, index) in courseStatus"
-                     :key="index"
-                     :label="item.label"
-                     :value="item.value"></el-option>
+        <el-select v-model.trim="searchForm.courseStatus" clearable filterable placeholder="课程状态">
+          <el-option
+            v-for="(item, index) in courseStatus"
+            :key="index"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-input placeholder="班级名称"
-                  @keyup.enter.native='search'
-                  v-model.trim="searchForm.classGroupName"></el-input>
+        <el-input
+          placeholder="班级名称"
+          @keyup.enter.native="search"
+          v-model.trim="searchForm.classGroupName"
+        ></el-input>
       </el-form-item>
       <el-form-item>
-        <el-input placeholder="老师姓名"
-                  @keyup.enter.native='search'
-                  v-model.trim="searchForm.teacherName"></el-input>
+        <el-input
+          placeholder="老师姓名"
+          @keyup.enter.native="search"
+          v-model.trim="searchForm.teacherName"
+        ></el-input>
       </el-form-item>
       <el-form-item>
-        <div @click="search"
-             class='searchBtn'>搜索</div>
+        <div @click="search" class="searchBtn">搜索</div>
       </el-form-item>
     </el-form>
     <!-- 查询列表 -->
@@ -109,55 +86,42 @@
         {{ item.key }}
         <i class="el-icon-close"></i>
       </div>
-    </div> -->
-    <div v-if="coursesShow"
-         class="tableWrap">
-      <el-table :data='coursesInfo'
-                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column align='center'
-                         prop="classGroupId"
-                         label="编号">
-        </el-table-column>
-        <el-table-column align='center'
-                         prop="courseDate"
-                         label="时间">
-        </el-table-column>
-        <el-table-column align='center'
-                         prop="classGroupName"
-                         label="班级名称">
+    </div>-->
+    <div v-if="coursesShow" class="tableWrap">
+      <el-table :data="coursesInfo" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column align="center" prop="classGroupId" label="编号"></el-table-column>
+        <el-table-column align="center" prop="courseDate" label="时间">
+           <template slot-scope="scope">{{ scope.row.courseDate | dateForMinFormat }}</template>
         </el-table-column>
-        <el-table-column align='center'
-                         label="课程类型">
-          <template slot-scope="scope">
-            {{ scope.row.classGroupType | coursesType }}
-          </template>
-        </el-table-column>
-        <el-table-column align='center'
-                         label="课程状态">
-          <template slot-scope="scope">
-            {{ scope.row.courseStatus | coursesStatus }}
-          </template>
+        <el-table-column align="center" prop="classGroupName" label="班级名称"></el-table-column>
+        <el-table-column align="center" label="课程类型">
+          <template slot-scope="scope">{{ scope.row.classGroupType | coursesType }}</template>
         </el-table-column>
-        <el-table-column align='center'
-                         prop="teacherName"
-                         label="老师姓名">
+        <el-table-column align="center" label="课程状态">
+          <template slot-scope="scope">{{ scope.row.courseStatus | coursesStatus }}</template>
         </el-table-column>
+        <el-table-column align="center" prop="teacherName" label="老师姓名"></el-table-column>
       </el-table>
-      <pagination :total="pageInfo.total"
-                  :page.sync="pageInfo.page"
-                  :limit.sync="pageInfo.limit"
-                  :page-sizes="pageInfo.page_size"
-                  @pagination="getStudentCourses" />
+      <pagination
+        :total="pageInfo.total"
+        :page.sync="pageInfo.page"
+        :limit.sync="pageInfo.limit"
+        :page-sizes="pageInfo.page_size"
+        @pagination="getStudentCourses"
+      />
     </div>
   </div>
 </template>
 <script>
-import pagination from '@/components/Pagination/index'
-import { findStudentMusicGroups, findStudentCourses } from '@/api/studentManager'
+import pagination from "@/components/Pagination/index";
+import {
+  findStudentMusicGroups,
+  findStudentCourses
+} from "@/api/studentManager";
 export default {
-  name: 'teamAndcourse',
+  name: "teamAndcourse",
   components: { pagination },
-  data () {
+  data() {
     return {
       userId: null,
       musicGroupInfo: [], // 乐团列表
@@ -173,11 +137,11 @@ export default {
         teacherName: null
       },
       courseArray: [
-        { label: '单技课', value: 'NORMAL' },
-        { label: '合奏课', value: 'MIX' },
-        { label: '基础技能班', value: 'HIGH' },
-        { label: 'VIP课', value: 'VIP' },
-        { label: '试听课', value: 'DEMO' }
+        { label: "单技课", value: "NORMAL" },
+        { label: "合奏课", value: "MIX" },
+        { label: "基础技能班", value: "HIGH" },
+        { label: "VIP课", value: "VIP" },
+        { label: "试听课", value: "DEMO" }
       ],
       courseStatus: [
         { value: "NOT_START", label: "未开始" },
@@ -190,30 +154,29 @@ export default {
         page: 1, // 当前页
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
-      },
-
-    }
+      }
+    };
   },
-  mounted () {
-    this.userId = this.$route.query.userId
-    this.searchForm.studentId = this.$route.query.userId
-    this.__init()
+  mounted() {
+    this.userId = this.$route.query.userId;
+    this.searchForm.studentId = this.$route.query.userId;
+    this.__init();
   },
   activated() {
-    this.userId = this.$route.query.userId
-    this.searchForm.studentId = this.$route.query.userId
-    this.__init()
+    this.userId = this.$route.query.userId;
+    this.searchForm.studentId = this.$route.query.userId;
+    this.__init();
   },
   methods: {
-    __init () {
+    __init() {
       findStudentMusicGroups({ userId: this.userId }).then(res => {
         if (res.code == 200) {
-          this.musicGroupInfo = res.data
+          this.musicGroupInfo = res.data;
         }
-      })
+      });
     },
-    onCourse (row) {
-      this.coursesShow = true
+    onCourse(row) {
+      this.coursesShow = true;
       this.searchForm = {
         studentId: this.$route.query.userId,
         musicGroupId: row.musicGroupId,
@@ -221,26 +184,26 @@ export default {
         courseStatus: null,
         classGroupName: null,
         teacherName: null
-      }
-      this.getStudentCourses()
+      };
+      this.getStudentCourses();
     },
-    search () {
+    search() {
       this.pageInfo.page = 1;
       this.getStudentCourses();
     },
-    getStudentCourses () {
-      let params = this.searchForm
-      params.rows = this.pageInfo.limit
-      params.page = this.pageInfo.page
+    getStudentCourses() {
+      let params = this.searchForm;
+      params.rows = this.pageInfo.limit;
+      params.page = this.pageInfo.page;
       findStudentCourses(params).then(res => {
         if (res.code == 200) {
-          this.coursesInfo = res.data.rows
-          this.pageInfo.total = res.data.total
+          this.coursesInfo = res.data.rows;
+          this.pageInfo.total = res.data.total;
         }
-      })
+      });
     }
   }
-}
+};
 </script>
 <style lang="scss">
 .tabTopWrap {

src/views/studentManager/studentList.vue

@@ -284,6 +284,7 @@ import axios from "axios";
 import qs from "qs";
 import { getToken } from "@/utils/auth";
 import load from "@/utils/loading";
+import {permission} from "@/utils/directivePage"
 export default {
   name: "studentList",
   components: { pagination },

src/views/teacherManager/teacherDetail/components/leaveRecord.vue

@@ -39,6 +39,11 @@
         <el-table-column align='center'
                          prop="createTime"
                          label="请假发起时间">
+                         <template slot-scope="scope">
+                           <div>
+                             {{ scope.row.createTime |dateForMinFormat}}
+                           </div>
+                         </template>
         </el-table-column>
         <el-table-column align='center'
                          label="请假时间">

src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -53,9 +53,10 @@
       <el-table :data="tableList"
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column label="上课时间"
+        align="center"
                          width="200">
           <template slot-scope="scope">
-            {{ scope.row.classDate + ' ' + scope.row.classTime }}
+            {{ scope.row.classDate + ' ' + (scope.row.classTime.substring(0,5)) }}
           </template>
         </el-table-column>
         <el-table-column label="班级名称"

src/views/teacherManager/teacherDetail/components/teacherRecord.vue

@@ -57,10 +57,10 @@
         <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
           <el-table-column align="center" prop="courseScheduleId" label="课程编号"></el-table-column>
           <el-table-column align="center" label="上课时间" width="150">
-            <template slot-scope="scope">{{ scope.row.classDate }} {{ scope.row.startClassTime }}</template>
+            <template slot-scope="scope">{{ scope.row.classDate }} {{ scope.row.startClassTime.substring(0,5) }}</template>
           </el-table-column>
           <el-table-column align="center" label="下课时间"  width="150">
-            <template slot-scope="scope">{{ scope.row.classDate }} {{ scope.row.endClassTime }}</template>
+            <template slot-scope="scope">{{ scope.row.classDate }} {{ scope.row.endClassTime.substring(0,5) }}</template>
           </el-table-column>
           <el-table-column align="center" label="课程类型">
             <template slot-scope="scope">{{ scope.row.type | coursesType }}</template>

src/views/teacherManager/teacherDetail/components/timerList.vue

@@ -42,7 +42,11 @@
     >可用时间：{{ totalTransMinutes }}分钟 &nbsp;&nbsp;&nbsp;&nbsp;</div>
     <div class="tableWrap">
       <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column align="center" prop="updateTime" label="操作时间"></el-table-column>
+        <el-table-column align="center" prop="updateTime" label="操作时间">
+            <template slot-scope="scope">
+            <div>{{scope.row.updateTime | dateForMinFormat}}</div>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="操作类型">
           <template slot-scope="scope">
             <div>{{scope.row.transType | transTypeFilter}}</div>

src/views/teamDetail/componentCourse/studentRollCall.vue

@@ -36,10 +36,20 @@
               <el-table-column align='center'
                          prop="signInTime"
                          label="签到时间">
+                         <template slot-scope="scope">
+                           <div>
+                             {{scope.row.signInTime | dateForMinFormat}}
+                           </div>
+                         </template>
         </el-table-column>
               <el-table-column align='center'
                          prop="signOutTime"
                          label="签退时间">
+                          <template slot-scope="scope">
+                           <div>
+                             {{scope.row.signOutTime | dateForMinFormat}}
+                           </div>
+                         </template>
         </el-table-column>
         <el-table-column align='center'
                          prop="status"

src/views/teamDetail/componentCourse/studentWork.vue

@@ -23,7 +23,11 @@
         <el-table-column align="center" prop="username" label="学生姓名"></el-table-column>
         <el-table-column align="center" prop="phone" label="手机号"></el-table-column>
         <el-table-column align="center" prop="subjectName" label="声部名称"></el-table-column>
-        <el-table-column align="center" prop="createTime" width="200" label="交作业时间"></el-table-column>
+        <el-table-column align="center" prop="createTime" width="150" label="交作业时间">
+           <template slot-scope="scope">
+            <div>{{ scope.row.createTime | dateForMinFormat}}</div>
+          </template>
+        </el-table-column>
         <el-table-column align="center" prop="isView" label="是否查看">
           <template slot-scope="scope">
             <div>{{ scope.row.isView ? '是' : '否' }}</div>

src/views/teamDetail/components/studentList.vue

@@ -520,6 +520,7 @@ import { vaildStudentUrl } from "@/utils/validate";
 import QRCode from "qrcodejs2";
 import axios from "axios";
 import { getToken } from "@/utils/auth";
+import {permission} from "@/utils/directivePage"
 export default {
   name: "tstudentList",
   props: ["teamid"],

src/views/teamDetail/teamCourseList.vue

@@ -196,12 +196,12 @@
         <el-form-item label="签到时间">
           <!-- <el-input v-model.trim=" maskForm.signInTime"
           disabled></el-input>-->
-          <div class="inputStyle">{{maskForm.signInTime}}</div>
+          <div class="inputStyle">{{maskForm.signInTime | dateForMinFormat}}</div>
         </el-form-item>
         <el-form-item label="签退时间">
           <!-- <el-input v-model.trim="maskForm.signOutTime"
           disabled></el-input>-->
-          <div class="inputStyle">{{maskForm.signOutTime}}</div>
+          <div class="inputStyle">{{maskForm.signOutTime | dateForMinFormat}}</div>
         </el-form-item>
         <el-form-item label="是否点名">
           <!-- <el-input :value="maskForm.isCallNames | isCall"

src/views/timedTask/index.vue

@@ -26,6 +26,11 @@
           <el-table-column align='center'
                            prop="modifyOn"
                            label="最后执行时间">
+                            <template slot-scope="scope">
+              <div>
+                {{ scope.row.modifyOn | dateForMinFormat }}
+              </div>
+            </template>
           </el-table-column>
           <el-table-column prop="status"
                            align='center'

src/views/vipClass/vipDetail/components/fnanceInfo.vue

@@ -1,137 +1,149 @@
 <template>
-  <div class="">
+  <div class>
     <!-- 头部展示 -->
     <div class="headWrap">
       <div class="left">
         <div class="headItem">
-          <p>课程总价: <span> {{ totalPrice }}</span></p>
+          <p>
+            课程总价:
+            <span>{{ totalPrice }}</span>
+          </p>
         </div>
         <div class="headItem">
-          <p>实收笔数: <span> {{ feeDeductionNum }}</span></p>
+          <p>
+            实收笔数:
+            <span>{{ feeDeductionNum }}</span>
+          </p>
         </div>
         <div class="headItem">
-          <p>线上课课酬: <span> {{ onlineClassesUnitPrice }}</span></p>
+          <p>
+            线上课课酬:
+            <span>{{ onlineClassesUnitPrice }}</span>
+          </p>
         </div>
         <div class="headItem">
-          <p>课酬总额: <span> {{ totalSalary }}</span></p>
+          <p>
+            课酬总额:
+            <span>{{ totalSalary }}</span>
+          </p>
         </div>
         <div class="headItem">
-          <p>实收总额: <span> {{ totalFeeDeduction }}</span></p>
+          <p>
+            实收总额:
+            <span>{{ totalFeeDeduction }}</span>
+          </p>
         </div>
         <div class="headItem">
-          <p>线下课课酬: <span> {{offlineClassesUnitPrice}}</span></p>
+          <p>
+            线下课课酬:
+            <span>{{offlineClassesUnitPrice}}</span>
+          </p>
         </div>
       </div>
     </div>
     <!-- 搜索栏 -->
-    <el-form :inline="true"
-             :model="searchForm">
+    <el-form :inline="true" :model="searchForm">
       <el-form-item label="时间范围">
-        <el-date-picker v-model.trim="searchForm.time"
-                        style="width:400px;"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        value-format="yyyy-MM-dd">
-        </el-date-picker>
+        <el-date-picker
+          v-model.trim="searchForm.time"
+          style="width:400px;"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button @click="search"
-                   type="danger">搜索</el-button>
+        <el-button @click="search" type="danger">搜索</el-button>
       </el-form-item>
     </el-form>
     <div class="tableWrap">
-      <el-table :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-                :data='tableList'>
-        <el-table-column label="上课时间"
-                         align="center"
-                         prop="classDate">
-        </el-table-column>
-        <el-table-column label="课时类型"
-                         align="center"
-                         prop="teachMode">
+      <el-table :header-cell-style="{background:'#EDEEF0',color:'#444'}" :data="tableList">
+        <el-table-column label="上课时间" align="center" prop="classDate">
           <template slot-scope="scope">
-            <div>
-              {{ scope.row.teachMode | fitterteachMode }}
-            </div>
+            <div>{{ scope.row.classDate | dateForMinFormat }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="实收总额"
-                         align="center"
-                         prop="deductionFee">
-        </el-table-column>
-        <el-table-column label="老师课酬"
-                         align="center"
-                         prop="actualSalary">
+        <el-table-column label="课时类型" align="center" prop="teachMode">
+          <template slot-scope="scope">
+            <div>{{ scope.row.teachMode | fitterteachMode }}</div>
+          </template>
         </el-table-column>
-        <el-table-column label="结算状态"
-                         align="center"
-                         prop="isSalary">
+        <el-table-column label="实收总额" align="center" prop="deductionFee"></el-table-column>
+        <el-table-column label="老师课酬" align="center" prop="actualSalary"></el-table-column>
+        <el-table-column label="结算状态" align="center" prop="isSalary">
           <template slot-scope="scope">
-            <div>
-              {{ scope.row.isSalary | fitterisSalary }}
-            </div>
+            <div>{{ scope.row.isSalary | fitterisSalary }}</div>
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页器 -->
-      <pagination :total="rules.total"
-                  :page.sync="rules.page"
-                  :limit.sync="rules.limit"
-                  :page-sizes="rules.page_size"
-                  @pagination="getList" />
+      <pagination
+        :total="rules.total"
+        :page.sync="rules.page"
+        :limit.sync="rules.limit"
+        :page-sizes="rules.page_size"
+        @pagination="getList"
+      />
     </div>
   </div>
 </template>
 <script>
-import pagination from '@/components/Pagination/index'
-import { getVipGroupSalarys, getVipGroupDetail } from '@/api/vipSeting'
+import pagination from "@/components/Pagination/index";
+import { getVipGroupSalarys, getVipGroupDetail } from "@/api/vipSeting";
 export default {
   components: { pagination },
-  data () {
+  data() {
     return {
       searchForm: {
         time: []
       },
       tableList: [],
-      id: '',
-      onlineClassesUnitPrice: '',
-      totalPrice: '',
-      offlineClassesUnitPrice: '',
-      totalFeeDeduction: '', // 扣费总额
-      feeDeductionNum: '', //扣费笔数
-      totalSalary: '', // 课酬总额
+      id: "",
+      onlineClassesUnitPrice: "",
+      totalPrice: "",
+      offlineClassesUnitPrice: "",
+      totalFeeDeduction: "", // 扣费总额
+      feeDeductionNum: "", //扣费笔数
+      totalSalary: "", // 课酬总额
       rules: {
         // 分页规则
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
-      },
-    }
+      }
+    };
+  },
+  mounted() {
+    this.__init();
   },
-  mounted () {
-    this.__init()
-  }, 
   activated() {
-    this.__init()
+    this.__init();
   },
   methods: {
     __init() {
       let id = this.$route.query.id;
       this.id = id;
-      this.getList()
+      this.getList();
     },
-    search () {
+    search() {
       this.rules.page = 1;
       this.getList();
     },
-    getList () {
+    getList() {
       if (!this.searchForm.time) {
         this.searchForm.time = [];
       }
-      getVipGroupSalarys({ vipGroupId: this.id, organId: null, page: this.rules.page, rows: this.rules.limit, startTime: this.searchForm.time[0] || null, endTime: this.searchForm.time[1] || null }).then(res => {
+      getVipGroupSalarys({
+        vipGroupId: this.id,
+        organId: null,
+        page: this.rules.page,
+        rows: this.rules.limit,
+        startTime: this.searchForm.time[0] || null,
+        endTime: this.searchForm.time[1] || null
+      }).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.pageInfo.rows;
           //课程总价 totalPrice
@@ -143,29 +155,30 @@ export default {
           // 课酬总额 totalSalary
           this.totalSalary = res.data.baseInfo.expectTotalSalary;
           // 线上课课酬
-          this.onlineClassesUnitPrice = res.data.baseInfo.totalOnlineTeacherSalary;
+          this.onlineClassesUnitPrice =
+            res.data.baseInfo.totalOnlineTeacherSalary;
           // 线下课课酬
-          this.offlineClassesUnitPrice = res.data.baseInfo.totalOfflineTeacherSalary;
-          this.rules.total = res.data.pageInfo.total
-
+          this.offlineClassesUnitPrice =
+            res.data.baseInfo.totalOfflineTeacherSalary;
+          this.rules.total = res.data.pageInfo.total;
         }
-      })
+      });
     }
   },
   filters: {
-    fitterisSalary (val) {
-      let arr = ['未结算', '已结算']
-      return arr[val]
+    fitterisSalary(val) {
+      let arr = ["未结算", "已结算"];
+      return arr[val];
     },
-    fitterteachMode (val) {
-      if (val == 'ONLINE') {
-        return '线上课'
-      } else if (val == 'OFFLINE') {
-        return '线下课'
+    fitterteachMode(val) {
+      if (val == "ONLINE") {
+        return "线上课";
+      } else if (val == "OFFLINE") {
+        return "线下课";
       }
     }
   }
-}
+};
 </script>
 <style lang="scss" scope>
 </style>

src/views/vipClass/vipDetail/components/vipBaseInfo.vue

@@ -1,82 +1,70 @@
 <template>
-  <div class='vip-base'>
+  <div class="vip-base">
     <div class="left">
-      <el-form label-position='right'
-               label-width="120px"
-               :model="topForm">
+      <el-form label-position="right" label-width="120px" :model="topForm">
         <el-form-item label="指导老师">
-          <el-input v-model.trim="topForm.teacherCount"
-                    disabled></el-input>
+          <el-input v-model.trim="topForm.teacherCount" disabled></el-input>
         </el-form-item>
         <el-form-item label="科目名称">
-          <el-input v-model.trim="topForm.subject"
-                    disabled></el-input>
+          <el-input v-model.trim="topForm.subject" disabled></el-input>
         </el-form-item>
         <el-form-item label="活动方案">
-          <el-input v-model.trim="topForm.active"
-                    disabled></el-input>
+          <el-input v-model.trim="topForm.active" disabled></el-input>
         </el-form-item>
         <el-form-item label="课程形式">
-          <el-input v-model.trim="topForm.status"
-                    disabled></el-input>
+          <el-input v-model.trim="topForm.status" disabled></el-input>
         </el-form-item>
         <el-form-item label="每班人数">
-          <el-input v-model.trim="topForm.classNum"
-                    disabled></el-input>
+          <el-input v-model.trim="topForm.classNum" disabled></el-input>
         </el-form-item>
         <el-form-item label="每课时长">
-          <el-input v-model.trim="topForm.classTime"
-                    disabled></el-input>
+          <el-input v-model.trim="topForm.classTime" disabled></el-input>
         </el-form-item>
         <el-form-item label="教学点名称">
-          <el-input v-model.trim="topForm.address"
-                    disabled></el-input>
+          <el-input v-model.trim="topForm.address" disabled></el-input>
         </el-form-item>
         <el-form-item label="线上课数">
-          <el-input v-model.trim="topForm.onlineClass"
-                    disabled></el-input>
+          <el-input v-model.trim="topForm.onlineClass" disabled></el-input>
         </el-form-item>
         <el-form-item label="线下课数">
-          <el-input v-model.trim="topForm.offlineClass"
-                    disabled></el-input>
+          <el-input v-model.trim="topForm.offlineClass" disabled></el-input>
         </el-form-item>
         <el-form-item label="报名开始时间">
-          <el-input v-model.trim="topForm.startTime"
-                    disabled></el-input>
+          <div class="disBox">{{topForm.startTime | dateForMinFormat}}</div>
+          <!-- <el-input v-model.trim="topForm.startTime" disabled></el-input> -->
         </el-form-item>
         <el-form-item label="报名结束时间">
-          <el-input v-model.trim="topForm.endTime"
-                    disabled></el-input>
+          <div class="disBox">{{topForm.endTime | dateForMinFormat}}</div>
+          <!-- <el-input v-model.trim="topForm.endTime" disabled></el-input> -->
         </el-form-item>
       </el-form>
     </div>
     <div class="right">
-      <el-form label-position='right'
-               label-width="120px"
-               :model="rightForm">
+      <el-form label-position="right" label-width="120px" :model="rightForm">
         <el-form-item label="总课时数">
-          <el-input v-model.trim="rightForm.allClass"
-                    disabled></el-input>
+          <el-input v-model.trim="rightForm.allClass" disabled></el-input>
         </el-form-item>
         <el-form-item label="课程单价(线上)">
-          <el-input v-model.trim="rightForm.onlineClass"
-                    type="number"
-                    @mousewheel.native.prevent
-                    :disabled='!isreset'></el-input>
+          <el-input
+            v-model.trim="rightForm.onlineClass"
+            type="number"
+            @mousewheel.native.prevent
+            :disabled="!isreset"
+          ></el-input>
         </el-form-item>
         <el-form-item label="课程单价(线下)">
-          <el-input v-model.trim="rightForm.offlineClass"
-                    type="number"
-                    @mousewheel.native.prevent
-                    :disabled='!isreset'></el-input>
+          <el-input
+            v-model.trim="rightForm.offlineClass"
+            type="number"
+            @mousewheel.native.prevent
+            :disabled="!isreset"
+          ></el-input>
         </el-form-item>
         <el-form-item label="课程总价">
-          <el-input v-model.trim="rightForm.allPrice"
-                    disabled></el-input>
+          <el-input v-model.trim="rightForm.allPrice" disabled></el-input>
         </el-form-item>
         <el-form-item label="当前课程进度">
-          <el-input v-model.trim="rightForm.progress"
-                    disabled></el-input>
+          <el-input v-model.trim="rightForm.progress" disabled></el-input>
         </el-form-item>
       </el-form>
       <!-- <el-button v-if="!isreset"
@@ -88,44 +76,49 @@
                  v-permission="'vipGroupManage/updateVipBaseInfo'"
                  v-if="isreset"
                  type="primary"
-                 @click="submitBtn">确定</el-button> -->
+      @click="submitBtn">确定</el-button>-->
     </div>
   </div>
 </template>
 <script>
-import { getVipGroupDetail, findVipGroupStudents, leaveSchool, updateVipBaseInfo } from '@/api/vipSeting'
+import {
+  getVipGroupDetail,
+  findVipGroupStudents,
+  leaveSchool,
+  updateVipBaseInfo
+} from "@/api/vipSeting";
 export default {
-  data () {
+  data() {
     return {
       topForm: {
-        teacherCount: '',
-        subject: '', // 科目名称
-        active: '', // 活动名称
-        status: '', //课程形式
+        teacherCount: "",
+        subject: "", // 科目名称
+        active: "", // 活动名称
+        status: "", //课程形式
         classNum: "", // 每班人数
-        classTime: '', // 每课时长
-        address: '', // 教学点名称
-        onlineClass: '', //线上课数
-        offlineClass: '', //线下课数
-        startTime: '', // 报名开始时间
-        endTime: ''
+        classTime: "", // 每课时长
+        address: "", // 教学点名称
+        onlineClass: "", //线上课数
+        offlineClass: "", //线下课数
+        startTime: "", // 报名开始时间
+        endTime: ""
       },
       rightForm: {
-        allClass: '',
-        onlineClass: '',
-        offlineClass: '',
-        allPrice: '',
-        progress: ''
+        allClass: "",
+        onlineClass: "",
+        offlineClass: "",
+        allPrice: "",
+        progress: ""
       },
       tableList: [],
       isreset: false
-    }
-  }, 
-  mounted () {
-    this.__init()
+    };
+  },
+  mounted() {
+    this.__init();
   },
   activated() {
-    this.__init()
+    this.__init();
   },
   methods: {
     __init() {
@@ -136,7 +129,7 @@ export default {
       // 根据id 获取vip学员
       this.getStudents();
     },
-    getVipGroupDetail (id) {
+    getVipGroupDetail(id) {
       getVipGroupDetail({ vipGroupId: id }).then(res => {
         if (res.code == 200) {
           /**
@@ -153,14 +146,14 @@ export default {
            * 
            */
           this.topForm.teacherCount = res.data.userName;
-          this.topForm.subject = res.data.subjectName  //科目名称
+          this.topForm.subject = res.data.subjectName; //科目名称
           this.topForm.active = res.data.vipGroupActivityName;
-          this.topForm.status = res.data.categoryName
+          this.topForm.status = res.data.categoryName;
           this.topForm.classNum = res.data.studentNum;
           // totalClassTimes; 总课时数
           this.topForm.classTime = res.data.singleClassMinutes;
           //  教学点
-          this.topForm.address = res.data.teacherSchoolName
+          this.topForm.address = res.data.teacherSchoolName;
           this.topForm.onlineClass = res.data.onlineClassesNum;
           this.topForm.offlineClass = res.data.offlineClassesNum;
           // endTime
@@ -170,7 +163,8 @@ export default {
           this.rightForm.onlineClass = res.data.onlineClassesUnitPrice;
           this.rightForm.offlineClass = res.data.offlineClassesUnitPrice;
           this.rightForm.allPrice = res.data.totalPrice;
-          this.rightForm.progress = res.data.currentClassTimes + '/' + res.data.totalClassTimes;
+          this.rightForm.progress =
+            res.data.currentClassTimes + "/" + res.data.totalClassTimes;
           /**
            * allClass: '',
           onlineClass: '',
@@ -181,47 +175,49 @@ export default {
         }
       });
     },
-    getStudents () {
+    getStudents() {
       findVipGroupStudents({ vipGroupId: this.id }).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
         }
-      })
+      });
     },
-    leaveSchool (scope) {
+    leaveSchool(scope) {
       let studentId = scope.row.id;
       let vipGroupId = this.id;
       leaveSchool({ studentId, vipGroupId }).then(res => {
         if (res.code == 200) {
-          this.$message.success('退学成功')
+          this.$message.success("退学成功");
           scope._self.$refs[scope.$index].doClose();
           this.getStudents();
-
         }
-      })
-
+      });
     },
-    resetPrice () {
+    resetPrice() {
       this.isreset = true;
     },
-    submitBtn () {
-      // 提交 
+    submitBtn() {
+      // 提交
       /**
        * this.rightForm.onlineClass = res.data.onlineClassesUnitPrice;
         this.rightForm.offlineClass = res.data.offlineClassesUnitPrice;
        */
       let onlineClassesUnitPrice = this.rightForm.onlineClass;
-      let offlineClassesUnitPrice = this.rightForm.offlineClass
-      updateVipBaseInfo({ id: this.id, onlineClassesUnitPrice, offlineClassesUnitPrice }).then(res => {
+      let offlineClassesUnitPrice = this.rightForm.offlineClass;
+      updateVipBaseInfo({
+        id: this.id,
+        onlineClassesUnitPrice,
+        offlineClassesUnitPrice
+      }).then(res => {
         if (res.code == 200) {
-          this.$message.success('修改成功')
+          this.$message.success("修改成功");
           this.isreset = false;
           this.getVipGroupDetail(this.id);
         }
-      })
+      });
     }
-  },
-}
+  }
+};
 </script>
 <style lang="scss" scoped>
 .vip-base {
@@ -257,5 +253,16 @@ export default {
       float: right;
     }
   }
+  .disBox {
+    background-color: #f5f7fa;
+    border-color: #e4e7ed;
+    color: #c0c4cc;
+    cursor: not-allowed;
+    border-radius: 4px;
+    border: 1px solid #dcdfe6;
+    color: #333;
+    padding: 0 15px;
+    width: 180px;
+  }
 }
 </style>

src/views/vipClass/vipReset.vue

@@ -54,8 +54,16 @@
             <div>{{scope.row.isSettlement?'已结算':'未结算'}}</div>
           </template>
         </el-table-column>
-        <el-table-column label="开始时间" align="center" prop="startClassTimeStr"></el-table-column>
-        <el-table-column label="结束时间" align="center" prop="endClassTimeStr"></el-table-column>
+        <el-table-column label="开始时间" align="center" prop="startClassTimeStr">
+           <template slot-scope="scope">
+            <div>{{ scope.row.startClassTimeStr | timerForMinFormat }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="结束时间" align="center" prop="endClassTimeStr">
+           <template slot-scope="scope">
+            <div>{{ scope.row.endClassTimeStr | timerForMinFormat }}</div>
+          </template>
+        </el-table-column>
         <el-table-column label="课程类型" align="center">
           <template slot-scope="scope">
             <div>{{ scope.row.teachMode | teachMode }}</div>