diff --git a/src/api/base/customer/index.js b/src/api/base/customer/index.js
index d6a6200..e745be9 100644
--- a/src/api/base/customer/index.js
+++ b/src/api/base/customer/index.js
@@ -34,7 +34,14 @@ export function getCustomerMain(id) {
   })
 }
 
-// 获得客户管理分页
+// 获取经办人信息
+export function getCustomerMainAttn(deptCode) {
+  return request({
+    url: '/base/custom/getAttn?deptCode=' + deptCode,
+    method: 'get'
+  })
+}
+
 export function getCustomerMainPage(params) {
   return request({
     url: '/base/custom/page',
diff --git a/src/views/base/customer/CustomerMainForm.vue b/src/views/base/customer/CustomerMainForm.vue
index 2cff6b1..631f7ea 100644
--- a/src/views/base/customer/CustomerMainForm.vue
+++ b/src/views/base/customer/CustomerMainForm.vue
@@ -31,7 +31,7 @@
               <el-col :span="11">
                 <el-form-item v-if="formData.typeCode !=='03'" label="性别" prop="sex">
                   <el-radio-group v-model="formData.sex">
-                    <el-radio v-for="dict in sexDictDatas" :key="parseInt(dict.value)" :label="parseInt(dict.value)">
+                    <el-radio v-for="dict in sexDictDatas" :key="dict.value" :label="dict.value">
                       {{ dict.label }}
                     </el-radio>
                   </el-radio-group>
@@ -96,9 +96,9 @@
                   服务内容
                 </template>
                 <template v-slot="scope">
-                  <el-select v-model="scope.row.serContent" placeholder="请选择服务内容">
-                    <el-option v-for="dict in cusBusiTypeDictDatas"
-                               :key="dict.value" :label="dict.label" :value="dict.value"/>
+                  <el-select @change="serviceChange(scope.row)" v-model="scope.row.systemCode" placeholder="请选择服务内容">
+                    <el-option v-for="dict in serviceList"
+                               :key="dict.id" :label="dict.name" :value="dict.id"/>
                   </el-select>
                 </template>
               </el-table-column>
@@ -158,6 +158,7 @@
 
 <script>
 import * as CustomerMainApi from '@/api/base/customer';
+import { getServicePackageList} from "@/api/system/servicePackage";
 import ImageUpload from '@/components/ImageUpload';
 import Editor from '@/components/Editor';
 import {getDictDatas, DICT_TYPE} from '@/utils/dict'
@@ -178,7 +179,12 @@ export default {
       formLoading: false,
       //折叠面板默认展开
       activeNames: ['1','2','3'],
+      //类型
       typeCode:"",
+      //企业
+      deptCode:undefined,
+      //服务套餐列表
+      serviceList:[],
       // 表单参数
       formData: {
         id: undefined,
@@ -189,7 +195,7 @@ export default {
         phoneNumber: undefined,
         birthday: undefined,
         address: undefined,
-        sex: 1,
+        sex: '1',
         idCard: undefined,
         idCardImage: undefined,
         dataFrom: '08',
@@ -200,6 +206,7 @@ export default {
         status: undefined,
         itemList:[
           {
+            systemCode:'',
             serContent:'',
             serTimeStart:'',
             serTimeEnd:''
@@ -230,6 +237,21 @@ export default {
     };
   },
   methods: {
+    /**获取服务套餐精简信息*/
+    getServiceList(){
+      getServicePackageList().then(response => {
+        this.serviceList = response.data;
+      });
+    },
+    /**绑定事件*/
+    serviceChange(row){
+      this.serviceList.map(item => {
+        if (item.id == row.systemCode){
+          row.serContent = item.name
+          return
+        }
+      })
+    },
     /**
      * 新增服务内容
      */
@@ -253,6 +275,7 @@ export default {
       this.dialogVisible = true;
       this.typeCode = typeCode
       this.reset();
+      this.getServiceList()
       // 修改时，设置数据
       if (id) {
         this.formLoading = true;
@@ -266,6 +289,15 @@ export default {
       }
       this.dialogTitle = "新增客户";
     },
+    /** 打开弹窗 */
+    async openAttn(row) {
+      this.dialogVisible = true;
+      this.typeCode = '04'
+      this.deptCode = row.deptCode
+      this.reset();
+      this.dialogTitle = row.cusName;
+    },
+
     /** 提交按钮 */
     async submitForm() {
       // 校验主表
@@ -300,12 +332,12 @@ export default {
         id: undefined,
         userId: undefined,
         typeCode: this.typeCode,
-        deptCode: undefined,
+        deptCode: this.deptCode,
         cusName: undefined,
         phoneNumber: undefined,
         birthday: undefined,
         address: undefined,
-        sex: 1,
+        sex: '1',
         idCard: undefined,
         idCardImage: undefined,
         dataFrom: '08',
diff --git a/src/views/base/customer/components/CorpCustomer.vue b/src/views/base/customer/components/CorpCustomer.vue
new file mode 100644
index 0000000..97ef29c
--- /dev/null
+++ b/src/views/base/customer/components/CorpCustomer.vue
@@ -0,0 +1,245 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="客户名称" prop="cusName">
+        <el-input v-model="queryParams.cusName" placeholder="请输入客户名称" clearable
+                  @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="联系方式" prop="phoneNumber">
+        <el-input v-model="queryParams.phoneNumber" placeholder="请输入联系方式" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="身份证号" prop="idCard">
+        <el-input v-model="queryParams.idCard" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="客户状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择客户状态" clearable size="small">
+          <el-option label="请选择字典生成" value=""/>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @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="openForm(undefined)"
+                   v-hasPermi="['base:customer-main:create']">新增
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table @expand-change="expandChange" v-loading="loading" :data="list" :stripe="true"
+              :show-overflow-tooltip="true">
+      <!--表格展开行-->
+      <el-table-column type="expand">
+        <template slot-scope="scope">
+          <el-table
+            :data="attnList"
+            border
+            size="mini"
+            style="width: 100%">
+            <el-table-column prop="cusName" label="经办人姓名" width="100"/>
+            <el-table-column width="50" label="性别" align="center" prop="sex">
+              <template v-slot="scope">
+                <dict-tag :type="DICT_TYPE.DICT_SYS_USER_SEX" :value="scope.row.sex"/>
+              </template>
+            </el-table-column>
+            <el-table-column width="110" label="联系方式" align="center" prop="phoneNumber"/>
+            <el-table-column width="100" label="生日" align="center" prop="birthday">
+              <template v-slot="scope">
+                <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column width="280" label="住址" align="left" prop="address"/>
+
+            <el-table-column
+              label="操作"
+              width="150"
+              align="center"
+              class-name="small-padding fixed-width">
+              <template v-slot="scope">
+                <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+                           v-hasPermi="['base:customer-main:update']">修改
+                </el-button>
+                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                           v-hasPermi="['base:customer-main:delete']">删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </template>
+      </el-table-column>
+
+      <el-table-column width="200" label="客户名称" align="center" prop="cusName"/>
+      <el-table-column width="110" label="联系方式" align="center" prop="phoneNumber"/>
+      <el-table-column width="280" label="服务内容" align="left" prop="serContents"/>
+      <el-table-column width="280" label="地址" align="left" prop="address"/>
+      <el-table-column label="最近业务办理时间" align="center" prop="nearDoTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.nearDoTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column width="180" label="最近办理业务" align="center" prop="nearDoContent">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.DICT_CUS_BUSI_TYPE" :value="scope.row.nearDoContent"/>
+        </template>
+      </el-table-column>
+      <el-table-column width="100" fixed="right" label="客户状态" align="center" prop="status">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.DICT_CUS_INFO_STATUS" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+
+      <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-s-custom" @click="openFormAttn(scope.row)"
+                     v-hasPermi="['base:customer-main:attn']">经办人管理
+          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+                     v-hasPermi="['base:customer-main:update']">修改
+          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['base:customer-main:delete']">删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+    <!-- 对话框(添加 / 修改) -->
+    <CustomerMainForm ref="formRef" @success="getList"/>
+  </div>
+</template>
+
+<script>
+import * as CustomerMainApi from '@/api/base/customer';
+import CustomerMainForm from '@/views/base/customer/CustomerMainForm.vue';
+
+export default {
+  name: "PersonCustomer",
+  components: {
+    CustomerMainForm,
+  },
+  props: {
+    typeCode: {
+      type: String,
+      default: '01'
+    },
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 客户管理列表
+      list: [],
+      //经办人列表
+      attnList: [],
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 选中行
+      currentRow: {},
+      activeName: 'private',
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        userId: null,
+        typeCode: '03',
+        deptCode: null,
+        cusName: null,
+        phoneNumber: null,
+        birthday: null,
+        address: null,
+        sex: null,
+        idCard: null,
+        idCardImage: null,
+        dataFrom: null,
+        nearDoTime: [],
+        nearDoContent: null,
+        inviter: null,
+        inviterType: null,
+        status: null,
+        createTime: [],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    async getList() {
+      try {
+        this.loading = true;
+        const res = await CustomerMainApi.getCustomerMainPage(this.queryParams);
+        this.list = res.data.records;
+        this.total = res.data.total;
+      } finally {
+        this.loading = false;
+      }
+    },
+
+    /**展开行*/
+    async expandChange(row, expandedRows) {
+      const res = await CustomerMainApi.getCustomerMainAttn(row.deptCode);
+      this.attnList = res.data
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 添加/修改操作 */
+    openForm(id) {
+      this.$refs["formRef"].open(id, this.queryParams.typeCode);
+    },
+    /**经办人管理*/
+    openFormAttn(row) {
+      this.$refs["formRef"].openAttn(row);
+    },
+    /** 删除按钮操作 */
+    async handleDelete(row) {
+      const id = row.id;
+      await this.$modal.confirm('是否确认删除客户管理编号为"' + id + '"的数据项?')
+      try {
+        await CustomerMainApi.deleteCustomerMain(id);
+        await this.getList();
+        this.$modal.msgSuccess("删除成功");
+      } catch {
+      }
+    },
+    /** 导出按钮操作 */
+    async handleExport() {
+      await this.$modal.confirm('是否确认导出所有客户管理数据项?');
+      try {
+        this.exportLoading = true;
+        const data = await CustomerMainApi.exportCustomerMainExcel(this.queryParams);
+        this.$download.excel(data, '客户管理.xls');
+      } catch {
+      } finally {
+        this.exportLoading = false;
+      }
+    },
+  }
+};
+</script>
+
diff --git a/src/views/base/customer/components/PrivateCustomer.vue b/src/views/base/customer/components/PrivateCustomer.vue
index cac8651..fc05d25 100644
--- a/src/views/base/customer/components/PrivateCustomer.vue
+++ b/src/views/base/customer/components/PrivateCustomer.vue
@@ -34,49 +34,57 @@
     </el-row>
 
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="客户名称" align="center" prop="cusName"/>
-      <el-table-column label="联系方式" align="center" prop="phoneNumber"/>
-      <el-table-column label="生日" align="center" prop="birthday" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.birthday,'{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="住址" align="center" prop="address"/>
-      <el-table-column label="性别" align="center" prop="sex">
+      <el-table-column width="100" label="客户名称" align="center" prop="cusName"/>
+      <el-table-column width="50" label="性别" align="center" prop="sex">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.DICT_SYS_USER_SEX" :value="scope.row.sex" />
         </template>
       </el-table-column>
-      <el-table-column label="身份证号" align="center" prop="idCard"/>
-      <el-table-column label="客户初始来源" align="center" prop="dataFrom">
+      <el-table-column width="110" label="联系方式" align="center" prop="phoneNumber"/>
+      <el-table-column width="100" label="生日" align="center" prop="birthday">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.birthday,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column width="280" label="住址" align="left" prop="address"/>
+      <el-table-column width="80" label="客户来源" align="center" prop="dataFrom">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.DICT_CUS_DATA_FROM" :value="scope.row.dataFrom" />
         </template>
       </el-table-column>
+      <el-table-column width="100" label="最近办理业务" align="center" prop="nearDoContent">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.DICT_CUS_BUSI_TYPE" :value="scope.row.nearDoContent" />
+        </template>
+      </el-table-column>
       <el-table-column label="最近业务办理时间" align="center" prop="nearDoTime" width="180">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.nearDoTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="最近办理业务" align="center" prop="nearDoContent">
-        <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.DICT_CUS_BUSI_TYPE" :value="scope.row.nearDoContent" />
-        </template>
-      </el-table-column>
-      <el-table-column label="客户状态" align="center" prop="status">
+      <el-table-column width="100" fixed="right" label="客户状态" align="center" prop="status">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.DICT_CUS_INFO_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
 
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        fixed="right"
+        label="操作"
+        width="180"
+        align="center"
+        class-name="small-padding fixed-width">
         <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-truck" @click="handleDelete(scope.row)"
+                     v-hasPermi="['base:customer-main:car']">绑定车辆
+          </el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
                      v-hasPermi="['base:customer-main:update']">修改
           </el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                      v-hasPermi="['base:customer-main:delete']">删除
           </el-button>
+
         </template>
       </el-table-column>
     </el-table>
@@ -178,7 +186,7 @@ export default {
     /** 删除按钮操作 */
     async handleDelete(row) {
       const id = row.id;
-      await this.$modal.confirm('是否确认删除客户管理编号为"' + id + '"的数据项?')
+      await this.$modal.confirm('是否确认删除客户名称为"' + row.cusName + '"的数据项?')
       try {
         await CustomerMainApi.deleteCustomerMain(id);
         await this.getList();
diff --git a/src/views/base/customer/components/TodoCustomer.vue b/src/views/base/customer/components/TodoCustomer.vue
index 8c8f2fb..353692f 100644
--- a/src/views/base/customer/components/TodoCustomer.vue
+++ b/src/views/base/customer/components/TodoCustomer.vue
@@ -34,42 +34,46 @@
     </el-row>
 
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="客户名称" align="center" prop="cusName"/>
-      <el-table-column label="联系方式" align="center" prop="phoneNumber"/>
-      <el-table-column label="生日" align="center" prop="birthday" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.birthday,'{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="住址" align="center" prop="address"/>
-      <el-table-column label="性别" align="center" prop="sex">
+      <el-table-column width="100" label="客户名称" align="center" prop="cusName"/>
+      <el-table-column width="50" label="性别" align="center" prop="sex">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.DICT_SYS_USER_SEX" :value="scope.row.sex" />
         </template>
       </el-table-column>
-      <el-table-column label="身份证号" align="center" prop="idCard"/>
-      <el-table-column label="客户初始来源" align="center" prop="dataFrom">
+      <el-table-column width="110" label="联系方式" align="center" prop="phoneNumber"/>
+      <el-table-column width="100" label="生日" align="center" prop="birthday">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.birthday,'{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column width="280" label="住址" align="left" prop="address"/>
+      <el-table-column width="80" label="客户来源" align="center" prop="dataFrom">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.DICT_CUS_DATA_FROM" :value="scope.row.dataFrom" />
         </template>
       </el-table-column>
+      <el-table-column width="100" label="最近办理业务" align="center" prop="nearDoContent">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.DICT_CUS_BUSI_TYPE" :value="scope.row.nearDoContent" />
+        </template>
+      </el-table-column>
       <el-table-column label="最近业务办理时间" align="center" prop="nearDoTime" width="180">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.nearDoTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="最近办理业务" align="center" prop="nearDoContent">
-        <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.DICT_CUS_BUSI_TYPE" :value="scope.row.nearDoContent" />
-        </template>
-      </el-table-column>
-      <el-table-column label="客户状态" align="center" prop="status">
+      <el-table-column width="150" fixed="right" label="客户状态" align="center" prop="status">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.DICT_CUS_INFO_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
 
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        fixed="right"
+        label="操作"
+        width="150"
+        align="center"
+        class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
                      v-hasPermi="['base:customer-main:update']">修改
diff --git a/src/views/base/customer/index.vue b/src/views/base/customer/index.vue
index 1820772..f383d34 100644
--- a/src/views/base/customer/index.vue
+++ b/src/views/base/customer/index.vue
@@ -7,7 +7,9 @@
       <el-tab-pane label="待办客户" name="02">
         <TodoCustomer :typeCode="activeName" ref="todoRef"/>
       </el-tab-pane>
-      <el-tab-pane label="政企客户" name="03"/>
+      <el-tab-pane label="政企客户" name="03">
+        <CorpCustomer :typeCode="activeName" ref="corpRef"/>
+      </el-tab-pane>
     </el-tabs>
 
   </div>
@@ -16,10 +18,11 @@
 <script>
 import PrivateCustomer from '@/views/base/customer/components/PrivateCustomer.vue'
 import TodoCustomer from '@/views/base/customer/components/TodoCustomer.vue'
+import CorpCustomer from '@/views/base/customer/components/CorpCustomer.vue'
 export default {
   name: "CustomerMain",
   components: {
-    PrivateCustomer,TodoCustomer
+    PrivateCustomer,TodoCustomer,CorpCustomer
   },
   data() {
     return {