diff --git a/app/adminapi/controller/BaseAdminController.php b/app/adminapi/controller/BaseAdminController.php
index 66e8ccea5..a8c040161 100755
--- a/app/adminapi/controller/BaseAdminController.php
+++ b/app/adminapi/controller/BaseAdminController.php
@@ -37,4 +37,11 @@ class BaseAdminController extends BaseLikeAdminController
         }
     }
 
+    public function getPage()
+    {
+        $page = $this->request->get('page', 1);
+        $limit = $this->request->get('limit', 15);
+        return [$page, $limit];
+    }
+
 }
\ No newline at end of file
diff --git a/app/adminapi/controller/CateController.php b/app/adminapi/controller/CateController.php
index 66a37cbb8..3802eb0cb 100644
--- a/app/adminapi/controller/CateController.php
+++ b/app/adminapi/controller/CateController.php
@@ -1,24 +1,20 @@
 <?php
-/**
- * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-3.0
- * @link https://www.gougucms.com
- */
 
 declare (strict_types=1);
 
 namespace app\adminapi\controller;
 
-use think\exception\ValidateException;
 use think\facade\Db;
 
 class CateController extends BaseAdminController
 {
 
-    //审批类型
     public function index()
     {
-        $cate = Db::name('FlowType')->order('id asc')->select()->toArray();
+        [$page, $limit] = $this->getPage();
+        $query = Db::name('FlowType');
+        $cate = $query->order('id asc')->page($page, $limit)->select()->toArray();
+        $count = $query->count();
         $type = get_config('approve.type');
         foreach ($cate as $key => &$value) {
             foreach ($type as $k => $val) {
@@ -32,10 +28,9 @@ class CateController extends BaseAdminController
                 $value['department'] = implode(',', $department);
             }
         }
-        return $this->success('success', $cate);
+        return $this->success('success', ['data' => $cate, 'count' => $count]);
     }
 
-    //审批类型添加
     public function create()
     {
         $param = get_params();
@@ -50,394 +45,14 @@ class CateController extends BaseAdminController
         }
     }
 
-    //审批类型设置
-    public function flow_type_check()
+    public function status()
     {
         $param = get_params();
-        $res = Db::name('FlowType')->strict(false)->field('id,status')->update($param);
+        $res = Db::name('FlowType')->where('id', $param['id'])->strict(false)->field('id,status')->update($param);
         if ($res) {
-            return to_assign();
+            return $this->success('修改成功', [], 1, 1);
         } else {
-            return to_assign(0, '操作失败');
-        }
-    }
-
-    //费用类别
-    public function cost_cate()
-    {
-        if (request()->isAjax()) {
-            $cate = Db::name('CostCate')->order('create_time asc')->select();
-            return to_assign(0, '', $cate);
-        } else {
-            return view();
-        }
-    }
-
-    //费用类别添加
-    public function cost_cate_add()
-    {
-        if (request()->isAjax()) {
-            $param = get_params();
-            if (!empty($param['id']) && $param['id'] > 0) {
-                try {
-                    validate(CostCateCheck::class)->scene('edit')->check($param);
-                } catch (ValidateException $e) {
-                    // 验证失败 输出错误信息
-                    return to_assign(1, $e->getError());
-                }
-                $data['update_time'] = time();
-                $res = Db::name('CostCate')->strict(false)->field(true)->update($param);
-                if ($res) {
-                    add_log('edit', $param['id'], $param);
-                }
-                return to_assign();
-            } else {
-                try {
-                    validate(CostCateCheck::class)->scene('add')->check($param);
-                } catch (ValidateException $e) {
-                    // 验证失败 输出错误信息
-                    return to_assign(1, $e->getError());
-                }
-                $param['create_time'] = time();
-                $insertId = Db::name('CostCate')->strict(false)->field(true)->insertGetId($param);
-                if ($insertId) {
-                    add_log('add', $insertId, $param);
-                }
-                return to_assign();
-            }
-        }
-    }
-
-    //费用类别设置
-    public function cost_cate_check()
-    {
-        $param = get_params();
-        $res = Db::name('CostCate')->strict(false)->field('id,status')->update($param);
-        if ($res) {
-            if ($param['status'] == 0) {
-                add_log('disable', $param['id'], $param);
-            } else if ($param['status'] == 1) {
-                add_log('recovery', $param['id'], $param);
-            }
-            return to_assign();
-        } else {
-            return to_assign(0, '操作失败');
-        }
-    }
-
-    //报销类别
-    public function expense_cate()
-    {
-        if (request()->isAjax()) {
-            $cate = Db::name('ExpenseCate')->order('create_time asc')->select();
-            return to_assign(0, '', $cate);
-        } else {
-            return view();
-        }
-    }
-
-    //报销类别添加
-    public function expense_cate_add()
-    {
-        if (request()->isAjax()) {
-            $param = get_params();
-            if (!empty($param['id']) && $param['id'] > 0) {
-                try {
-                    validate(ExpenseCateCheck::class)->scene('edit')->check($param);
-                } catch (ValidateException $e) {
-                    // 验证失败 输出错误信息
-                    return to_assign(1, $e->getError());
-                }
-                $data['update_time'] = time();
-                $res = Db::name('ExpenseCate')->strict(false)->field(true)->update($param);
-                if ($res) {
-                    add_log('edit', $param['id'], $param);
-                }
-                return to_assign();
-            } else {
-                try {
-                    validate(ExpenseCateCheck::class)->scene('add')->check($param);
-                } catch (ValidateException $e) {
-                    // 验证失败 输出错误信息
-                    return to_assign(1, $e->getError());
-                }
-                $param['create_time'] = time();
-                $insertId = Db::name('ExpenseCate')->strict(false)->field(true)->insertGetId($param);
-                if ($insertId) {
-                    add_log('add', $insertId, $param);
-                }
-                return to_assign();
-            }
-        }
-    }
-
-    //报销类别设置
-    public function expense_cate_check()
-    {
-        $param = get_params();
-        $res = Db::name('ExpenseCate')->strict(false)->field('id,status')->update($param);
-        if ($res) {
-            if ($param['status'] == 0) {
-                add_log('disable', $param['id'], $param);
-            } else if ($param['status'] == 1) {
-                add_log('recovery', $param['id'], $param);
-            }
-            return to_assign();
-        } else {
-            return to_assign(0, '操作失败');
-        }
-    }
-
-    //发票主体
-    public function subject()
-    {
-        if (request()->isAjax()) {
-            $subject = Db::name('InvoiceSubject')->order('create_time asc')->select();
-            return to_assign(0, '', $subject);
-        } else {
-            return view();
-        }
-    }
-
-    //发票主体新建编辑
-    public function subject_add()
-    {
-        if (request()->isAjax()) {
-            $param = get_params();
-            if (!empty($param['id']) && $param['id'] > 0) {
-                try {
-                    validate(InvoiceSubjectCheck::class)->scene('edit')->check($param);
-                } catch (ValidateException $e) {
-                    // 验证失败 输出错误信息
-                    return to_assign(1, $e->getError());
-                }
-                $param['update_time'] = time();
-                $res = Db::name('InvoiceSubject')->strict(false)->field('title,id,update_time')->update($param);
-                if ($res) {
-                    add_log('edit', $param['id'], $param);
-                }
-                return to_assign();
-            } else {
-                try {
-                    validate(InvoiceSubjectCheck::class)->scene('add')->check($param);
-                } catch (ValidateException $e) {
-                    // 验证失败 输出错误信息
-                    return to_assign(1, $e->getError());
-                }
-                $param['create_time'] = time();
-                $insertId = Db::name('InvoiceSubject')->strict(false)->field('title,id,create_time')->insertGetId($param);
-                if ($insertId) {
-                    add_log('add', $insertId, $param);
-                }
-                return to_assign();
-            }
-        }
-    }
-
-    //发票主体设置
-    public function subject_check()
-    {
-        $param = get_params();
-        $res = Db::name('InvoiceSubject')->strict(false)->field('id,status')->update($param);
-        if ($res) {
-            if ($param['status'] == 0) {
-                add_log('disable', $param['id'], $param);
-            } else if ($param['status'] == 1) {
-                add_log('recovery', $param['id'], $param);
-            }
-            return to_assign();
-        } else {
-            return to_assign(0, '操作失败');
-        }
-    }
-
-    //行业类型
-    public function industry_cate()
-    {
-        if (request()->isAjax()) {
-            $cate = Db::name('Industry')->order('create_time asc')->select();
-            return to_assign(0, '', $cate);
-        } else {
-            return view();
-        }
-    }
-
-    //行业类型添加
-    public function industry_cate_add()
-    {
-        if (request()->isAjax()) {
-            $param = get_params();
-            if (!empty($param['id']) && $param['id'] > 0) {
-                try {
-                    validate(IndustryCheck::class)->scene('edit')->check($param);
-                } catch (ValidateException $e) {
-                    // 验证失败 输出错误信息
-                    return to_assign(1, $e->getError());
-                }
-                $data['update_time'] = time();
-                $res = Db::name('Industry')->strict(false)->field(true)->update($param);
-                if ($res) {
-                    add_log('edit', $param['id'], $param);
-                }
-                return to_assign();
-            } else {
-                try {
-                    validate(IndustryCheck::class)->scene('add')->check($param);
-                } catch (ValidateException $e) {
-                    // 验证失败 输出错误信息
-                    return to_assign(1, $e->getError());
-                }
-                $param['create_time'] = time();
-                $insertId = Db::name('Industry')->strict(false)->field(true)->insertGetId($param);
-                if ($insertId) {
-                    add_log('add', $insertId, $param);
-                }
-                return to_assign();
-            }
-        }
-    }
-
-    //行业类型设置
-    public function industry_cate_check()
-    {
-        $param = get_params();
-        $res = Db::name('Industry')->strict(false)->field('id,status')->update($param);
-        if ($res) {
-            if ($param['status'] == 0) {
-                add_log('disable', $param['id'], $param);
-            } else if ($param['status'] == 1) {
-                add_log('recovery', $param['id'], $param);
-            }
-            return to_assign();
-        } else {
-            return to_assign(0, '操作失败');
-        }
-    }
-
-    //服务类型
-    public function services_cate()
-    {
-        if (request()->isAjax()) {
-            $cate = Db::name('Services')->order('create_time asc')->select();
-            return to_assign(0, '', $cate);
-        } else {
-            return view();
-        }
-    }
-
-    //服务类型添加
-    public function services_cate_add()
-    {
-        if (request()->isAjax()) {
-            $param = get_params();
-            if (!empty($param['id']) && $param['id'] > 0) {
-                try {
-                    validate(ServicesCheck::class)->scene('edit')->check($param);
-                } catch (ValidateException $e) {
-                    // 验证失败 输出错误信息
-                    return to_assign(1, $e->getError());
-                }
-                $data['update_time'] = time();
-                $res = Db::name('Services')->strict(false)->field(true)->update($param);
-                if ($res) {
-                    add_log('edit', $param['id'], $param);
-                }
-                return to_assign();
-            } else {
-                try {
-                    validate(ServicesCheck::class)->scene('add')->check($param);
-                } catch (ValidateException $e) {
-                    // 验证失败 输出错误信息
-                    return to_assign(1, $e->getError());
-                }
-                $param['create_time'] = time();
-                $insertId = Db::name('Services')->strict(false)->field(true)->insertGetId($param);
-                if ($insertId) {
-                    add_log('add', $insertId, $param);
-                }
-                return to_assign();
-            }
-        }
-    }
-
-    //服务类型设置
-    public function services_cate_check()
-    {
-        $param = get_params();
-        $res = Db::name('Services')->strict(false)->field('id,status')->update($param);
-        if ($res) {
-            if ($param['status'] == 0) {
-                add_log('disable', $param['id'], $param);
-            } else if ($param['status'] == 1) {
-                add_log('recovery', $param['id'], $param);
-            }
-            return to_assign();
-        } else {
-            return to_assign(0, '操作失败');
-        }
-    }
-
-
-    //工作类别
-    public function work_cate()
-    {
-        if (request()->isAjax()) {
-            $cate = Db::name('WorkCate')->order('create_time asc')->select();
-            return to_assign(0, '', $cate);
-        } else {
-            return view();
-        }
-    }
-
-    //工作类别添加
-    public function work_cate_add()
-    {
-        if (request()->isAjax()) {
-            $param = get_params();
-            if (!empty($param['id']) && $param['id'] > 0) {
-                try {
-                    validate(WorkCateCheck::class)->scene('edit')->check($param);
-                } catch (ValidateException $e) {
-                    // 验证失败 输出错误信息
-                    return to_assign(1, $e->getError());
-                }
-                $data['update_time'] = time();
-                $res = Db::name('WorkCate')->strict(false)->field(true)->update($param);
-                if ($res) {
-                    add_log('edit', $param['id'], $param);
-                }
-                return to_assign();
-            } else {
-                try {
-                    validate(WorkCateCheck::class)->scene('add')->check($param);
-                } catch (ValidateException $e) {
-                    // 验证失败 输出错误信息
-                    return to_assign(1, $e->getError());
-                }
-                $param['create_time'] = time();
-                $insertId = Db::name('WorkCate')->strict(false)->field(true)->insertGetId($param);
-                if ($insertId) {
-                    add_log('add', $insertId, $param);
-                }
-                return to_assign();
-            }
-        }
-    }
-
-    //工作类别设置
-    public function work_cate_check()
-    {
-        $param = get_params();
-        $res = Db::name('WorkCate')->strict(false)->field('id,status')->update($param);
-        if ($res) {
-            if ($param['status'] == 0) {
-                add_log('disable', $param['id'], $param);
-            } else if ($param['status'] == 1) {
-                add_log('recovery', $param['id'], $param);
-            }
-            return to_assign();
-        } else {
-            return to_assign(0, '操作失败');
+            return $this->fail('修改失败');
         }
     }
 
diff --git a/app/adminapi/controller/FlowController.php b/app/adminapi/controller/FlowController.php
index 0ae4d0fa2..c363b24eb 100644
--- a/app/adminapi/controller/FlowController.php
+++ b/app/adminapi/controller/FlowController.php
@@ -11,13 +11,15 @@ class FlowController extends BaseAdminController
 
     public function index()
     {
+        [$page, $limit] = $this->getPage();
         $type = get_config('approve.type');
-        $list = Db::name('Flow')
-            ->field('f.*,a.name as username,t.title as flow_cate')
+        $query = Db::name('Flow');
+        $list = $query->field('f.*,a.name as username,t.title as flow_cate')
             ->alias('f')
             ->join('Admin a', 'a.id = f.admin_id', 'left')
             ->join('FlowType t', 't.id = f.flow_cate', 'left')
-            ->select()->toArray();
+            ->page($page, $limit)->select()->toArray();
+        $count = $query->count();
         foreach ($list as $key => &$value) {
             $department = Db::name('Department')->where('id', 'in', $value['department_ids'])->column('title');
             $value['department'] = implode(',', $department);
@@ -30,7 +32,7 @@ class FlowController extends BaseAdminController
                 }
             }
         }
-        return $this->success('success', $list);
+        return $this->success('success', ['count' => $count, 'data' => $list]);
     }
 
     //添加新增/编辑
@@ -97,7 +99,7 @@ class FlowController extends BaseAdminController
         if ($res !== false) {
             return $this->success('保存成功', [], 1, 1);
         } else {
-            return $this->success('操作失败', [], 1, 1);
+            return $this->fail('操作失败');
         }
     }
 }