服务指标明细加字段

1

src/utils/vueFilter.js

@@ -742,11 +742,8 @@ Vue.filter('ProbationPeriod', value => {
 Vue.filter('downListType', value => {
   return constant.downListType[value]
 })
-<<<<<<< Updated upstream
-=======
 
 // 退团状态
 Vue.filter('withdrawalStatus', value => {
   return constant.withdrawalStatus[value]
 })
->>>>>>> Stashed changes

src/views/serverDetail/index.vue

@@ -102,15 +102,12 @@
         <el-form-item>
           <el-button native-type="submit" type="primary">搜索</el-button>
           <el-button native-type="reset" type="danger">重置</el-button>
-<<<<<<< Updated upstream
-=======
           <el-button
             @click="onExport"
             type="primary"
             v-permission="'export/teacherServeInfo'"
             >导出</el-button
           >
->>>>>>> Stashed changes
         </el-form-item>
       </save-form>
       <div class="btnWraps" style="margin-bottom: 20px">
@@ -264,11 +261,8 @@ import { getTeacherServeInfo, teacherServeRemindPush } from "./api";
 import { getTimes } from "@/utils";
 import { getNowDateAndSunday, getNowDateAndMonday } from "@/utils/date";
 import { jobNature } from "@/utils/searchArray";
-<<<<<<< Updated upstream
-=======
 import { Export } from "@/utils/downLoadFile";
 import qs from "qs";
->>>>>>> Stashed changes
 export default {
   components: { pagination, serverMask },
   data() {
@@ -420,9 +414,6 @@ export default {
           return time.getTime() >= Date.now();
         },
       };
-<<<<<<< Updated upstream
-    }
-=======
     },
     onExport() {
       const { orderDate, ...rest } = this.searchForm;
@@ -440,7 +431,6 @@ export default {
         "您确定导出退团申请列表?"
       );
     },
->>>>>>> Stashed changes
   },
 };
 </script>