Browse Source

添加活动默认时间

test
jiangyy 3 years ago
parent
commit
11fe4cdd04
  1. 50
      src/views/modules/communityParty/calendar/index.vue
  2. 18
      src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue

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

@ -140,7 +140,8 @@
<div class="hd-btn"> <div class="hd-btn">
<el-button type="primary" <el-button type="primary"
size="big" size="big"
@click="handleAddYearPlan" style="padding-left:10px; padding-right:10px;">生成年度活动计划</el-button> @click="handleAddYearPlan"
style="padding-left:10px; padding-right:10px;">生成年度活动计划</el-button>
</div> </div>
</div> </div>
<calendar :currentYear="currentYear" <calendar :currentYear="currentYear"
@ -256,6 +257,7 @@
<add-activity ref="ref_add_form" <add-activity ref="ref_add_form"
:formType="formType" :formType="formType"
:icPartyActId="icPartyActId" :icPartyActId="icPartyActId"
:defaultTime="currentDate.dateId"
@handleOk="handleOk" @handleOk="handleOk"
@handleClose="handleClose"></add-activity> @handleClose="handleClose"></add-activity>
</el-dialog> </el-dialog>
@ -725,9 +727,9 @@ $red: #f33;
text-align: center; text-align: center;
border-radius: 8px; border-radius: 8px;
line-height: 66px; line-height: 66px;
color:#666666; color: #666666;
font-size: 14px; font-size: 14px;
font-weight:bold; font-weight: bold;
cursor: pointer; cursor: pointer;
} }
} }
@ -790,17 +792,16 @@ $red: #f33;
cursor: pointer; cursor: pointer;
color: #666666; color: #666666;
&:hover { &:hover {
.all-list { .all-list {
transform: scale(1); transform: scale(1);
background:#f3ca7e; background: #f3ca7e;
color:#333333; color: #333333;
font-size:14px; font-size: 14px;
border:1px #ffCC00 solid; border: 1px #ffcc00 solid;
border-radius:5px; border-radius: 5px;
line-height:20px; line-height: 20px;
z-index:9999; z-index: 9999;
} }
} }
.tip-num { .tip-num {
@ -817,11 +818,11 @@ $red: #f33;
text-align: center; text-align: center;
color: #ffffff; color: #ffffff;
background-color: #ff3300; background-color: #ff3300;
border:#ffffff 2px solid; border: #ffffff 2px solid;
} }
.z-on { .z-on {
color: $red; color: $red;
font-weight:bold; font-weight: bold;
} }
.tip-text { .tip-text {
@include toe; @include toe;
@ -845,7 +846,6 @@ $red: #f33;
display: block; display: block;
width: 26px; width: 26px;
height: 26px; height: 26px;
} }
} }
@ -859,12 +859,12 @@ $red: #f33;
&:hover { &:hover {
.all-list { .all-list {
transform: scale(1); transform: scale(1);
background:#f3ca7e; background: #f3ca7e;
color:#333333; color: #333333;
font-size:14px; font-size: 14px;
border:1px #ffCC00 solid; border: 1px #ffcc00 solid;
border-radius:5px; border-radius: 5px;
line-height:20px; line-height: 20px;
} }
} }
.corn-num { .corn-num {
@ -878,11 +878,11 @@ $red: #f33;
line-height: 20px; line-height: 20px;
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
font-weight:bold; font-weight: bold;
text-align: center; text-align: center;
color: #ffffff; color: #ffffff;
background-color: #F56C6C; background-color: #f56c6c;
border:#ffffff 2px solid; border: #ffffff 2px solid;
} }
.corn-text { .corn-text {
position: relative; position: relative;
@ -902,8 +902,8 @@ $red: #f33;
right: 0; right: 0;
width: 0px; width: 0px;
height: 0; height: 0;
border-top: 25px solid #E60000; border-top: 25px solid #e60000;
border-right: 28px solid #E60000; border-right: 28px solid #e60000;
border-bottom: 25px solid transparent; border-bottom: 25px solid transparent;
border-left: 28px solid transparent; border-left: 28px solid transparent;
} }

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

@ -271,6 +271,8 @@ export default {
components: {}, components: {},
async mounted () { async mounted () {
this.startLoading() this.startLoading()
await this.getCategrayList() await this.getCategrayList()
await this.getAutoTimeArray() await this.getAutoTimeArray()
await this.getOrgTreeList() await this.getOrgTreeList()
@ -282,13 +284,21 @@ export default {
} else { } else {
this.$refs.ref_form.resetFields(); 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() this.endLoading()
}, },
methods: { methods: {
getFormatDate() { getFormatDate () {
var date = new Date(); var date = new Date();
var month = date.getMonth() + 1; var month = date.getMonth() + 1;
var strDate = date.getDate(); var strDate = date.getDate();
@ -299,7 +309,7 @@ export default {
strDate = "0" + strDate; strDate = "0" + strDate;
} }
var currentDate = date.getFullYear() + "-" + month + "-" + strDate var currentDate = date.getFullYear() + "-" + month + "-" + strDate
+ " " + '09:00:00'; + " " + '09:00:00';
return currentDate; return currentDate;
}, },
handleChangeScope (value) { handleChangeScope (value) {
@ -740,6 +750,10 @@ export default {
type: String, type: String,
required: '' required: ''
}, },
defaultTime: {
type: String,
required: ''
},
} }
} }

Loading…
Cancel
Save