Merge branch 'master' into 03/12permission

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>
           <el-select
             v-model.trim="searchForm.jobNature"
             filterable
@@ -337,6 +337,7 @@ export default {
         getNowDateAndMonday(lastWeek),
         getNowDateAndSunday(nowDate),
       ];
+      this.searchForm.jobNature = 'FULL_TIME'
     },
     changeWeek(val) {
       if (val) {
@@ -398,14 +399,21 @@ export default {
       };
     },
     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>