elink-star
/
epmet-oper-gov
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bug修改

test
jiangyy 3 years ago
parent
7cab8b6803
commit
b8c9adfe75
3 changed files with 177 additions and 209 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 191
      src/views/modules/communityParty/calendar/index.vue
  2. 39
      src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
  3. 6
      src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue

191
src/views/modules/communityParty/calendar/index.vue
View File

@ -1,28 +1,25 @@
<template> <template>
<div> <div>
<div v-if="showType === 'list'" class="g-cnt"> <div v-if="showType === 'list'"
class="g-cnt">
<el-row :gutter="15"> <el-row :gutter="15">
<el-col :span="6"> <el-col :span="6">
<div class="m-sizer"> <div class="m-sizer">
<div class="item"> <div class="item">
<el-cascader <el-cascader class="customer_cascader"
class="customer_cascader"
ref="myCascader" ref="myCascader"
size="small" size="small"
v-model="fmData.orgId" v-model="fmData.orgId"
:options="partyOptions" :options="partyOptions"
:props="partyOptionsProps" :props="partyOptionsProps"
:show-all-levels="false" :show-all-levels="false"
@change="handleChangeParty" @change="handleChangeParty"></el-cascader>
></el-cascader>
</div> </div>
<div class="item"> <div class="item">
<el-radio v-model="fmData.isSelf" label="1" <el-radio v-model="fmData.isSelf"
>本人创建的活动</el-radio label="1">本人创建的活动</el-radio>
> <el-radio v-model="fmData.isSelf"
<el-radio v-model="fmData.isSelf" label="0" label="0">本组织所有活动</el-radio>
>本组织所有活动</el-radio
>
</div> </div>
</div> </div>
@ -34,26 +31,22 @@
<div class="date-week">{{ currentDate.dayFormat }}</div> <div class="date-week">{{ currentDate.dayFormat }}</div>
</div> </div>
<div <div class="m-list"
class="m-list"
v-if=" v-if="
currentDateData.activityList.length > 0 || currentDateData.activityList.length > 0 ||
currentDateData.scheduleList.length > 0 currentDateData.scheduleList.length > 0
" ">
>
<div class="list-title">今日活动/日程</div> <div class="list-title">今日活动/日程</div>
<div class="list"> <div class="list">
<div <div class="item"
class="item"
:key="item.activityId" :key="item.activityId"
v-for="item in currentDateData.activityList" v-for="item in currentDateData.activityList">
>
<div class="item-title"> <div class="item-title">
{{ item.theme }} {{ item.theme }}
</div> </div>
<div class="item-prop"> <div class="item-prop">
<span>活动类型：</span> <span>活动类型：</span>
<span>{{ item.type }}</span> <span>{{ item.actTypeName }}</span>
</div> </div>
<div class="item-prop"> <div class="item-prop">
<span>开始时间：</span> <span>开始时间：</span>
@ -67,32 +60,22 @@
<span>参加组织：</span> <span>参加组织：</span>
<span>{{ item.joinOrgs.join("、") }}</span> <span>{{ item.joinOrgs.join("、") }}</span>
</div> </div>
<div class="item-ope"> <div v-if="item.isMe"
<el-button class="item-ope">
type="primary" <el-button type="primary"
size="mini"
@click="handleClickHuodong('publish', item)"
>发布</el-button
>
<el-button
type="success"
size="mini" size="mini"
@click="handleClickHuodong('edit', item)" @click="handleClickHuodong('publish', item)">发布</el-button>
>编辑</el-button <el-button type="success"
>
<el-button
size="mini" size="mini"
@click="handleClickHuodong('del', item)" @click="handleClickHuodong('edit', item)">编辑</el-button>
>删除</el-button <el-button size="mini"
> @click="handleClickHuodong('del', item)">删除</el-button>
</div> </div>
</div> </div>
<div <div class="item"
class="item"
:key="item.scheduleId" :key="item.scheduleId"
v-for="item in currentDateData.scheduleList" v-for="item in currentDateData.scheduleList">
>
<div class="item-title"> <div class="item-title">
{{ item.title }} {{ item.title }}
</div> </div>
@ -105,29 +88,22 @@
<span>{{ item.remark }}</span> <span>{{ item.remark }}</span>
</div> </div>
<div class="item-ope"> <div class="item-ope">
<el-button <el-button type="success"
type="success"
size="mini"
@click="handleClickRicheng('edit', item)"
>编辑</el-button
>
<el-button
size="mini" size="mini"
@click="handleClickRicheng('del', item)" @click="handleClickRicheng('edit', item)">编辑</el-button>
>删除</el-button <el-button size="mini"
> @click="handleClickRicheng('del', item)">删除</el-button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="m-ope"> <div class="m-ope">
<el-button type="warning" style="width: 48%" @click="addHudong" <el-button type="warning"
>添加活动计划</el-button style="width: 48%"
> @click="addHudong">添加活动计划</el-button>
<el-button style="width: 48%" @click="addRicheng" <el-button style="width: 48%"
>添加日程</el-button @click="addRicheng">添加日程</el-button>
>
</div> </div>
</el-col> </el-col>
@ -135,67 +111,51 @@
<div class="m-cal"> <div class="m-cal">
<div class="hd"> <div class="hd">
<div class="hd-year"> <div class="hd-year">
<el-date-picker <el-date-picker v-model="currentYearStr"
v-model="currentYearStr"
value-format="yyyy" value-format="yyyy"
type="year" type="year"
placeholder="选择年" placeholder="选择年"
size="small" size="small"
style="width: 150px" style="width: 150px">
>
</el-date-picker> </el-date-picker>
</div> </div>
<div class="hd-month"> <div class="hd-month">
<div <div class="month-item"
class="month-item"
:class="{ 'z-on': m - 1 == currentMonth }" :class="{ 'z-on': m - 1 == currentMonth }"
:key="'month' + m" :key="'month' + m"
@click="currentMonth = m - 1" @click="currentMonth = m - 1"
v-for="m in 12" v-for="m in 12">
> <el-badge :value="monthData[m-1]"
<el-badge
:value="monthData[m-1]"
:hidden="monthData[m-1] == 0" :hidden="monthData[m-1] == 0"
class="item" class="item">
>
<div class="month-text">{{ m }}月</div> <div class="month-text">{{ m }}月</div>
</el-badge> </el-badge>
</div> </div>
</div> </div>
<div class="hd-btn"> <div class="hd-btn">
<el-button <el-button type="primary"
type="primary"
size="small" size="small"
@click="handleAddYearPlan" @click="handleAddYearPlan">批量生成年度报表</el-button>
>批量生成年度报表</el-button
>
</div> </div>
</div> </div>
<calendar <calendar :currentYear="currentYear"
:currentYear="currentYear"
:currentMonth="currentMonth" :currentMonth="currentMonth"
@rangeChange="handleRangeChange" @rangeChange="handleRangeChange"
@clickDate="handleChangeDate" @clickDate="handleChangeDate">
>
<template v-slot:date-item="{ item, index }"> <template v-slot:date-item="{ item, index }">
<div <div class="tip"
class="tip"
v-if=" v-if="
rangeData[item.dateId] && rangeData[item.dateId] &&
rangeData[item.dateId].activityList.length > 0 rangeData[item.dateId].activityList.length > 0
" ">
> <div class="tip-num"
<div v-if="rangeData[item.dateId].activityList.length > 1">
class="tip-num"
v-if="rangeData[item.dateId].activityList.length > 1"
>
{{ rangeData[item.dateId].activityList.length }} {{ rangeData[item.dateId].activityList.length }}
</div> </div>
<div class="tip-text"> <div class="tip-text">
<span class="z-on"> <span class="z-on">
{{ rangeData[item.dateId].activityList[0].type }}</span {{ rangeData[item.dateId].activityList[0].actTypeName }}</span>
>
{{ {{
rangeData[item.dateId].activityList[0].isPublicValue rangeData[item.dateId].activityList[0].isPublicValue
? "(已发布)" ? "(已发布)"
@ -206,18 +166,17 @@
{{ rangeData[item.dateId].activityList[0].topic }} {{ rangeData[item.dateId].activityList[0].topic }}
</div> </div>
<div class="all-list" :class="computeAllListClass(index)"> <div class="all-list"
<div :class="computeAllListClass(index)">
class="item" <div class="item"
:key="item.activityId" :key="item.activityId"
v-for="item in rangeData[item.dateId].activityList" v-for="item in rangeData[item.dateId].activityList">
>
<div class="item-title"> <div class="item-title">
{{ item.theme }} {{ item.theme }}
</div> </div>
<div class="item-prop"> <div class="item-prop">
<span>活动类型：</span> <span>活动类型：</span>
<span>{{ item.type }}</span> <span>{{ item.actTypeName }}</span>
</div> </div>
<div class="item-prop"> <div class="item-prop">
<span>开始时间：</span> <span>开始时间：</span>
@ -234,24 +193,21 @@
</div> </div>
</div> </div>
</div> </div>
<div <div class="corn"
class="corn"
v-if=" v-if="
rangeData[item.dateId] && rangeData[item.dateId] &&
rangeData[item.dateId].scheduleList.length > 0 rangeData[item.dateId].scheduleList.length > 0
" ">
>
<div class="corn-num"> <div class="corn-num">
{{ rangeData[item.dateId].scheduleList.length }} {{ rangeData[item.dateId].scheduleList.length }}
</div> </div>
<div class="corn-text">日程</div> <div class="corn-text">日程</div>
<div class="all-list" :class="computeAllListClass(index)"> <div class="all-list"
<div :class="computeAllListClass(index)">
class="item" <div class="item"
:key="item.scheduleId" :key="item.scheduleId"
v-for="item in rangeData[item.dateId].scheduleList" v-for="item in rangeData[item.dateId].scheduleList">
>
<div class="item-title"> <div class="item-title">
{{ item.title }} {{ item.title }}
</div> </div>
@ -274,14 +230,11 @@
</div> </div>
<div v-if="showType === 'yearplan'"> <div v-if="showType === 'yearplan'">
<yearplan-list <yearplan-list @handleOk="handleAddPlanOk"
@handleOk="handleAddPlanOk" @handleClose="handleAddPlanClose"></yearplan-list>
@handleClose="handleAddPlanClose"
></yearplan-list>
</div> </div>
<el-dialog <el-dialog v-if="showAdd"
v-if="showAdd"
:visible.sync="showAdd" :visible.sync="showAdd"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
@ -289,19 +242,15 @@
width="850px" width="850px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="showAdd = false" @closed="showAdd = false">
> <add-activity ref="ref_add_form"
<add-activity
ref="ref_add_form"
:formType="formType" :formType="formType"
:icPartyActId="icPartyActId" :icPartyActId="icPartyActId"
@handleOk="handleOk" @handleOk="handleOk"
@handleClose="handleClose" @handleClose="handleClose"></add-activity>
></add-activity>
</el-dialog> </el-dialog>
<el-dialog <el-dialog v-if="showSchedule"
v-if="showSchedule"
:visible.sync="showSchedule" :visible.sync="showSchedule"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
@ -309,15 +258,12 @@
width="850px" width="850px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="showSchedule = false" @closed="showSchedule = false">
> <schedule-form ref="ref_schedule_form"
<schedule-form
ref="ref_schedule_form"
:formType="formType" :formType="formType"
:scheduleId="scheduleId" :scheduleId="scheduleId"
@handleOk="handleOk" @handleOk="handleOk"
@handleClose="handleClose" @handleClose="handleClose">
>
</schedule-form> </schedule-form>
</el-dialog> </el-dialog>
</div> </div>
@ -443,6 +389,7 @@ export default {
// 添加日程 // 添加日程
addRicheng () { addRicheng () {
this.formType = "schedule"; this.formType = "schedule";
this.scheduleId = ''
this.showSchedule = true; this.showSchedule = true;
}, },

39
src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
View File

@ -242,6 +242,7 @@ export default {
tableLoading: false, tableLoading: false,
tableData: [], tableData: [],
isHasRule: false,
actTypeArray: [], actTypeArray: [],
selActType: {}, selActType: {},
actType: "", actType: "",
@ -307,14 +308,36 @@ export default {
this.selActType = { ...this.actTypeArray[index] } this.selActType = { ...this.actTypeArray[index] }
//首先获取当前年份对应活动类型是否有活动 //首先获取当前年份对应活动类型是否有活动
// await this.getTableData() await this.getTableData()
//如果没有活动，根据字典数据，初始化 //如果没有活动，根据字典数据，初始化
// if (this.tableData.length === 0) { if (this.isHasRule) {
this.$confirm("您已经生成过该活动类型的规则，您需要在该活动类型下追加新的活动吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.tableData = []
for (let i = 0; i < this.selActType.yearCount; i++) { for (let i = 0; i < this.selActType.yearCount; i++) {
this.handleAdd() this.handleAdd()
} }
// }
})
.catch(err => {
if (err == "cancel") {
this.tableData = []
}
});
} else {
this.tableData = []
for (let i = 0; i < this.selActType.yearCount; i++) {
this.handleAdd()
}
}
}, },
@ -354,11 +377,11 @@ export default {
}); });
if (data.length > 0) {
this.isHasRule = true
this.tableData = tempArray } else {
console.log(' this.tableData', this.tableData) this.isHasRule = false
}
} else { } else {
this.$message.error(msg); this.$message.error(msg);

6
src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
View File

@ -117,6 +117,7 @@ export default {
}, },
components: {}, components: {},
async mounted () { async mounted () {
if (this.scheduleId) { if (this.scheduleId) {
this.formData.scheduleId = this.scheduleId this.formData.scheduleId = this.scheduleId
await this.loadInfo() await this.loadInfo()
@ -203,17 +204,14 @@ export default {
}, },
resetData () { resetData () {
this.scheduleId = ''
this.formData = { this.formData = {
title: '',// title: '',//
remindTime: '',// remindTime: '',//
isPublic: '',// isPublic: '',//
remark: '',// remark: '',//
scheduleId: '', scheduleId: '',
} }
}, },

Write Preview
Loading…
Cancel
Save