Merge branch 'dev-calendar' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-calendar

src/views/modules/communityParty/calendar/index.vue

@@ -68,7 +68,7 @@
                              @click="handleClickHuodong('publish', item)">发布</el-button>
                   <el-button type="success"
                              size="mini"
-                             @click="handleClickHuodong('edit', item)">编辑</el-button>
+                             @click="handleClickHuodong('edit', item)">修改</el-button>
                   <el-button size="mini"
                              @click="handleClickHuodong('del', item)">删除</el-button>
                 </div>
@@ -80,6 +80,10 @@
                 <div class="item-title">
                   {{ item.title }}
                 </div>
+                <div class="item-prop">
+                  <span>日程时间：</span>
+                  <span>{{ item.happenedTime }}</span>
+                </div>
                 <div class="item-prop">
                   <span>提醒时间：</span>
                   <span>{{ item.remindTime }}</span>
@@ -91,7 +95,7 @@
                 <div class="item-ope">
                   <el-button type="success"
                              size="mini"
-                             @click="handleClickRicheng('edit', item)">编辑</el-button>
+                             @click="handleClickRicheng('edit', item)">修改</el-button>
                   <el-button size="mini"
                              @click="handleClickRicheng('del', item)">删除</el-button>
                 </div>
@@ -212,6 +216,10 @@
                       <div class="item-title">
                         {{ item.title }}
                       </div>
+                      <div class="item-prop">
+                        <span>日程时间：</span>
+                        <span>{{ item.happenedTime }}</span>
+                      </div>
                       <div class="item-prop">
                         <span>提醒时间：</span>
                         <span>{{ item.remindTime }}</span>

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

@@ -325,11 +325,11 @@ export default {
       ],
 
       formData: {
-        publishPartyOrgId: '',//发布活动党组织；所属党组织	
+        publishPartyOrgId: '',//发布活动党组织；所属党组织
         actType: '',//活动类型
-        startDate: '',//活动开始时间20220817	
-        endDate: '',//活动结束时间20220817	
-        isPublish: '',//活动状态。0未完成；1:已完成	
+        startDate: '',//活动开始时间20220817
+        endDate: '',//活动结束时间20220817
+        isPublish: '',//活动状态。0未完成；1:已完成
         address: '',
         topic: '',
 
@@ -717,10 +717,10 @@ export default {
     resetSearch () {
       this.agencyIdArray = []
       this.formData = {
-        publishPartyOrgId: '',//发布活动党组织；所属党组织	
+        publishPartyOrgId: '',//发布活动党组织；所属党组织
         actType: '',//活动类型
-        startDate: '',//活动开始时间20220817	
-        endDate: '',//活动结束时间20220817	
+        startDate: '',//活动开始时间20220817
+        endDate: '',//活动结束时间20220817
         isPublish: '',//活动状态。
         address: '',
         topic: '',
@@ -728,7 +728,7 @@ export default {
 
 
       this.pageNo = 1
-      // this.getTableData()
+      this.getTableData()
     },
   },
 };

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

@@ -569,7 +569,7 @@ export default {
         publishOrgPid: this.defaultPublishParty.defaultPartyOrgPid,//	参加活动党组织ID的上级节点
         publishOrgType: this.defaultPublishParty.orgType,//党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组
         publishOrgPathShow: this.defaultPublishParty.defaultPartyOrgPath,//PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显
-        joinUserType: this.joinArray[1].value || '',//参加人员类型，0：全体党员；1：支部委员 默认 全体
+        joinUserType: this.actType === 'zbwyh' ? this.joinArray[1].value || '' :  this.joinArray[0].value || '',//参加人员类型，0：全体党员；1：支部委员 默认 全体
         isAutoInform: '',//	是否自动通知参加人员，0否；1是
         introduce: '',//	活动介绍
         attachmentList: [],

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

@@ -17,14 +17,24 @@
                     v-model="formData.title">
           </el-input>
         </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"
+                          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.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>
@@ -93,7 +103,7 @@ export default {
         isPublic: '',//
         remark: '',//
         scheduleId: '',
-
+        happenedTime: ''
       },
 
 
@@ -184,6 +194,7 @@ export default {
 
         ...this.formData
       }
+      //params.happenedTime = this.formData+" 08:00:00"
 
       const { data, code, msg } = await requestPost(url, params)
 
@@ -241,6 +252,9 @@ export default {
         remindTime: [
           { required: true, message: '提醒时间不能为空', trigger: 'change' }
         ],
+        happenedTime: [
+          { required: true, message: '日程时间不能为空', trigger: 'change' }
+        ],
         isPublic: [
           { required: true, message: '是否公开不能为空', trigger: 'change' }
         ],

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"
@@ -104,8 +104,15 @@
                            :show-overflow-tooltip="true">
           </el-table-column>
 
-          <el-table-column prop="remindTime"
+          <el-table-column prop="happenedTime"
+                           label="日程时间"
+                           align="center"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+
+          <el-table-column prop="remindTimeName"
                            label="提醒时间"
+                           :formatter="yyyy-MM-dd"
                            align="center"
                            :show-overflow-tooltip="true">
           </el-table-column>
@@ -220,14 +227,25 @@
                     v-model="scFormData.title">
           </el-input>
         </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"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="提醒时间"
                       style="display: block"
                       prop="remindTime"
                       label-width="150px">
           <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>
@@ -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' }
         ],