From 4ab2dc27e7eab0a7c7e64ef2fced7dae11857711 Mon Sep 17 00:00:00 2001
From: zhenghuang <236220500@qq.com>
Date: Tue, 26 May 2020 09:24:00 +0800
Subject: [PATCH] 1

---
 src/pages/activity/ActivityPlan.vue       |   1 +
 src/pages/activity/useActivityStepOne.vue | 133 +++++++++++++---------
 src/pages/activity/useTable.vue           | 114 +++++++++----------
 3 files changed, 132 insertions(+), 116 deletions(-)

diff --git a/src/pages/activity/ActivityPlan.vue b/src/pages/activity/ActivityPlan.vue
index ac0000b..6dcc911 100644
--- a/src/pages/activity/ActivityPlan.vue
+++ b/src/pages/activity/ActivityPlan.vue
@@ -77,6 +77,7 @@
     <useTable ref="useTable"
               @doShow="doShow"
               :show="showUse"
+              :isModify="true"
               :schedule="activityInstance.scheduleVO"></useTable>
   </div>
 </template>
diff --git a/src/pages/activity/useActivityStepOne.vue b/src/pages/activity/useActivityStepOne.vue
index 9198eb4..f8d5fd0 100644
--- a/src/pages/activity/useActivityStepOne.vue
+++ b/src/pages/activity/useActivityStepOne.vue
@@ -1,67 +1,91 @@
 <template>
   <div>
-    <Form
-      ref="formValidate"
-      :model="formValidate"
-      :rules="ruleValidate"
-      :label-width="80"
-    >
+    <Form ref="formValidate"
+          :model="formValidate"
+          :rules="ruleValidate"
+          :label-width="80">
       <Row>
-        <i-col span="20" offset="2">
-          <FormItem label="活动名称" prop="name">
+        <i-col span="20"
+               offset="2">
+          <FormItem label="活动名称"
+                    prop="name">
             <div>
-              <i-input
-                disabled
-                type="text"
-                v-model="schedule.name"
-                placeholder
-              ></i-input>
+              <i-input disabled
+                       type="text"
+                       v-model="schedule.name"
+                       placeholder></i-input>
             </div>
           </FormItem>
           <div class="dateClass">
-            <Form-item label="活动时间" prop="activityStartDate">
-              <Date-picker
-                @on-change="storeStartDate"
-                type="date"
-                v-model="formValidate.beginTime"
-                format="yyyy-MM-dd"
-                placeholder="请选择开始日期"
-                style="width: 200px"
-              ></Date-picker>
+            <Form-item label="活动时间"
+                       prop="activityStartDate">
+              <Date-picker @on-change="storeStartDate"
+                           type="date"
+                           v-if="isModify"
+                           disabled
+                           v-model="formValidate.beginTime"
+                           format="yyyy-MM-dd"
+                           placeholder="请选择开始日期"
+                           style="width: 200px"></Date-picker>
+              <Date-picker @on-change="storeStartDate"
+                           type="date"
+                           v-else
+                           v-model="formValidate.beginTime"
+                           format="yyyy-MM-dd"
+                           placeholder="请选择开始日期"
+                           style="width: 200px"></Date-picker>
             </Form-item>
             <div class="text">至</div>
-            <Form-item label prop="activityEndDate">
-              <Date-picker
-                @on-change="storeEndDate"
-                type="date"
-                v-model="formValidate.endTime"
-                format="yyyy-MM-dd"
-                placeholder="请选择结束日期"
-                style="width: 200px"
-              ></Date-picker>
+            <Form-item label
+                       prop="activityEndDate">
+              <Date-picker @on-change="storeEndDate"
+                           type="date"
+                           v-if="isModify"
+                           disabled
+                           v-model="formValidate.endTime"
+                           format="yyyy-MM-dd"
+                           placeholder="请选择结束日期"
+                           style="width: 200px"></Date-picker>
+              <Date-picker @on-change="storeEndDate"
+                           type="date"
+                           v-else
+                           v-model="formValidate.endTime"
+                           format="yyyy-MM-dd"
+                           placeholder="请选择结束日期"
+                           style="width: 200px"></Date-picker>
             </Form-item>
           </div>
-          <FormItem label="活动类型" prop="activityStyle">
-            <RadioGroup
-              @on-change="onChange"
-              v-model="formValidate.activityStyle"
-              vertical
-            >
-              <Radio
-                :border="true"
-                v-for="(item, index) in schedule.params"
-                :key="index"
-                :label="item.id"
-                style="margin-bottom: 10px"
-              >
+          <FormItem label="活动类型"
+                    prop="activityStyle">
+            <RadioGroup @on-change="onChange"
+                        v-model="formValidate.activityStyle"
+                        vertical>
+              <Radio :border="true"
+                     v-for="(item, index) in schedule.params"
+                     :key="index"
+                     :label="item.id"
+                     v-if="isModify"
+                     disabled
+                     style="margin-bottom: 10px">
                 <Icon type="social-apple"></Icon>
-                <span
-                  >{{
+                <span>{{
                     item.name
                   }}&nbsp;&nbsp;&nbsp;&nbsp;----&nbsp;&nbsp;&nbsp;&nbsp;{{
                     item.key
-                  }}</span
-                >
+                  }}</span>
+              </Radio>
+              <Radio :border="true"
+                     v-for="(item, index) in schedule.params"
+                     :key="index"
+                     :label="item.id"
+                     v-else
+                     style="margin-bottom: 10px">
+                <Icon type="social-apple"></Icon>
+                <span>{{
+                    item.name
+                  }}&nbsp;&nbsp;&nbsp;&nbsp;----&nbsp;&nbsp;&nbsp;&nbsp;{{
+                    item.key
+                  }}</span>
               </Radio>
             </RadioGroup>
           </FormItem>
@@ -76,7 +100,7 @@ import { mapGetters } from "vuex";
 
 export default {
   name: "useActivityStepOne",
-  data() {
+  data () {
     return {
       formValidate: store.getters.useData,
       ruleValidate: {
@@ -105,8 +129,9 @@ export default {
   },
   props: {
     schedule: Object,
+    isModify: Boolean
   },
-  created() {
+  created () {
     let _this = this;
     this.formValidate = store.getters.useData;
     this.formValidate.activityStyle = "";
@@ -118,7 +143,7 @@ export default {
     console.log(22, this.formValidate);
   },
   methods: {
-    onChange(e) {
+    onChange (e) {
       let _this = this;
       this.formValidate.activityStyle = e;
       let type = {};
@@ -129,10 +154,10 @@ export default {
       });
       store.getters.useData.params = [type];
     },
-    storeStartDate(date) {
+    storeStartDate (date) {
       store.getters.useData.beginTime = date;
     },
-    storeEndDate(date) {
+    storeEndDate (date) {
       store.getters.useData.endTime = date;
     },
   },
diff --git a/src/pages/activity/useTable.vue b/src/pages/activity/useTable.vue
index 5f4fb2c..59faf2c 100644
--- a/src/pages/activity/useTable.vue
+++ b/src/pages/activity/useTable.vue
@@ -1,60 +1,49 @@
 <template>
   <div class="use_box">
-    <Modal
-      :scrollable="false"
-      v-model="showUse"
-      title="使用活动"
-      @on-cancel="cancel"
-      :loading="true"
-      width="70%"
-    >
-      <Steps style="padding: 40px;" :current="currentStep">
+    <Modal :scrollable="false"
+           v-model="showUse"
+           title="使用活动"
+           @on-cancel="cancel"
+           :loading="true"
+           width="70%">
+      <Steps style="padding: 40px;"
+             :current="currentStep">
         <Step title="基本信息"></Step>
-        <Step title="选择零售公司" content></Step>
-        <Step title="选择店铺" content></Step>
-        <Step title="确认信息" content></Step>
+        <Step :title="isModify ? '修改零售公司' : '选择零售公司'"
+              content></Step>
+        <Step :title="isModify ? '修改店铺' : '选择店铺'"
+              content></Step>
+        <Step title="确认信息"
+              content></Step>
       </Steps>
-      <useActivityStepOne
-        :schedule="schedule"
-        v-if="currentStep == 0 && show"
-      ></useActivityStepOne>
-      <useActivityStepTwo
-        :schedule="schedule"
-        v-if="currentStep == 1"
-      ></useActivityStepTwo>
-      <useActivityStepThree
-        :schedule="schedule"
-        v-if="currentStep == 2"
-      ></useActivityStepThree>
-      <useActivityStepFoure
-        :schedule="schedule"
-        v-if="currentStep == 3"
-      ></useActivityStepFoure>
+      <useActivityStepOne :schedule="schedule"
+                          :isModify="isModify"
+                          v-if="currentStep == 0 && show"></useActivityStepOne>
+      <useActivityStepTwo :schedule="schedule"
+                          :isModify="isModify"
+                          v-if="currentStep == 1"></useActivityStepTwo>
+      <useActivityStepThree :schedule="schedule"
+                            :isModify="isModify"
+                            v-if="currentStep == 2"></useActivityStepThree>
+      <useActivityStepFoure :schedule="schedule"
+                            :isModify="isModify"
+                            v-if="currentStep == 3"></useActivityStepFoure>
       <div slot="footer">
-        <Button
-          v-if="currentStep !== 0"
-          type="primary"
-          shape="circle"
-          :loading="modal_loading"
-          @click="back"
-          >上一步</Button
-        >
-        <Button
-          v-if="currentStep !== 3"
-          type="primary"
-          shape="circle"
-          :loading="modal_loading"
-          @click="next"
-          >下一步</Button
-        >
-        <Button
-          v-if="currentStep == 3"
-          type="primary"
-          shape="circle"
-          :loading="modal_loading"
-          @click="finish"
-          >完成</Button
-        >
+        <Button v-if="currentStep !== 0"
+                type="primary"
+                shape="circle"
+                :loading="modal_loading"
+                @click="back">上一步</Button>
+        <Button v-if="currentStep !== 3"
+                type="primary"
+                shape="circle"
+                :loading="modal_loading"
+                @click="next">下一步</Button>
+        <Button v-if="currentStep == 3"
+                type="primary"
+                shape="circle"
+                :loading="modal_loading"
+                @click="finish">完成</Button>
       </div>
     </Modal>
   </div>
@@ -74,7 +63,7 @@ export default {
     useActivityStepThree,
     useActivityStepFoure,
   },
-  data() {
+  data () {
     return {
       currentStep: 0,
       modal_loading: false,
@@ -85,28 +74,29 @@ export default {
     id: String,
     schedule: Object,
     show: Boolean,
+    isModify: Boolean
   },
   watch: {
-    show() {
+    show () {
       this.showUse = this.show;
     },
-    schedule() {
+    schedule () {
       store.getters.useData.scheduleId = this.schedule.id;
     },
   },
-  mounted() {},
+  mounted () { },
   methods: {
-    cancel() {
+    cancel () {
       this.currentStep = 0;
     },
-    cancel() {
+    cancel () {
       store.commit("RSET_useData");
       this.$emit("doShow", false);
       this.modal_loading = false;
       this.showUse = false;
       this.currentStep = 0;
     },
-    next() {
+    next () {
       let data = store.getters.useData;
       data.name = this.schedule.name;
       if (this.currentStep === 0) {
@@ -142,15 +132,15 @@ export default {
       store.commit("SET_useData", data);
       this.currentStep = this.currentStep + 1;
     },
-    back() {
+    back () {
       this.currentStep = this.currentStep - 1;
     },
-    finish() {
+    finish () {
       let that = this;
       let data = store.getters.useData;
       data.isGetActivityInfo = true;
       this.modal_loading = true;
-      ActivityManager.saveActivityData(store.getters.useData, function(data) {
+      ActivityManager.saveActivityData(store.getters.useData, function (data) {
         store.commit("RSET_useData");
         that.$emit("doShow", false);
         that.$router.push("/activity/plan");