1

src/pages/activity/ActivityManager.vue

@@ -1,18 +1,18 @@
 <template>
   <div class="activityManager">
-    <Spin v-show="loading" fix>加载中...</Spin>
+    <Spin v-show="loading"
+          fix>加载中...</Spin>
     <Row>
-      <i-col
+      <i-col class="activityListClass"
-        class="activityListClass"
              v-for="(item, index) in activityList"
              :key="index"
              span="7"
-        offset="1"
+             offset="1">
-      >
         <Card>
           <div class="operateAndThemeItem">
             <div class="ThemeItem">
-              <img class="img" :src="'/kiisoo-ic' + item.logo" />
+              <img class="img"
+                   :src="'/kiisoo-ic' + item.logo" />
               <div class="tipItem">
                 <span>{{ item.name }}</span>
                 <span>{{ item.description }}</span>
@@ -27,24 +27,22 @@
       </i-col>
     </Row>
     <Row>
-      <i-col span="7" offset="1">
+      <i-col span="7"
-        <div @click="dispalyAddActivity('')" class="addactivity">
+             offset="1">
+        <div @click="dispalyAddActivity('')"
+             class="addactivity">
           <span>+</span>
           <span>添加活动</span>
         </div>
       </i-col>
     </Row>
-    <useTable
+    <useTable ref="useTable"
-      ref="useTable"
               @doShow="doShow"
               :show="showUse"
-      :schedule="useSchedule"
+              :schedule="useSchedule"></useTable>
-    ></useTable>
+    <addActivity @dispalyAddActivityModal="dispalyAddActivityModal"
-    <addActivity
-      @dispalyAddActivityModal="dispalyAddActivityModal"
                  :addActivityModal="addActivityModal"
-      :id="id"
+                 :id="id"></addActivity>
-    ></addActivity>
   </div>
 </template>
 
@@ -114,6 +112,7 @@ export default {
       ActivityManager.getActivityInfo(data, function (data) {
         that.useSchedule = data.data.results;
         that.showUse = true;
+        that.$forceUpdate()
       });
     },
     dispalyAddActivity (id) {

src/pages/activity/ActivityPlan.vue

@@ -1,93 +1,83 @@
 <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>
+        <i-col span="7">
+          <FormItem label="选择日期"
+                    prop="">
+            <Date-picker v-model="formValidate.date"
+                         type="daterange"
+                         placement="bottom-end"
+                         placeholder="选择日期区间"></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
                     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="7">
-          <FormItem label="选择日期" prop="">
-            <Date-picker
-              v-model="formValidate.date"
-              type="daterange"
-              placement="bottom-end"
-              placeholder="选择日期区间"
-            ></Date-picker>
-          </FormItem>
-        </i-col>
         <i-col span="1">
-          <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
                :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"
-      :schedule="activityInstance.scheduleVO"
+              :schedule="activityInstance.scheduleVO"></useTable>
-    ></useTable>
   </div>
 </template>
 
@@ -167,26 +157,22 @@ export default {
           title: "活动类型",
           key: "scheduleVO.name",
           render (h, params) {
-            return h("span", params.row["scheduleVO"]["name"]);
+            return h("span", params.row["params"][0]["defaultVal"]);
           },
         },
         {
-          title: "活动开始时间",
+          title: "活动时间",
           key: "beginTime",
+          width: 230,
+          render (h, params) {
+            return h("span", (params.row.beginTime) + " - " + (params.row.endTime));
           },
-        {
-          title: "活动结束时间",
-          key: "endTime",
         },
-        // {
-        //     title: '零售公司',
-        //     key: 'company'
-        // },
         {
           title: "店铺",
           key: "shop",
           render (h, params) {
-            return h("span", (params.row.stores.length || 0) + "家");
+            return h("span", (params.row.stores[0].abbreviation) + "等" + (params.row.stores.length || 0) + "家");
           },
         },
         {
@@ -304,21 +290,30 @@ export default {
       this.searchTable();
     },
     stop (instance) {
-      this.saving = true;
       let _this = this;
+      this.$Modal.confirm({
+        title: '您确认要终止?',
+        content: '终止之后不可恢复',
+        onOk: () => {
+          this.saving = true;
           ActivityManager.instanceTerminate({ instanceId: instance.id }, (res) => {
             _this.saving = false;
-        if (res.success == undefined || !res.success) {
+            if (res.data.success == undefined || !res.data.success) {
-          that.$Message.error("终止失败!");
+              _this.$Message.error("终止失败!");
             } else {
               _this.searchTable();
             }
           });
         },
+        onCancel: () => {
+
+        }
+      });
+    },
     modify (instance) {
       this.activityInstance = instance;
       this.showUse = true;
-      store.commit("SET_useData", instance);
+      store.commit("SET_useData", Object.assign({}, instance));
     },
     navigateCode (instance) {
       this.$router.push({

src/pages/activity/useActivityStepTwo.vue

@@ -117,7 +117,7 @@ export default {
       ActivityManager.getCompany(data, function (data) {
         that.companyList = [];
         that.companyListdata = data.data.results;
-        if (store.getters.useData.company.length == that.companyListdata.length) {
+        if (store.getters.useData.company && store.getters.useData.company.length == that.companyListdata.length) {
           that.allSelect = true;
         }
         data.data.results.forEach((element) => {