diff --git a/epmet-oper-web/package-lock.json b/epmet-oper-web/package-lock.json
index 999ca92..e146f30 100644
--- a/epmet-oper-web/package-lock.json
+++ b/epmet-oper-web/package-lock.json
@@ -5160,7 +5160,8 @@
       "version": "4.6.0",
       "resolved": "https://registry.npmmirror.com/co/-/co-4.6.0.tgz",
       "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "coa": {
       "version": "2.0.2",
@@ -7182,6 +7183,7 @@
           "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
           "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -10254,7 +10256,8 @@
           "version": "3.0.1",
           "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-3.0.1.tgz",
           "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "cli-cursor": {
           "version": "2.1.0",
@@ -10310,6 +10313,7 @@
           "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-4.0.0.tgz",
           "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^3.0.0"
           }
@@ -10979,6 +10983,7 @@
       "resolved": "https://registry.npmmirror.com/levn/-/levn-0.3.0.tgz",
       "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2"
@@ -14257,7 +14262,8 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.1.2.tgz",
       "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "prepend-http": {
       "version": "1.0.4",
@@ -15036,7 +15042,8 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmmirror.com/rx-lite/-/rx-lite-4.0.8.tgz",
       "integrity": "sha512-Cun9QucwK6MIrp3mry/Y7hqD1oFqTYLQ4pGxaHTjIdaFDWRGGLikqp6u8LcWJnzpoALg9hap+JGk8sFIUuEGNA==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "rx-lite-aggregates": {
       "version": "4.0.8",
@@ -17092,6 +17099,7 @@
       "resolved": "https://registry.npmmirror.com/type-check/-/type-check-0.3.2.tgz",
       "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
       "dev": true,
+      "optional": true,
       "requires": {
         "prelude-ls": "~1.1.2"
       }
diff --git a/epmet-oper-web/src/views/modules/customer/manage/CustomerList.vue b/epmet-oper-web/src/views/modules/customer/manage/CustomerList.vue
index edff648..0f4b00e 100644
--- a/epmet-oper-web/src/views/modules/customer/manage/CustomerList.vue
+++ b/epmet-oper-web/src/views/modules/customer/manage/CustomerList.vue
@@ -15,6 +15,10 @@
           <el-form-item>
             <el-button @click="loadData()">查询</el-button>
           </el-form-item>
+          <el-form-item>
+            <el-button type="primary"
+                       @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          </el-form-item>
         </el-form>
 
         <c-table column-type=""
@@ -29,6 +33,10 @@
                  @edit="edit"
                  @init="init">
         </c-table>
+        <!-- 弹窗, 新增 / 修改 -->
+        <add-or-update v-if="addOrUpdateVisible"
+                       ref="addOrUpdate"
+                       @refreshDataList="getDataList"></add-or-update>
       </div>
     </el-card>
     <edit-form ref="ref_edit_form"
@@ -44,9 +52,12 @@ import EditForm from './EditForm'
 import ConfigForm from './ConfigForm'
 import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
+import AddOrUpdate from './customer-add-or-update.vue'
+import mixinViewModule from "@/mixins/view-module";
 
 let loading // 加载动画
 export default {
+  mixins: [mixinViewModule],
   data () {
     return {
       // 列表相关
@@ -98,12 +109,12 @@ export default {
       // 列表数据
       tableData: [
 
-      ]
-
+      ],
+      addOrUpdateVisible: false   // 新增／更新，弹窗visible状态
     }
   },
   components: {
-    CTable, EditForm, ConfigForm
+    CTable, EditForm, ConfigForm,AddOrUpdate
   },
   activated () {
     this.$nextTick(() => {
@@ -122,6 +133,7 @@ export default {
     ...mapGetters(['clientHeight', 'env'])
   },
   methods: {
+
     // 获取列表数据
     loadData () {
       this.$refs.table.loadData()
diff --git a/epmet-oper-web/src/views/modules/customer/manage/customer-add-or-update.vue b/epmet-oper-web/src/views/modules/customer/manage/customer-add-or-update.vue
new file mode 100644
index 0000000..3f6e4f0
--- /dev/null
+++ b/epmet-oper-web/src/views/modules/customer/manage/customer-add-or-update.vue
@@ -0,0 +1,275 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             :title="!dataForm.id ? $t('add') : $t('update')"
+             :close-on-click-modal="false"
+             :close-on-press-escape="false">
+    <el-form :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             @keyup.enter.native="dataFormSubmitHandle()"
+             :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
+<!--      <el-form-item label="功能"
+                    prop="xialazhushi1"
+                    v-if="true">
+        <el-select v-model="dataForm.xialazhushi1"
+                   placeholder="请选择"
+                   clearable>
+          <el-option v-for="item in functionList"
+                     :key="item.id"
+                     :label="item.functionName"
+                     :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>-->
+      <el-form-item label="客户名称"
+                    prop="customerName">
+        <el-input v-model="dataForm.paCustomer.customerName"
+                  placeholder="客户名称"></el-input>
+      </el-form-item>
+
+
+      <el-form
+          :inline="true"
+          :model="dataForm"
+          :rules="dataRule"
+          ref="ref_form_2"
+          style="margin: 0 auto; width: 860px"
+          :label-width="'100px'"
+      >
+        <el-form-item prop="logo" label="Logo">
+          <el-upload
+              :headers="$getElUploadHeaders()"
+              class="item_width_1 avatar-uploader"
+              :action="uploadUlr"
+              :show-file-list="false"
+              :on-success="handleImgSuccess"
+              :before-upload="beforeImgUpload"
+          >
+            <img
+                v-if="dataForm.paAgency.logo"
+                :src="dataForm.paAgency.logo"
+                style="width: 70px; height: 70px"
+                class="function-icon"
+            />
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <el-form-item label="平台名称"
+                    prop="agencyName">
+        <el-input v-model="dataForm.paAgency.agencyName"
+                  placeholder="平台名称"></el-input>
+      </el-form-item>
+
+      <el-form-item label="组织级别"
+                    prop="level">
+        <el-select v-model="dataForm.paAgency.level"
+                   placeholder="请选择"
+                   clearable>
+          <el-option v-for="item in zuzhijibieList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="组织地区code"
+                    prop="areaCode">
+        <el-input v-model="dataForm.paAgency.areaCode"
+                  placeholder="组织地区code"></el-input>
+      </el-form-item>
+      <el-form-item label="组织省份"
+                    prop="province">
+        <el-input v-model="dataForm.paAgency.province"
+                  placeholder="组织省份"></el-input>
+      </el-form-item>
+
+      <el-form-item label="组织城市"
+                    prop="city">
+        <el-input v-model="dataForm.paAgency.city"
+                  placeholder="组织城市"></el-input>
+      </el-form-item>
+
+      <el-form-item label="组织区域"
+                    prop="district">
+        <el-input v-model="dataForm.paAgency.district"
+                  placeholder="组织区域"></el-input>
+      </el-form-item>
+      <el-form-item label="最大网格数"
+                    prop="partybranchnum">
+        <el-input-number  v-model="dataForm.paAgency.partybranchnum"
+                  placeholder="最大网格数"></el-input-number>
+      </el-form-item>
+      <el-form-item label="有效期"
+                    prop="validityTime">
+        <el-date-picker v-model="dataForm.paAgency.validityTime"
+                        type="datetime"
+                        format="yyyy 年 MM 月 dd 日"
+                        value-format="yyyy-MM-dd"
+                  placeholder="有效期"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="超级管理员"
+                    prop="realName">
+        <el-input v-model="dataForm.paUser.realName"
+                  placeholder="超级管理员"></el-input>
+      </el-form-item>
+      <el-form-item label="联系方式"
+                    prop="realName">
+        <el-input v-model="dataForm.paUser.phone"
+                  placeholder="联系方式"></el-input>
+      </el-form-item>
+
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary"
+                 @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+import CForm from '@c/CForm'
+import CDialog from '@c/CDialog'
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+export default {
+  data () {
+    return {
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadimg',
+      visible: false,
+      dataForm: {
+        id: '',
+        paAgency:{
+          logo:'',
+          agencyName: '',
+          areaCode: '',
+          city: '',
+          district: '',
+          level: '',
+          levelNum: '',
+          partybranchnum: '',
+          province: '',
+          validityTime:''
+        },
+        paCustomer:{
+          customerName:'',
+        },
+        paUser:{
+          gender:'1',
+          phone:'',
+          realName:''
+        },
+
+        // xialazhushi1: '',
+
+        // zuzhijibie:''
+      },
+      zuzhijibieList: [
+        {
+          'dictName': '社区级',
+          'dictValue': 'community'
+        }, {
+          'dictName': '乡（镇、街道）级',
+          'dictValue': 'street'
+        }, {
+          'dictName': '区县级',
+          'dictValue': 'district'
+        }, {
+          'dictName': '市级',
+          'dictValue': 'city'
+        }, {
+          'dictName': '省级',
+          'dictValue': 'province'
+        }
+      ],
+
+      functionList: []
+
+
+    }
+  },
+  components: {
+    CForm,
+    CDialog
+  },
+  created () {
+    this.queryFunctionList()
+  },
+  computed: {
+    dataRule () {
+      return {
+/*        agencyName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],*/
+        logo: [
+          {
+            required: false,
+            message: this.$t('validate.required'),
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
+  },
+  methods: {
+    // 上传logo成功
+    handleImgSuccess(res, file) {
+      console.log("!")
+      if (res.code === 0 && res.msg === 'success') {
+        console.log("!")
+        this.dataForm.paAgency.logo = res.data.url
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    beforeImgUpload(file) {
+      // const isPNG = file.type === 'image/png'
+      const isLt1M = file.size / 1024 / 1024 < 1
+
+      // if (!isPNG) {
+      //   this.$message.error('上传图片只能是 PNG 格式!')
+      // }
+      if (!isLt1M) {
+        this.$message.error('上传图片大小不能超过 1MB!')
+      }
+      // return isPNG && isLt1M
+      return isLt1M
+    },
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        console.log(this.dataForm)
+        this.$http['post']('/oper/crm/customer/initLocally', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => { })
+      })
+    }, 1000, { 'leading': true, 'trailing': false }),
+  }
+}
+</script>
diff --git a/epmet-oper-web/src/views/modules/sys/dingding/EditDomainNameList.vue b/epmet-oper-web/src/views/modules/sys/dingding/EditDomainNameList.vue
index 7de27e1..b247cc2 100644
--- a/epmet-oper-web/src/views/modules/sys/dingding/EditDomainNameList.vue
+++ b/epmet-oper-web/src/views/modules/sys/dingding/EditDomainNameList.vue
@@ -87,13 +87,13 @@
           class="item_width_1 avatar-uploader"
           :action="uploadUlr"
           :show-file-list="false"
-          :on-success="
+          :before-upload="beforeImgUpload">
+<!--          :on-success="
             function (res, file) {
               return handleImgSuccess(res, file, 'large')
             }
-          "
-          :before-upload="beforeImgUpload"
-        >
+          "-->
+
           <img
             v-if="dataForm.iconLargeImg"
             :src="dataForm.iconLargeImg"
@@ -110,13 +110,14 @@
           class="item_width_1 avatar-uploader"
           :action="uploadUlr"
           :show-file-list="false"
-          :on-success="
-            function (res, file) {
-              return handleImgSuccess(res, file, 'small')
-            }
-          "
+
           :before-upload="beforeImgUpload"
         >
+<!--          :on-success="-->
+<!--          function (res, file) {-->
+<!--          return handleImgSuccess(res, file, 'small')-->
+<!--          }-->
+<!--          "-->
           <img
             v-if="dataForm.iconSmallImg"
             :src="dataForm.iconSmallImg"