diff --git a/src/api/company-manage/index.js b/src/api/company-manage/index.js
index 0b447277..44a1d9d3 100644
--- a/src/api/company-manage/index.js
+++ b/src/api/company-manage/index.js
@@ -1,8 +1,14 @@
 import request from '@/utils/request'
 
 /**
- *  @data 参数 公司注册接口
+ *  @data 新增注册参数 公司注册接口
  */
 export const addCompanyAPI = (data) => {
     return request.post('/system/dept', data)
 }
+/**
+ *  @data 查询参数 公司列表查询接口
+ */
+export const getDeptListAPI = (data = {}) => {
+    return request.get('/system/dept/deptList', data)
+}
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 2f3b9ef9..c3267d9f 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -121,7 +121,12 @@ aside {
 
 //main-container全局样式
 .app-container {
+  height: calc(100vh - 84px);
   padding: 20px;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  overflow-y: auto;
 }
 
 .components-container {
diff --git a/src/components/TitleTip/index.vue b/src/components/TitleTip/index.vue
new file mode 100644
index 00000000..f9153944
--- /dev/null
+++ b/src/components/TitleTip/index.vue
@@ -0,0 +1,35 @@
+<template>
+    <div class="title-tip">
+        <div />
+        <div>
+            {{ titleText }}
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    props: {
+        titleText: {
+            type: String,
+            default: () => '',
+        },
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+.title-tip {
+    margin-bottom: 8px;
+    display: flex;
+    align-items: center;
+    font-weight: bold;
+    & div:first-child {
+        width: 4px;
+        height: 16px;
+        margin-right: 8px;
+        background-color: #409eff;
+        border-radius: 2px;
+    }
+}
+</style>
diff --git a/src/components/UploadModel/index.vue b/src/components/UploadModel/index.vue
new file mode 100644
index 00000000..91831dbd
--- /dev/null
+++ b/src/components/UploadModel/index.vue
@@ -0,0 +1,66 @@
+<template>
+    <div>
+        <el-upload
+            :limit="limit"
+            :action="uploadFileUrl"
+            list-type="picture-card"
+            :file-list="fileList"
+            :on-remove="handleRemove"
+            :on-preview="handlePreview"
+        >
+            <i class="el-icon-plus"></i>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl" alt="" />
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+export default {
+    props: {
+        uploadFileUrl: {
+            type: String,
+            default: '',
+        },
+        uploadFileList: {
+            type: Array,
+            default: () => [],
+        },
+        limit: {
+            type: Number,
+            default: () => 1,
+        },
+    },
+    computed: {
+        fileList: {
+            get() {
+                return this.uploadFileList
+            },
+        },
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            dialogImageUrl: '',
+        }
+    },
+    methods: {
+        handleRemove() {},
+        handlePreview() {
+            this.dialogVisible = true
+        },
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-upload {
+    width: 120px;
+    height: 120px;
+}
+
+::v-deep .el-upload--picture-card {
+    line-height: 120px;
+}
+</style>
diff --git a/src/main.js b/src/main.js
index a691e07a..344c9e93 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,7 +18,14 @@ import './assets/icons' // icon
 import './permission' // permission control
 import { getDicts } from '@/api/system/dict/data'
 import { getConfigKey } from '@/api/system/config'
-import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from '@/utils/bonus'
+import {
+    parseTime,
+    resetForm,
+    addDateRange,
+    selectDictLabel,
+    selectDictLabels,
+    handleTree,
+} from '@/utils/bonus'
 // 分页组件
 import Pagination from '@/components/Pagination'
 // 自定义表格工具组件
@@ -37,6 +44,7 @@ import DictTag from '@/components/DictTag'
 import VueMeta from 'vue-meta'
 // 字典数据组件
 import DictData from '@/components/DictData'
+import TitleTip from '@/components/TitleTip'
 
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
@@ -57,7 +65,8 @@ Vue.component('Editor', Editor)
 Vue.component('FileUpload', FileUpload)
 Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)
-import { get } from '@/utils/config'  // 引入get方法
+Vue.component('TitleTip', TitleTip)
+import { get } from '@/utils/config' // 引入get方法
 Vue.use(directive)
 Vue.use(plugins)
 Vue.use(VueMeta)
@@ -73,15 +82,14 @@ DictData.install()
  */
 
 Vue.use(Element, {
-  size: Cookies.get('size') || 'medium' // set element-ui default size
+    size: Cookies.get('size') || 'medium', // set element-ui default size
 })
 
 Vue.config.productionTip = false
 
 new Vue({
-  el: '#app',
-  router,
-  store,
-  render: h => h(App)
+    el: '#app',
+    router,
+    store,
+    render: (h) => h(App),
 })
-
diff --git a/src/views/company-manage/components/add-form.vue b/src/views/company-manage/components/add-form.vue
index 2aeca62f..701bc36f 100644
--- a/src/views/company-manage/components/add-form.vue
+++ b/src/views/company-manage/components/add-form.vue
@@ -2,16 +2,17 @@
     <div>
         <el-dialog
             width="50%"
-            title="公司注册"
+            :title="dialogTitle"
             :visible.sync="dialogVisible"
             :before-close="handleClose"
         >
             <el-form
                 label-width="120px"
                 :model="addOrEditForm"
+                :rules="addOrEditFormRef"
                 ref="addOrEditFormRef"
             >
-                <h3>公司信息</h3>
+                <TitleTip :titleText="`公司信息`" />
                 <el-form-item label="公司名称：" prop="deptName">
                     <el-input v-model="addOrEditForm.deptName" />
                 </el-form-item>
@@ -21,25 +22,30 @@
                 <el-form-item label="公司概述：" prop="remark">
                     <el-input v-model="addOrEditForm.remark" type="textarea" />
                 </el-form-item>
-                <h3>基础设置</h3>
+                <TitleTip :titleText="`基础设置`" />
                 <el-form-item label="默认密码：" prop="password">
-                    <el-input
-                        type="textarea"
-                        v-model="addOrEditForm.password"
-                    />
+                    <el-input disabled v-model="addOrEditForm.password" />
                 </el-form-item>
                 <el-form-item label="LOGO设置：" prop="logo">
-                    <el-input type="textarea" v-model="addOrEditForm.logo" />
+                    <div class="upload-container">
+                        <UploadModel />
+                        <div>
+                            1、上传图片文件格式仅支持SVG； <br />
+                            2、LOGO图片大小不超过3MB,尺寸100px * 100px； <br />
+                            3、收集客户的logo请UI设计完成海购添加； <br />
+                            4、默认智慧工地LOGO。<a> >> 恢复默认</a> <br />
+                        </div>
+                    </div>
                 </el-form-item>
-                <h3>默认管理员</h3>
+                <TitleTip :titleText="`默认管理员`" />
                 <el-form-item label="姓名：" prop="nickName">
                     <el-input v-model="addOrEditForm.nickName" />
                 </el-form-item>
                 <el-form-item label="手机号码：" prop="phonenumber">
                     <el-input v-model="addOrEditForm.phonenumber" />
                 </el-form-item>
-                <el-form-item label="角色：">
-                    <el-input type="textarea" />
+                <el-form-item label="角色：" prop="roles">
+                    <el-input disabled v-model="addOrEditForm.roles" />
                 </el-form-item>
                 <el-form-item class="handle">
                     <el-button
@@ -61,14 +67,22 @@
 </template>
 
 <script>
+import UploadModel from '@/components/UploadModel'
 import { addCompanyAPI } from '@/api/company-manage/index.js'
 export default {
     props: {
+        formType: {
+            type: Number,
+            default: () => 3,
+        },
         formDialogVisible: {
             type: Boolean,
             default: () => false,
         },
     },
+    components: {
+        UploadModel,
+    },
     data() {
         return {
             // 新增或修改接口
@@ -82,6 +96,70 @@ export default {
                 phonenumber: '',
                 userName: '',
                 orderNum: 200,
+                roles: '系统管理员',
+            },
+            addOrEditFormRef: {
+                deptName: [
+                    {
+                        required: true,
+                        message: '请输入公司名称',
+                        trigger: 'blur',
+                    },
+                ],
+                deptAbbreviation: [
+                    {
+                        required: true,
+                        message: '请输入公司简称',
+                        trigger: 'blur',
+                    },
+                ],
+                remark: [
+                    {
+                        required: true,
+                        message: '请输入公司概述',
+                        trigger: 'blur',
+                    },
+                ],
+                password: [
+                    {
+                        required: true,
+                        message: '请输入默认密码',
+                        trigger: 'blur',
+                    },
+                ],
+                logo: [
+                    {
+                        required: true,
+                        message: '请上传logo',
+                        trigger: 'blur',
+                    },
+                ],
+                nickName: [
+                    {
+                        required: true,
+                        message: '请输入管理员姓名',
+                        trigger: 'blur',
+                    },
+                ],
+                phonenumber: [
+                    {
+                        required: true,
+                        message: '请输入手机号码',
+                        trigger: 'blur',
+                    },
+                    {
+                        pattern: /^1[3456789]\d{9}$/,
+                        message: '请输入正确的手机号码',
+                        trigger: 'blur',
+                    },
+                ],
+                roles: [
+                    {
+                        required: true,
+                        message: '请输入角色',
+                        trigger: 'blur',
+                    },
+                ],
             },
         }
     },
@@ -92,19 +170,33 @@ export default {
                 return this.formDialogVisible
             },
         },
+        dialogTitle: {
+            get() {
+                if (this.formType === 1) return '公司详情'
+                if (this.formType === 2) return '公司编辑'
+                if (this.formType === 3) return '公司注册'
+            },
+        },
     },
     methods: {
         handleClose() {
             this.$emit('update:formDialogVisible', false)
         },
         async onSubmitForm() {
+            this.addOrEditForm.userName = this.addOrEditForm.phonenumber
             const res = await addCompanyAPI(this.addOrEditForm)
             if (res.code === 200) {
                 this.$modal.msgSuccess('新增成功')
             }
             this.$emit('update:formDialogVisible', false)
+            this.$emit('updateTableList')
         },
     },
+    mounted() {
+        this.getConfigKey('sys.user.initPassword').then((res) => {
+            this.addOrEditForm.password = res.msg
+        })
+    },
     watch: {
         formDialogVisible: {
             handler(newValue) {
@@ -122,4 +214,40 @@ export default {
 ::v-deep .handle .el-form-item__content {
     text-align: right;
 }
+
+::v-deep .el-dialog {
+    display: flex !important;
+    flex-direction: column !important;
+    margin: 0 !important;
+    position: absolute !important;
+    top: 50% !important;
+    left: 50% !important;
+    transform: translate(-50%, -50%) !important;
+    max-height: 100vh !important;
+    .el-dialog__body {
+        flex: 1;
+        overflow-y: scroll !important;
+        .el-table__header-wrapper .el-checkbox {
+            display: none !important;
+        }
+    }
+    .dialog-content {
+        padding: 20px;
+    }
+}
+
+.upload-container {
+    display: flex;
+    align-items: center;
+
+    & div:last-child {
+        font-size: 13px;
+        padding-left: 20px;
+        line-height: 2.2;
+
+        a {
+            color: #1890ff;
+        }
+    }
+}
 </style>
diff --git a/src/views/company-manage/components/company-card.vue b/src/views/company-manage/components/company-card.vue
index c67ad7fc..ac3b424b 100644
--- a/src/views/company-manage/components/company-card.vue
+++ b/src/views/company-manage/components/company-card.vue
@@ -3,70 +3,123 @@
         <div class="company-info">
             <div>
                 <el-avatar
+                    size="large"
                     src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
                 />
             </div>
-            <div>
-                <div>
-                    安徽送变电工程有限公司
-                    <span> 启用中 </span>
+            <div style="flex: 1; padding-left: 14px">
+                <div class="company-title">
+                    <span> {{ companyInfo.deptName }} </span>
+                    <el-tag type="success" effect="dark" size="mini">
+                        启用中
+                    </el-tag>
                 </div>
 
-                <p> 秉承专业.... </p>
+                <p> {{ companyInfo.remark }} </p>
             </div>
         </div>
 
         <div class="items-card">
-            <div class="items-center">
-                <div>用户</div>
-                <div>20</div>
-            </div>
-            <div class="items-center">
-                <div>项目</div>
-                <div>20</div>
-            </div>
-            <div class="items-center">
-                <div>设备</div>
-                <div>20</div>
+            <div
+                :key="index"
+                class="items-center"
+                v-for="(item, index) in userList"
+            >
+                <div>{{ item.title_name }}</div>
+                <div>{{ item.count }}</div>
             </div>
         </div>
         <div class="items-card">
-            <div>
-                <div>详情</div>
-            </div>
-            <div>
-                <div>编辑</div>
-            </div>
-            <div>
-                <div>注销</div>
-            </div>
+            <el-button
+                type="text"
+                :key="index"
+                :icon="item.icon"
+                v-for="(item, index) in btnList"
+                @click="onClickButton(item.type)"
+            >
+                {{ item.btn_name }}
+            </el-button>
         </div>
     </div>
 </template>
 
 <script>
-export default {}
+export default {
+    props: {
+        companyInfo: {
+            type: Object,
+            default: () => {},
+        },
+    },
+    data() {
+        return {
+            userList: [
+                { title_name: '用户', count: 20 },
+                { title_name: '项目', count: 20 },
+                { title_name: '设备', count: 20 },
+            ],
+            btnList: [
+                { btn_name: '详情', icon: 'el-icon-chat-dot-round', type: 1 },
+                { btn_name: '编辑', icon: 'el-icon-edit', type: 2 },
+                { btn_name: '注销', icon: 'el-icon-delete', type: 3 },
+            ],
+        }
+    },
+
+    methods: {
+        onClickButton(type) {
+            if (type === 1 || type === 2) {
+                this.$emit('openAddForm', type)
+            } else {
+                this.$modal
+                    .confirm('是否确认注销')
+                    .then(() => {})
+                    .catch(() => {})
+            }
+        },
+    },
+}
 </script>
 
 <style lang="scss" scoped>
 .company-card {
-    background-color: #f7f8fc;
     padding: 12px 10px;
     border-radius: 6px;
+    background-color: #f7f8fc;
+
     .company-info {
         display: flex;
         align-items: center;
-    }
 
+        .company-title {
+            width: 100%;
+            display: flex;
+            justify-content: space-between;
+            & span:first-child {
+                font-weight: bold;
+            }
+        }
+
+        p {
+            font-size: 14px;
+            color: #abafb3;
+        }
+    }
     .items-card {
         margin-top: 16px;
         display: flex;
         justify-content: space-around;
+        color: #454545;
 
         .items-center {
             display: flex;
             flex-direction: column;
             align-items: center;
+
+            & div:last-child {
+                margin-top: 14px;
+                font-weight: bold;
+            }
         }
     }
 }
diff --git a/src/views/company-manage/index.vue b/src/views/company-manage/index.vue
index 6fbfcca8..d99c851a 100644
--- a/src/views/company-manage/index.vue
+++ b/src/views/company-manage/index.vue
@@ -1,15 +1,23 @@
 <template>
+    <!-- 公司管理 -->
     <div class="app-container">
         <el-form ref="queryForm" size="small" :inline="true">
             <el-form-item>
-                <el-input placeholder="请输入搜索关键词" />
+                <el-input placeholder="请输入搜索关键词">
+                    <i
+                        slot="suffix"
+                        class="el-icon-search"
+                        style="cursor: pointer"
+                        @click="getCompanyList"
+                    />
+                </el-input>
             </el-form-item>
 
             <el-form-item>
                 <el-button
                     size="mini"
                     type="primary"
-                    icon="el-icon-search"
+                    icon="el-icon-plus"
                     @click="onRegisterCompany"
                 >
                     注册公司
@@ -18,18 +26,35 @@
         </el-form>
 
         <div class="company-list">
-            <CompanyCard class="company-items" />
-            <CompanyCard class="company-items" />
-            <CompanyCard class="company-items" />
+            <div
+                :key="index"
+                class="company-items"
+                v-for="(item, index) in companyList"
+            >
+                <CompanyCard @openAddForm="openAddForm" :companyInfo="item" />
+            </div>
         </div>
 
-        <AddForm :formDialogVisible.sync="formDialogVisible" />
+        <pagination
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getCompanyList"
+        />
+
+        <AddForm
+            :formType="formType"
+            v-if="formDialogVisible"
+            :formDialogVisible.sync="formDialogVisible"
+            @updateTableList="getCompanyList"
+        />
     </div>
 </template>
 
 <script>
 import AddForm from './components/add-form'
 import CompanyCard from './components/company-card'
+import { getDeptListAPI } from '@/api/company-manage/index.js'
 export default {
     components: {
         AddForm,
@@ -37,13 +62,32 @@ export default {
     },
     data() {
         return {
+            total: 0,
+            formType: 3,
+            companyList: [],
             formDialogVisible: false,
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+            },
         }
     },
     methods: {
         onRegisterCompany() {
             this.formDialogVisible = true
         },
+        async getCompanyList() {
+            const res = await getDeptListAPI()
+            this.companyList = res.rows
+            this.total = res.total
+        },
+        openAddForm(type) {
+            this.formType = type
+            this.formDialogVisible = true
+        },
+    },
+    mounted() {
+        this.getCompanyList()
     },
 }
 </script>
@@ -51,11 +95,13 @@ export default {
 <style scoped lang="scss">
 .company-list {
     display: flex;
+    flex: 1;
     flex-wrap: wrap;
-
+    overflow-y: auto;
     .company-items {
         width: calc((100% - 30px) / 3);
         margin-right: 15px;
+        margin-bottom: 15px;
     }
 
     & .company-items:nth-child(3n) {
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index ffe48311..f599eb66 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -1,381 +1,497 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="部门名称" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入部门名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_normal_disable"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:dept:add']"
-        >新增
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-sort"
-          size="mini"
-          @click="toggleExpandAll"
-        >展开/折叠
-        </el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table
-      v-if="refreshTable"
-      v-loading="loading"
-      :data="deptList"
-      row-key="deptId"
-      :default-expand-all="isExpandAll"
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-    >
-      <el-table-column prop="deptName" label="部门名称" min-width="260"></el-table-column>
-      <el-table-column prop="orderNum" label="排序" min-width="200"></el-table-column>
-      <el-table-column prop="status" label="状态" min-width="100">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" min-width="200">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" min-width="200" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dept:edit']"
-          >修改
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
-            @click="handleAdd(scope.row)"
-            v-hasPermi="['system:dept:add']"
-          >新增
-          </el-button>
-          <el-button
-            v-if="config.isAddRootCompany? true : scope.row.parentId != 0"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dept:remove']"
-          >删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="24" v-if="form.parentId !== 0">
-            <el-form-item label="上级部门" prop="parentId">
-              <treeselect
-                v-model="form.parentId"
-                :options="deptOptions"
-                :normalizer="normalizer"
-                :placeholder="config.isAddRootCompany ? '选择上级部门，如果不选择则创建顶级部门' : '选择上级部门'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
+    <div class="app-container">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+        >
             <el-form-item label="部门名称" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入部门名称"/>
+                <el-input
+                    v-model="queryParams.deptName"
+                    placeholder="请输入部门名称"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                />
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="显示排序" prop="orderNum">
-              <el-input-number v-model="form.orderNum" controls-position="right" :min="0"/>
+            <el-form-item label="状态" prop="status">
+                <el-select
+                    v-model="queryParams.status"
+                    placeholder="部门状态"
+                    clearable
+                >
+                    <el-option
+                        v-for="dict in dict.type.sys_normal_disable"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                    />
+                </el-select>
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="负责人" prop="leader">
-              <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20"/>
+            <el-form-item>
+                <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="handleQuery"
+                    >搜索</el-button
+                >
+                <el-button
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+                    >重置</el-button
+                >
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="联系电话" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="部门状态">
-              <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{ dict.label }}
-                </el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <div v-if="config.addAddress || false">
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="省" prop="province">
-                <el-input v-model="form.province" placeholder="请输入省份" maxlength="50"/>
-              </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <!-- <el-button
+                    type="primary"
+                    plain
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="handleAdd"
+                    v-hasPermi="['system:dept:add']"
+                    >新增
+                </el-button> -->
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="市" prop="city">
-                <el-input v-model="form.city" placeholder="请输入市" maxlength="50"/>
-              </el-form-item>
+            <el-col :span="1.5">
+                <el-button
+                    type="info"
+                    plain
+                    icon="el-icon-sort"
+                    size="mini"
+                    @click="toggleExpandAll"
+                    >展开/折叠
+                </el-button>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="县" prop="district">
-                <el-input v-model="form.district" placeholder="请输入县" maxlength="50"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-form-item label="详细地址" prop="address">
-              <el-input v-model="form.address" type="textarea" maxlength="200"
-                        show-word-limit placeholder="请输入详细地址"
-              />
-            </el-form-item>
-          </el-row>
-        </div>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+            <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+            ></right-toolbar>
+        </el-row>
+
+        <el-table
+            v-if="refreshTable"
+            v-loading="loading"
+            :data="deptList"
+            row-key="deptId"
+            :default-expand-all="isExpandAll"
+            :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        >
+            <el-table-column
+                prop="deptName"
+                label="部门名称"
+                min-width="260"
+            ></el-table-column>
+            <el-table-column
+                prop="orderNum"
+                label="排序"
+                min-width="200"
+            ></el-table-column>
+            <el-table-column prop="status" label="状态" min-width="100">
+                <template slot-scope="scope">
+                    <dict-tag
+                        :options="dict.type.sys_normal_disable"
+                        :value="scope.row.status"
+                    />
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="创建时间"
+                align="center"
+                prop="createTime"
+                min-width="200"
+            >
+                <template slot-scope="scope">
+                    <span>{{ parseTime(scope.row.createTime) }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="操作"
+                align="center"
+                min-width="200"
+                class-name="small-padding fixed-width"
+            >
+                <template slot-scope="scope">
+                    <!-- <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-edit"
+                        @click="handleUpdate(scope.row)"
+                        v-hasPermi="['system:dept:edit']"
+                        >修改
+                    </el-button>
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-plus"
+                        @click="handleAdd(scope.row)"
+                        v-hasPermi="['system:dept:add']"
+                        >新增
+                    </el-button> -->
+                    <el-button
+                        v-if="
+                            config.isAddRootCompany
+                                ? true
+                                : scope.row.parentId != 0
+                        "
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        @click="handleDelete(scope.row)"
+                        v-hasPermi="['system:dept:remove']"
+                        >删除
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 添加或修改部门对话框 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="open"
+            width="600px"
+            append-to-body
+        >
+            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+                <el-row>
+                    <el-col :span="24" v-if="form.parentId !== 0">
+                        <el-form-item label="上级部门" prop="parentId">
+                            <treeselect
+                                v-model="form.parentId"
+                                :options="deptOptions"
+                                :normalizer="normalizer"
+                                :placeholder="
+                                    config.isAddRootCompany
+                                        ? '选择上级部门，如果不选择则创建顶级部门'
+                                        : '选择上级部门'
+                                "
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="部门名称" prop="deptName">
+                            <el-input
+                                v-model="form.deptName"
+                                placeholder="请输入部门名称"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="显示排序" prop="orderNum">
+                            <el-input-number
+                                v-model="form.orderNum"
+                                controls-position="right"
+                                :min="0"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="负责人" prop="leader">
+                            <el-input
+                                v-model="form.leader"
+                                placeholder="请输入负责人"
+                                maxlength="20"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="联系电话" prop="phone">
+                            <el-input
+                                v-model="form.phone"
+                                placeholder="请输入联系电话"
+                                maxlength="11"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="邮箱" prop="email">
+                            <el-input
+                                v-model="form.email"
+                                placeholder="请输入邮箱"
+                                maxlength="50"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="部门状态">
+                            <el-radio-group v-model="form.status">
+                                <el-radio
+                                    v-for="dict in dict.type.sys_normal_disable"
+                                    :key="dict.value"
+                                    :label="dict.value"
+                                    >{{ dict.label }}
+                                </el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <div v-if="config.addAddress || false">
+                    <el-row>
+                        <el-col :span="8">
+                            <el-form-item label="省" prop="province">
+                                <el-input
+                                    v-model="form.province"
+                                    placeholder="请输入省份"
+                                    maxlength="50"
+                                />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="市" prop="city">
+                                <el-input
+                                    v-model="form.city"
+                                    placeholder="请输入市"
+                                    maxlength="50"
+                                />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="县" prop="district">
+                                <el-input
+                                    v-model="form.district"
+                                    placeholder="请输入县"
+                                    maxlength="50"
+                                />
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-form-item label="详细地址" prop="address">
+                            <el-input
+                                v-model="form.address"
+                                type="textarea"
+                                maxlength="200"
+                                show-word-limit
+                                placeholder="请输入详细地址"
+                            />
+                        </el-form-item>
+                    </el-row>
+                </div>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from '@/api/system/dept'
+import {
+    listDept,
+    getDept,
+    delDept,
+    addDept,
+    updateDept,
+    listDeptExcludeChild,
+} from '@/api/system/dept'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 export default {
-  name: 'Dept',
-  computed: {
-    config() {
-      return JSON.parse(localStorage.getItem('systemConfig')) // 获取 JSON 对象
-    }
-  },
-  dicts: ['sys_normal_disable'],
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 表格树数据
-      deptList: [],
-      // 部门树选项
-      deptOptions: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      // 是否展开，默认全部展开
-      isExpandAll: true,
-      // 重新渲染表格状态
-      refreshTable: true,
-      // 查询参数
-      queryParams: {
-        deptName: undefined,
-        status: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        parentId: JSON.parse(localStorage.getItem('systemConfig')).isAddRootCompany ? [] : [{
-          required: true,
-          message: '上级部门不能为空',
-          trigger: 'blur'
-        }],
-        deptName: [
-          { required: true, message: '部门名称不能为空', trigger: 'blur' }
-        ],
-        orderNum: [
-          { required: true, message: '显示排序不能为空', trigger: 'blur' }
-        ],
-        email: [
-          {
-            type: 'email',
-            message: '请输入正确的邮箱地址',
-            trigger: ['blur', 'change']
-          }
-        ],
-        phone: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: '请输入正确的手机号码',
-            trigger: 'blur'
-          }
-        ]
-      }
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    /** 查询部门列表 */
-    getList() {
-      this.loading = true
-      listDept(this.queryParams).then(response => {
-        this.deptList = this.handleTree(response.data, 'deptId')
-        this.loading = false
-      })
+    name: 'Dept',
+    computed: {
+        config() {
+            return JSON.parse(localStorage.getItem('systemConfig')) // 获取 JSON 对象
+        },
     },
-    /** 转换部门数据结构 */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children
-      }
-      return {
-        id: node.deptId,
-        label: node.deptName,
-        children: node.children
-      }
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        deptId: undefined,
-        parentId: undefined,
-        deptName: undefined,
-        orderNum: undefined,
-        leader: undefined,
-        phone: undefined,
-        email: undefined,
-        status: '0'
-      }
-      this.resetForm('form')
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      this.handleQuery()
-    },
-    /** 新增按钮操作 */
-    handleAdd(row) {
-      this.reset()
-      if (row != undefined) {
-        this.form.parentId = row.deptId
-      }
-      this.open = true
-      this.title = '添加部门'
-      listDept().then(response => {
-        this.deptOptions = this.handleTree(response.data, 'deptId')
-      })
-    },
-    /** 展开/折叠操作 */
-    toggleExpandAll() {
-      this.refreshTable = false
-      this.isExpandAll = !this.isExpandAll
-      this.$nextTick(() => {
-        this.refreshTable = true
-      })
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      getDept(row.deptId).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = '修改部门'
-      })
-      listDeptExcludeChild(row.deptId).then(response => {
-        this.deptOptions = this.handleTree(response.data, 'deptId')
-      })
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          if (this.form.deptId != undefined) {
-            updateDept(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
-              this.open = false
-              this.getList()
-            })
-          } else {
-            addDept(this.form).then(response => {
-              this.$modal.msgSuccess('新增成功')
-              this.open = false
-              this.getList()
-            })
-          }
+    dicts: ['sys_normal_disable'],
+    components: { Treeselect },
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 表格树数据
+            deptList: [],
+            // 部门树选项
+            deptOptions: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            // 是否展开，默认全部展开
+            isExpandAll: true,
+            // 重新渲染表格状态
+            refreshTable: true,
+            // 查询参数
+            queryParams: {
+                deptName: undefined,
+                status: undefined,
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+                parentId: JSON.parse(localStorage.getItem('systemConfig'))
+                    .isAddRootCompany
+                    ? []
+                    : [
+                          {
+                              required: true,
+                              message: '上级部门不能为空',
+                              trigger: 'blur',
+                          },
+                      ],
+                deptName: [
+                    {
+                        required: true,
+                        message: '部门名称不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                orderNum: [
+                    {
+                        required: true,
+                        message: '显示排序不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                email: [
+                    {
+                        type: 'email',
+                        message: '请输入正确的邮箱地址',
+                        trigger: ['blur', 'change'],
+                    },
+                ],
+                phone: [
+                    {
+                        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                        message: '请输入正确的手机号码',
+                        trigger: 'blur',
+                    },
+                ],
+            },
         }
-      })
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function() {
-        return delDept(row.deptId)
-      }).then(() => {
+    created() {
         this.getList()
-        this.$modal.msgSuccess('删除成功')
-      }).catch(() => {
-      })
-    }
-  }
+    },
+    methods: {
+        /** 查询部门列表 */
+        getList() {
+            this.loading = true
+            listDept(this.queryParams).then((response) => {
+                this.deptList = this.handleTree(response.data, 'deptId')
+                this.loading = false
+            })
+        },
+        /** 转换部门数据结构 */
+        normalizer(node) {
+            if (node.children && !node.children.length) {
+                delete node.children
+            }
+            return {
+                id: node.deptId,
+                label: node.deptName,
+                children: node.children,
+            }
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                deptId: undefined,
+                parentId: undefined,
+                deptName: undefined,
+                orderNum: undefined,
+                leader: undefined,
+                phone: undefined,
+                email: undefined,
+                status: '0',
+            }
+            this.resetForm('form')
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        /** 新增按钮操作 */
+        handleAdd(row) {
+            this.reset()
+            if (row != undefined) {
+                this.form.parentId = row.deptId
+            }
+            this.open = true
+            this.title = '添加部门'
+            listDept().then((response) => {
+                this.deptOptions = this.handleTree(response.data, 'deptId')
+            })
+        },
+        /** 展开/折叠操作 */
+        toggleExpandAll() {
+            this.refreshTable = false
+            this.isExpandAll = !this.isExpandAll
+            this.$nextTick(() => {
+                this.refreshTable = true
+            })
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset()
+            getDept(row.deptId).then((response) => {
+                this.form = response.data
+                this.open = true
+                this.title = '修改部门'
+            })
+            listDeptExcludeChild(row.deptId).then((response) => {
+                this.deptOptions = this.handleTree(response.data, 'deptId')
+            })
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    if (this.form.deptId != undefined) {
+                        updateDept(this.form).then((response) => {
+                            this.$modal.msgSuccess('修改成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    } else {
+                        addDept(this.form).then((response) => {
+                            this.$modal.msgSuccess('新增成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    }
+                }
+            })
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            this.$modal
+                .confirm('是否确认删除名称为"' + row.deptName + '"的数据项？')
+                .then(function () {
+                    return delDept(row.deptId)
+                })
+                .then(() => {
+                    this.getList()
+                    this.$modal.msgSuccess('删除成功')
+                })
+                .catch(() => {})
+        },
+    },
 }
 </script>