Merge branches 'ol_12_30' and 'ol_12_30' of http://git.dayaedu.com/molingzhide/dy-admin-manager into ol_12_30

src/constant/index.js

@@ -190,3 +190,8 @@ export const mergeType = {
   合并课: '合并课',
   被合并课: '被合并课',
 }
+
+export const belongDaya = {
+  0: '奖金',
+  1: '工资'
+}

src/views/operateManager/serverIndexList.vue

@@ -160,6 +160,14 @@
           <el-table-column align="center"
                            prop="educationalTeacherName"
                            label="乐团主管"></el-table-column>
+          <el-table-column align="center"
+                           prop="courseIds"
+                           width="100"
+                           label="服务课程">
+                           <template slot-scope="scope">
+                              <copy-text>{{scope.row.courseIds || '课外训练'}}</copy-text>
+                            </template>
+          </el-table-column>
           <!-- <el-table-column align="center" label="当前有VIP课" width="100" >
             <template slot-scope="scope">
               <div>{{scope.row.existVipCourse?'是':'否'}}</div>
@@ -237,6 +245,14 @@
             </template>
           </el-table-column>
           <el-table-column align="center"
+                           width="120"
+                           label="服务周期">
+            <template slot-scope="scope">
+              <div>{{dayjs(scope.row.monday).format('YYYY-MM-DD')}}</div>
+              <div>{{dayjs(scope.row.sunday).format('YYYY-MM-DD')}}</div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center"
                            label="操作">
             <!--  -->
             <template slot-scope="scope">
@@ -262,6 +278,7 @@ import axios from "axios";
 import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
+import dayjs from 'dayjs'
 import { getEmployeeOrgan, getTeacher } from "@/api/buildTeam";
 import { findStudentExtracurricularExercisesSituations } from "@/api/afterSchool";
 // findStudentExtracurricularExercisesSituations
@@ -329,6 +346,7 @@ export default {
     this.init();
   },
   methods: {
+    dayjs,
     init () {
       if (this.$route.query.teacherId) {
         this.searchForm.teacherId = this.$route.query.teacherId * 1;