From dc4ff627ed7ac865ba5e4a5920305e012c609f58 Mon Sep 17 00:00:00 2001
From: Caps <452713115@qq.com>
Date: Fri, 24 Apr 2020 22:55:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/shop/IncreaseDataCompany.vue |  8 ++++++--
 src/pages/shop/IncreaseDataStore.vue   | 16 ++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/pages/shop/IncreaseDataCompany.vue b/src/pages/shop/IncreaseDataCompany.vue
index 51aaafa..3c2a83a 100644
--- a/src/pages/shop/IncreaseDataCompany.vue
+++ b/src/pages/shop/IncreaseDataCompany.vue
@@ -70,9 +70,13 @@
                         key: 'newEffectiveCustomer'
                     },
                     {
-                        title: '日增好友平均（去重）',
+                        title: '日增好友平均',
                         key: 'avgNewCustomer'
                     },
+                    {
+                        title: '日增好友平均（去重）',
+                        key: 'avgNewEffectiveCustomer'
+                    },
                     {
                         title: '删除/拉黑成员客户数（累计）',
                         key: 'delCustomer'
@@ -199,7 +203,7 @@
                             const { export_json_to_excel } = require('../../excel/Export2Excel');
                             const tHeader = ['序号', '零售公司名称', '总好友数', '总好友数（去重）', '新增好友数', '新增好友数（去重）','日增好友平均（去重）','删除/拉黑成员客户数（累计）','拉黑率（累计）'];
                             // 属性名
-                            const filterVal = ['index', 'retailCompany', 'allCustomer', 'effectiveCustomer', 'newCustomer', 'newEffectiveCustomer','avgNewCustomer','delCustomer','delRate'];
+                            const filterVal = ['index', 'retailCompany', 'allCustomer', 'effectiveCustomer', 'newCustomer', 'newEffectiveCustomer','avgNewCustomer','avgNewEffectiveCustomer','delCustomer','delRate'];
                             // 数据
                               //把data里的tableData存到list
                             const data = that.formatJson(filterVal, originAllData);
diff --git a/src/pages/shop/IncreaseDataStore.vue b/src/pages/shop/IncreaseDataStore.vue
index 9ffff03..c6ad901 100644
--- a/src/pages/shop/IncreaseDataStore.vue
+++ b/src/pages/shop/IncreaseDataStore.vue
@@ -63,12 +63,12 @@
                         key: 'shopName'
                     },
                     {
-                        title: '所属零售公司',
-                        key: 'companyName'
+                        title: '店铺编号',
+                        key: 'shopCode'
                     },
                     {
-                        title: '所属区域',
-                        key: 'region'
+                        title: '所属零售公司',
+                        key: 'companyName'
                     },
                     {
                         title: '总好友数',
@@ -87,9 +87,13 @@
                         key: 'newEffectiveCustomer'
                     },
                     {
-                        title: '日增好友平均（去重）',
+                        title: '日增好友平均',
                         key: 'avgNewCustomer'
                     },
+                    {
+                        title: '日增好友平均（去重）',
+                        key: 'avgNewEffectiveCustomer'
+                    },
                     {
                         title: '删除/拉黑成员客户数（累计）',
                         key: 'delCustomer'
@@ -278,7 +282,7 @@
                             const { export_json_to_excel } = require('../../excel/Export2Excel');
                             const tHeader = ['序号', '店铺', '所属零售公司', '所属区域', '总好友数', '总好友数（去重）','新增好友数','新增好友数（去重）','日增好友平均（去重）','删除/拉黑成员客户数（累计）','拉黑率（累计）'];
                             // 属性名
-                            const filterVal = ['index', 'shopName', 'companyName', 'region', 'allCustomer', 'effectiveCustomer','newCustomer','newEffectiveCustomer','avgNewCustomer','delCustomer','delRate'];
+                            const filterVal = ['index', 'shopName', 'companyName', 'allCustomer', 'effectiveCustomer','newCustomer','newEffectiveCustomer','avgNewCustomer','avgNewEffectiveCustomer', 'delCustomer','delRate'];
                             // 数据
                             //把data里的tableData存到list
                             const data = that.formatJson(filterVal, originAllData);