diff --git a/src/api/system/basic-type-config/divide-company-manage.js b/src/api/system/basic-type-config/divide-company-manage.js
index 5f866db..fc54609 100644
--- a/src/api/system/basic-type-config/divide-company-manage.js
+++ b/src/api/system/basic-type-config/divide-company-manage.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 新增和修改分公司管理
 export function addAndEditDivideCompanyManageAPI(data) {
     return request({
-        url: '/bmw/company/addOrUpdateCompany',
+        url: '/bmw/subCompany/addOrUpdateSubCompany',
         method: 'post',
         data,
     })
@@ -20,8 +20,8 @@ export function deleteDivideCompanyManageAPI(data) {
 // 获取分公司管理列表
 export function getDivideCompanyManageListAPI(data) {
     return request({
-        url: '/system/dict/type/add',
-        method: 'post',
-        data,
+        url: '/bmw/subCompany/list',
+        method: 'get',
+        params: data,
     })
 }
diff --git a/src/views/system/basic-type-config/company-manage/config.js b/src/views/system/basic-type-config/company-manage/config.js
index 5b1869f..4324100 100644
--- a/src/views/system/basic-type-config/company-manage/config.js
+++ b/src/views/system/basic-type-config/company-manage/config.js
@@ -10,7 +10,7 @@ export const formLabel = [
 export const columnsList = [
     { t_props: 'companyName', t_label: '公司名称' },
     { t_props: 'isEnable', t_label: '状态', t_slot: 'isEnable' },
-    { t_props: 'name', t_label: '公司二维码' },
+    { t_props: 'qrCode', t_label: '公司二维码', t_slot: 'qrCode' },
     { t_props: 'updateTime', t_label: '更新时间' },
 ]
 export const dialogConfig = {
diff --git a/src/views/system/basic-type-config/company-manage/index.vue b/src/views/system/basic-type-config/company-manage/index.vue
index f2be4a5..7e49873 100644
--- a/src/views/system/basic-type-config/company-manage/index.vue
+++ b/src/views/system/basic-type-config/company-manage/index.vue
@@ -15,6 +15,7 @@
                     size="mini"
                     type="primary"
                     icon="el-icon-plus"
+                    v-hasPermi="['bmw:company:add']"
                     @click="onHandleAddOrEditCompanyManage(1, null)"
                 >
                     新增
@@ -33,12 +34,25 @@
                 />
             </template>
 
+            <!-- 公司二维码 -->
+            <template slot="qrCode" slot-scope="{ data }">
+                <el-image
+                    :src="url"
+                    :preview-src-list="srcList"
+                    style="width: 36px; height: 36px"
+                />
+                <span style="color: #999; font-size: 12px">
+                    注：测试假数据，真实数据后续开发...
+                </span>
+            </template>
+
             <template slot="handle" slot-scope="{ data }">
                 <el-button
                     plain
                     size="mini"
                     type="primary"
                     icon="el-icon-edit"
+                    v-hasPermi="['bmw:company:edit']"
                     @click="onHandleAddOrEditCompanyManage(2, data)"
                 >
                     修改
@@ -47,6 +61,7 @@
                     size="mini"
                     type="danger"
                     icon="el-icon-delete"
+                    v-hasPermi="['bmw:company:delete']"
                     @click="onHandleDeleteJobType(data)"
                 >
                     删除
@@ -125,6 +140,10 @@ export default {
             columnsList,
             dialogConfig,
             getCompanyManageListAPI,
+            url: 'https://t7.baidu.com/it/u=2454491737,1960814890&fm=3035&app=3035&size=w931&q=100&n=0&g=11n&f=JPEG&fmt=auto&maxorilen2heic=2000000?s=6B043A62C9D205FB5C3D148E000080A1',
+            srcList: [
+                'https://t7.baidu.com/it/u=2454491737,1960814890&fm=3035&app=3035&size=w931&q=100&n=0&g=11n&f=JPEG&fmt=auto&maxorilen2heic=2000000?s=6B043A62C9D205FB5C3D148E000080A1',
+            ],
             addOrEditForm: {
                 companyName: '', // 公司名称
                 isEnable: 1, // 状态
diff --git a/src/views/system/basic-type-config/divide-company-manage/config.js b/src/views/system/basic-type-config/divide-company-manage/config.js
index 5efd444..979c918 100644
--- a/src/views/system/basic-type-config/divide-company-manage/config.js
+++ b/src/views/system/basic-type-config/divide-company-manage/config.js
@@ -10,52 +10,10 @@ export const formLabel = [
 export const columnsList = [
     { t_props: 'projectName', t_label: '分公司名称' },
     { t_props: 'xmb', t_label: '所属公司名称' },
-    { t_props: 'name', t_label: '状态' },
+    { t_props: 'name', t_label: '状态', t_slot: 'isEnable' },
     { t_props: 'type', t_label: '更新时间' },
 ]
 
-export const testTableList = [
-    {
-        projectName: '总工程名称',
-        level: '等级3',
-        xmb: 'xxx项目部',
-        name: '110kv工程',
-        type: '基建变电',
-        address: '安徽省合肥市110k工程',
-        status: '在建',
-        businessLicense: '已上传',
-        idCard: '已上传',
-        electronicStamp: '已上传',
-        electronicSignature: '未上传',
-    },
-    {
-        projectName: '总工程名称21',
-        level: '等级3',
-        xmb: 'xxx项目部',
-        name: '110kv工程',
-        type: '基建变电',
-        address: '安徽省合肥市110k工程',
-        status: '在建',
-        businessLicense: '已上传',
-        idCard: '已上传',
-        electronicStamp: '已上传',
-        electronicSignature: '未上传',
-    },
-    {
-        projectName: '总工程名称3',
-        level: '等级3',
-        xmb: 'xxx项目部',
-        name: '110kv工程',
-        type: '基建变电',
-        address: '安徽省合肥市110k工程',
-        status: '在建',
-        businessLicense: '已上传',
-        idCard: '已上传',
-        electronicStamp: '已上传',
-        electronicSignature: '未上传',
-    },
-]
-
 export const dialogConfig = {
     outerVisible: false,
     outerTitle: '',
diff --git a/src/views/system/basic-type-config/divide-company-manage/index.vue b/src/views/system/basic-type-config/divide-company-manage/index.vue
index 8e16f2b..e511095 100644
--- a/src/views/system/basic-type-config/divide-company-manage/index.vue
+++ b/src/views/system/basic-type-config/divide-company-manage/index.vue
@@ -5,9 +5,8 @@
             :formLabel="formLabel"
             :showOperation="true"
             :showRightTools="false"
-            ref="jobTypeTableRef"
+            ref="divideCompanyManageTableRef"
             :columnsList="columnsList"
-            :testTableList="testTableList"
             :request-api="getDivideCompanyManageListAPI"
         >
             <template slot="btn">
@@ -16,18 +15,32 @@
                     size="mini"
                     type="primary"
                     icon="el-icon-plus"
+                    v-hasPermi="['divide:company:add']"
                     @click="onHandleAddOrEditJobType(1, null)"
                 >
                     新增
                 </el-button>
             </template>
 
+            <!-- 状态 -->
+            <template slot="isEnable" slot-scope="{ data }">
+                <el-switch
+                    active-text="启用"
+                    inactive-text="禁用"
+                    :active-value="1"
+                    :inactive-value="0"
+                    v-model="data.isEnable"
+                    @change="onHandleChangeIsEnable(data)"
+                />
+            </template>
+
             <template slot="handle" slot-scope="{ data }">
                 <el-button
                     plain
                     size="mini"
                     type="primary"
                     icon="el-icon-edit"
+                    v-hasPermi="['divide:company:edit']"
                     @click="onHandleAddOrEditJobType(2, data)"
                 >
                     修改
@@ -36,6 +49,7 @@
                     size="mini"
                     type="danger"
                     icon="el-icon-delete"
+                    v-hasPermi="['divide:company:delete']"
                     @click="onHandleDeleteJobType(data)"
                 >
                     删除
@@ -54,13 +68,14 @@
                     :model="addOrEditForm"
                     :rules="addOrEditFormRules"
                 >
-                    <el-form-item label="所属公司" prop="subName">
+                    <el-form-item label="所属公司" prop="comId">
                         <el-select
                             clearable
                             filterable
                             style="width: 100%"
                             placeholder="请选择所属公司"
-                            v-model="addOrEditForm.companyId"
+                            v-model="addOrEditForm.comId"
+                            :disabled="dialogConfig.outerTitle === '修改'"
                         >
                             <el-option
                                 :key="item.id"
@@ -71,11 +86,11 @@
                         </el-select>
                     </el-form-item>
 
-                    <el-form-item label="分公司名称" prop="subName">
+                    <el-form-item label="分公司名称" prop="subCompanyName">
                         <el-input
                             clearable
                             placeholder="请输入分公司名称"
-                            v-model="addOrEditForm.subName"
+                            v-model="addOrEditForm.subCompanyName"
                         />
                     </el-form-item>
 
@@ -113,10 +128,9 @@
 <script>
 import TableModel from '@/components/TableModel'
 import DialogModel from '@/components/DialogModel'
-import { formLabel, columnsList, dialogConfig, testTableList } from './config'
+import { formLabel, columnsList, dialogConfig } from './config'
 import {
-    addDivideCompanyManageAPI,
-    editDivideCompanyManageAPI,
+    addAndEditDivideCompanyManageAPI,
     deleteDivideCompanyManageAPI,
     getDivideCompanyManageListAPI,
 } from '@/api/system/basic-type-config/divide-company-manage'
@@ -133,10 +147,32 @@ export default {
             formLabel,
             columnsList,
             dialogConfig,
-            testTableList,
             getDivideCompanyManageListAPI,
-            addOrEditForm: {},
-            addOrEditFormRules: {},
+            addOrEditForm: {
+                comId: null, // 所属公司id
+                subCompanyName: '', // 分公司名称
+                isEnable: 1, // 状态
+                id: null, // 分公司id
+            },
+            addOrEditFormRules: {
+                comId: [
+                    {
+                        required: true,
+                        message: '请选择所属公司',
+                        trigger: 'blur',
+                    },
+                ],
+                subCompanyName: [
+                    {
+                        required: true,
+                        message: '请输入分公司名称',
+                        trigger: 'blur',
+                    },
+                ],
+                isEnable: [
+                    { required: true, message: '请选择状态', trigger: 'blur' },
+                ],
+            },
 
             // 公司下拉列表
             companySelectList: [],
@@ -153,9 +189,23 @@ export default {
         // 新增或修改
         onHandleAddOrEditJobType(type, data) {
             this.dialogConfig.outerTitle = type === 1 ? '新增' : '修改'
+
+            if (type === 2) {
+                const { comId, subCompanyName, isEnable, id } = data
+                this.addOrEditForm = { comId, subCompanyName, isEnable, id }
+            }
             this.dialogConfig.outerVisible = true
         },
 
+        // 状态设置
+        onHandleChangeIsEnable(data) {
+            this.dialogConfig.outerTitle === ''
+            this.onHandleAddOrEditJobTypeConfirm({
+                id: data.id,
+                isEnable: data.isEnable,
+            })
+        },
+
         // 删除
         onHandleDeleteJobType(data) {
             console.log(data, '删除')
@@ -163,15 +213,43 @@ export default {
 
         // 取消
         handleCloseDialogOuter() {
-            this.$refs.addOrEditFormRef.resetFields() // 清除表单
+            if (
+                this.dialogConfig.outerTitle === '修改' ||
+                this.dialogConfig.outerTitle === '新增'
+            ) {
+                this.$refs.addOrEditFormRef.resetFields() // 清除表单
+                this.addOrEditForm = {
+                    comId: null, // 所属公司id
+                    subCompanyName: '', // 分公司名称
+                    isEnable: 1, // 状态
+                    id: null, // 分公司id
+                }
+            }
+
             this.dialogConfig.outerVisible = false
         },
 
+        // 新增或修改表单提交
+        async onHandleAddOrEditJobTypeConfirm(data) {
+            const res = await addAndEditDivideCompanyManageAPI(data)
+            if (res.code === 200) {
+                this.$message.success('操作成功')
+                this.handleCloseDialogOuter()
+                this.$refs.divideCompanyManageTableRef.getTableList()
+            } else {
+                this.$message.error(res.msg)
+            }
+        },
+
         // 确定按钮
         onHandleConfirmAddOrEdit() {
-            this.$refs.addOrEditFormRef.validate((valid) => {
+            this.$refs.addOrEditFormRef.validate(async (valid) => {
                 if (valid) {
-                    console.log(this.addOrEditForm, 'addOrEditForm')
+                    const params = { ...this.addOrEditForm }
+                    if (this.dialogConfig.outerTitle === '新增') {
+                        this.$delete(params, 'id')
+                    }
+                    this.onHandleAddOrEditJobTypeConfirm(params)
                 }
             })
         },