From 3ec33be54b4becd08a6af65d635fb9ee06c16fbb Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 2 Sep 2022 15:35:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E7=A8=8B=E6=B7=BB=E5=8A=A0=20?=
 =?UTF-8?q?=E6=97=A5=E7=A8=8B=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/calendar/index.vue     |  8 ++++++++
 .../orgActivity/activivityList/addActivity.vue    |  2 +-
 .../orgActivity/activivityList/scheduleForm.vue   | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue
index df64d6e1d..223fcd88f 100644
--- a/src/views/modules/communityParty/calendar/index.vue
+++ b/src/views/modules/communityParty/calendar/index.vue
@@ -84,6 +84,10 @@
                   <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.remark }}</span>
@@ -216,6 +220,10 @@
                         <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.remark }}</span>
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
index 659d50320..acf077b85 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
@@ -299,7 +299,7 @@ export default {
         strDate = "0" + strDate;
       }
       var currentDate = date.getFullYear() + "-" + month + "-" + strDate
-              + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
+              + " " + '09:00:00';
       return currentDate;
     },
     handleChangeScope (value) {
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
index ad1f5c561..dc04a5b22 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
@@ -22,6 +22,16 @@
                       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"
+                      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"
                           type="datetime"
@@ -90,6 +100,7 @@ export default {
       formData: {
         title: '',//
         remindTime: '',//
+        happenedTime:'',
         isPublic: '',//
         remark: '',//
         scheduleId: '',
@@ -184,6 +195,7 @@ export default {
 
         ...this.formData
       }
+      //params.happenedTime = this.formData+" 08:00:00"
 
       const { data, code, msg } = await requestPost(url, params)
 
@@ -241,6 +253,9 @@ export default {
         remindTime: [
           { required: true, message: '提醒时间不能为空', trigger: 'change' }
         ],
+        happenedTime: [
+          { required: true, message: '日程时间不能为空', trigger: 'change' }
+        ],
         isPublic: [
           { required: true, message: '是否公开不能为空', trigger: 'change' }
         ],