Merge branch 'test'

src/utils/vueFilter.js

@@ -622,6 +622,7 @@ Vue.filter('hrStatus', value => {
     'PART_TIME': "兼职",
     'FULL_TIME': "全职",
     'DIMISSION': "离职",
+    "TEMPORARY":'临时工'
   }
   return template[value]
 })
@@ -745,4 +746,4 @@ Vue.filter('downListType', value => {
 // 退团状态
 Vue.filter('withdrawalStatus', value => {
   return constant.withdrawalStatus[value]
-})
+})

src/views/serverDetail/index.vue

@@ -69,7 +69,7 @@
             v-model.trim="searchForm.operatorId"
           />
         </el-form-item>
-      <el-form-item prop="jobNature">
+        <el-form-item prop="jobNature">
           <el-select
             v-model.trim="searchForm.jobNature"
             filterable
@@ -102,7 +102,12 @@
         <el-form-item>
           <el-button native-type="submit" type="primary">搜索</el-button>
           <el-button native-type="reset" type="danger">重置</el-button>
-          <el-button @click="onExport" type="primary" v-permission="'export/teacherServeInfo'">导出</el-button>
+          <el-button
+            @click="onExport"
+            type="primary"
+            v-permission="'export/teacherServeInfo'"
+            >导出</el-button
+          >
         </el-form-item>
       </save-form>
       <div class="btnWraps" style="margin-bottom: 20px">
@@ -141,20 +146,33 @@
             prop="teacherName"
             label="老师姓名"
           ></el-table-column>
-           <el-table-column
+          <el-table-column
             align="center"
             prop="teacherName"
-            label="服务周期"
-            width="180px"
+            label="工作类型"
           >
           <template slot-scope="scope">
             <div>
-              {{scope.row.monday | dayjsFormat}}~{{scope.row.sunday | dayjsFormat}}
+              {{ scope.row.jobNature|hrStatus}}
             </div>
           </template>
           </el-table-column>
           <el-table-column
             align="center"
+            prop="teacherName"
+            label="服务周期"
+            width="180px"
+          >
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.monday | dayjsFormat }}~{{
+                  scope.row.sunday | dayjsFormat
+                }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
             prop="homeworkNum"
             label="课后作业(节)"
           ></el-table-column>
@@ -168,23 +186,24 @@
               {{ scope.row.unDone ? "是" : "否" }}
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="remindDate"
-            label="提醒时间"
-          >
-          <template slot-scope="scope">
-            <div>
-            {{scope.row.remindDate | dateForMinFormat}}
-            </div>
-          </template>
+          <el-table-column align="center" prop="remindDate" label="提醒时间">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.remindDate | dateForMinFormat }}
+              </div>
+            </template>
           </el-table-column>
           <el-table-column
             align="center"
             prop="operatorName"
             label="操作人"
           ></el-table-column>
-          <el-table-column align="center" prop="studentId" label="操作" width="160px">
+          <el-table-column
+            align="center"
+            prop="studentId"
+            label="操作"
+            width="160px"
+          >
             <template slot-scope="scope">
               <div>
                 <el-button type="text" @click="gotoDteail(scope.row)"
@@ -242,8 +261,8 @@ import { getTeacherServeInfo, teacherServeRemindPush } from "./api";
 import { getTimes } from "@/utils";
 import { getNowDateAndSunday, getNowDateAndMonday } from "@/utils/date";
 import { jobNature } from "@/utils/searchArray";
-import { Export } from '@/utils/downLoadFile'
-import qs from 'qs'
+import { Export } from "@/utils/downLoadFile";
+import qs from "qs";
 export default {
   components: { pagination, serverMask },
   data() {
@@ -255,7 +274,7 @@ export default {
         reminded: "",
         unDone: "",
         operatorId: "",
-        jobNature:""
+        jobNature: "",
       },
       orderDate: [],
       tableList: [],
@@ -270,7 +289,7 @@ export default {
       lookVisible: false,
       activeRow: null,
       chioseList: [],
-       jobNature: jobNature,
+      jobNature: jobNature,
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -288,7 +307,7 @@ export default {
       this.getDefaultTime();
       if (this.$route.query.searchType) {
         this.searchForm.organId = this.$route.query.organId * 1 || "";
-        this.searchForm.unDone = this.$route.query.unDone+'' || ""
+        this.searchForm.unDone = this.$route.query.unDone + "" || "";
         const dayjs = this.$helpers.dayjs;
         let nowDate = dayjs(new Date()).format("YYYY-MM-DD");
         this.orderDate = [
@@ -300,9 +319,8 @@ export default {
       this.getList();
     },
     async getList() {
-
       try {
-        const {orderDate, ...rest} = this.searchForm;
+        const { orderDate, ...rest } = this.searchForm;
         const result = await getTeacherServeInfo({
           ...rest,
           ...getTimes(this.orderDate, ["monday", "sunday"]),
@@ -340,10 +358,10 @@ export default {
     },
     changeWeek(val) {
       if (val) {
-        this.orderDate =  [
+        this.orderDate = [
           getNowDateAndMonday(val[0]),
           getNowDateAndSunday(val[1]),
-        ]
+        ];
       } else {
         this.getDefaultTime();
       }
@@ -388,24 +406,31 @@ export default {
     handleSelectionChange(arr) {
       this.chioseList = arr;
     },
-    bigin(){
+    bigin() {
       let self = this;
       return {
         firstDayOfWeek: 1,
         disabledDate(time) {
-            return time.getTime() >= Date.now();
+          return time.getTime() >= Date.now();
         },
       };
     },
     onExport() {
-      const {orderDate, ...rest} = this.searchForm;
-      Export(this, {
-        url: '/api-web/export/teacherServeInfo',
-        fileName: '退团申请.xlsx',
-        method: 'post',
-        params: qs.stringify({ ...rest, ...getTimes(this.orderDate, ["monday", "sunday"]) })
-      }, '您确定导出退团申请列表?')
-    }
+      const { orderDate, ...rest } = this.searchForm;
+      Export(
+        this,
+        {
+          url: "/api-web/export/teacherServeInfo",
+          fileName: "退团申请.xlsx",
+          method: "post",
+          params: qs.stringify({
+            ...rest,
+            ...getTimes(this.orderDate, ["monday", "sunday"]),
+          }),
+        },
+        "您确定导出退团申请列表?"
+      );
+    },
   },
 };
 </script>

src/views/teamDetail/teamCourseList.vue

@@ -369,14 +369,14 @@
           >
             <template slot-scope="scope">
               <div>
-                <el-button
+                <!-- <el-button
                   type="text"
                   @click="removeCourse(scope.row)"
                   v-permission="
                     'courseSchedule/batchDelete?page=teamCourseList'
                   "
                   >删除</el-button
-                >
+                > -->
                 <el-button
                   type="text"
                   v-if="permission('teamCourseList/details')"