Browse Source

Merge branch 'dev-calendar' into dev

dev-用户反馈
jianjun 3 years ago
parent
commit
3ba79a4686
  1. 10
      src/views/modules/communityParty/calendar/index.vue
  2. 71
      src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
  3. 29
      src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
  4. 29
      src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
  5. 24
      src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue

10
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>
@ -364,11 +372,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);

71
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
@ -311,6 +324,8 @@ export default {
handleChangeJoinOrg (value) {
console.log('value', value)
console.log('joinIdArray', this.formData.joinIdArray)
this.formData.joinIdArray = []
this.formData.joinIdArray = value
this.formData.joinOrgList = []
let selArray = this.$refs["myCascader_join"].getCheckedNodes()
@ -358,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 = ''
@ -395,6 +412,14 @@ export default {
this.formData.publichIdArray = []
if (data.publishOrgPathShow) {
this.formData.publichIdArray = data.publishOrgPathShow.split(':')
} else {
let array = data.publishOrgPath.split(':')
array.forEach(element => {
if (this.isInTree(element)) {
this.formData.publichIdArray.push(element)
}
});
}
this.formData.joinIdArray = []
@ -402,12 +427,25 @@ export default {
data.joinOrgList.forEach(element => {
if (element.joinOrgPathShow) {
this.formData.joinIdArray.push(element.joinOrgPathShow.split(':'))
} else {
let array = element.joinOrgPath.split(':')
let joinIdTemp = []
array.forEach(element => {
if (this.isInTree(element)) {
joinIdTemp.push(element)
}
});
this.formData.joinIdArray.push(joinIdTemp)
}
this.formData.joinNames = this.formData.joinNames + element.joinOrgName + ','
});
console.log('info-joinIdArray', this.formData.joinIdArray)
if (this.formData.joinNames) {
this.formData.joinNames = this.formData.joinNames.substring(0, this.formData.joinNames.length - 1)
}
@ -420,6 +458,33 @@ export default {
}
},
//id
isInTree (id) {
let inTree = false
const fn = (obj) => {
if (Array.isArray(obj)) {
obj.forEach((item) => {
//
if (item.id === id) {
inTree = true
} else {
}
fn(item.children);
});
}
};
fn(this.publishOptions);
return inTree
},
//
async getCategrayList () {
const url = "/resi/partymember/icPartyAct/acttypelist"

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

@ -299,6 +299,21 @@ export default {
handleChangeScope (index) {
let obj = this.$refs["myCascader" + index].getCheckedNodes()[0].data
// if (obj) {
// this.tableData[index].publishPartyOrgId = obj.id//id
// this.tableData[index].publishPartyOrgName = obj.partyOrgName//
// this.tableData[index].publishOrgPid = obj.pid//ID
// this.tableData[index].publishOrgType = obj.partyOrgType// 0,1,2,3,4,56
// this.tableData[index].publishOrgPathShow = value.join(':')//PUBLISH_PARTY_ORG_ID便
// } else {
// this.tableData[index].publishPartyOrgId = ''
// this.tableData[index].publishPartyOrgName = ''
// this.tableData[index].publishOrgPid = ''
// this.tableData[index].publishOrgType = ''
// this.tableData[index].publishOrgPathShow = ''
// }
},
handleChangeJoinOrg (value, index) {
@ -426,6 +441,16 @@ export default {
disposeParty () {
this.tableData.forEach((tableItem, index) => {
let obj = this.$refs["myCascader" + index].getCheckedNodes()[0]
//
tableItem.publishPartyOrgId = obj.data.id//id
tableItem.publishPartyOrgName = obj.data.partyOrgName//
tableItem.publishOrgPid = obj.data.pid//ID
tableItem.publishOrgType = obj.data.partyOrgType// 0,1,2,3,4,56
tableItem.publishOrgPathShow = obj.path.join(':')//PUBLISH_PARTY_ORG_ID便
//
tableItem.joinOrgList = []
let selJoinArray = this.$refs["myCascader_join" + index].getCheckedNodes()
@ -538,13 +563,13 @@ export default {
address: '',//
latitude: '',//
longitude: '',//
autoPublicType: this.autoTimeArray[1].value ||'',//key; 3
autoPublicType: this.autoTimeArray[1].value || '',//key; 3
publishPartyOrgId: this.defaultPublishParty.defaultPartyOrgId,// id
publishPartyOrgName: this.defaultPublishParty.defaultPartyOrgName,//
publishOrgPid: this.defaultPublishParty.defaultPartyOrgPid,// ID
publishOrgType: this.defaultPublishParty.orgType,// 0,1,2,3,4,56
publishOrgPathShow: this.defaultPublishParty.defaultPartyOrgPath,//PUBLISH_PARTY_ORG_ID便
joinUserType: this.joinArray[1].value ||'',//01
joinUserType: this.joinArray[1].value || '',//01
isAutoInform: '',// 01
introduce: '',//
attachmentList: [],

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

@ -22,6 +22,28 @@
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"
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.happenedTime"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss"
type="datetime"
@ -90,10 +112,11 @@ export default {
formData: {
title: '',//
remindTime: '',//
happenedTime:new Date(),
isPublic: '',//
remark: '',//
scheduleId: '',
happenedTime: ''
},
@ -184,6 +207,7 @@ export default {
...this.formData
}
//params.happenedTime = this.formData+" 08:00:00"
const { data, code, msg } = await requestPost(url, params)
@ -241,6 +265,9 @@ export default {
remindTime: [
{ required: true, message: '提醒时间不能为空', trigger: 'change' }
],
happenedTime: [
{ required: true, message: '日程时间不能为空', trigger: 'change' }
],
isPublic: [
{ required: true, message: '是否公开不能为空', trigger: 'change' }
],

24
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"
@ -106,6 +106,13 @@
<el-table-column prop="remindTime"
label="提醒时间"
:formatter="yyyy-MM-dd"
align="center"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="happenedTime"
label="日程时间"
align="center"
:show-overflow-tooltip="true">
</el-table-column>
@ -225,6 +232,17 @@
prop="remindTime"
label-width="150px">
<el-date-picker v-model="scFormData.remindTime"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyy-MM-dd"
type="date"
placeholder="选择时间">
</el-date-picker>
</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"
@ -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' }
],

Loading…
Cancel
Save