08/11 15:02

111

src/views/accompanyManager/accompanys.vue

@@ -206,6 +206,9 @@
                           style="width:200px!important;"
                           type="date"
                           value-format="yyyy-MM-dd"
+                          :picker-options="{
+        firstDayOfWeek: 1
+    }"
                           placeholder="选择日期"></el-date-picker>
         </el-form-item>
         <el-form-item label="开始时间"
@@ -554,6 +557,7 @@ export default {
         fee: [{ required: true, message: "请输入费用" }]
       },
       pickerOptions: {
+        firstDayOfWeek: 1,
         disabledDate (time) {
           return time.getTime() + 86400000 <= new Date().getTime();
         }
@@ -719,6 +723,7 @@ export default {
     beginDate () {
       let self = this
       return {
+        firstDayOfWeek: 1,
         disabledDate (time) {
           if (self.expireForm.tempCoursesExpireDate) {
             return new Date(self.expireForm.tempCoursesExpireDate).getTime() > time.getTime()
@@ -904,6 +909,7 @@ export default {
     coursesDate () {
       let self = this;
       return {
+        firstDayOfWeek: 1,
         disabledDate: time => {
           // if (self.leftForm.courseStart) {
           // let date = new Date(self.leftForm.courseStart.replace(/-/, "/"));

src/views/afterSchoolManager/afterSchoolList.vue

@@ -5,100 +5,110 @@
       <div class="squrt"></div>课外训练
     </h2> -->
     <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.listSearch"
-            @keyup.enter.native="search"
-            placeholder="请输入标题"
-          ></el-input>
+          <el-input v-model.trim="searchForm.listSearch"
+                    @keyup.enter.native="search"
+                    placeholder="请输入标题"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-select placeholder="老师姓名" v-model="searchForm.teacherId" clearable filterable>
-            <el-option
-              v-for="(item,index) in teacherList"
-              :label="item.realName"
-              :value="item.id"
-              :key="index"
-            ></el-option>
+          <el-select placeholder="老师姓名"
+                     v-model="searchForm.teacherId"
+                     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 prop="organIdList">
-          <el-select
-            class="multiple"
-            v-model.trim="searchForm.organIdList"
-            filterable
-            clearable
-            placeholder="请选择分部"
-          >
-            <el-option
-              v-for="(item,index) in organList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+        <el-form-item prop="organIdList">
+          <el-select class="multiple"
+                     v-model.trim="searchForm.organIdList"
+                     filterable
+                     clearable
+                     placeholder="请选择分部">
+            <el-option v-for="(item,index) in organList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-date-picker
-            v-model.trim="searchForm.listTimer"
-            style="width:410px;"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
+          <el-date-picker v-model.trim="searchForm.listTimer"
+                          style="width:410px;"
+                          type="daterange"
+                          value-format="yyyy-MM-dd"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          :picker-options="{
+        firstDayOfWeek: 1
+    }"></el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="search">搜索</el-button>
-          <el-button @click="onReSet" type="primary">重置</el-button>
+          <el-button type="danger"
+                     @click="search">搜索</el-button>
+          <el-button @click="onReSet"
+                     type="primary">重置</el-button>
         </el-form-item>
       </el-form>
       <div class="tableWrap">
-        <el-table
-          style="width: 100%"
-          :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-          :data="tableList"
-        >
-          <el-table-column align="center" prop="createTime" label="布置时间">
-              <template slot-scope="scope">
+        <el-table style="width: 100%"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                  :data="tableList">
+          <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="截止时间">
-              <template slot-scope="scope">
+          <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="截止时间">
+            <template slot-scope="scope">
               {{scope.row.expireDate | dateForMinFormat}}
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="teacherName" label="老师姓名">
+          <el-table-column align="center"
+                           prop="teacherName"
+                           label="老师姓名">
             <template slot-scope="scope">
               <div v-if="scope.row.teacher">
                 {{scope.row.teacher.username}}
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="操作">
+          <el-table-column align="center"
+                           label="操作">
             <template slot-scope="scope">
               <div>
-                <el-button type="text" v-permission="'afterSchollList/look'" @click="lookDetail(scope.row)">查看</el-button>
+                <el-button type="text"
+                           v-permission="'afterSchollList/look'"
+                           @click="lookDetail(scope.row)">查看</el-button>
               </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>
-    <el-dialog title="课外训练详情" :visible.sync="afterSchoolVisible" width="600px">
+    <el-dialog title="课外训练详情"
+               :visible.sync="afterSchoolVisible"
+               width="600px">
       <el-form :model="visibleForm">
         <el-form-item label="布置时间">
           <p class="schoolCell">{{visibleForm.createTime}}</p>
@@ -107,13 +117,12 @@
           <p class="schoolCell">{{visibleForm.createTime}}</p>
         </el-form-item>
         <el-form-item label="学生姓名">
-          <el-popover
-            placement="top-start"
-            width="400"
-            trigger="hover"
-            :content="visibleForm.createTime"
-          >
-            <p class="schoolCell" slot="reference">{{visibleForm.createTime}}</p>
+          <el-popover placement="top-start"
+                      width="400"
+                      trigger="hover"
+                      :content="visibleForm.createTime">
+            <p class="schoolCell"
+               slot="reference">{{visibleForm.createTime}}</p>
           </el-popover>
         </el-form-item>
         <el-form-item label="截止时间">
@@ -123,16 +132,16 @@
           <p class="schoolCell">{{visibleForm.createTime}}</p>
         </el-form-item>
         <el-form-item label="训练内容">
-          <el-input
-            disabled
-            type="textarea"
-            rows="5"
-            v-model="visibleForm.createTime"
-            style="width:400px"
-          ></el-input>
+          <el-input disabled
+                    type="textarea"
+                    rows="5"
+                    v-model="visibleForm.createTime"
+                    style="width:400px"></el-input>
         </el-form-item>
         <el-form-item label="学生上传">
-          <el-input disabled v-model="visibleForm.createTime" style="width:400px"></el-input>
+          <el-input disabled
+                    v-model="visibleForm.createTime"
+                    style="width:400px"></el-input>
         </el-form-item>
       </el-form>
     </el-dialog>
@@ -142,16 +151,16 @@
 <script>
 import pagination from "@/components/Pagination/index";
 import { queryPageList } from "@/api/afterSchool";
-import { getTeacher,getEmployeeOrgan } from "@/api/buildTeam";
+import { getTeacher, getEmployeeOrgan } from "@/api/buildTeam";
 export default {
   components: { pagination },
-  data() {
+  data () {
     return {
       searchForm: {
         listSearch: null,
         listTimer: [],
-        teacherId:null,
-        organIdList:null
+        teacherId: null,
+        organIdList: null
       },
       rules: {
         // 分页规则
@@ -171,15 +180,15 @@ export default {
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
-  created() {},
+  created () { },
   //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {
+  mounted () {
     getTeacher().then(res => {
       if (res.code == 200) {
         this.teacherList = res.data;
       }
     });
-      getEmployeeOrgan().then(res => {
+    getEmployeeOrgan().then(res => {
       if (res.code == 200) {
         this.organList = res.data;
       }
@@ -187,11 +196,11 @@ export default {
     // 获取分部
     this.init();
   },
-  activated() {
+  activated () {
     this.init();
   },
   methods: {
-    init() {
+    init () {
       var now = new Date();
       var startDate = new Date(
         Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
@@ -208,29 +217,29 @@ export default {
       this.searchForm.listTimer.push(startDate);
       this.searchForm.listTimer.push(endDate);
       if (this.$route.query.searchForm) {
-      this.$route.query.searchForm instanceof Object
-        ? (this.searchForm = this.$route.query.searchForm)
-        : (this.searchForm = JSON.parse(this.$route.query.searchForm));
-    }
-    if (this.$route.query.rules) {
-      this.$route.query.rules instanceof Object
-        ? (this.rules = this.$route.query.rules)
-        : (this.rules = JSON.parse(this.$route.query.rules));
-    } 
+        this.$route.query.searchForm instanceof Object
+          ? (this.searchForm = this.$route.query.searchForm)
+          : (this.searchForm = JSON.parse(this.$route.query.searchForm));
+      }
+      if (this.$route.query.rules) {
+        this.$route.query.rules instanceof Object
+          ? (this.rules = this.$route.query.rules)
+          : (this.rules = JSON.parse(this.$route.query.rules));
+      }
       this.getList();
     },
-    getList() {
+    getList () {
       // assignStartTime  assignEndTime page search teacherId title
       let obj = {};
-      if (this.searchForm.listTimer&&this.searchForm.listTimer.length > 0) {
+      if (this.searchForm.listTimer && this.searchForm.listTimer.length > 0) {
         obj.assignStartTime = this.searchForm.listTimer[0];
         obj.assignEndTime = this.searchForm.listTimer[1];
       }
       obj.page = this.rules.page;
-         obj.rows= this.rules.limit,
-      this.searchForm.teacherId?obj.teacherId = this.searchForm.teacherId:null;
-      this.searchForm.listSearch?obj.title = this.searchForm.listSearch:null;
-      this.searchForm.organIdList?obj.organIdList = this.searchForm.organIdList:null;
+      obj.rows = this.rules.limit,
+        this.searchForm.teacherId ? obj.teacherId = this.searchForm.teacherId : null;
+      this.searchForm.listSearch ? obj.title = this.searchForm.listSearch : null;
+      this.searchForm.organIdList ? obj.organIdList = this.searchForm.organIdList : null;
       queryPageList(obj).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
@@ -238,25 +247,25 @@ export default {
         }
       });
     },
-    search() {
+    search () {
       this.rules.page = 1;
       this.getList();
     },
-    onReSet() {
-       this.searchForm= {
+    onReSet () {
+      this.searchForm = {
         listSearch: null,
         listTimer: [],
-        teacherId:null,
-        organIdList:null
+        teacherId: null,
+        organIdList: null
       }
       this.search();
     },
-    lookDetail(row) {
+    lookDetail (row) {
       // this.afterSchoolVisible = true;
 
       let rules = JSON.stringify(this.rules);
       let searchForm = JSON.stringify(this.searchForm);
-      this.$router.push({path:'/business/afterSchoolDetail',query:{extracurricularExercisesId:row.id,rules,searchForm,title:row.title}})
+      this.$router.push({ path: '/business/afterSchoolDetail', query: { extracurricularExercisesId: row.id, rules, searchForm, title: row.title } })
 
     }
   }

src/views/afterSchoolManager/afterWorkList.vue

@@ -5,147 +5,180 @@
       <div class="squrt"></div>课外作业
     </h2>-->
     <div class="m-core">
-      <el-form :inline="true" :model="searchForm" v-if="show">
+      <el-form :inline="true"
+               :model="searchForm"
+               v-if="show">
         <el-form-item>
-          <el-input
-            v-model.trim="searchForm.search"
-            @keyup.enter.native="search"
-            placeholder="请输入标题 学生姓名"
-          ></el-input>
+          <el-input v-model.trim="searchForm.search"
+                    @keyup.enter.native="search"
+                    placeholder="请输入标题 学生姓名"></el-input>
         </el-form-item>
         <el-form-item prop="organId">
-          <el-select
-            class="multiple"
-            v-model.trim="searchForm.organIdList"
-            filterable
-            clearable
-            placeholder="请选择分部"
-          >
-            <el-option
-              v-for="(item,index) in organList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+          <el-select class="multiple"
+                     v-model.trim="searchForm.organIdList"
+                     filterable
+                     clearable
+                     placeholder="请选择分部">
+            <el-option v-for="(item,index) in organList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
 
         <el-form-item>
-          <el-select placeholder="是否提交" v-model="searchForm.status" clearable>
-            <el-option label="是" value="1"></el-option>
-            <el-option label="否" value="0"></el-option>
+          <el-select placeholder="是否提交"
+                     v-model="searchForm.status"
+                     clearable>
+            <el-option label="是"
+                       value="1"></el-option>
+            <el-option label="否"
+                       value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select placeholder="是否评价" v-model="searchForm.isReplied" clearable>
-            <el-option label="是" value="1"></el-option>
-            <el-option label="否" value="0"></el-option>
+          <el-select placeholder="是否评价"
+                     v-model="searchForm.isReplied"
+                     clearable>
+            <el-option label="是"
+                       value="1"></el-option>
+            <el-option label="否"
+                       value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select placeholder="及时评价" v-model="searchForm.isRepliedTimely" clearable>
-            <el-option label="是" value="1"></el-option>
-            <el-option label="否" value="0"></el-option>
+          <el-select placeholder="及时评价"
+                     v-model="searchForm.isRepliedTimely"
+                     clearable>
+            <el-option label="是"
+                       value="1"></el-option>
+            <el-option label="否"
+                       value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select placeholder="是否有vip" v-model="searchForm.existVipCourse" clearable>
-            <el-option label="是" value="1"></el-option>
-            <el-option label="否" value="0"></el-option>
+          <el-select placeholder="是否有vip"
+                     v-model="searchForm.existVipCourse"
+                     clearable>
+            <el-option label="是"
+                       value="1"></el-option>
+            <el-option label="否"
+                       value="0"></el-option>
           </el-select>
         </el-form-item>
         <br />
         <el-form-item label="布置时间">
-          <el-date-picker
-            v-model.trim="searchForm.timer"
-            style="width:400px;"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            range-separator="至"
-            start-placeholder="布置开始日期"
-            end-placeholder="布置结束日期"
-          ></el-date-picker>
+          <el-date-picker v-model.trim="searchForm.timer"
+                          style="width:400px;"
+                          type="daterange"
+                          value-format="yyyy-MM-dd"
+                          range-separator="至"
+                          start-placeholder="布置开始日期"
+                          end-placeholder="布置结束日期"
+                          :picker-options="{
+        firstDayOfWeek: 1
+    }"></el-date-picker>
         </el-form-item>
         <br />
         <el-form-item label="截止时间">
-          <el-date-picker
-            v-model.trim="searchForm.expireDate"
-            style="width:400px;"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            range-separator="至"
-            start-placeholder="截止开始日期"
-            end-placeholder="截止结束日期"
-          ></el-date-picker>
+          <el-date-picker v-model.trim="searchForm.expireDate"
+                          style="width:400px;"
+                          type="daterange"
+                          value-format="yyyy-MM-dd"
+                          range-separator="至"
+                          start-placeholder="截止开始日期"
+                          end-placeholder="截止结束日期"
+                          :picker-options="{
+        firstDayOfWeek: 1
+    }"></el-date-picker>
         </el-form-item>
 
         <el-form-item>
-          <el-button type="danger" @click="search">搜索</el-button>
-          <el-button @click="onReSet" type="primary">重置</el-button>
-          <el-button
-            @click="onExport"
-            type="primary"
-            v-permission="'export/extraExercisesReplys'"
-            style=" background: #14928a; border:1px solid #14928a;"
-          >导出</el-button>
+          <el-button type="danger"
+                     @click="search">搜索</el-button>
+          <el-button @click="onReSet"
+                     type="primary">重置</el-button>
+          <el-button @click="onExport"
+                     type="primary"
+                     v-permission="'export/extraExercisesReplys'"
+                     style=" background: #14928a; border:1px solid #14928a;">导出</el-button>
         </el-form-item>
       </el-form>
       <div class="tableWrap">
-        <el-table
-          style="width: 100%"
-          :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-          :data="tableList"
-        >
-          <el-table-column align="center" prop="createTime" label="布置时间" width="150">
+        <el-table style="width: 100%"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                  :data="tableList">
+          <el-table-column align="center"
+                           prop="createTime"
+                           label="布置时间"
+                           width="150">
             <template slot-scope="scope">{{scope.row.createTime | dateForMinFormat}}</template>
           </el-table-column>
-          <el-table-column align="center" prop="expireDate" label="截止时间" width="150">
+          <el-table-column align="center"
+                           prop="expireDate"
+                           label="截止时间"
+                           width="150">
             <template slot-scope="scope">{{scope.row.expireDate | dateForMinFormat}}</template>
           </el-table-column>
-          <el-table-column align="center" prop="title" label="训练标题">
+          <el-table-column align="center"
+                           prop="title"
+                           label="训练标题">
             <template slot-scope="scope">
               <div>
-                <div
-                  v-if="scope.row.extracurricularExercises"
-                >{{scope.row.extracurricularExercises.title}}</div>
+                <div v-if="scope.row.extracurricularExercises">{{scope.row.extracurricularExercises.title}}</div>
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="teacherName" label="老师"></el-table-column>
-          <el-table-column align="center" prop="organName" label="学员分部"></el-table-column>
-          <el-table-column align="center" prop="createTime" label="学生姓名">
+          <el-table-column align="center"
+                           prop="teacherName"
+                           label="老师"></el-table-column>
+          <el-table-column align="center"
+                           prop="organName"
+                           label="学员分部"></el-table-column>
+          <el-table-column align="center"
+                           prop="createTime"
+                           label="学生姓名">
             <template slot-scope="scope">
               <div>
                 <div v-if="scope.row.user">{{scope.row.user.username}}</div>
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="userId" label="学生编号"></el-table-column>
-          <el-table-column align="center" label="提交作业">
+          <el-table-column align="center"
+                           prop="userId"
+                           label="学生编号"></el-table-column>
+          <el-table-column align="center"
+                           label="提交作业">
             <template slot-scope="scope">
               <div>{{scope.row.status?'是':'否'}}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="createTime" label="提交时间" width="150">
+          <el-table-column align="center"
+                           prop="createTime"
+                           label="提交时间"
+                           width="150">
             <template slot-scope="scope">{{scope.row.submitTime | dateForMinFormat}}</template>
           </el-table-column>
-          <el-table-column align="center" prop="isReplied" label="是否评价">
+          <el-table-column align="center"
+                           prop="isReplied"
+                           label="是否评价">
             <template slot-scope="scope">
               <div>{{scope.row.isReplied?'是':'否'}}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="是否有vip" width="100" fixed="right">
+          <el-table-column align="center"
+                           label="是否有vip"
+                           width="100"
+                           fixed="right">
             <template slot-scope="scope">
               <div>{{scope.row.existVipCourse?'是':'否'}}</div>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="isRepliedTimely"
-            label="及时评价"
-            width="100"
-            fixed="right"
-          >
+          <el-table-column align="center"
+                           prop="isRepliedTimely"
+                           label="及时评价"
+                           width="100"
+                           fixed="right">
             <template slot-scope="scope">
               <div>{{scope.row.isRepliedTimely?'是':'否'}}</div>
             </template>
@@ -155,28 +188,28 @@
               <div v-if="scope.row.extracurricularExercises&&scope.row.extracurricularExercises.teacher">{{scope.row.extracurricularExercises.teacher.username}}</div>
             </template>
           </el-table-column>-->
-          <el-table-column align="center" label="操作" fixed="right">
+          <el-table-column align="center"
+                           label="操作"
+                           fixed="right">
             <template slot-scope="scope">
               <div>
-                <el-button
-                  type="text"
-                  v-permission="'afterWorkList/look'"
-                  @click="lookDetail(scope.row)"
-                >查看</el-button>
+                <el-button type="text"
+                           v-permission="'afterWorkList/look'"
+                           @click="lookDetail(scope.row)">查看</el-button>
               </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>
-    <el-dialog title="课外训练详情" :visible.sync="afterSchoolVisible" width="600px">
+    <el-dialog title="课外训练详情"
+               :visible.sync="afterSchoolVisible"
+               width="600px">
       <el-form :model="visibleForm">
         <!-- <el-form-item label="结束时间">
           <p class="schoolCell">{{visibleForm.expiryDate}}</p>
@@ -185,13 +218,12 @@
           <p class="schoolCell">{{visibleForm.teacherName}}</p>
         </el-form-item>
         <el-form-item label="学生姓名">
-          <el-popover
-            placement="top-start"
-            width="400"
-            trigger="hover"
-            :content="visibleForm.studentName"
-          >
-            <p class="schoolCell" slot="reference">{{visibleForm.studentName}}</p>
+          <el-popover placement="top-start"
+                      width="400"
+                      trigger="hover"
+                      :content="visibleForm.studentName">
+            <p class="schoolCell"
+               slot="reference">{{visibleForm.studentName}}</p>
           </el-popover>
         </el-form-item>
         <el-form-item label="截止时间">
@@ -201,28 +233,31 @@
           <p class="schoolCell">{{visibleForm.title}}</p>
         </el-form-item>
         <el-form-item label="训练内容">
-          <el-input
-            disabled
-            type="textarea"
-            rows="5"
-            v-model="visibleForm.content"
-            style="width:400px"
-          ></el-input>
+          <el-input disabled
+                    type="textarea"
+                    rows="5"
+                    v-model="visibleForm.content"
+                    style="width:400px"></el-input>
         </el-form-item>
 
-        <el-form-item label="学生上传" v-for="(item,index) in visibleForm.attachments" :key="index">
-          <p class="schoolCell" v-if="item" @click="lookWork(item)">点击播放</p>
+        <el-form-item label="学生上传"
+                      v-for="(item,index) in visibleForm.attachments"
+                      :key="index">
+          <p class="schoolCell"
+             v-if="item"
+             @click="lookWork(item)">点击播放</p>
         </el-form-item>
       </el-form>
     </el-dialog>
-    <el-dialog title="查看作业" width="680px" append-to-body :visible.sync="workVisible">
+    <el-dialog title="查看作业"
+               width="680px"
+               append-to-body
+               :visible.sync="workVisible">
       <!-- activeUrl -->
-      <video
-        style="width:640px;"
-        :src="activeSrc"
-        ref="dialogVideo"
-        controls="controls"
-      >您的浏览器不支持视频播放</video>
+      <video style="width:640px;"
+             :src="activeSrc"
+             ref="dialogVideo"
+             controls="controls">您的浏览器不支持视频播放</video>
     </el-dialog>
   </div>
 </template>
@@ -239,7 +274,7 @@ import { getToken } from "@/utils/auth";
 export default {
   props: ["id"],
   components: { pagination },
-  data() {
+  data () {
     return {
       searchForm: {
         search: null,
@@ -277,9 +312,9 @@ export default {
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
-  created() {},
+  created () { },
   //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {
+  mounted () {
     getEmployeeOrgan().then(res => {
       if (res.code == 200) {
         this.organList = res.data;
@@ -287,11 +322,11 @@ export default {
     });
     this.init();
   },
-  activated() {
+  activated () {
     this.init();
   },
   methods: {
-    init() {
+    init () {
       //   var now = new Date();
       //   var startDate = new Date(
       //     Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
@@ -322,7 +357,7 @@ export default {
       // console.log(this.$route.query)
       this.getList();
     },
-    getList() {
+    getList () {
       // assignStartTime  assignEndTime page search teacherId title
       let obj = this.getDate();
       extracurricularExercisesReply(obj).then(res => {
@@ -332,12 +367,12 @@ export default {
         }
       });
     },
-    search() {
+    search () {
       this.rules.page = 1;
       this.getList();
     },
     // 导出
-    onExport() {
+    onExport () {
       let url = "/api-web/export/extraExercisesReplys";
       let obj = this.getDate();
       const options = {
@@ -382,9 +417,9 @@ export default {
             link.click();
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    getDate() {
+    getDate () {
       let obj = {};
       if (this.searchForm.timer && this.searchForm.timer.length > 0) {
         obj.submitStartTime = this.searchForm.timer[0];
@@ -408,7 +443,7 @@ export default {
         : null;
       this.searchForm.isView ? (obj.isView = this.searchForm.isView) : null;
       this.extracurricularExercisesId &&
-      this.extracurricularExercisesId != "yes"
+        this.extracurricularExercisesId != "yes"
         ? (obj.extracurricularExercisesId = this.extracurricularExercisesId)
         : null;
       this.searchForm.organIdList
@@ -419,7 +454,7 @@ export default {
         : null;
       return obj;
     },
-    onReSet() {
+    onReSet () {
       this.searchForm = {
         search: null,
         timer: [],
@@ -433,7 +468,7 @@ export default {
       this.extracurricularExercisesId = null;
       this.getList();
     },
-    lookDetail(row) {
+    lookDetail (row) {
       //   this.afterSchoolVisible = true;
       //   console.log(row)
       findStudentExtraExerciseDetail({
@@ -453,13 +488,13 @@ export default {
         }
       });
     },
-    lookWork(src) {
+    lookWork (src) {
       this.activeSrc = src;
       this.workVisible = true;
     }
   },
   watch: {
-    workVisible(val) {
+    workVisible (val) {
       if (!val) {
         this.activeSrc = "";
       }

src/views/businessManager/orderManager/backMoney.vue

@@ -28,7 +28,10 @@
                           @change="searchOrderDate"
                           range-separator="至"
                           start-placeholder="开始日期"
-                          end-placeholder="结束日期">
+                          end-placeholder="结束日期"
+                          :picker-options="{
+        firstDayOfWeek: 1
+    }">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
@@ -43,14 +46,14 @@
         <el-table :data='tableList'
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
           <el-table-column align='center'
-            width="150"
+                           width="150"
                            prop="createTime"
                            label="申请时间">
-                           <template slot-scope="scope">
-                             <div>
-                               {{scope.row.createTime | dateForMinFormat}}
-                             </div>
-                           </template>
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.createTime | dateForMinFormat}}
+              </div>
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            prop="orderNo"
@@ -177,12 +180,12 @@ export default {
       }
     })
     this.getList()
-        var now = new Date();
-var startDate = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())).toISOString().slice(0, 10);
-var endDate = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())).toISOString().slice(0, 10);
-this.orderDate=[];
-this.orderDate.push(startDate)
-this.orderDate.push(endDate)
+    var now = new Date();
+    var startDate = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())).toISOString().slice(0, 10);
+    var endDate = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())).toISOString().slice(0, 10);
+    this.orderDate = [];
+    this.orderDate.push(startDate)
+    this.orderDate.push(endDate)
   },
   methods: {
     search () {

src/views/businessManager/orderManager/financeManager.vue

@@ -60,6 +60,9 @@
                           type="daterange"
                           value-format="yyyy-MM-dd"
                           @change="searchOrderDate"
+                          :picker-options="{
+        firstDayOfWeek: 1
+    }"
                           range-separator="至"
                           start-placeholder="开始日期"
                           end-placeholder="结束日期"></el-date-picker>

src/views/businessManager/orderManager/income.vue

@@ -58,6 +58,9 @@
                           value-format="yyyy-MM-dd"
                           @change="searchOrderDate"
                           range-separator="至"
+                          :picker-options="{
+        firstDayOfWeek: 1
+    }"
                           start-placeholder="开始日期"
                           end-placeholder="结束日期"></el-date-picker>
         </el-form-item>
@@ -395,7 +398,7 @@ export default {
         }
       });
     },
-    onGetOrderStatus(row) {
+    onGetOrderStatus (row) {
       this.$confirm("您确定查询该订单状态", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

src/views/businessManager/orderManager/incomeOne.vue

@@ -57,6 +57,9 @@
                           type="daterange"
                           value-format="yyyy-MM-dd"
                           @change="searchOrderDate"
+                          :picker-options="{
+        firstDayOfWeek: 1
+    }"
                           range-separator="至"
                           start-placeholder="开始日期"
                           end-placeholder="结束日期"></el-date-picker>

src/views/businessManager/orderManager/incomeOut.vue

@@ -55,6 +55,9 @@
                           @change="searchOrderDate"
                           range-separator="至"
                           start-placeholder="开始日期"
+                          :picker-options="{
+        firstDayOfWeek: 1
+    }"
                           end-placeholder="结束日期"></el-date-picker>
         </el-form-item>
         <!-- <el-form-item>

src/views/businessManager/orderManager/incomeTwo.vue

@@ -57,6 +57,9 @@
                           type="daterange"
                           value-format="yyyy-MM-dd"
                           @change="searchOrderDate"
+                          :picker-options="{
+        firstDayOfWeek: 1
+    }"
                           range-separator="至"
                           start-placeholder="开始日期"
                           end-placeholder="结束日期"></el-date-picker>

src/views/categroyManager/insideSetting/staffManager.vue

@@ -226,6 +226,9 @@
                       :label-width="formLabelWidth">
           <el-date-picker v-model.trim="form.entryDate"
                           type="date"
+                          :picker-options="{
+                            firstDayOfWeek:1
+                          }"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           placeholder="选择日期">
           </el-date-picker>

src/views/categroyManager/specialSetup/branchSetting.vue

@@ -104,6 +104,9 @@
           <el-date-picker v-model.trim="form.registerDate"
                           type="date"
                           value-format="yyyy-MM-dd"
+                          :picker-options="{
+                            firstDayOfWeek:1
+                          }"
                           placeholder="选择日期"></el-date-picker>
         </el-form-item>
       </el-form>

src/views/evaluateManager/networkList.vue

@@ -133,6 +133,9 @@
                         value-format="yyyy-MM-dd"
                         format="yyyy-MM-dd"
                         range-separator="-"
+                        :picker-options="{
+        firstDayOfWeek: 1
+    }"
                         start-placeholder="开始日期"
                         end-placeholder="结束日期">
           ></el-date-picker>

src/views/evaluateManager/vipEvaluateList.vue

@@ -101,6 +101,9 @@
                         type="daterange"
                         value-format="yyyy-MM-dd"
                         format="yyyy-MM-dd"
+                        :picker-options="{
+        firstDayOfWeek: 1
+    }"
                         range-separator="-"
                         start-placeholder="开始日期"
                         end-placeholder="结束日期">

src/views/levelManager/levelManager.vue

@@ -6,58 +6,65 @@
     </h2>
     <div class="m-core">
       <!-- 搜索标题 -->
-      <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 v-model.trim="searchForm.orderNo" placeholder="请输入订单编号"></el-input>
+          <el-input v-model.trim="searchForm.orderNo"
+                    placeholder="请输入订单编号"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input v-model.trim="searchForm.transNo" placeholder="请输入交易流水号"></el-input>
+          <el-input v-model.trim="searchForm.transNo"
+                    placeholder="请输入交易流水号"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input v-model.trim="searchForm.city" @keyup.enter.native="city" placeholder="请输入城市名"></el-input>
+          <el-input v-model.trim="searchForm.city"
+                    @keyup.enter.native="city"
+                    placeholder="请输入城市名"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-select v-model.trim="searchForm.organId" filterable clearable placeholder="请选择分部">
-            <el-option
-              v-for="item in branchList"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
+          <el-select v-model.trim="searchForm.organId"
+                     filterable
+                     clearable
+                     placeholder="请选择分部">
+            <el-option v-for="item in branchList"
+                       :key="item.id"
+                       :label="item.label"
+                       :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select
-            class="multiple"
-            v-model.trim="searchForm.status"
-            filterable
-            clearable
-            placeholder="请选择缴费状态"
-          >
-            <el-option value="reg" label="未缴费"></el-option>
-            <el-option value="pay" label="已缴费"></el-option>
+          <el-select class="multiple"
+                     v-model.trim="searchForm.status"
+                     filterable
+                     clearable
+                     placeholder="请选择缴费状态">
+            <el-option value="reg"
+                       label="未缴费"></el-option>
+            <el-option value="pay"
+                       label="已缴费"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-date-picker
-            v-model.trim="orderDate"
-            style="width:410px;"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            @change="searchOrderDate"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
+          <el-date-picker v-model.trim="orderDate"
+                          style="width:410px;"
+                          type="daterange"
+                          value-format="yyyy-MM-dd"
+                          @change="searchOrderDate"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          :picker-options="{
+        firstDayOfWeek: 1
+    }"></el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="onSearch" type="danger">搜索</el-button>
+          <el-button @click="onSearch"
+                     type="danger">搜索</el-button>
           <!-- <el-button @click="onReSet" type="primary">重置</el-button> -->
-          <el-button
-            @click="onExport"
-            v-permission="'export/degreeRegistration/825'"
-            type="primary"
-          >导出</el-button>
+          <el-button @click="onExport"
+                     v-permission="'export/degreeRegistration/825'"
+                     type="primary">导出</el-button>
         </el-form-item>
       </el-form>
       <div style="font-size: 14px; color: #F85043; padding-bottom: 10px;">
@@ -66,12 +73,22 @@
         实收总金额：{{ totalAmount }}元
       </div>
       <div class="tableWrap">
-        <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table :data="tableList"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
           >
-          <el-table-column width="90px" align="center" prop="id" label="编号"></el-table-column>
-          <el-table-column align="center" prop="name" label="姓名"></el-table-column>
-          <el-table-column align="center" prop="orderNo" label="订单编号"></el-table-column>
-          <el-table-column align="center" prop="transNo" label="交易流水号">
+          <el-table-column width="90px"
+                           align="center"
+                           prop="id"
+                           label="编号"></el-table-column>
+          <el-table-column align="center"
+                           prop="name"
+                           label="姓名"></el-table-column>
+          <el-table-column align="center"
+                           prop="orderNo"
+                           label="订单编号"></el-table-column>
+          <el-table-column align="center"
+                           prop="transNo"
+                           label="交易流水号">
             <template slot-scope="scope">
               <el-tooltip placement="top-start">
                 <div slot="content">{{ scope.row.transNo }}</div>
@@ -79,39 +96,61 @@
               </el-tooltip>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="gender" label="性别">
+          <el-table-column align="center"
+                           prop="gender"
+                           label="性别">
             <template slot-scope="scope">{{ scope.row.gender == 1 ? '男' : '女' }}</template>
           </el-table-column>
-          <el-table-column align="center" prop="idcard" label="身份证号"></el-table-column>
-          <el-table-column align="center" prop="mobile" label="联系电话"></el-table-column>
-          <el-table-column align="center" prop="city" label="城市"></el-table-column>
-          <el-table-column align="center" prop="subject" label="报考乐器"></el-table-column>
-          <el-table-column align="center" prop="level" label="报考级别"></el-table-column>
-          <el-table-column align="center" prop="theoryLevel" label="乐理级别"></el-table-column>
-          <el-table-column align="center" label="缴费状态">
+          <el-table-column align="center"
+                           prop="idcard"
+                           label="身份证号"></el-table-column>
+          <el-table-column align="center"
+                           prop="mobile"
+                           label="联系电话"></el-table-column>
+          <el-table-column align="center"
+                           prop="city"
+                           label="城市"></el-table-column>
+          <el-table-column align="center"
+                           prop="subject"
+                           label="报考乐器"></el-table-column>
+          <el-table-column align="center"
+                           prop="level"
+                           label="报考级别"></el-table-column>
+          <el-table-column align="center"
+                           prop="theoryLevel"
+                           label="乐理级别"></el-table-column>
+          <el-table-column align="center"
+                           label="缴费状态">
             <template slot-scope="scope">{{ scope.row.status == 2 ? '已缴费' : '未缴费' }}</template>
           </el-table-column>
-          <el-table-column align="center" prop="money" label="报考级别费用">
+          <el-table-column align="center"
+                           prop="money"
+                           label="报考级别费用">
             <template slot-scope="scope">{{ scope.row.money }}元</template>
           </el-table-column>
-          <el-table-column align="center" prop="theoryMoney" label="乐理级别费用">
+          <el-table-column align="center"
+                           prop="theoryMoney"
+                           label="乐理级别费用">
             <template slot-scope="scope">{{ scope.row.theoryMoney }}元</template>
           </el-table-column>
-          <el-table-column align="center" label="证书">
+          <el-table-column align="center"
+                           label="证书">
             <template slot-scope="scope">
               <div v-if="scope.row.theoryCert">
-                <el-image
-                  fit="cover"
-                  style="width: 100px; height: 100px"
-                  :src="scope.row.theoryCert"
-                  :preview-src-list="[scope.row.theoryCert]"
-                ></el-image>
+                <el-image fit="cover"
+                          style="width: 100px; height: 100px"
+                          :src="scope.row.theoryCert"
+                          :preview-src-list="[scope.row.theoryCert]"></el-image>
               </div>
               <div v-else>--</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="createTime" label="报名时间"></el-table-column>
-          <el-table-column align="center" prop="memo" label="备注"></el-table-column>
+          <el-table-column align="center"
+                           prop="createTime"
+                           label="报名时间"></el-table-column>
+          <el-table-column align="center"
+                           prop="memo"
+                           label="备注"></el-table-column>
           <!-- <el-table-column align="center" label="操作">
                     <template slot-scope="scope">
                     <el-button @click="onTypeDelOpeation(scope.row)"
@@ -119,13 +158,11 @@
                     </template>
           </el-table-column>-->
         </el-table>
-        <pagination
-          :total="pageInfo.total"
-          :page.sync="pageInfo.page"
-          :limit.sync="pageInfo.limit"
-          :page-sizes="pageInfo.page_size"
-          @pagination="getList"
-        />
+        <pagination :total="pageInfo.total"
+                    :page.sync="pageInfo.page"
+                    :limit.sync="pageInfo.limit"
+                    :page-sizes="pageInfo.page_size"
+                    @pagination="getList" />
       </div>
     </div>
   </div>
@@ -141,7 +178,7 @@ import load from "@/utils/loading";
 export default {
   components: { pagination },
   name: "helpCategory",
-  data() {
+  data () {
     return {
       orderDate: null,
       searchForm: {
@@ -167,16 +204,16 @@ export default {
       tempTreeList: [],
     };
   },
-  activated() {
+  activated () {
     this.getList();
     this.__init();
   },
-  mounted() {
+  mounted () {
     this.getList();
     this.__init();
   },
   methods: {
-    __init() {
+    __init () {
       getEmployeeOrgan().then((res) => {
         if (res.code == 200) {
           this.branchList = [];
@@ -189,12 +226,12 @@ export default {
         }
       });
     },
-    onSearch() {
+    onSearch () {
       let pageInfo = this.pageInfo;
       pageInfo.page = 1;
       this.getList();
     },
-    onReSet() {
+    onReSet () {
       // 重置搜索
       this.orderDate = null;
       this.searchForm = {
@@ -208,7 +245,7 @@ export default {
       };
       this.getList();
     },
-    getList() {
+    getList () {
       let searchForm = this.searchForm;
       let params = {
         orderNo: searchForm.orderNo ? searchForm.orderNo : null,
@@ -231,7 +268,7 @@ export default {
         }
       });
     },
-    searchOrderDate(value) {
+    searchOrderDate (value) {
       if (value) {
         this.searchForm.startTime = value[0];
         this.searchForm.endTime = value[1];
@@ -241,7 +278,7 @@ export default {
       }
     },
     // 导出
-    onExport() {
+    onExport () {
       let url = "/api-web/export/degreeRegistration";
       let searchForm = this.searchForm;
       let params = {
@@ -310,7 +347,7 @@ export default {
               load.endLoading();
             });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
   },
 };

src/views/recodeManager/recodeList.vue

@@ -67,6 +67,9 @@
                           value-format="yyyy-MM-dd"
                           range-separator="至"
                           start-placeholder="开始日期"
+                          :picker-options="{
+        firstDayOfWeek: 1
+    }"
                           end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>

src/views/repairManager/repairList.vue

@@ -70,6 +70,9 @@
                           style="width:400px;"
                           type="daterange"
                           value-format="yyyy-MM-dd"
+                          :picker-options="{
+        firstDayOfWeek: 1
+    }"
                           range-separator="至"
                           start-placeholder="送修开始日期"
                           end-placeholder="送修结束日期"></el-date-picker>

src/views/resetTeaming/components/resetPayList.vue

@@ -213,6 +213,7 @@ export default {
       isNew: false,
       activeRow: null,
       pickerOptions: {
+        firstDayOfWeek: 1,
         disabledDate (time) {
           return time.getTime() + 86400000 <= new Date().getTime();
         }
@@ -336,7 +337,6 @@ export default {
       obj.studentIds = this.chioseStudentList.map(stu => {
         return stu.userId
       }).join(',')
-      console.log(obj)
       obj.musicGroupId = this.$route.query.id
       obj.startPaymentDate = this.payForm.startPaymentDate + ' 00:00:00'
       obj.deadlinePaymentDate = this.payForm.deadlinePaymentDate + ' 23:59:59'
@@ -376,6 +376,7 @@ export default {
     beginDate () {
       let self = this
       return {
+        firstDayOfWeek: 1,
         disabledDate (time) {
           if (self.payForm.startPaymentDate) {
             return new Date(self.payForm.startPaymentDate).getTime() - 86400000 >= time.getTime()

src/views/settlementManager/settlementList.vue

@@ -5,96 +5,111 @@
       <div class="squrt"></div>结转奖励
     </h2>
     <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"
-            @keyup.enter.native="search"
-            placeholder="课程组编号&名字"
-          ></el-input>
+          <el-input v-model.trim="searchForm.search"
+                    @keyup.enter.native="search"
+                    placeholder="课程组编号&名字"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-select placeholder="请选择分部" v-model="searchForm.organId" clearable>
-            <el-option
-              v-for="(item,index) in organList"
-              :label="item.name"
-              :value="item.id"
-              :key="index"
-            ></el-option>
+          <el-select placeholder="请选择分部"
+                     v-model="searchForm.organId"
+                     clearable>
+            <el-option v-for="(item,index) in organList"
+                       :label="item.name"
+                       :value="item.id"
+                       :key="index"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select placeholder="指导老师" v-model="searchForm.teacherId" clearable filterable>
-            <el-option
-              v-for="(item,index) in teacherList"
-              :label="item.realName"
-              :value="item.id"
-              :key="index"
-            ></el-option>
+          <el-select placeholder="指导老师"
+                     v-model="searchForm.teacherId"
+                     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>
-          <el-select placeholder="转结状态" v-model="searchForm.settlementStatus" clearable> 
-            <el-option label="已结算" value="1"></el-option>
-            <el-option label="未结算" value="0"></el-option>
+          <el-select placeholder="转结状态"
+                     v-model="searchForm.settlementStatus"
+                     clearable>
+            <el-option label="已结算"
+                       value="1"></el-option>
+            <el-option label="未结算"
+                       value="0"></el-option>
           </el-select>
         </el-form-item>
-          <el-form-item>
-          <el-date-picker
-            v-model.trim="searchForm.date"
-            style="width:410px;"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
+        <el-form-item>
+          <el-date-picker v-model.trim="searchForm.date"
+                          style="width:410px;"
+                          type="daterange"
+                          value-format="yyyy-MM-dd"
+                          :picker-options="{
+        firstDayOfWeek: 1
+    }"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"></el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="search">搜索</el-button>
-          <el-button @click="onReSet" type="primary">重置</el-button>
-          <el-button
-            @click="onExport"
-            type="primary"
-            v-permission="'export/teacherCourseReward'"
-            style=" background: #14928a; border:1px solid #14928a;"
-          >导出</el-button>
+          <el-button type="danger"
+                     @click="search">搜索</el-button>
+          <el-button @click="onReSet"
+                     type="primary">重置</el-button>
+          <el-button @click="onExport"
+                     type="primary"
+                     v-permission="'export/teacherCourseReward'"
+                     style=" background: #14928a; border:1px solid #14928a;">导出</el-button>
         </el-form-item>
       </el-form>
       <div class="tableWrap">
-        <el-table
-          style="width: 100%"
-          :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-          :data="tableList"
-        >
-          <el-table-column align="center" prop="musicGroupId" label="课程组编号"></el-table-column>
-          <el-table-column align="center" prop="courseGroupName" label="课程组名称"></el-table-column>
-          <el-table-column align="center" prop="organName" label="分部"></el-table-column>
-          <el-table-column align="center" prop="teacherName" label="指导老师"></el-table-column>
-          <el-table-column align="center" label="结转状态">
+        <el-table style="width: 100%"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                  :data="tableList">
+          <el-table-column align="center"
+                           prop="musicGroupId"
+                           label="课程组编号"></el-table-column>
+          <el-table-column align="center"
+                           prop="courseGroupName"
+                           label="课程组名称"></el-table-column>
+          <el-table-column align="center"
+                           prop="organName"
+                           label="分部"></el-table-column>
+          <el-table-column align="center"
+                           prop="teacherName"
+                           label="指导老师"></el-table-column>
+          <el-table-column align="center"
+                           label="结转状态">
             <template slot-scope="scope">
               <div>{{ scope.row.settlementStatus?'已结算':'未结算'}}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="结转金额">
+          <el-table-column align="center"
+                           label="结转金额">
             <template slot-scope="scope">
               <div>{{ scope.row.expectRewardAmount + '元'}}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="结转日期">
+          <el-table-column align="center"
+                           label="结转日期">
             <template slot-scope="scope">
               <div>{{ scope.row.settlementDate | formatTimer}}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="memo" width="500" label="备注"></el-table-column>
+          <el-table-column align="center"
+                           prop="memo"
+                           width="500"
+                           label="备注"></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>
   </div>
@@ -110,14 +125,14 @@ import { getTeacher, getEmployeeOrgan } from "@/api/buildTeam";
 import { teacherCourseReward } from "@/api/operateManager";
 export default {
   components: { pagination },
-  data() {
+  data () {
     return {
       searchForm: {
         search: null,
         organId: null,
         teacherId: null,
-        settlementStatus:null,
-        date:[],
+        settlementStatus: null,
+        date: [],
       },
       teacherList: [],
       tableList: [],
@@ -132,9 +147,9 @@ export default {
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
-  created() {},
+  created () { },
   //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {
+  mounted () {
     getTeacher().then(res => {
       if (res.code == 200) {
         this.teacherList = res.data;
@@ -148,24 +163,24 @@ export default {
     // 获取分部
     this.init();
   },
-  activated() {
+  activated () {
     this.init();
   },
   methods: {
-    init() {
+    init () {
       this.getList();
     },
-    getList() {
+    getList () {
       this.searchForm.page = this.rules.page;
       this.searchForm.rows = this.rules.limit;
-      if(this.searchForm.date&&this.searchForm.date.length>0){
+      if (this.searchForm.date && this.searchForm.date.length > 0) {
         this.searchForm.startTime = this.searchForm.date[0]
         this.searchForm.endTime = this.searchForm.date[1]
-      }else {
+      } else {
         this.searchForm.startTime = null
         this.searchForm.endTime = null;
       }
-      
+
       let obj = JSON.parse(JSON.stringify(this.searchForm));
       obj.date = null;
       teacherCourseReward(obj).then(res => {
@@ -175,20 +190,20 @@ export default {
         }
       });
     },
-    onExport() {
-       let url = "/api-web/export/teacherCourseReward";
-        this.searchForm.page = this.rules.page;
+    onExport () {
+      let url = "/api-web/export/teacherCourseReward";
+      this.searchForm.page = this.rules.page;
       this.searchForm.rows = this.rules.limit;
-      if(this.searchForm.date&&this.searchForm.date.length>0){
+      if (this.searchForm.date && this.searchForm.date.length > 0) {
         this.searchForm.startTime = this.searchForm.date[0]
         this.searchForm.endTime = this.searchForm.date[1]
-      }{
+      } {
         this.searchForm.startTime = null
         this.searchForm.endTime = null;
       }
       let obj = JSON.parse(JSON.stringify(this.searchForm));
       obj.date = null;
-       const options = {
+      const options = {
         method: "POST",
         headers: {
           Authorization: getToken()
@@ -213,7 +228,7 @@ export default {
             let text = (new Response(blob)).text()
             text.then(res => {
               // 判断是否报错
-              if(res.indexOf('code') != -1) {
+              if (res.indexOf('code') != -1) {
                 let json = JSON.parse(res)
                 this.$message.error(json.msg)
               } else {
@@ -244,19 +259,19 @@ export default {
             load.endLoading();
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    search() {
+    search () {
       this.rules.page = 1;
       this.getList();
     },
-    onReSet() {
+    onReSet () {
       this.searchForm = {
         search: null,
         organId: null,
         teacherId: null,
-        settlementStatus:null,
-        date:[],
+        settlementStatus: null,
+        date: [],
       };
       this.search();
     }

src/views/studentManager/components/studentOrder.vue

@@ -5,19 +5,17 @@
         <div class="headItem">
           <p>
             账户余额:
-            <span>{{ (dataInfo.balance).toFixed(2) }}</span>
+            <span>{{ dataInfo.balance?(dataInfo.balance).toFixed(2):0.00 }}</span>
           </p>
-          <el-button
-            type="text"
-            v-permission="'userCashAccount/updateBalance'"
-            @click="onMoneyOperation('recharge')"
-          >修改</el-button>
+          <el-button type="text"
+                     v-permission="'userCashAccount/updateBalance'"
+                     @click="onMoneyOperation('recharge')">修改</el-button>
         </div>
         <div class="headItem">
           <!-- v-if="amountStatus" -->
           <p>
             课程余额:
-            <span>{{ (dataInfo.courseBalance).toFixed(2) }}</span>
+            <span>{{ dataInfo.courseBalance?(dataInfo.courseBalance).toFixed(2):0.00 }}</span>
           </p>
           <!-- <p v-else>课程余额:<span>
               <el-input style="width: 130px;"
@@ -25,11 +23,9 @@
                         placeholder="课程余额"></el-input>
           </span></p>-->
 
-          <el-button
-            v-permission="'userCashAccount/updateCourseBalance'"
-            @click="onMoneyOperation('account')"
-            type="text"
-          >修改</el-button>
+          <el-button v-permission="'userCashAccount/updateCourseBalance'"
+                     @click="onMoneyOperation('account')"
+                     type="text">修改</el-button>
           <!-- <el-button style="top:0;"
                      @click="onUpdateCourse"
                      v-else
@@ -48,163 +44,212 @@
           <p>微信:<span>{{ dataInfo.wxBalance }}</span></p>
         </div>-->
       </div>
-      <el-button @click="onCashAccount" v-permission="'userCashAccountDetail/queryPage'" type="primary">交易明细</el-button>
+      <el-button @click="onCashAccount"
+                 v-permission="'userCashAccountDetail/queryPage'"
+                 type="primary">交易明细</el-button>
     </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-date-picker
-          style="width: 400px;"
-          v-model.trim="orderDate"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          @change="searchCourseDate"
-          range-separator="至"
-          start-placeholder="订单开始日期"
-          end-placeholder="订单结束日期"
-        ></el-date-picker>
+        <el-date-picker style="width: 400px;"
+                        v-model.trim="orderDate"
+                        type="daterange"
+                        value-format="yyyy-MM-dd"
+                        @change="searchCourseDate"
+                        range-separator="至"
+                        start-placeholder="订单开始日期"
+                        end-placeholder="订单结束日期"
+                        :picker-options="{
+        firstDayOfWeek: 1
+    }"></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-select
-          v-model.trim="searchForm.paymentType"
-          filterable
-          clearable
-          @clear="onClear('paymentType')"
-          placeholder="交易类型"
-        >
-          <el-option
-            v-for="(item, index) in orderStatus"
-            :key="index"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
+        <el-select v-model.trim="searchForm.paymentType"
+                   filterable
+                   clearable
+                   @clear="onClear('paymentType')"
+                   placeholder="交易类型">
+          <el-option v-for="(item, index) in orderStatus"
+                     :key="index"
+                     :label="item.label"
+                     :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-input
-          type="text"
-          @keyup.enter.native="search"
-          v-model.trim="searchForm.remark"
-          placeholder="订单说明"
-        ></el-input>
+        <el-input type="text"
+                  @keyup.enter.native="search"
+                  v-model.trim="searchForm.remark"
+                  placeholder="订单说明"></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button @click="search" type="danger">搜索</el-button>
-        <el-button @click="onReSet" type="primary">重置</el-button>
+        <el-button @click="search"
+                   type="danger">搜索</el-button>
+        <el-button @click="onReSet"
+                   type="primary">重置</el-button>
       </el-form-item>
     </el-form>
     <div class="tableWrap">
-      <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column label="订单日期" prop="createTime" align="center" width="150px">
+      <el-table :data="tableList"
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column label="订单日期"
+                         prop="createTime"
+                         align="center"
+                         width="150px">
           <template slot-scope="scope">{{ scope.row.createTime | dateForMinFormat }}</template>
         </el-table-column>
-        <el-table-column label="交易类型" align="center" width="180px">
+        <el-table-column label="交易类型"
+                         align="center"
+                         width="180px">
           <template slot-scope="scope">{{ scope.row.type | orderType }}</template>
         </el-table-column>
-        <el-table-column width="180px" align="center" label="应付金额" prop="expectAmount"></el-table-column>
-        <el-table-column width="180px" align="center" label="余额支付" prop="balancePaymentAmount"></el-table-column>
-        <el-table-column width="180px" align="center" label="实际金额" prop="actualAmount"></el-table-column>
-        <el-table-column width="180px" align="center" label="订单状态" prop="status">
+        <el-table-column width="180px"
+                         align="center"
+                         label="应付金额"
+                         prop="expectAmount"></el-table-column>
+        <el-table-column width="180px"
+                         align="center"
+                         label="余额支付"
+                         prop="balancePaymentAmount"></el-table-column>
+        <el-table-column width="180px"
+                         align="center"
+                         label="实际金额"
+                         prop="actualAmount"></el-table-column>
+        <el-table-column width="180px"
+                         align="center"
+                         label="订单状态"
+                         prop="status">
           <template slot-scope="scope">
             <div>{{scope.row.status | payStatus}}</div>
           </template>
         </el-table-column>
-        <el-table-column label="订单说明" align="center" prop="memo"></el-table-column>
+        <el-table-column label="订单说明"
+                         align="center"
+                         prop="memo"></el-table-column>
       </el-table>
-      <pagination
-        :total="pageInfo.total"
-        :page.sync="pageInfo.page"
-        :limit.sync="pageInfo.limit"
-        :page-sizes="pageInfo.page_size"
-        @pagination="getList"
-      />
+      <pagination :total="pageInfo.total"
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getList" />
     </div>
-    <el-dialog title="交易明细" width="850px" :visible.sync="cashAccount.status">
-      <el-tabs v-model="activeName" type="border-card">
-        <el-tab-pane label="账户余额明细" name="first">
+    <el-dialog title="交易明细"
+               width="850px"
+               :visible.sync="cashAccount.status">
+      <el-tabs v-model="activeName"
+               type="border-card">
+        <el-tab-pane label="账户余额明细"
+                     name="first">
           <el-table :data="cashAccount.gridData">
             <!-- 交易金额，账户可用余额，交易状态，交易类型，操作时间，备注 -->
-            <el-table-column align="center" property="amount" label="交易金额"></el-table-column>
-            <el-table-column align="center" property="balance" label="账户可用余额"></el-table-column>
-            <el-table-column align="center" label="交易状态">
+            <el-table-column align="center"
+                             property="amount"
+                             label="交易金额"></el-table-column>
+            <el-table-column align="center"
+                             property="balance"
+                             label="账户可用余额"></el-table-column>
+            <el-table-column align="center"
+                             label="交易状态">
               <template slot-scope="scope">{{ scope.row.status | payStatus }}</template>
             </el-table-column>
-            <el-table-column align="center" label="交易类型">
+            <el-table-column align="center"
+                             label="交易类型">
               <template slot-scope="scope">{{ scope.row.type | payType }}</template>
             </el-table-column>
-            <el-table-column align="center" width="160px" property="createTime" label="交易时间"></el-table-column>
-            <el-table-column align="center" width="140px" label="备注">
+            <el-table-column align="center"
+                             width="160px"
+                             property="createTime"
+                             label="交易时间"></el-table-column>
+            <el-table-column align="center"
+                             width="140px"
+                             label="备注">
               <template slot-scope="scope">
                 <span :title="scope.row.comment">{{ scope.row.comment }}</span>
               </template>
             </el-table-column>
           </el-table>
-          <pagination
-            :total="cashAccount.total"
-            :page.sync="cashAccount.page"
-            :limit.sync="cashAccount.limit"
-            :page-sizes="cashAccount.page_size"
-            @pagination="getCashAccount"
-          />
+          <pagination :total="cashAccount.total"
+                      :page.sync="cashAccount.page"
+                      :limit.sync="cashAccount.limit"
+                      :page-sizes="cashAccount.page_size"
+                      @pagination="getCashAccount" />
         </el-tab-pane>
-        <el-tab-pane label="课程余额明细" name="second">
+        <el-tab-pane label="课程余额明细"
+                     name="second">
           <el-table :data="courseAccount.gridData">
             <!-- 交易金额，账户可用余额，交易状态，交易类型，操作时间，备注 -->
-            <el-table-column align="center" property="amount" label="交易金额"></el-table-column>
-            <el-table-column align="center" property="balance" label="课程可用余额"></el-table-column>
-            <el-table-column align="center" label="交易状态">
+            <el-table-column align="center"
+                             property="amount"
+                             label="交易金额"></el-table-column>
+            <el-table-column align="center"
+                             property="balance"
+                             label="课程可用余额"></el-table-column>
+            <el-table-column align="center"
+                             label="交易状态">
               <template slot-scope="scope">{{ scope.row.status | payStatus }}</template>
             </el-table-column>
-            <el-table-column align="center" label="交易类型">
+            <el-table-column align="center"
+                             label="交易类型">
               <template slot-scope="scope">{{ scope.row.type | payType }}</template>
             </el-table-column>
-            <el-table-column align="center" width="160px" property="createTime" label="交易时间"></el-table-column>
-            <el-table-column align="center" width="140px" label="备注">
+            <el-table-column align="center"
+                             width="160px"
+                             property="createTime"
+                             label="交易时间"></el-table-column>
+            <el-table-column align="center"
+                             width="140px"
+                             label="备注">
               <template slot-scope="scope">
                 <span :title="scope.row.comment">{{ scope.row.comment }}</span>
               </template>
             </el-table-column>
           </el-table>
-          <pagination
-            :total="courseAccount.total"
-            :page.sync="courseAccount.page"
-            :limit.sync="courseAccount.limit"
-            :page-sizes="courseAccount.page_size"
-            @pagination="getCourseAccount"
-          />
+          <pagination :total="courseAccount.total"
+                      :page.sync="courseAccount.page"
+                      :limit.sync="courseAccount.limit"
+                      :page-sizes="courseAccount.page_size"
+                      @pagination="getCourseAccount" />
         </el-tab-pane>
       </el-tabs>
     </el-dialog>
-    <el-dialog
-      :title="moneyForm.title"
-      width="450px"
-      @close="onFormClose('moneyForm')"
-      :visible.sync="moneyVisible"
-    >
-      <el-form ref="moneyForm" :rules="moneyRule" :model="moneyForm" label-width="80px">
-        <el-form-item label="操作选择" prop="type">
+    <el-dialog :title="moneyForm.title"
+               width="450px"
+               @close="onFormClose('moneyForm')"
+               :visible.sync="moneyVisible">
+      <el-form ref="moneyForm"
+               :rules="moneyRule"
+               :model="moneyForm"
+               label-width="80px">
+        <el-form-item label="操作选择"
+                      prop="type">
           <el-radio-group v-model="moneyForm.type">
             <el-radio :label="1">充值</el-radio>
             <el-radio :label="2">扣除</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item :label="moneyForm.titleType == 'account' ? '课程余额' : '账户余额'">
-          <el-input
-            type="number"
-            disabled
-            :value="moneyForm.titleType == 'account' ? dataInfo.courseBalance : dataInfo.balance"
-          ></el-input>
+          <el-input type="number"
+                    disabled
+                    :value="moneyForm.titleType == 'account' ? dataInfo.courseBalance : dataInfo.balance"></el-input>
         </el-form-item>
-        <el-form-item label="金额" prop="money">
-          <el-input type="number" @mousewheel.native.prevent v-model="moneyForm.money"></el-input>
+        <el-form-item label="金额"
+                      prop="money">
+          <el-input type="number"
+                    @mousewheel.native.prevent
+                    v-model="moneyForm.money"></el-input>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input type="textarea" v-model="moneyForm.remark"></el-input>
+        <el-form-item label="备注"
+                      prop="remark">
+          <el-input type="textarea"
+                    v-model="moneyForm.remark"></el-input>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer"
+           class="dialog-footer">
         <el-button @click="moneyVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submitMoney('moneyForm')">确 定</el-button>
+        <el-button type="primary"
+                   @click="submitMoney('moneyForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 充值弹窗 -->
@@ -260,7 +305,7 @@ let validPrice = (rule, value, callback) => {
 export default {
   name: "studentOrder",
   components: { pagination },
-  data() {
+  data () {
     return {
       rechargeVisible: false,
       organId: null,
@@ -322,23 +367,23 @@ export default {
       }
     };
   },
-  mounted() {
+  mounted () {
     this.searchForm.studentId = this.$route.query.userId;
     this.getList();
     this.__init();
   },
-  activated() {
+  activated () {
     this.searchForm.studentId = this.$route.query.userId;
     this.getList();
     this.__init();
   },
   methods: {
-    onClear(type) {
+    onClear (type) {
       if (type == "paymentType") {
         this.searchForm.paymentType = null;
       }
     },
-    __init() {
+    __init () {
       getUserCashAccountBaseInfo({ userId: this.$route.query.userId }).then(
         res => {
           if (res.code == 200) {
@@ -353,11 +398,11 @@ export default {
         }
       );
     },
-    onFormClose(formName) {
+    onFormClose (formName) {
       // 关闭弹窗重置验证
       this.$refs[formName].resetFields();
     },
-    onMoneyOperation(type) {
+    onMoneyOperation (type) {
       let moneyForm = this.moneyForm;
       if (type == "recharge") {
         moneyForm.title = "账户余额修改";
@@ -368,14 +413,14 @@ export default {
       }
       this.moneyVisible = true;
     },
-    onCashAccount(item) {
+    onCashAccount (item) {
       // 点名表
       this.cashAccount.page = 1;
       this.getCashAccount();
       this.courseAccount.page = 1;
       this.getCourseAccount();
     },
-    getCashAccount() {
+    getCashAccount () {
       let cashAccount = this.cashAccount;
       let params = {
         page: cashAccount.page,
@@ -391,7 +436,7 @@ export default {
         }
       });
     },
-    getCourseAccount() {
+    getCourseAccount () {
       let courseAccount = this.courseAccount;
       let params = {
         page: courseAccount.page,
@@ -407,7 +452,7 @@ export default {
         }
       });
     },
-    submitMoney(formName) {
+    submitMoney (formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
           let moneyForm = this.moneyForm;
@@ -431,7 +476,7 @@ export default {
               } else {
                 courseBalance = Number(
                   Number(dataInfo.courseBalance) -
-                    Number(moneyForm.money).toFixed(2)
+                  Number(moneyForm.money).toFixed(2)
                 );
               }
             }
@@ -483,7 +528,7 @@ export default {
         }
       });
     },
-    onUpdateCourse() {
+    onUpdateCourse () {
       if (!this.dataInfo.courseBalance) {
         this.$message.error("请输入课程余额");
         return;
@@ -512,11 +557,11 @@ export default {
           this.amountStatus = true;
         });
     },
-    search() {
+    search () {
       this.pageInfo.page = 1;
       this.getList();
     },
-    getList() {
+    getList () {
       let params = this.searchForm;
       params.rows = this.pageInfo.limit;
       params.page = this.pageInfo.page;
@@ -530,7 +575,7 @@ export default {
         }
       });
     },
-    searchCourseDate(value) {
+    searchCourseDate (value) {
       if (value) {
         this.searchForm.orderStartDate = value[0];
         this.searchForm.orderEndDate = value[1];
@@ -539,7 +584,7 @@ export default {
         this.searchForm.orderEndDate = null;
       }
     },
-    onReSet() {
+    onReSet () {
       // 重置搜索
       this.orderDate = null;
       this.searchForm = {
@@ -550,7 +595,7 @@ export default {
         remark: null
       };
     },
-    submitRecharge() {
+    submitRecharge () {
       let money = parseFloat(
         this.dataInfo.courseBalance - this.rechargeForm.money
       ).toFixed(2);

src/views/studentManager/studentList.vue

@@ -290,6 +290,9 @@
           <el-date-picker v-model.trim="studentForm.date"
                           value-format="yyyy-MM-dd"
                           type="date"
+                          :picker-options="{
+                            firstDayOfWeek:1
+                          }"
                           placeholder="选择日期"></el-date-picker>
         </el-form-item>
       </el-form>

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

@@ -20,6 +20,9 @@
                         type="daterange"
                         value-format="yyyy-MM-dd"
                         @change="searchCourseDate"
+                        :picker-options="{
+        firstDayOfWeek: 1
+    }"
                         range-separator="至"
                         start-placeholder="开始日期"
                         end-placeholder="结束日期">
@@ -39,11 +42,11 @@
         <el-table-column align='center'
                          prop="createTime"
                          label="请假发起时间">
-                         <template slot-scope="scope">
-                           <div>
-                             {{ scope.row.createTime |dateForMinFormat}}
-                           </div>
-                         </template>
+          <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

@@ -17,7 +17,10 @@
                         @change="searchCourseDate"
                         range-separator="至"
                         start-placeholder="开始日期"
-                        end-placeholder="结束日期">
+                        end-placeholder="结束日期"
+                        :picker-options="{
+        firstDayOfWeek: 1
+    }">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -53,7 +56,7 @@
       <el-table :data="tableList"
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column label="上课时间"
-        align="center"
+                         align="center"
                          width="200">
           <template slot-scope="scope">
             {{ scope.row.classDate + ' ' + (scope.row.classTime.substring(0,5)) }}

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

@@ -1,86 +1,98 @@
 <template>
   <div class="tr-cotainer">
     <!-- 搜索标题 -->
-    <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+    <el-form :inline="true"
+             class="searchForm"
+             v-model.trim="searchForm">
       <el-form-item>
-        <el-date-picker
-          style="width: 400px;"
-          v-model.trim="courseDate"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          @change="searchCourseDate"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
+        <el-date-picker style="width: 400px;"
+                        v-model.trim="courseDate"
+                        type="daterange"
+                        value-format="yyyy-MM-dd"
+                        @change="searchCourseDate"
+                        range-separator="至"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"
+                        :picker-options="{
+        firstDayOfWeek: 1
+    }"></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-select
-          v-model.trim="searchForm.courseScheduleType"
-          clearable
-          filterable
-          placeholder="课程类型"
-        >
-          <el-option
-            v-for="(item, index) in courseType"
-            :key="index"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
+        <el-select v-model.trim="searchForm.courseScheduleType"
+                   clearable
+                   filterable
+                   placeholder="课程类型">
+          <el-option v-for="(item, index) in courseType"
+                     :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-select v-model.trim="searchForm.signInStatus" filterable clearable placeholder="考勤状态">
-          <el-option
-            v-for="(item, index) in attendance"
-            :key="index"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
+        <el-select v-model.trim="searchForm.signInStatus"
+                   filterable
+                   clearable
+                   placeholder="考勤状态">
+          <el-option v-for="(item, index) in attendance"
+                     :key="index"
+                     :label="item.label"
+                     :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="search" type="danger">搜索</el-button>
-        <el-button @click="onReSet" type="primary">重置</el-button>
+        <el-button @click="search"
+                   type="danger">搜索</el-button>
+        <el-button @click="onReSet"
+                   type="primary">重置</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->
     <div class="tableWrap">
       <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" label="上课时间" width="150">
+        <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.substring(0,5) }}</template>
           </el-table-column>
-          <el-table-column align="center" label="下课时间"  width="150">
+          <el-table-column align="center"
+                           label="下课时间"
+                           width="150">
             <template slot-scope="scope">{{ scope.row.classDate }} {{ scope.row.endClassTime.substring(0,5) }}</template>
           </el-table-column>
-          <el-table-column align="center" label="课程类型">
+          <el-table-column align="center"
+                           label="课程类型">
             <template slot-scope="scope">{{ scope.row.type | coursesType }}</template>
           </el-table-column>
-          <el-table-column align="center" prop="name" label="课程名称"></el-table-column>
-          <el-table-column align="center" label="签到">
+          <el-table-column align="center"
+                           prop="name"
+                           label="课程名称"></el-table-column>
+          <el-table-column align="center"
+                           label="签到">
             <template slot-scope="scope">{{ scope.row.signInStatus | attendanceType }}</template>
           </el-table-column>
-          <el-table-column align="center" label="签退">
+          <el-table-column align="center"
+                           label="签退">
             <template slot-scope="scope">{{ scope.row.signOutStatus | attendanceOutType }}</template>
           </el-table-column>
-          <el-table-column align="center" prop="remark" label="备注"></el-table-column>
+          <el-table-column align="center"
+                           prop="remark"
+                           label="备注"></el-table-column>
         </el-table>
-        <pagination
-          :total="pageInfo.total"
-          :page.sync="pageInfo.page"
-          :limit.sync="pageInfo.limit"
-          :page-sizes="pageInfo.page_size"
-          @pagination="getList"
-        />
+        <pagination :total="pageInfo.total"
+                    :page.sync="pageInfo.page"
+                    :limit.sync="pageInfo.limit"
+                    :page-sizes="pageInfo.page_size"
+                    @pagination="getList" />
       </div>
     </div>
   </div>
@@ -95,7 +107,7 @@ export default {
   components: {
     pagination
   },
-  data() {
+  data () {
     return {
       courseType: courseType, // 课程类型
       attendance: attendance, // 考勤状态
@@ -119,18 +131,18 @@ export default {
       }
     };
   },
-  mounted() {
+  mounted () {
     this.getList();
   },
-  activated() {
+  activated () {
     this.getList();
   },
   methods: {
-    search() {
+    search () {
       this.pageInfo.page = 1;
       this.getList();
     },
-    getList() {
+    getList () {
       let params = this.searchForm;
       params.rows = this.pageInfo.limit;
       (params.page = this.pageInfo.page), (params.teacherId = this.teacherId);
@@ -141,7 +153,7 @@ export default {
         }
       });
     },
-    searchCourseDate(value) {
+    searchCourseDate (value) {
       if (value) {
         this.searchForm.courseStartDate = value[0];
         this.searchForm.courseEndDate = value[1];
@@ -150,7 +162,7 @@ export default {
         this.searchForm.courseEndDate = null;
       }
     },
-    onReSet() {
+    onReSet () {
       this.courseDate = null;
       this.searchForm = {
         courseStartDate: null,

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

@@ -2,112 +2,130 @@
 <template>
   <div class="m-core">
     <div class="wrap">
-      <div
-        class="newBand"
-        v-permission="'sysTenantAccount/addMinutes'"
-        style="margin-right:20px"
-        @click="addTimer"
-      >系统充值</div>
-      <div class="newBand" v-permission="'sysTenantAccount/subtractMinutes'" @click="subTimer">系统扣除</div>
+      <div class="newBand"
+           v-permission="'sysTenantAccount/addMinutes'"
+           style="margin-right:20px"
+           @click="addTimer">系统充值</div>
+      <div class="newBand"
+           v-permission="'sysTenantAccount/subtractMinutes'"
+           @click="subTimer">系统扣除</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-select clearable placeholder="操作类型" v-model="searchForm.transType">
-          <el-option
-            :label="item.label"
-            :value="item.value"
-            v-for="(item,index) in teacherTimeStatus"
-            :key="index"
-          ></el-option>
+        <el-select clearable
+                   placeholder="操作类型"
+                   v-model="searchForm.transType">
+          <el-option :label="item.label"
+                     :value="item.value"
+                     v-for="(item,index) in teacherTimeStatus"
+                     :key="index"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-date-picker
-          style="width: 400px;"
-          v-model.trim="searchForm.courseDate"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
+        <el-date-picker style="width: 400px;"
+                        v-model.trim="searchForm.courseDate"
+                        type="daterange"
+                        value-format="yyyy-MM-dd"
+                        range-separator="至"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"
+                        :picker-options="{
+        firstDayOfWeek: 1
+    }"></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button @click="search" type="danger">搜索</el-button>
-        <el-button @click="onReSet" type="primary">重置</el-button>
+        <el-button @click="search"
+                   type="danger">搜索</el-button>
+        <el-button @click="onReSet"
+                   type="primary">重置</el-button>
       </el-form-item>
     </el-form>
-    <div
-      style="font-size: 14px; color: #F85043; padding-bottom: 10px;"
-    >可用时间：{{ totalTransMinutes }}分钟 &nbsp;&nbsp;&nbsp;&nbsp;</div>
+    <div style="font-size: 14px; color: #F85043; padding-bottom: 10px;">可用时间：{{ 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="操作时间">
-            <template slot-scope="scope">
+      <el-table :data="tableList"
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <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="操作类型">
+        <el-table-column align="center"
+                         label="操作类型">
           <template slot-scope="scope">
             <div>{{scope.row.transType | transTypeFilter}}</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="operatorId" label="操作人">
-           <template slot-scope="scope">
+        <el-table-column align="center"
+                         prop="operatorId"
+                         label="操作人">
+          <template slot-scope="scope">
             <div>{{scope.row.operatorId?scope.row.operatorId:scope.row.userId}}</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="transMinutes" label="时间变动/分钟">
+        <el-table-column align="center"
+                         prop="transMinutes"
+                         label="时间变动/分钟">
           <template slot-scope="scope">
             <div>{{scope.row.transMinutes +'分钟'}}</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="totalAvailableMinutes" label="剩余时间/分钟">
+        <el-table-column align="center"
+                         prop="totalAvailableMinutes"
+                         label="剩余时间/分钟">
           <template slot-scope="scope">
             <div>{{scope.row.totalAvailableMinutes +'分钟'}}</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="memo" label="备注"></el-table-column>
+        <el-table-column align="center"
+                         prop="memo"
+                         label="备注"></el-table-column>
       </el-table>
-      <pagination
-        :total="pageInfo.total"
-        :page.sync="pageInfo.page"
-        :limit.sync="pageInfo.limit"
-        :page-sizes="pageInfo.page_size"
-        @pagination="getList"
-      />
+      <pagination :total="pageInfo.total"
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getList" />
     </div>
-    <el-dialog :title="maskTitle" width="440px" :visible.sync="timerVisible">
-      <el-form :model="timerForm" ref="timerForm">
-        <el-form-item
-          :label="isAdd?'本次充值':'本次扣除'"
-          prop="minutes"
-          :rules="[{ required: true, message: '请输入时间' }]"
-        >
+    <el-dialog :title="maskTitle"
+               width="440px"
+               :visible.sync="timerVisible">
+      <el-form :model="timerForm"
+               ref="timerForm">
+        <el-form-item :label="isAdd?'本次充值':'本次扣除'"
+                      prop="minutes"
+                      :rules="[{ required: true, message: '请输入时间' }]">
           <el-row>
             <el-col :span="28">
-              <el-input
-                type="number"
-                @mousewheel.native.prevent
-                v-model.trim="timerForm.minutes"
-                @keyup.native="handleInput"
-              >
+              <el-input type="number"
+                        @mousewheel.native.prevent
+                        v-model.trim="timerForm.minutes"
+                        @keyup.native="handleInput">
                 <template slot="append">分钟</template>
               </el-input>
             </el-col>
           </el-row>
         </el-form-item>
-        <el-form-item label="操作备注" prop="memo" :rules="[{ required: true, message: '请输入备注' }]">
+        <el-form-item label="操作备注"
+                      prop="memo"
+                      :rules="[{ required: true, message: '请输入备注' }]">
           <el-row>
             <el-col :span="28">
-              <el-input type="textarea" :rows="3" v-model.trim="timerForm.memo"></el-input>
+              <el-input type="textarea"
+                        :rows="3"
+                        v-model.trim="timerForm.memo"></el-input>
             </el-col>
           </el-row>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer"
+           class="dialog-footer">
         <el-button @click="timerVisible = false">取 消</el-button>
-        <el-button type="primary" @click="addTimerSub(isAdd)">确 定</el-button>
+        <el-button type="primary"
+                   @click="addTimerSub(isAdd)">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -124,7 +142,7 @@ import {
 } from "@/api/teacherManager";
 export default {
   components: { pagination },
-  data() {
+  data () {
     return {
       teacherId: null,
       teacherTimeStatus,
@@ -151,32 +169,32 @@ export default {
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
-  created() {},
+  created () { },
   //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {
+  mounted () {
     this.init();
   },
-  activated() {
+  activated () {
     this.init();
   },
   methods: {
-    init() {
+    init () {
       this.teacherId = this.$route.query.teacherId;
 
       this.getList();
     },
-    search() {
+    search () {
       this.pageInfo.page = 1;
       this.getList();
     },
-    onReSet() {
+    onReSet () {
       (this.searchForm = {
         courseDate: [],
         transType: null
       }),
         this.search();
     },
-    getTime() {
+    getTime () {
       queryTenantAcGet({ teacherId: this.teacherId }).then(res => {
         if (res.code == 200) {
           if (res.data) {
@@ -185,11 +203,11 @@ export default {
         }
       });
     },
-    getList() {
+    getList () {
       let obj = {};
       if (this.searchForm.courseDate && this.searchForm.courseDate.length > 0) {
-        obj.startTime = this.searchForm.courseDate[0]+ ' 00:00:00';
-        obj.endTime = this.searchForm.courseDate[1]+ ' 23:59:59';
+        obj.startTime = this.searchForm.courseDate[0] + ' 00:00:00';
+        obj.endTime = this.searchForm.courseDate[1] + ' 23:59:59';
       }
       this.searchForm.transType
         ? (obj.transType = this.searchForm.transType)
@@ -205,17 +223,17 @@ export default {
       });
       this.getTime();
     },
-    addTimer() {
+    addTimer () {
       this.isAdd = true;
       this.maskTitle = "充值时间";
       this.timerVisible = true;
     },
-    subTimer() {
+    subTimer () {
       this.isAdd = false;
       this.maskTitle = "扣除时间";
       this.timerVisible = true;
     },
-    addTimerSub(flag) {
+    addTimerSub (flag) {
       // true 加时间  false 减时间
       this.$refs["timerForm"].validate(res => {
         if (res) {
@@ -244,13 +262,13 @@ export default {
         }
       });
     },
-    handleInput() {
+    handleInput () {
       this.timerForm.minutes = this.timerForm.minutes.replace(/[^\.\d]/g, "");
       this.timerForm.minutes = this.timerForm.minutes.replace(".", "");
     }
   },
   watch: {
-    timerVisible(val) {
+    timerVisible (val) {
       if (!val) {
         this.timerForm = {
           minutes: null,

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -174,6 +174,9 @@
             <el-date-picker v-model.trim="startDate"
                             type="date"
                             value-format="yyyy-MM-dd"
+                            :picker-options="{
+                              firstDayOfWeek:1
+                            }"
                             placeholder="选择日期"></el-date-picker>
             <div style="display: inline; color: red; padding-left: 10px;">说明：本次调整只对生效日期之后（包含当天）且未结算的课程生效；</div>
           </el-form-item>

src/views/teamDetail/componentCourse/courseList.vue

@@ -45,7 +45,10 @@
                         value-format="yyyy-MM-dd"
                         range-separator="至"
                         start-placeholder="开始日期"
-                        end-placeholder="结束日期">
+                        end-placeholder="结束日期"
+                        :picker-options="{
+        firstDayOfWeek: 1
+    }">
         </el-date-picker>
       </el-form-item>
       <el-form-item>

src/views/teamDetail/components/courseList.vue

@@ -72,7 +72,10 @@
                         value-format="yyyy-MM-dd"
                         range-separator="至"
                         start-placeholder="开始日期"
-                        end-placeholder="结束日期"></el-date-picker>
+                        end-placeholder="结束日期"
+                        :picker-options="{
+        firstDayOfWeek: 1
+    }"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <div class="searchBtn"

src/views/teamDetail/components/salaryList.vue

@@ -147,31 +147,9 @@ export default {
         date: '' // 时间选择器返回的值
       },
       pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick (picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick (picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近三个月',
-          onClick (picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-            picker.$emit('pick', [start, end]);
-          }
-        }]
+
+        firstDayOfWeek: 1,
+
       }, // 时间选择器默认选项
       tableList: [], // table列表
       rules: {

src/views/teamDetail/components/studentSignin.vue

@@ -18,7 +18,10 @@
                           format="yyyy-MM-dd"
                           range-separator="至"
                           start-placeholder="开始日期"
-                          end-placeholder="结束日期">
+                          end-placeholder="结束日期"
+                          :picker-options="{
+        firstDayOfWeek: 1
+    }">
           </el-date-picker>
         </el-form-item>
         <el-form-item label='班级名称'>

src/views/teamDetail/components/teamTeacherRecord.vue

@@ -31,7 +31,10 @@
                         value-format="yyyy-MM-dd"
                         range-separator="至"
                         start-placeholder="开始日期"
-                        end-placeholder="结束日期">
+                        end-placeholder="结束日期"
+                        :picker-options="{
+        firstDayOfWeek: 1
+    }">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -148,7 +151,7 @@ export default {
       this.rules.page = 1;
       this.getList();
     },
-    reset() {
+    reset () {
       this.rules.page = 1
       this.rules.limit = 10
       this.searchForm = {

src/views/teamDetail/teamCourseList.vue

@@ -90,7 +90,10 @@
                           value-format="yyyy-MM-dd"
                           range-separator="至"
                           start-placeholder="开始日期"
-                          end-placeholder="结束日期"></el-date-picker>
+                          end-placeholder="结束日期"
+                          :picker-options="{
+        firstDayOfWeek: 1
+    }"></el-date-picker>
         </el-form-item>
         <el-form-item>
           <div class="searchBtn"

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

@@ -42,50 +42,62 @@
       </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"
+                        :picker-options="{
+        firstDayOfWeek: 1
+    }"></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 :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                :data="tableList">
+        <el-table-column label="上课时间"
+                         align="center"
+                         prop="classDate">
           <template slot-scope="scope">
             <div>{{ scope.row.classDate | dateForMinFormat }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="课时类型" align="center" prop="teachMode">
+        <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="deductionFee"></el-table-column>
-        <el-table-column label="老师课酬" align="center" prop="actualSalary"></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>
           </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>
@@ -94,7 +106,7 @@ import pagination from "@/components/Pagination/index";
 import { getVipGroupSalarys, getVipGroupDetail } from "@/api/vipSeting";
 export default {
   components: { pagination },
-  data() {
+  data () {
     return {
       searchForm: {
         time: []
@@ -116,23 +128,23 @@ export default {
       }
     };
   },
-  mounted() {
+  mounted () {
     this.__init();
   },
-  activated() {
+  activated () {
     this.__init();
   },
   methods: {
-    __init() {
+    __init () {
       let id = this.$route.query.id;
       this.id = id;
       this.getList();
     },
-    search() {
+    search () {
       this.rules.page = 1;
       this.getList();
     },
-    getList() {
+    getList () {
       if (!this.searchForm.time) {
         this.searchForm.time = [];
       }
@@ -166,11 +178,11 @@ export default {
     }
   },
   filters: {
-    fitterisSalary(val) {
+    fitterisSalary (val) {
       let arr = ["未结算", "已结算"];
       return arr[val];
     },
-    fitterteachMode(val) {
+    fitterteachMode (val) {
       if (val == "ONLINE") {
         return "线上课";
       } else if (val == "OFFLINE") {

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

@@ -54,7 +54,10 @@
                         value-format="yyyy-MM-dd"
                         range-separator="至"
                         start-placeholder="开始日期"
-                        end-placeholder="结束日期">
+                        end-placeholder="结束日期"
+                        :picker-options="{
+        firstDayOfWeek: 1
+    }">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -65,7 +68,7 @@
     <!-- 列表 -->
     <div class="tableWrap">
       <el-table :data='tableList'>
-          <el-table-column align='center'
+        <el-table-column align='center'
                          label="课程编号"
                          prop="id">
         </el-table-column>
@@ -139,7 +142,8 @@
           </template>
         </el-table-column>
         <el-table-column align='center'
-                         label="操作" width="200">
+                         label="操作"
+                         width="200">
           <template slot-scope="scope">
             <div>
               <el-button type="text"
@@ -555,7 +559,7 @@ export default {
     },
     endTime (val) {
       if (val) {
-        return val.split(' ')[1].substring(0,5)
+        return val.split(' ')[1].substring(0, 5)
       } else {
         return val
       }

src/views/vipClass/vipReset.vue

@@ -392,7 +392,8 @@
     <el-dialog title="课程信息"
                width="400px"
                :visible.sync="educationalVisible">
-      <el-form :model="addrForm" label-width="120px">
+      <el-form :model="addrForm"
+               label-width="120px">
         <el-form-item label="课程分部"
                       prop="organId">
           <el-select v-model.trim="addrForm.organId"
@@ -559,7 +560,7 @@ export default {
         addrForm.educationalTeacherId = null;
       }
 
-      if(query.organId) {
+      if (query.organId) {
         addrForm.organId = Number(query.organId)
         this.onEduTeacher()
       } else {
@@ -616,10 +617,8 @@ export default {
        * maskForm.startTime
        *
        */
-
       this.maskForm.date = row.classDate.split(' ')[0];
-      this.startTime = row.startClassTimeStr
-
+      this.startTime = row.startClassTimeStr.substring(0, 5)
       // this.maskForm.endTime = row.endClassTimeStr;
       this.maskForm.id = row.id;
       this.maskForm.address = row.schoolId || null;
@@ -892,10 +891,10 @@ export default {
         }
       });
     },
-    onEduTeacher(type) {
+    onEduTeacher (type) {
       this.educationList = []
       let addrForm = this.addrForm
-      if(type) { addrForm.educationalTeacherId = null }
+      if (type) { addrForm.educationalTeacherId = null }
       queryEmployByOrganId({ organId: addrForm.organId, rows: 10000 }).then(res => {
         if (res.code == 200) {
           this.educationList = res.data.rows
@@ -904,7 +903,7 @@ export default {
     },
     resetEducationalVisible () {
       let addrForm = this.addrForm
-      if(!addrForm.organId) {
+      if (!addrForm.organId) {
         this.$message.error("请选择课程分部");
         return;
       }

src/views/workBenchManager/payAppeal.vue

@@ -45,7 +45,10 @@
                           value-format="yyyy-MM-dd"
                           range-separator="至"
                           start-placeholder="开始日期"
-                          end-placeholder="结束日期"></el-date-picker>
+                          end-placeholder="结束日期"
+                          :picker-options="{
+        firstDayOfWeek: 1
+    }"></el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button type="danger"