1

src/pages/activity/selectStoreStep.vue

@@ -1,41 +1,40 @@
 <template>
   <div class="use_box">
-    <Modal
+    <Modal :scrollable="false"
-      :scrollable="false"
            v-model="showUse"
            title="使用活动"
            @on-cancel="cancel"
            :loading="true"
-      width="70%"
+           width="70%">
-    >
+      <Steps style="padding: 40px;"
-      <Steps style="padding: 40px;" :current="currentStep">
+             :current="currentStep">
-        <Step :title="isModify ? '修改零售公司' : '选择零售公司'" content></Step>
+        <Step :title="isModify ? '修改零售公司' : '选择零售公司'"
-        <Step :title="isModify ? '修改店铺' : '选择店铺'" content></Step>
+              content></Step>
+        <Step :title="isModify ? '修改店铺' : '选择店铺'"
+              content></Step>
       </Steps>
-      <useActivityStepTwo :schedule="schedule" :isModify="isModify" v-if="currentStep == 0"></useActivityStepTwo>
+      <useActivityStepTwo :schedule="schedule"
-      <useActivityStepThree :schedule="schedule" :isModify="isModify" v-if="currentStep == 1"></useActivityStepThree>
+                          :isModify="isModify"
+                          v-if="currentStep == 0"></useActivityStepTwo>
+      <useActivityStepThree :schedule="schedule"
+                            :isModify="isModify"
+                            v-if="currentStep == 1"></useActivityStepThree>
       <div slot="footer">
-        <Button
+        <Button v-if="currentStep !== 0"
-          v-if="currentStep !== 0"
                 type="primary"
                 shape="circle"
                 :loading="modal_loading"
-          @click="back"
+                @click="back">上一步</Button>
-        >上一步</Button>
+        <Button v-if="currentStep !== 1"
-        <Button
-          v-if="currentStep !== 1"
                 type="primary"
                 shape="circle"
                 :loading="modal_loading"
-          @click="next"
+                @click="next">下一步</Button>
-        >下一步</Button>
+        <Button v-if="currentStep == 1"
-        <Button
-          v-if="currentStep == 1"
                 type="primary"
                 shape="circle"
                 :loading="modal_loading"
-          @click="finish"
+                @click="finish">完成</Button>
-        >完成</Button>
       </div>
     </Modal>
   </div>
@@ -76,6 +75,7 @@ export default {
     show () {
       this.showUse = this.show;
       this.currentStep = 0;
+      this.modal_loading = false;
     },
     schedule () {
       store.getters.useData.scheduleId = this.schedule.id;
@@ -85,9 +85,9 @@ export default {
   methods: {
     cancel () {
       this.currentStep = 0;
-      if (!this.isModify) {
+      // if (!this.isModify) {
-        store.commit("RSET_useData");
+      //   store.commit("RSET_useData");
-      }
+      // }
       this.$emit("doShow", false);
       this.modal_loading = false;
       this.showUse = false;

src/pages/shop/IncreaseWelcomeList.vue

@@ -1,46 +1,60 @@
 <template>
   <div>
     <Row class="search-row">
-      <i-col span="24" class="search-col">
+      <i-col span="24"
+             class="search-col">
         <Row class="row-style">
-          <Button @click="handleEdit" type="primary">配置欢迎语</Button>
+          <Button @click="handleEdit"
+                  type="primary">配置欢迎语</Button>
         </Row>
       </i-col>
     </Row>
-    <Table
+    <Table :columns="columns1"
-      :columns="columns1"
            :data="data"
            :loading="loading"
+           @on-cell-click="clickCell"
            style="margin-top: 20px;"
+           size="small">
+      <template slot-scope="{ row, index }"
+                slot="action">
+        <Button type="primary"
                 size="small"
-    >
+                @click="handleEdit(row, index)">修改</Button>
-      <template slot-scope="{ row, index }" slot="action">
+        <Button type="error"
-        <Button type="primary" size="small" @click="handleEdit(row, index)">修改</Button>
+                size="small"
-        <Button type="error" size="small" @click="handleDelete(row, index)">删除</Button>
+                @click="handleDelete(row, index)">删除</Button>
       </template>
     </Table>
-    <Page
+    <Page :total="total"
-      :total="total"
           :current="pageNum"
           :page-size="pageSize"
           show-elevator
           show-total
           placement="top"
           @on-change="handlePage"
-      class="ks-page"
+          class="ks-page"></Page>
-    ></Page>
+    <Modal v-model="showDetail"
+           title="配置范围"
+           width="70%"
+           :footer-hide="true">
+      <welcomeDetail v-if="showDetail"
+                     :detail="detail"></welcomeDetail>
+    </Modal>
   </div>
 </template>
 
 <script>
+import ActivityManager from "../../services/ActivityManager/ActivityManager";
 import data from "../../utils/PhoneRegionData";
 import http from "../../services/store/IncreaseStoreManager";
 
 import staff from "../../services/staff/staff";
+import welcomeDetail from "./WelcomeDetail";
 
 export default {
   name: "IncreaseWelcomeList",
   inject: ["setMenuName"],
+  components: { welcomeDetail },
   data () {
     let _this = this;
     return {
@@ -48,8 +62,10 @@ export default {
       // 分页
       total: 0,
       pageSize: 10,
+      showDetail: false,
       data: [],
       pageNum: 1,
+      detail: {},
       columns1: [
         {
           width: 60,
@@ -97,6 +113,27 @@ export default {
     this.handlePaginate();
   },
   methods: {
+    clickCell (row, column, data, event) {
+      if (column.key === "shop") {
+        let _this = this;
+        this.getDetail(row.id).then(res => {
+          _this.detail = res;
+          _this.showDetail = true;
+        });
+      }
+    },
+    getDetail (instanceId) {
+      return new Promise((resolve, reject) => {
+        ActivityManager.instanceDetail(
+          {
+            instanceId
+          },
+          res => {
+            resolve(res.data.results);
+          }
+        );
+      });
+    },
     // 分页刷新
     handlePaginate () {
       this.loading = true;
@@ -132,7 +169,10 @@ export default {
         title: "删除欢迎语",
         content: "您确定要删除该欢迎语?",
         onOk: () => {
-          http.deleteWelcome({ id: row.scheduleId }).then(_this.handlePaginate);
+          http.deleteWelcome({ id: row.scheduleId }).then(res => {
+            _this.pageNum = 1;
+            _this.handlePaginate()
+          });
         },
         onCancel: () => { }
       });

src/pages/shop/WelcomeDetail.vue

@@ -0,0 +1,92 @@
+<template>
+  <div style="padding: 0 40px;">
+    <Form ref="formValidate"
+          :model="useData"
+          :label-width="80">
+      <Row>
+        <i-col span="22"
+               offset="2">
+          <FormItem label="配置范围"
+                    prop="activityRange">
+            <Collapse simple>
+              <Panel :key="index"
+                     v-for="(item, index) in groups">
+                {{
+                  item.name
+                }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
+                  item.stores.length
+                }}家店铺
+                <div slot="content">
+                  <div class="activityShopClass">
+                    <div class="mr10"
+                         v-for="(item, index) in item.stores"
+                         :key="index">
+                      <Tag class="tagClass"
+                           color="blue">{{ item.name }}</Tag>
+                    </div>
+                  </div>
+                </div>
+              </Panel>
+            </Collapse>
+          </FormItem>
+        </i-col>
+      </Row>
+    </Form>
+  </div>
+</template>
+<script>
+import store from "../../store/index";
+export default {
+  name: "useActivityStepFoure",
+  data () {
+    return {
+      useData: store.getters.useData,
+      operate: "收起",
+      displayActivityShopFlag: false,
+      groups: [],
+    };
+  },
+  props: {
+    detail: Object
+  },
+  created () {
+    let _this = this;
+    this.$nextTick(() => {
+      console.log(123, this.detail)
+      _this.detail.organizations.forEach((item) => {
+        item.stores = _this._.filter(
+          _this.detail.stores,
+          (s) => s.companyId == item.id || s.parentId == item.id
+        );
+        console.log(item.stores)
+        _this.groups.push(item);
+      });
+    });
+  },
+  methods: {
+    isDisplay () {
+      if (this.operate === "展开") {
+        this.operate = "收起";
+        this.displayActivityShopFlag = false;
+      } else {
+        this.operate = "展开";
+        this.displayActivityShopFlag = true;
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+.activityShopClass {
+  display: flex;
+  justify-content: start;
+  flex-wrap: wrap;
+}
+.mr10 {
+  margin-right: 20px;
+}
+.tagClass {
+  text-align: center;
+}
+</style>