diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue index 26fae65a0..fd3a8692a 100644 --- a/src/views/modules/communityParty/calendar/index.vue +++ b/src/views/modules/communityParty/calendar/index.vue @@ -140,7 +140,8 @@
生成年度活动计划 + @click="handleAddYearPlan" + style="padding-left:10px; padding-right:10px;">生成年度活动计划
@@ -725,9 +727,9 @@ $red: #f33; text-align: center; border-radius: 8px; line-height: 66px; - color:#666666; + color: #666666; font-size: 14px; - font-weight:bold; + font-weight: bold; cursor: pointer; } } @@ -790,17 +792,16 @@ $red: #f33; cursor: pointer; color: #666666; - &:hover { .all-list { transform: scale(1); - background:#f3ca7e; - color:#333333; - font-size:14px; - border:1px #ffCC00 solid; - border-radius:5px; - line-height:20px; - z-index:9999; + background: #f3ca7e; + color: #333333; + font-size: 14px; + border: 1px #ffcc00 solid; + border-radius: 5px; + line-height: 20px; + z-index: 9999; } } .tip-num { @@ -817,11 +818,11 @@ $red: #f33; text-align: center; color: #ffffff; background-color: #ff3300; - border:#ffffff 2px solid; + border: #ffffff 2px solid; } .z-on { color: $red; - font-weight:bold; + font-weight: bold; } .tip-text { @include toe; @@ -845,7 +846,6 @@ $red: #f33; display: block; width: 26px; height: 26px; - } } @@ -859,12 +859,12 @@ $red: #f33; &:hover { .all-list { transform: scale(1); - background:#f3ca7e; - color:#333333; - font-size:14px; - border:1px #ffCC00 solid; - border-radius:5px; - line-height:20px; + background: #f3ca7e; + color: #333333; + font-size: 14px; + border: 1px #ffcc00 solid; + border-radius: 5px; + line-height: 20px; } } .corn-num { @@ -878,11 +878,11 @@ $red: #f33; line-height: 20px; text-align: center; font-size: 12px; - font-weight:bold; + font-weight: bold; text-align: center; color: #ffffff; - background-color: #F56C6C; - border:#ffffff 2px solid; + background-color: #f56c6c; + border: #ffffff 2px solid; } .corn-text { position: relative; @@ -902,8 +902,8 @@ $red: #f33; right: 0; width: 0px; height: 0; - border-top: 25px solid #E60000; - border-right: 28px solid #E60000; + border-top: 25px solid #e60000; + border-right: 28px solid #e60000; border-bottom: 25px solid transparent; border-left: 28px solid transparent; } diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue index 2a8339787..13cd011a9 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue @@ -271,6 +271,8 @@ export default { components: {}, async mounted () { this.startLoading() + + await this.getCategrayList() await this.getAutoTimeArray() await this.getOrgTreeList() @@ -282,13 +284,21 @@ export default { } else { this.$refs.ref_form.resetFields(); } + if (this.defaultTime) { + console.log('this.defaultTime', this.defaultTime) + let year = this.defaultTime.substring(0, 4) + let month = this.defaultTime.substring(4, 6) + let day = this.defaultTime.substring(6, 8) + this.formData.holdTime = year + '-' + month + '-' + day + ' 09:00:00' + + } this.endLoading() }, methods: { - getFormatDate() { + getFormatDate () { var date = new Date(); var month = date.getMonth() + 1; var strDate = date.getDate(); @@ -299,7 +309,7 @@ export default { strDate = "0" + strDate; } var currentDate = date.getFullYear() + "-" + month + "-" + strDate - + " " + '09:00:00'; + + " " + '09:00:00'; return currentDate; }, handleChangeScope (value) { @@ -740,6 +750,10 @@ export default { type: String, required: '' }, + defaultTime: { + type: String, + required: '' + }, } }