页面修改

src/components/tradePavilion/tradeactivityList.vue

@@ -31,9 +31,17 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="StartTimeStr" label="开始时间">
+          <el-table-column prop="StartTimeStr" label="活动时间">
+            <template slot-scope="scope">
+              <span>{{scope.row.StartTimeStr}}</span><br/>
+              <span>{{scope.row.EndTimeStr}}</span>
+            </template>
           </el-table-column>
-          <el-table-column prop="EndTimeStr" label="结束时间">
+          <el-table-column prop="SignStartTimeStr" label="报名时间">
+            <template slot-scope="scope">
+              <span>{{scope.row.SignStartTimeStr}}</span><br/>
+              <span>{{scope.row.SignEndTimeStr}}</span>
+            </template>
           </el-table-column>
           <el-table-column prop="ActivityStatusStr" label="活动状态">
           </el-table-column>
@@ -73,13 +81,21 @@
             <el-input type="text" class="w400" v-model="addMsg.ActivityName" size="small"></el-input>
           </el-form-item>
           <el-form-item label="开始时间" class="is-required" prop="StartTime">
-            <el-date-picker class="w300" :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd"
-              v-model="addMsg.StartTime" type="date" size="small" placeholder="开始时间">
+            <el-date-picker class="w300" value-format="yyyy-MM-dd" v-model="addMsg.StartTime" type="date" size="small"
+              placeholder="开始时间">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="结束时间" class="is-required" prop="EndTime">
-            <el-date-picker class="w300" :picker-options="pickerBeginDateAfter" v-model="addMsg.EndTime" type="date"
-              size="small" placeholder="结束时间">
+            <el-date-picker class="w300" v-model="addMsg.EndTime" type="date" size="small" placeholder="结束时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="报名开始时间" class="is-required" prop="SignStartTime">
+            <el-date-picker class="w300" v-model="addMsg.SignStartTime" type="datetime" size="small"
+              placeholder="报名开始时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="报名截止时间" class="is-required" prop="SignEndTime">
+            <el-date-picker class="w300" v-model="addMsg.SignEndTime" type="datetime" size="small" placeholder="报名截止时间">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="活动类型" class="is-required" prop="ActivityType">
@@ -156,6 +172,8 @@
           CoverImg: "", //封面图
           ActivityType: 0, //活动类型
           ActivityInfo: "", //活动详情
+          SignStartTime: "", //报名开始时间
+          SignEndTime: "", //报名截止时间
         },
         activityTypeList: [], //活动类型列表
         dialogTableVisible: false, //是否显示弹窗
@@ -193,11 +211,27 @@
             }
           }
         },
+        pickerSignBeginDateBefore: {
+          disabledDate: time => {
+            if (this.addMsg.SignEndTime == null) {
+              return false;
+            } else {
+              let endTime = new Date(this.addMsg.SignEndTime)
+              return endTime.getTime() < time.getTime()
+            }
+          }
+        },
         pickerBeginDateAfter: {
           disabledDate: time => {
             let startTime = new Date(this.addMsg.StartTime)
             return startTime.getTime() >= time.getTime()
           }
+        },
+        pickerSignBeginDateAfter: {
+          disabledDate: time => {
+            let startTime = new Date(this.addMsg.SignStartTime)
+            return startTime.getTime() >= time.getTime()
+          }
         }
       };
     },
@@ -226,6 +260,8 @@
         this.addMsg.CoverImg = "";
         this.addMsg.ActivityType = 0;
         this.addMsg.ActivityInfo = "";
+        this.addMsg.SignStartTime = '';
+        this.addMsg.SignEndTime = '';
       },
       SelectId(msg) {
         let url = this.getIconLink(msg.url)
@@ -259,6 +295,8 @@
             this.addMsg.ActivityName = tempData.ActivityName;
             this.addMsg.StartTime = tempData.StartTimeStr;
             this.addMsg.EndTime = tempData.EndTimeStr;
+            this.addMsg.SignStartTime = tempData.SignStartTimeStr;
+            this.addMsg.SignEndTime = tempData.SignEndTimeStr;
             this.addMsg.CoverImg = tempData.CoverImg;
             this.addMsg.ActivityType = tempData.ActivityType;
             this.addMsg.ActivityInfo = tempData.ActivityInfo;