From 95d7bb3bc8a20faef35622cfca29a2df99439bc7 Mon Sep 17 00:00:00 2001
From: zhenghuang <236220500@qq.com>
Date: Tue, 26 May 2020 16:20:06 +0800
Subject: [PATCH] 1

---
 src/pages/activity/ActivityManager.vue |  5 ++++-
 src/pages/activity/ActivityPlan.vue    | 15 +++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/pages/activity/ActivityManager.vue b/src/pages/activity/ActivityManager.vue
index ece0879..77e688a 100644
--- a/src/pages/activity/ActivityManager.vue
+++ b/src/pages/activity/ActivityManager.vue
@@ -20,7 +20,8 @@
             </div>
             <div class="operateItem">
               <div @click="disPlayUseTable(item)">使用</div>
-              <div @click="dispalyAddActivity(item.id)">配置</div>
+              <div v-show="roleCode === 'GLY-ADMIN'"
+                   @click="dispalyAddActivity(item.id)">配置</div>
             </div>
           </div>
         </Card>
@@ -68,11 +69,13 @@ export default {
       inputActivityList: [],
       useSchedule: {},
       loading: false,
+      roleCode: ""
     };
   },
   mounted () {
     this.setMenuName("活动管理", "活动池");
     this.getActivityTable();
+    this.roleCode = sessionStorage.getItem("roleCode");
   },
   methods: {
     doShow (show) {
diff --git a/src/pages/activity/ActivityPlan.vue b/src/pages/activity/ActivityPlan.vue
index e33bb0b..5b442d0 100644
--- a/src/pages/activity/ActivityPlan.vue
+++ b/src/pages/activity/ActivityPlan.vue
@@ -140,11 +140,7 @@ export default {
         {
           label: "已结束",
           value: 3,
-        },
-        {
-          label: "已终止",
-          value: 4,
-        },
+        }
       ],
       columns1: [
         {
@@ -171,11 +167,18 @@ export default {
             return h("span", (params.row.beginTime) + " - " + (params.row.endTime));
           },
         },
+        {
+          title: "零售公司",
+          key: "shop",
+          render (h, params) {
+            return h("span", (params.row.companyName) + "等" + (params.row.companyCount || 0) + "家公司");
+          },
+        },
         {
           title: "店铺",
           key: "shop",
           render (h, params) {
-            return h("span", (params.row.stores[0].abbreviation) + "等" + (params.row.stores.length || 0) + "家");
+            return h("span", (params.row.storeName) + "等" + (params.row.storeCount || 0) + "家店铺");
           },
         },
         {