1

src/pages/activity/ActivityManager.vue

@@ -27,7 +27,7 @@
         </Card>
       </i-col>
     </Row>
-    <Row>
+    <Row v-show="roleCode === 'GLY-ADMIN'">
       <i-col span="7"
              offset="1">
         <div @click="dispalyAddActivity('')"

src/pages/activity/ActivityPlan.vue

@@ -1,103 +1,92 @@
 <template>
   <div>
-    <Spin v-if="saving" fix>加载中...</Spin>
+    <Spin v-if="saving"
-    <Form ref="formValidate" :model="formValidate" :label-width="80">
+          fix>加载中...</Spin>
+    <Form ref="formValidate"
+          :model="formValidate"
+          :label-width="80">
       <Row :gutter="10">
         <i-col span="4">
-          <FormItem label="选择日期" prop="">
+          <FormItem label="选择日期"
-            <Date-picker
+                    prop="">
-              v-model="formValidate.date"
+            <Date-picker v-model="formValidate.date"
                          type="daterange"
                          placement="bottom-end"
-              placeholder="选择日期区间"
+                         placeholder="选择日期区间"></Date-picker>
-            ></Date-picker>
           </FormItem>
         </i-col>
         <i-col span="6">
-          <FormItem label="零售公司" prop="">
+          <FormItem label="零售公司"
-            <Select
+                    prop="">
-              v-model="formValidate.organizationId"
+            <Select v-model="formValidate.organizationId"
                     filterable
                     @on-change="selectCompany"
                     placeholder="全部"
-              clearable
+                    clearable>
-            >
+              <Option v-for="(item, index) in companyList"
-              <Option
-                v-for="(item, index) in companyList"
                       :key="index"
-                :value="item.value"
+                      :value="item.value">{{ item.label }}
-                >{{ item.label }}
               </Option>
             </Select>
           </FormItem>
         </i-col>
         <i-col span="6">
-          <FormItem label="店铺" prop="">
+          <FormItem label="店铺"
-            <Select
+                    prop="">
-              v-model="formValidate.storeId"
+            <Select v-model="formValidate.storeId"
                     filterable
                     placeholder="全部"
-              clearable
+                    clearable>
-            >
+              <Option v-for="(item, index) in shopList"
-              <Option
-                v-for="(item, index) in shopList"
                       :key="index"
-                :value="item.value"
+                      :value="item.value">{{ item.label }}
-                >{{ item.label }}
               </Option>
             </Select>
           </FormItem>
         </i-col>
         <i-col span="4">
-          <FormItem label="活动状态" prop="">
+          <FormItem label="活动状态"
+                    prop="">
             <Select v-model="formValidate.status">
-              <Option
+              <Option v-for="(item, index) in activityStatusList"
-                v-for="(item, index) in activityStatusList"
                       :key="index"
-                :value="item.value"
+                      :value="item.value">{{ item.label }}
-                >{{ item.label }}
               </Option>
             </Select>
           </FormItem>
         </i-col>
         <i-col span="4">
-          <Button type="primary" @click="searchTable">查询</Button>
+          <Button type="primary"
+                  @click="searchTable">查询</Button>
         </i-col>
       </Row>
       <Row style="margin-top:50px">
-        <Table
+        <Table :loading="loading"
-          :loading="loading"
                border
                @on-row-dblclick="showDetail"
                :columns="columns1"
-          :data="data"
+               :data="data"></Table>
-        ></Table>
+        <Page :total="totalSize"
-        <Page
-          :total="totalSize"
               :current="pageNum"
               :page-size="pageSize"
               show-elevator
               show-total
               placement="top"
               @on-change="handlePage"
-          class-name="ks-page"
+              class-name="ks-page"></Page>
-        ></Page>
       </Row>
     </Form>
-    <useTable
+    <useTable ref="useTable"
-      ref="useTable"
               @doShow="doShow"
               :show="showUse"
               :isModify="true"
-      :schedule="activityInstance.scheduleVO"
+              :schedule="activityInstance.scheduleVO"></useTable>
-    ></useTable>
+    <Modal v-model="isShowDetail"
-    <Modal
-      v-model="isShowDetail"
            title="活动计划详情"
            width="70%"
-      :footer-hide="true"
+           :footer-hide="true">
-    >
+      <planDetail v-if="isShowDetail"
-      <planDetail v-if="isShowDetail" :detail="detail"></planDetail>
+                  :detail="detail"></planDetail>
     </Modal>
   </div>
 </template>
@@ -295,6 +284,7 @@ export default {
   methods: {
     doShow (show) {
       this.showUse = show;
+      this.searchTable();
     },
     showDetail (detail) {
       let _this = this;
@@ -410,6 +400,7 @@ export default {
       params.pageNum = this.pageNum;
       params.pageSize = this.pageSize;
       params = { ...params, ...this.formValidate };
+      params.userId = JSON.parse(sessionStorage.getItem("loginInfo")).userId;
       if (params.status == 0) {
         params.status = undefined;
       }

src/pages/activity/useActivityStepThree.vue

@@ -119,7 +119,6 @@ export default {
         });
       }
       this.isSelect = this._.filter(this.isSelect, item => item)
-      console.log(that.shopList)
     },
     onChange (data) {
       let _this = this;
@@ -153,6 +152,7 @@ export default {
       let data = {
         userId: JSON.parse(sessionStorage.getItem("loginInfo")).userId,
         customerIds: companyIds.join(","),
+        scheduleId: store.getters.useData.scheduleId
       };
       that.loading = true;
       ActivityManager.getShop(data, function (data) {