1

src/api/administration/administration.js

@@ -293,7 +293,7 @@ export function myAudit(data) {
  */
 export function getOAPageList(data) {
   return request({
-    url: '/workflow/GetOAPageList',
+    url: '/workflowmanagement/GetOAPageList',
     method: 'post',
     data
   });

src/pages/administration/ApprovalStatistical.vue

@@ -3,7 +3,7 @@
     <div class="query-box" style="border-bottom: none;">
       <ul>
         <li>
-					<span><em>公司</em><el-select filterable @change='getUser' v-model='msg.RB_BranchId'>
+					<span><em>校区</em><el-select filterable @change='getUser' v-model='msg.RB_BranchId'>
 						<el-option label='不限' value='-1'></el-option>
 						<el-option v-for='item in companyList' :label='item.SName' :value='item.SId' :key='item.Id'></el-option>
 						</el-select>
@@ -53,7 +53,7 @@
     <div style="width: 100%; overflow: auto;">
       <table style="min-width: 1400px;" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
         <tr>
-          <th>公司</th>
+          <th>校区</th>
           <th>申请人</th>
           <th>请假类型</th>
           <th width="300">待审核人</th>
@@ -346,23 +346,23 @@
       getList(){
         this.loading=true;
 
-        // getOAPageList(this.msg).then(res => {
-        //   if(res.Code == 1) {
-        //     this.list=res.Data.pageData;
-        //     this.total=res.Data.count;
-        //     this.loading=false
-        //   }
-        // }).catch(() => {
-        //
-        // })
-        this.apipost('WorkFlow_get_GetOAPageList',this.msg,res=>{
-          if(res.data.resultCode==1){
-            this.list=res.data.data.pageData;
-            this.total=res.data.data.count;
+        getOAPageList(this.msg).then(res => {
+          if(res.Code == 1) {
+            this.list=res.Data.PageData;
+            this.total=res.Data.Count;
             this.loading=false
+          }
+        }).catch(() => {
 
-          }else{}
-        },err=>{})
+        })
+        // this.apipost('WorkFlow_get_GetOAPageList',this.msg,res=>{
+        //   if(res.data.resultCode==1){
+        //     this.list=res.data.data.pageData;
+        //     this.total=res.data.data.count;
+        //     this.loading=false
+        //
+        //   }else{}
+        // },err=>{})
       },
       handleCurrentChange(val) {
         this.msg.pageIndex = val;

src/pages/administration/Attendance.vue

@@ -11,7 +11,7 @@
   </div>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
       <tr>
-        <th width="400">{{$t('admin.admin_company')}}</th>
+        <th width="400">校区名称</th>
         <th>{{$t('admin.admin_personNumber')}}</th>
         <th>{{$t('adm.adm_Bindingattendance')}}</th>
         <th>{{$t('admin.admin_kqTime')}}</th>

src/pages/administration/outWorkApproval.vue

+<template>
+
+</template>
+
+<script>
+    export default {
+        name: "outWorkApproval"
+    }
+</script>
+
+<style scoped>
+
+</style>

src/router/routes.js

@@ -400,6 +400,11 @@ const routes = [{
         component: () =>
           import("pages/administration/AttendanceRules.vue")
       },
+      {
+        path: "/administration/outWorkApproval", //外勤考勤
+        component: () =>
+          import("pages/administration/outWorkApproval.vue")
+      },
       {
         path: "/sale/japaneseTrain", //日语培训列表
         component: () =>