1

src/pages/activity/ActivityPlan.vue

@@ -77,6 +77,7 @@
     <useTable ref="useTable"
               @doShow="doShow"
               :show="showUse"
+              :isModify="true"
               :schedule="activityInstance.scheduleVO"></useTable>
   </div>
 </template>

src/pages/activity/useActivityStepOne.vue

@@ -1,67 +1,91 @@
 <template>
   <div>
-    <Form
+    <Form ref="formValidate"
-      ref="formValidate"
           :model="formValidate"
           :rules="ruleValidate"
-      :label-width="80"
+          :label-width="80">
-    >
       <Row>
-        <i-col span="20" offset="2">
+        <i-col span="20"
-          <FormItem label="活动名称" prop="name">
+               offset="2">
+          <FormItem label="活动名称"
+                    prop="name">
             <div>
-              <i-input
+              <i-input disabled
-                disabled
                        type="text"
                        v-model="schedule.name"
-                placeholder
+                       placeholder></i-input>
-              ></i-input>
             </div>
           </FormItem>
           <div class="dateClass">
-            <Form-item label="活动时间" prop="activityStartDate">
+            <Form-item label="活动时间"
-              <Date-picker
+                       prop="activityStartDate">
-                @on-change="storeStartDate"
+              <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"
+                           style="width: 200px"></Date-picker>
-              ></Date-picker>
             </Form-item>
             <div class="text">至</div>
-            <Form-item label prop="activityEndDate">
+            <Form-item label
-              <Date-picker
+                       prop="activityEndDate">
-                @on-change="storeEndDate"
+              <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"
+                           style="width: 200px"></Date-picker>
-              ></Date-picker>
             </Form-item>
           </div>
-          <FormItem label="活动类型" prop="activityStyle">
+          <FormItem label="活动类型"
-            <RadioGroup
+                    prop="activityStyle">
-              @on-change="onChange"
+            <RadioGroup @on-change="onChange"
                         v-model="formValidate.activityStyle"
-              vertical
+                        vertical>
-            >
+              <Radio :border="true"
-              <Radio
+                     v-for="(item, index) in schedule.params"
-                :border="true"
+                     :key="index"
+                     :label="item.id"
+                     v-if="isModify"
+                     disabled
+                     style="margin-bottom: 10px">
+                <Icon type="social-apple"></Icon>
+                <span>{{
+                    item.name
+                  }}&nbsp;&nbsp;&nbsp;&nbsp;----&nbsp;&nbsp;&nbsp;&nbsp;{{
+                    item.key
+                  }}</span>
+              </Radio>
+              <Radio :border="true"
                      v-for="(item, index) in schedule.params"
                      :key="index"
                      :label="item.id"
-                style="margin-bottom: 10px"
+                     v-else
-              >
+                     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>
             </RadioGroup>
           </FormItem>
@@ -105,6 +129,7 @@ export default {
   },
   props: {
     schedule: Object,
+    isModify: Boolean
   },
   created () {
     let _this = this;

src/pages/activity/useTable.vue

@@ -1,60 +1,49 @@
 <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="基本信息"></Step>
-        <Step title="选择零售公司" content></Step>
+        <Step :title="isModify ? '修改零售公司' : '选择零售公司'"
-        <Step title="选择店铺" content></Step>
+              content></Step>
-        <Step title="确认信息" content></Step>
+        <Step :title="isModify ? '修改店铺' : '选择店铺'"
+              content></Step>
+        <Step title="确认信息"
+              content></Step>
       </Steps>
-      <useActivityStepOne
+      <useActivityStepOne :schedule="schedule"
-        :schedule="schedule"
+                          :isModify="isModify"
-        v-if="currentStep == 0 && show"
+                          v-if="currentStep == 0 && show"></useActivityStepOne>
-      ></useActivityStepOne>
+      <useActivityStepTwo :schedule="schedule"
-      <useActivityStepTwo
+                          :isModify="isModify"
-        :schedule="schedule"
+                          v-if="currentStep == 1"></useActivityStepTwo>
-        v-if="currentStep == 1"
+      <useActivityStepThree :schedule="schedule"
-      ></useActivityStepTwo>
+                            :isModify="isModify"
-      <useActivityStepThree
+                            v-if="currentStep == 2"></useActivityStepThree>
-        :schedule="schedule"
+      <useActivityStepFoure :schedule="schedule"
-        v-if="currentStep == 2"
+                            :isModify="isModify"
-      ></useActivityStepThree>
+                            v-if="currentStep == 3"></useActivityStepFoure>
-      <useActivityStepFoure
-        :schedule="schedule"
-        v-if="currentStep == 3"
-      ></useActivityStepFoure>
       <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 !== 3"
-        >
-        <Button
-          v-if="currentStep !== 3"
                 type="primary"
                 shape="circle"
                 :loading="modal_loading"
-          @click="next"
+                @click="next">下一步</Button>
-          >下一步</Button
+        <Button v-if="currentStep == 3"
-        >
-        <Button
-          v-if="currentStep == 3"
                 type="primary"
                 shape="circle"
                 :loading="modal_loading"
-          @click="finish"
+                @click="finish">完成</Button>
-          >完成</Button
-        >
       </div>
     </Modal>
   </div>
@@ -85,6 +74,7 @@ export default {
     id: String,
     schedule: Object,
     show: Boolean,
+    isModify: Boolean
   },
   watch: {
     show () {