From ea49bf8520ac187b2f34700c72fce517829198ff Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 2 Sep 2022 17:21:31 +0800
Subject: [PATCH] ai

---
 .../modules/communityParty/calendar/index.vue | 16 +++++-----
 .../activivityList/scheduleForm.vue           | 19 ++----------
 .../activivityList/scheduleList.vue           | 30 +++++++++----------
 3 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue
index 4be21c067..26fae65a0 100644
--- a/src/views/modules/communityParty/calendar/index.vue
+++ b/src/views/modules/communityParty/calendar/index.vue
@@ -80,14 +80,14 @@
                 <div class="item-title">
                   {{ item.title }}
                 </div>
-                <div class="item-prop">
-                  <span>提醒时间：</span>
-                  <span>{{ item.remindTime }}</span>
-                </div>
                 <div class="item-prop">
                   <span>日程时间：</span>
                   <span>{{ item.happenedTime }}</span>
                 </div>
+                <div class="item-prop">
+                  <span>提醒时间：</span>
+                  <span>{{ item.remindTime }}</span>
+                </div>
                 <div class="item-prop">
                   <span>备注说明：</span>
                   <span>{{ item.remark }}</span>
@@ -216,14 +216,14 @@
                       <div class="item-title">
                         {{ item.title }}
                       </div>
-                      <div class="item-prop">
-                        <span>提醒时间：</span>
-                        <span>{{ item.remindTime }}</span>
-                      </div>
                       <div class="item-prop">
                         <span>日程时间：</span>
                         <span>{{ item.happenedTime }}</span>
                       </div>
+                      <div class="item-prop">
+                        <span>提醒时间：</span>
+                        <span>{{ item.remindTime }}</span>
+                      </div>
                       <div class="item-prop">
                         <span>备注说明：</span>
                         <span>{{ item.remark }}</span>
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
index 3d95615d4..ed023e7b5 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
@@ -17,16 +17,6 @@
                     v-model="formData.title">
           </el-input>
         </el-form-item>
-        <el-form-item label="提醒时间"
-                      style="display: block"
-                      prop="remindTime"
-                      label-width="150px">
-          <el-date-picker v-model="formData.remindTime"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          format="yyyy-MM-dd"
-                          placeholder="选择时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="日程时间"
                       style="display: block"
                       prop="happenedTime"
@@ -38,15 +28,13 @@
                           placeholder="选择时间">
           </el-date-picker>
         </el-form-item>
-
-        <el-form-item label="日程时间"
+        <el-form-item label="提醒时间"
                       style="display: block"
                       prop="remindTime"
                       label-width="150px">
-          <el-date-picker v-model="formData.happenedTime"
+          <el-date-picker v-model="formData.remindTime"
                           value-format="yyyy-MM-dd HH:mm:ss"
-                          format="yyyy-MM-dd HH:mm:ss"
-                          type="datetime"
+                          format="yyyy-MM-dd"
                           placeholder="选择时间">
           </el-date-picker>
         </el-form-item>
@@ -112,7 +100,6 @@ export default {
       formData: {
         title: '',//
         remindTime: '',//
-        happenedTime:new Date(),
         isPublic: '',//
         remark: '',//
         scheduleId: '',
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue b/src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue
index 6f21537e2..85e50aff0 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue
@@ -104,15 +104,15 @@
                            :show-overflow-tooltip="true">
           </el-table-column>
 
-          <el-table-column prop="remindTimeName"
-                           label="提醒时间"
-                           :formatter="yyyy-MM-dd"
+          <el-table-column prop="happenedTime"
+                           label="日程时间"
                            align="center"
                            :show-overflow-tooltip="true">
           </el-table-column>
 
-          <el-table-column prop="happenedTime"
-                           label="日程时间"
+          <el-table-column prop="remindTimeName"
+                           label="提醒时间"
+                           :formatter="yyyy-MM-dd"
                            align="center"
                            :show-overflow-tooltip="true">
           </el-table-column>
@@ -227,25 +227,25 @@
                     v-model="scFormData.title">
           </el-input>
         </el-form-item>
-        <el-form-item label="提醒时间"
+        <el-form-item label="日程时间"
                       style="display: block"
-                      prop="remindTime"
+                      prop="happenedTime"
                       label-width="150px">
-          <el-date-picker v-model="scFormData.remindTime"
+          <el-date-picker v-model="scFormData.happenedTime"
                           value-format="yyyy-MM-dd HH:mm:ss"
-                          format="yyyy-MM-dd"
-                          type="date"
+                          format="yyyy-MM-dd HH:mm:ss"
+                          type="datetime"
                           placeholder="选择时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="日程时间"
+        <el-form-item label="提醒时间"
                       style="display: block"
-                      prop="happenedTime"
+                      prop="remindTime"
                       label-width="150px">
-          <el-date-picker v-model="scFormData.happenedTime"
+          <el-date-picker v-model="scFormData.remindTime"
                           value-format="yyyy-MM-dd HH:mm:ss"
-                          format="yyyy-MM-dd HH:mm:ss"
-                          type="datetime"
+                          format="yyyy-MM-dd"
+                          type="date"
                           placeholder="选择时间">
           </el-date-picker>
         </el-form-item>