Merge remote-tracking branch 'origin/dev-calendar' into dev-calendar

src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue

@@ -31,6 +31,18 @@
                       style="display: block"
                       prop="happenedTime"
                       label-width="150px">
+          <el-date-picker v-model="formData.happenedTime"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          format="yyyy-MM-dd"
+                          type="date"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="日程时间"
+                      style="display: block"
+                      prop="remindTime"
+                      label-width="150px">
           <el-date-picker v-model="formData.happenedTime"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           format="yyyy-MM-dd HH:mm:ss"
@@ -104,7 +116,7 @@ export default {
         isPublic: '',//
         remark: '',//
         scheduleId: '',
-
+        happenedTime: ''
       },
 
 

src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue

@@ -7,7 +7,7 @@
                  ref="ref_searchform"
                  :label-width="'80px'">
           <div>
-            <el-form-item label="提醒时间"
+            <el-form-item label="日程时间"
                           prop="startTime">
               <el-date-picker v-model="formData.startTime"
                               class="item_width_2"
@@ -106,6 +106,13 @@
 
           <el-table-column prop="remindTime"
                            label="提醒时间"
+                           :formatter="yyyy-MM-dd"
+                           align="center"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+
+          <el-table-column prop="happenedTime"
+                           label="日程时间"
                            align="center"
                            :show-overflow-tooltip="true">
           </el-table-column>
@@ -225,6 +232,17 @@
                       prop="remindTime"
                       label-width="150px">
           <el-date-picker v-model="scFormData.remindTime"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          format="yyy-MM-dd"
+                          type="date"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="日程时间"
+                      style="display: block"
+                      prop="happenedTime"
+                      label-width="150px">
+          <el-date-picker v-model="scFormData.happenedTime"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           format="yyyy-MM-dd HH:mm:ss"
                           type="datetime"
@@ -322,6 +340,7 @@ export default {
       scFormData: {
         title: '',
         remindTime: '',
+        happenedTime: '',
         remark: '',
         scheduleId: '',
         isPublic: ''
@@ -366,6 +385,9 @@ export default {
         remindTime: [
           { required: true, message: '提醒时间不能为空', trigger: 'change' }
         ],
+        happenedTime: [
+          { required: true, message: '日程时间不能为空', trigger: 'change' }
+        ],
         isPublic: [
           { required: true, message: '是否公开不能为空', trigger: 'change' }
         ],