diff --git a/src/pages/home/branch/setting/user.js b/src/pages/home/branch/setting/user.js
index fc17caa..8bfa197 100644
--- a/src/pages/home/branch/setting/user.js
+++ b/src/pages/home/branch/setting/user.js
@@ -1,7 +1,8 @@
 import React, { Component } from 'react'
-import { Row, Input, Button, Modal, Form, Select, message } from 'antd'
+import { Row, Input, Button, Modal, Form, Select, message, Space } from 'antd'
 import { rsaKey } from "@/utils/rsaKey.js";
 import api from "@/api/request"
+import FeTable from "@/components/table"
 
 const { Search } = Input
 
@@ -11,7 +12,9 @@ class UserSet extends Component {
     constructor(props) {
         super(props)
         this.state = {
-            visible: false
+            visible: false,
+            data: [],
+            columns: []
         }
     }
 
@@ -33,6 +36,49 @@ class UserSet extends Component {
         })
     }
 
+    onSearch = (value) => {
+        api.get("/admin/user/list_user", {
+            criteria: value,
+            skip: 1,
+            limit: 10
+        })
+            .then(res => {
+                const col = Object.keys(res.result.data[0]).map((item, key) => {
+                    return {
+                        title: item,
+                        dataIndex: item,
+                        key,
+                        align: 'center',
+                    }
+                })
+                col.push(
+                    {
+                        title: "operation",
+                        dataIndex: "operation",
+                        key: res.result.data[0].length - 1,
+                        align: 'center',
+                        render: (record) => <Space><Button type="info" danger>停 用</Button><Button type="primary" danger>删 除</Button></Space>,
+                    }
+                )
+                this.setState({
+                    data: res.result.data,
+                    columns: col
+                })
+            })
+            .catch(err => {
+                console.log(err)
+            })
+    }
+
+
+    callback = (e, value) => {
+        e === '停 用' ? api.get("/admin/user/disable_user", { UID: value.UID }).then(res => {
+            message.success(res.info)
+        }) : api.get("/admin/user/delete_user", { UID: value.UID }).then(res => {
+            message.success(res.info)
+        })
+    }
+
     onAdd = () => {
         const form = this.AddForm.current
         const data = {
@@ -58,6 +104,7 @@ class UserSet extends Component {
                         新增用户
                     </Button>
                 </Row>
+                <FeTable data={this.state.data} columns={this.state.columns} callback={this.callback.bind(this)} />
                 <Modal
                     visible={this.state.visible}
                     title="新增"