From 0afcb932b0dc51ed881415947c24d86deeba5302 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 23 Sep 2020 14:09:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/customer/init/RegisterList.vue   | 14 +++++++-------
 .../views/modules/customer/manage/CustomerList.vue |  2 +-
 .../productConfig/customizeFunction/Edit.vue       |  5 ++++-
 .../modules/productConfig/footbar/FootbarEdit.vue  |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue b/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue
index fe447bb..9acbd08 100644
--- a/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue
+++ b/epmet-oper-web/src/views/modules/customer/init/RegisterList.vue
@@ -222,13 +222,13 @@ export default {
           plain: false,
           methodName: 'showSubscribe', // 回调方法名称
           isShow: (row) => {
-            if (
-              row.initState === 1
-            ) {
-              return true
-            } else {
-              return false
-            }
+            // if (
+            //   row.initState === 1
+            // ) {
+            //   return true
+            // } else {
+            return false
+            // }
           }
         },
         {
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 cb53fdb..15d7ccd 100644
--- a/epmet-oper-web/src/views/modules/customer/manage/CustomerList.vue
+++ b/epmet-oper-web/src/views/modules/customer/manage/CustomerList.vue
@@ -8,7 +8,7 @@
                  @keyup.enter.native="loadData()">
           <el-form-item>
             <el-input v-model="tableParams.customerName"
-                      placeholder="组织名称">
+                      placeholder="客户名称">
             </el-input>
           </el-form-item>
 
diff --git a/epmet-oper-web/src/views/modules/productConfig/customizeFunction/Edit.vue b/epmet-oper-web/src/views/modules/productConfig/customizeFunction/Edit.vue
index b8d1325..599f3dd 100644
--- a/epmet-oper-web/src/views/modules/productConfig/customizeFunction/Edit.vue
+++ b/epmet-oper-web/src/views/modules/productConfig/customizeFunction/Edit.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :visible.sync="visible"
-             :title="'修改定制功能'"
+             :title="diaTitle"
              :close-on-click-modal="false"
              :before-close="handleClose"
              :close-on-press-escape="false"
@@ -161,6 +161,7 @@ export default {
   data () {
     return {
       visible: false,
+      diaTitle: '修改定制功能',
       type: '', // 操作类型A/U
       functionId: '', // 父组件传来功能id
       dataForm: {
@@ -238,6 +239,7 @@ export default {
       this.visible = true
       this.functionId = functionId
       if (type === 'A') {
+        this.diaTitle = '新增定制功能'
         this.dataForm = {
           functionId: '',
           functionName: '',
@@ -253,6 +255,7 @@ export default {
         this.domainNameList = ['']
         this.isApply = 0
       } else {
+        this.diaTitle = '修改定制功能'
         this.loadFormData()
       }
     },
diff --git a/epmet-oper-web/src/views/modules/productConfig/footbar/FootbarEdit.vue b/epmet-oper-web/src/views/modules/productConfig/footbar/FootbarEdit.vue
index d0a8749..cb403e6 100644
--- a/epmet-oper-web/src/views/modules/productConfig/footbar/FootbarEdit.vue
+++ b/epmet-oper-web/src/views/modules/productConfig/footbar/FootbarEdit.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :visible.sync="visible"
-             :title="'修改Footbar'"
+             :title="title"
              :close-on-click-modal="false"
              :before-close="handleClose"
              :close-on-press-escape="false"