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

@@ -364,11 +364,13 @@ export default {
       console.log("orgId", val);
       this.getCurrentDateData();
       this.getRangeData();
+      this.getMonthData();
     },
     "fmData.isSelf": function (val) {
       console.log("isSelf", val);
       this.getCurrentDateData();
       this.getRangeData();
+      this.getMonthData();
     },
     currentYear: function (val) {
       console.log("watch--currentYear", val);

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

@@ -220,7 +220,7 @@ export default {
         actType: '',//	活动类型，来源于活动类型接口value	
         holdYearId: '',//活动开始时间所属年份：yyyy	
         holdMonthId: '',//活动开始时间所属月份：yyyyMM	
-        holdTime: new Date(),//活动开始时间：yyyy-MM-dd HH:mm:ss
+        holdTime: this.getFormatDate(),//活动开始时间：yyyy-MM-dd HH:mm:ss
         topic: '',//	活动主题	
         address: '',//	活动地址	
         latitude: '',//活动地点纬度	
@@ -288,7 +288,20 @@ export default {
   },
 
   methods: {
-
+    getFormatDate() {
+      var date = new Date();
+      var month = date.getMonth() + 1;
+      var strDate = date.getDate();
+      if (month >= 1 && month <= 9) {
+        month = "0" + month;
+      }
+      if (strDate >= 0 && strDate <= 9) {
+        strDate = "0" + strDate;
+      }
+      var currentDate = date.getFullYear() + "-" + month + "-" + strDate
+              + " " + '09:00:00';
+      return currentDate;
+    },
     handleChangeScope (value) {
 
       let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
@@ -360,7 +373,9 @@ export default {
         this.formData.isAutoInform = '0'
       }
       this.formData.attachmentList = [...this.fileList]
-
+      let array = this.formData.holdTime.split('-')
+      this.formData.holdYearId = array[0]
+      this.formData.holdMonthId = array[0] + array[1]
 
       if (this.formType === 'add') {
         this.formData.icPartyActId = ''

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

@@ -60,6 +60,7 @@
                               format="yyyy-MM-dd hh:mm:ss"
                               value-format="yyyy-MM-dd hh:mm:ss"
                               type="datetime"
+                              :default-value="yearId"
                               default-time="09:00:00"
                               placeholder="选择日期">
               </el-date-picker>
@@ -292,7 +293,6 @@ export default {
     await this.getCategrayList()
     await this.getAutoTimeArray()
     await this.getDefaultPublishParty()
-
   },
 
   methods: {
@@ -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[0].value || '',//参加人员类型，0：全体党员；1：支部委员 默认 全体
+        joinUserType: this.joinArray[1].value || '',//参加人员类型，0：全体党员；1：支部委员 默认 全体
         isAutoInform: '',//	是否自动通知参加人员，0否；1是
         introduce: '',//	活动介绍
         attachmentList: [],