diff --git a/epmet-oper-web/src/js/columns/columns.js b/epmet-oper-web/src/js/columns/columns.js
index 3bc0663..8a0e545 100644
--- a/epmet-oper-web/src/js/columns/columns.js
+++ b/epmet-oper-web/src/js/columns/columns.js
@@ -1,6 +1,9 @@
 import Temp from './code/temp'
+import RegisterInfo from './customer/customer'
 
 export default {
-  Temp: Temp // 代码上传——上传代码
+  Temp: Temp, // 代码上传——上传代码
+
+  RegisterInfo: RegisterInfo // 客户管理——客户注册信息
 
 }
diff --git a/epmet-oper-web/src/js/columns/customer/customer.js b/epmet-oper-web/src/js/columns/customer/customer.js
new file mode 100644
index 0000000..948dad5
--- /dev/null
+++ b/epmet-oper-web/src/js/columns/customer/customer.js
@@ -0,0 +1,50 @@
+export default [
+  {
+    key: 'agencyName',
+    title: '组织名称',
+    display: ['formA', 'formU', 'table', 'model'],
+    fixed: true,
+    block: true,
+    width: 120
+  },
+  {
+    key: 'level',
+    title: '组织级别',
+    display: ['formA', 'formU', 'table', 'model'],
+    fixed: true,
+    block: true,
+    width: 120
+  },
+  {
+    key: 'location',
+    title: '所在地区',
+    display: ['formA', 'formU', 'table', 'model'],
+    fixed: true,
+    block: true,
+    width: 120
+  },
+  {
+    key: 'partybranchnum',
+    title: '党支部数量',
+    display: ['formA', 'formU', 'table', 'model'],
+    block: true
+  },
+  {
+    key: 'resiAuth',
+    title: '居民端',
+    display: ['formA', 'formU', 'table', 'model'],
+    block: true
+  },
+  {
+    key: 'workAuth',
+    title: '工作端',
+    display: ['formA', 'formU', 'table', 'model'],
+    block: true
+  },
+  {
+    key: 'initState',
+    title: '初始化状态',
+    display: ['formA', 'formU', 'table', 'model'],
+    block: true
+  }
+]
diff --git a/epmet-oper-web/src/views/components/CTable.vue b/epmet-oper-web/src/views/components/CTable.vue
index 3a5a773..8e4d60a 100644
--- a/epmet-oper-web/src/views/components/CTable.vue
+++ b/epmet-oper-web/src/views/components/CTable.vue
@@ -111,18 +111,18 @@ export default {
   data () {
     return {
       tableData: [],
-      tableColumn: app.service.getColumns(this.keyword, 'table'),
+      tableColumn: window.app.service.getColumns(this.keyword, 'table'),
       loading: false,
       table: {
         height: this.tableHeight,
         params: {
-          size: this.size,//当前页数显示记录数
-          page: this.page //当前页数
+          size: this.size, // 当前页数显示记录数
+          page: this.page // 当前页数
         }
       },
       total: 0,
       selected: false,
-      visiblePopover: false,// 删除弹出层开关
+      visiblePopover: false, //  删除弹出层开关
       templateRadio: ''
     }
   },
@@ -175,26 +175,23 @@ export default {
     tableHeight: {
       type: Number
     },
-    pageVisible: Boolean  //是否显示page分页     lyx   20190411
+    pageVisible: Boolean // 是否显示page分页     lyx   20190411
   },
   computed: {
-    //操作列宽度
+    // 操作列宽度
     operationWidth: function () {
-      // return this.operations.includes('add')
-      //   ? (this.operations.length - 1) * 80
-      //   : this.operations.length * 80
+      //  return this.operations.includes('add')
+      //    ? (this.operations.length - 1) * 80
+      //    : this.operations.length * 80
       if (this.operations.includes('add')) {
-        return (this.operations.length - 1) * 80 //操作列包含add类型按钮时返回
-      }
-      else if (this.operations.includes('analyze')) {
-        return (this.operations.length + 0.5) * 80 //操作列包含analyze类型按钮时返回
-      }
-      else {
+        return (this.operations.length - 1) * 80 // 操作列包含add类型按钮时返回
+      } else if (this.operations.includes('analyze')) {
+        return (this.operations.length + 0.5) * 80 // 操作列包含analyze类型按钮时返回
+      } else {
         return this.operations.length * 80
       }
     },
     tableSize () {
-
       if (this.resolution === 'small') {
         return 10
       } else {
@@ -215,7 +212,7 @@ export default {
     render () {
       this.loadData()
     },
-    loadData () {      debugger
+    loadData () {
       this.loading = true
       Object.keys(this.params).forEach(key => {
         if (this.params[key] instanceof Array) {
@@ -224,14 +221,13 @@ export default {
       })
       Object.assign(this.table.params, this.params)
 
-      // 获取数据
-      app.ajax.get(
+      //  获取数据
+      window.app.ajax.get(
         this.url,
         this.table.params,
         (data, rspMsg) => {
           if (data) {
-
-            //debugger
+            // debugger
             this.tableData = data.content
             this.total = data.totalElements
           }
@@ -239,49 +235,48 @@ export default {
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg)
-
           this.loading = false
         }
       )
     },
     handleClearSelection () {
-      // 清空选择
+      //  清空选择
       this.$refs['table'].clearSelection()
     },
-    //选中复选框
+    // 选中复选框
     handleSelect (selection, row) {
       this.$emit('select', selection)
-      //console.log(selection, row)
+      // console.log(selection, row)
     },
-    //全选复选框
+    // 全选复选框
     handleSelectAll (selection) {
       this.$emit('selectAll', selection)
     },
     handleCellClick (row, column, cell, event) { },
     handleRowClick (row) {
-      // 切换该列的勾选状态
+      //  切换该列的勾选状态
       this.selected = !this.selected
       this.$refs['table'].toggleRowSelection(row, this.selected)
     },
 
     handleEdit (index, row) {
-      // 因为操作列与数据列属于同一行，编辑某一列后会继续触发table的row-click事件，所以在按钮上添加stop修饰符阻止事件的继续传播
+      //  因为操作列与数据列属于同一行，编辑某一列后会继续触发table的row-click事件，所以在按钮上添加stop修饰符阻止事件的继续传播
       this.handleClearSelection()
       this.$refs['table'].toggleRowSelection(row)
       this.$emit('update', row)
     },
     handleAnalyze (index, row) {
-      this.handleClearSelection() // 清空选择
+      this.handleClearSelection() //  清空选择
       this.$refs['table'].toggleRowSelection(row, true)
       this.$emit('analyze', row)
     },
     handleDelete (index, row) {
-      this.handleClearSelection() // 删除选择
+      this.handleClearSelection() //  删除选择
       this.$refs['table'].toggleRowSelection(row, true)
       this.$emit('delete', row)
     },
     handleDeleteCancel (scope) {
-      // 关闭popover弹出层
+      //  关闭popover弹出层
       scope._self.$refs[`popover-${scope.$index}`].doClose()
     },
     handleSizeChange (size) {
@@ -291,52 +286,47 @@ export default {
         this.loadData()
       })
     },
-    //改变当前页
+    // 改变当前页
     handleCurrentChange (page) {
-      debugger
       this.table.params.page = page - 1
       this.$nextTick(() => {
         this.loadData()
       })
     },
-    //点击上一页
+    // 点击上一页
     handlePrevClick (page) {
-
     },
-    //点击下一页
+    // 点击下一页
     handleNextClick (page) {
-
     },
 
-    //单选选中
-    getRadioRow (index, row) {  //获取选中数据
-
+    // 单选选中
+    getRadioRow (index, row) { // 获取选中数据
       this.$emit('selectRadioRow', row)
     },
-    //导出表格
+    // 导出表格
     handleOutTable (name) {
-      app.util.exportExcel(name, '#out-table')
+      //  app.util.exportExcel(name, '#out-table')
     },
-    exportExcel (tHeader, filterVal) {
-      require.ensure([], () => {
-        const { export_json_to_excel } = require('@js/excel/Export2Excel')
+    //  exportExcel (tHeader, filterVal) {
+    //    require.ensure([], () => {
+    //      const { export_json_to_excel } = require('@js/excel/Export2Excel')
 
-        const list = this.tableData
-        const data = this.formatJson(filterVal, list)
-        export_json_to_excel(tHeader, data, '列表excel')
-      })
-    },
+    //      const list = this.tableData
+    //      const data = this.formatJson(filterVal, list)
+    //      export_json_to_excel(tHeader, data, '列表excel')
+    //    })
+    //  },
     formatJson (filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]))
     },
-    //操作列点击实现方法    lyx   20190411
+    // 操作列点击实现方法    lyx   20190411
     handleMethod (index, row, methodName) {
       this.handleClearSelection()
       this.$refs['table'].toggleRowSelection(row, true)
       this.$emit(methodName, row)
-    },
-  },
-
+    }
+  }
 }
 </script>
 <style>
diff --git a/epmet-oper-web/src/views/main-content.vue b/epmet-oper-web/src/views/main-content.vue
index 0ab04d4..3c85a63 100644
--- a/epmet-oper-web/src/views/main-content.vue
+++ b/epmet-oper-web/src/views/main-content.vue
@@ -4,24 +4,35 @@
     <template v-if="$route.meta.isTab">
       <el-dropdown class="aui-content--tabs-tools">
         <i class="el-icon-arrow-down"></i>
-        <el-dropdown-menu slot="dropdown" :show-timeout="0">
+        <el-dropdown-menu slot="dropdown"
+                          :show-timeout="0">
           <el-dropdown-item @click.native="tabRemoveHandle($store.state.contentTabsActiveName)">{{ $t('contentTabs.closeCurrent') }}</el-dropdown-item>
           <el-dropdown-item @click.native="tabsCloseOtherHandle()">{{ $t('contentTabs.closeOther') }}</el-dropdown-item>
           <el-dropdown-item @click.native="tabsCloseAllHandle()">{{ $t('contentTabs.closeAll') }}</el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
-      <el-tabs v-model="$store.state.contentTabsActiveName" @tab-click="tabSelectedHandle" @tab-remove="tabRemoveHandle">
-        <el-tab-pane
-          v-for="item in $store.state.contentTabs"
-          :key="item.name"
-          :name="item.name"
-          :label="item.title"
-          :closable="item.name !== 'home'"
-          :class="{ 'is-iframe': tabIsIframe(item.iframeURL) }">
+      <el-tabs v-model="$store.state.contentTabsActiveName"
+               @tab-click="tabSelectedHandle"
+               @tab-remove="tabRemoveHandle">
+        <el-tab-pane v-for="item in $store.state.contentTabs"
+                     :key="item.name"
+                     :name="item.name"
+                     :label="item.title"
+                     :closable="item.name !== 'home'"
+                     :class="{ 'is-iframe': tabIsIframe(item.iframeURL) }">
           <template v-if="item.name === 'home'">
-            <svg slot="label" class="icon-svg aui-content--tabs-icon-nav" aria-hidden="true"><use xlink:href="#icon-home"></use></svg>
+            <svg slot="label"
+                 class="icon-svg aui-content--tabs-icon-nav"
+                 aria-hidden="true">
+              <use xlink:href="#icon-home"></use>
+            </svg>
           </template>
-          <iframe v-if="tabIsIframe(item.iframeURL)" :src="item.iframeURL" width="100%" height="100%" frameborder="0" scrolling="yes"></iframe>
+          <iframe v-if="tabIsIframe(item.iframeURL)"
+                  :src="item.iframeURL"
+                  width="100%"
+                  height="100%"
+                  frameborder="0"
+                  scrolling="yes"></iframe>
           <keep-alive v-else>
             <router-view v-if="item.name === $store.state.contentTabsActiveName" />
           </keep-alive>
diff --git a/epmet-oper-web/src/views/modules/code/CommitForm.vue b/epmet-oper-web/src/views/modules/code/CommitForm.vue
index 8669561..7ce6fd0 100644
--- a/epmet-oper-web/src/views/modules/code/CommitForm.vue
+++ b/epmet-oper-web/src/views/modules/code/CommitForm.vue
@@ -168,6 +168,12 @@ export default {
     })
   },
   methods: {
+    // 数据初始化
+    initData (dataForm) {
+      this.$nextTick(() => {
+        this.$refs['ref_form_temp'].assign(dataForm)
+      })
+    },
     // 打开上传dialog
     showSubmitDia () {
       this.dialog.title = '上传代码'
diff --git a/epmet-oper-web/src/views/modules/code/CommitList.vue b/epmet-oper-web/src/views/modules/code/CommitList.vue
index f01983a..6fd63d3 100644
--- a/epmet-oper-web/src/views/modules/code/CommitList.vue
+++ b/epmet-oper-web/src/views/modules/code/CommitList.vue
@@ -67,6 +67,7 @@
         </el-form>
         <el-table id="out-table"
                   ref="table"
+                  :height="tableHeight"
                   :header-cell-style="{color:'#000'}"
                   :data="tableData"
                   :style="{width: '100%'}"
@@ -167,7 +168,7 @@
               :visible="commitDia.visible"
               :showConfirm="false"
               @cancel="commitDiaCancel">
-      <commit-form ref="ref_temp_list"></commit-form>
+      <commit-form ref="ref_commit_form"></commit-form>
     </c-dialog>
 
     <c-dialog :title="submitDia.title"
@@ -192,6 +193,7 @@ import CDialog from '../../components/CDialog'
 import SubmitForm from './SubmitForm'
 import CommitForm from './CommitForm'
 import OperHistory from './OperHistory'
+import { mapGetters } from 'vuex'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -338,8 +340,33 @@ export default {
   components: {
     CDialog, SubmitForm, CommitForm, OperHistory
   },
+  activated () {
+    this.$nextTick(() => {
+      this.$refs.table.doLayout() // 解决表格错位
+    })
+  },
   mounted () {
+    let params = this.$route.params
+    // 由客户注册信息跳转来
+    if (params.showCommit) {
+      this.commitDia.title = '上传代码'
+      this.commitDia.visible = true
+
+      let dataForm = {
+        type: '工作端',
+        client: params.name
+      }
 
+      this.$nextTick(() => {
+        this.$refs['ref_commit_form'].initData(dataForm)
+      })
+    }
+  },
+  computed: {
+    tableHeight () {
+      return this.clientHeight - 60 - 80 - 80 - 50
+    },
+    ...mapGetters(['clientHeight'])
   },
   methods: {
     // 上传代码
diff --git a/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue b/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue
new file mode 100644
index 0000000..802d316
--- /dev/null
+++ b/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue
@@ -0,0 +1,249 @@
+<template>
+  <div class="registerList">
+    <el-card shadow="never"
+             class="aui-card--fill">
+      <div class="mod-demo__demo}">
+        <el-form :inline="true"
+                 :model="dataForm"
+                 @keyup.enter.native="getDataList()">
+          <el-form-item>
+            <el-input v-model="dataForm.name"
+                      placeholder="组织名称">
+
+            </el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button @click="getDataList()">查询</el-button>
+          </el-form-item>
+
+        </el-form>
+        <!-- <div style=" height:100px;overflow-y:auto"> -->
+        <el-table id="out-table"
+                  ref="table"
+                  :height="tableHeight"
+                  :header-cell-style="{color:'#000'}"
+                  :data="tableData"
+                  :style="{width: '100%'}"
+                  border
+                  v-loading="loading"
+                  element-loading-text="正在加载中"
+                  element-loading-spinner="el-icon-loading"
+                  element-loading-background="rgba(255, 255， 255, 0.8)">
+          <!-- <el-table-column type="selection"
+                         header-align="center"
+                         align="center"
+                         width="50"></el-table-column> -->
+          <el-table-column prop="agencyName"
+                           label="组织名称"
+                           min-width="100"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column prop="level"
+                           label="组织级别"
+                           min-width="50"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column prop="location"
+                           label="所在地区"
+                           min-width="100"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column prop="partybranchnum"
+                           label="党支部数量"
+                           min-width="50"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column prop="resiAuth"
+                           label="居民端"
+                           min-width="60"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column prop="workAuth"
+                           label="工作端"
+                           min-width="60"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column label="操作"
+                           fixed="right"
+                           header-align="center"
+                           align="center"
+                           width="150">
+            <template slot-scope="scope">
+
+              <el-button type="text"
+                         size="small"
+                         @click="init(scope.row.id)">初始化
+              </el-button>
+              <el-button type="text"
+                         size="small"
+                         @click="commitCode(scope.row.id)">上传代码
+              </el-button>
+
+            </template>
+          </el-table-column>
+        </el-table>
+        <!-- </div> -->
+        <el-pagination :current-page="page"
+                       :page-sizes="[10, 20, 50, 100]"
+                       :page-size="limit"
+                       :total="total"
+                       layout="total, sizes, prev, pager, next, jumper"
+                       @size-change="pageSizeChangeHandle"
+                       @current-change="pageCurrentChangeHandle">
+        </el-pagination>
+
+        <!-- <c-table column-type="index"
+                 ref="table_dic"
+                 :url="this.url"
+                 :params="tableParams"
+                 keyword="RegisterInfo"
+                 :operations="operations"
+                 :tableHeight="tableHeight"
+                 @commitCode="commitCode">
+        </c-table> -->
+
+      </div>
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import CTable from '../../components/CTable'
+import { mapGetters } from 'vuex'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/demo/demo/page',
+        getDataListIsPage: true,
+        deleteURL: '/demo/demo',
+        deleteIsBatch: true,
+        exportURL: '/demo/demo/export'
+      },
+      loading: false,
+      dataForm: {
+        name: '' // 组织名称
+
+      },
+      tableParams: {
+        type: Object, // table的查询参数
+        default () {
+          return {}
+        }
+      },
+      // 列表操作栏的操作项数组
+      operations: {
+        label: '上传代码',
+        style: 'margin: 0 6px;',
+        size: 'mini',
+        methodName: 'commitCode'
+      },
+      // 查询栏下拉框数据
+      optionData:
+      {
+        client: [
+          {
+            value: '01',
+            label: '市北区政府'
+          },
+          {
+            value: '02',
+            label: '市南区政府'
+          }
+        ]
+      },
+
+      // 列表数据
+      tableData: [
+        {
+          name: '市北区政府',
+          level: '市区级',
+          location: '青岛市市北区上清路2号',
+          partyNum: '2',
+          resi: '未授权',
+          work: '已授权'
+        },
+        {
+          name: '市南区政府',
+          level: '市区级',
+          location: '青岛市市南区上清路2号',
+          partyNum: '2',
+          resi: '已授权',
+          work: '已授权'
+        },
+        {
+          name: '李沧区政府',
+          level: '市区级',
+          location: '青岛市李沧区黑龙江中路629号',
+          partyNum: '2',
+          resi: '未授权',
+          work: '未授权'
+        },
+        {
+          name: '城阳区政府',
+          level: '市区级',
+          location: '青岛市市北区上清路2号',
+          partyNum: '2',
+          resi: '未授权',
+          work: '已授权'
+        }
+      ]
+
+    }
+  },
+  components: {
+    CTable
+  },
+  activated () {
+    this.$nextTick(() => {
+      this.$refs.table.doLayout() // 解决表格错位
+    })
+  },
+  mounted () {
+
+  },
+  computed: {
+    tableHeight () {
+      return this.clientHeight - 60 - 80 - 80 - 50
+    },
+    ...mapGetters(['clientHeight'])
+  },
+  methods: {
+    //客户初始化
+    init (id) {
+
+    },
+    // 上传代码
+    commitCode (id) {
+      this.$router.push({
+        'name': 'code-CommitList',
+        'params': {
+          showCommit: true,
+          id: '1',
+          name: '市北区政府'
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang="css">
+.aaa {
+  height: 100px;
+}
+/* .register .el-table .el-table__header-wrapper {
+  position: absolute;
+  top: 0;
+  left: 0;
+}*/
+/*
+.register .el-table .el-table__fixed-body-wrapper {
+  height: calc(100% - 44px);
+  margin-top: 44px;
+  overflow-y: auto !important;
+} */
+</style>