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

活动列表

dev-用户反馈
jiangyy 3 years ago
parent
507cc0351a
commit
ee90b13a47
5 changed files with 445 additions and 318 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. 24
      src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
  2. 62
      src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
  3. 420
      src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
  4. 95
      src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
  5. 154
      src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue

24
src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
View File

@ -440,8 +440,8 @@ export default {
}, },
// 字典 // 字典
async getCategrayList () { async getCategrayList () {
// const url = "/resi/partymember/icPartyAct/acttypelist" const url = "/resi/partymember/icPartyAct/acttypelist"
const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/acttypelist" // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/acttypelist"
let params = {} let params = {}
@ -486,8 +486,8 @@ export default {
async publishActivity () { async publishActivity () {
// const url = `/resi/partymember/icPartyAct/publish/${this.icPartyActId}`; const url = `/resi/partymember/icPartyAct/publish/${this.icPartyActId}`;
const url = `http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/publish/${this.icPartyActId}`; // const url = `http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/publish/${this.icPartyActId}`;
const { data, code, msg } = await requestPost(url, {}); const { data, code, msg } = await requestPost(url, {});
@ -550,8 +550,8 @@ export default {
async cancelActivity () { async cancelActivity () {
// const url = "/resi/partymember/icPartyAct/del"; const url = "/resi/partymember/icPartyAct/del";
const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/del"; // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/del";
let params = [] let params = []
params.push(this.icPartyActId) params.push(this.icPartyActId)
@ -606,8 +606,8 @@ export default {
params.push(element.icPartyActId) params.push(element.icPartyActId)
}); });
// const url = "/resi/partymember/icPartyAct/del"; const url = "/resi/partymember/icPartyAct/del";
const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/del"; // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/del";
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
@ -621,8 +621,8 @@ export default {
async getTableData () { async getTableData () {
this.tableLoading = true this.tableLoading = true
// const url = "/resi/partymember/icPartyAct/page-list"; const url = "/resi/partymember/icPartyAct/page-list";
const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/page-list"; // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/page-list";
const { pageSize, pageNo, formData } = this; const { pageSize, pageNo, formData } = this;
const { data, code, msg } = await requestPost(url, { const { data, code, msg } = await requestPost(url, {
pageSize, pageSize,
@ -658,8 +658,8 @@ export default {
}, },
async handleExport () { async handleExport () {
// const url = "/resi/partymember/icPartyAct/export-act"; const url = "/resi/partymember/icPartyAct/export-act";
const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/export-act"; // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/export-act";
const { pageSize, pageNo, formData } = this; const { pageSize, pageNo, formData } = this;
axios({ axios({
url: window.SITE_CONFIG["apiURL"] + url, url: window.SITE_CONFIG["apiURL"] + url,

62
src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
View File

@ -15,7 +15,7 @@
placeholder="请选择" placeholder="请选择"
clearable clearable
class="item_width_1"> class="item_width_1">
<el-option v-for="(item,index) in categrayArray" <el-option v-for="(item) in categrayArray"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
@ -237,11 +237,11 @@ export default {
joinArray: [//参加人员 joinArray: [//参加人员
{ {
valule: '0', value: '0',
label: '全体党员' label: '全体党员'
}, },
{ {
valule: '1', value: '1',
label: '支部委员' label: '支部委员'
}, },
], ],
@ -286,7 +286,7 @@ export default {
if (obj) { if (obj) {
this.formData.publishPartyOrgId = obj.id//发布活动党组织id this.formData.publishPartyOrgId = obj.id//发布活动党组织id
this.formData.publishPartyOrgName = obj.partyOrgName//发布活动党组织名称 this.formData.publishPartyOrgName = obj.partyOrgName//发布活动党组织名称
this.formData.publishOrgPid = obj.orgPids//发布活动党组织ID的上级节点 this.formData.publishOrgPid = obj.pid//发布活动党组织ID的上级节点
this.formData.publishOrgType = obj.partyOrgType//党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 this.formData.publishOrgType = obj.partyOrgType//党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组
this.formData.publishOrgPath = value.join(',')//PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 this.formData.publishOrgPath = value.join(',')//PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显
} else { } else {
@ -300,7 +300,8 @@ export default {
handleChangeJoinOrg (value) { handleChangeJoinOrg (value) {
console.log('value', value) console.log('value', value)
this.formData.serviceScope = [] console.log('joinIdArray', this.joinIdArray)
this.formData.joinOrgList = []
let selArray = this.$refs["myCascader_join"].getCheckedNodes() let selArray = this.$refs["myCascader_join"].getCheckedNodes()
console.log('selArray', selArray) console.log('selArray', selArray)
@ -308,12 +309,12 @@ export default {
selArray.forEach((element, index) => { selArray.forEach((element, index) => {
let obj = { let obj = {
joinOrgId: element.id, joinOrgId: element.data.id,
orgType: element.partyOrgType, orgType: element.data.partyOrgType,
pid: element.pid, pid: element.data.pid,
joinOrgPath: value[index].join(','), joinOrgPath: element.path.join(','),
} }
this.formData.serviceScope.push(obj) this.formData.joinOrgList.push(obj)
}); });
}, },
@ -326,14 +327,11 @@ export default {
}, 10000) }, 10000)
this.$refs['ref_form'].validate((valid, messageObj) => { this.$refs['ref_form'].validate((valid, messageObj) => {
if (!valid) { if (!valid) {
app.util.validateRule(messageObj) // app.util.validateRule(messageObj)
this.btnDisable = false this.btnDisable = false
} else { } else {
this.addActivity() this.addActivity()
} }
}) })
@ -353,8 +351,8 @@ export default {
this.formData.icPartyActId = '' this.formData.icPartyActId = ''
} }
console.log(this.formData) console.log(this.formData)
// const url = '/resi/partymember/icPartyAct/addOrUpdate' const url = '/resi/partymember/icPartyAct/addOrUpdate'
const url = 'http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/addOrUpdate' // const url = 'http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/addOrUpdate'
let params = { let params = {
...this.formData ...this.formData
@ -363,17 +361,17 @@ export default {
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
if (code === 0) { if (code === 0) {
this.$message.success('操作成功') // this.$message.success('操作成功')
this.resetData() // this.resetData()
this.$emit('handleOk') // this.$emit('handleOk')
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
}, },
async loadInfo () { async loadInfo () {
// const url = `/resi/partymember/icPartyAct/act-detail/${this.icPartyActId}`; const url = `/resi/partymember/icPartyAct/act-detail/${this.icPartyActId}`;
const url = `http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/act-detail/${this.icPartyActId}`; // const url = `http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/act-detail/${this.icPartyActId}`;
let params = {} let params = {}
@ -391,8 +389,8 @@ export default {
// 活动类型 // 活动类型
async getCategrayList () { async getCategrayList () {
// const url = "/resi/partymember/icPartyAct/acttypelist" const url = "/resi/partymember/icPartyAct/acttypelist"
const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/acttypelist" // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/acttypelist"
let params = {} let params = {}
@ -507,21 +505,23 @@ export default {
const mp3Array = ['mp3'] const mp3Array = ['mp3']
if (picArray.indexOf(fileType) > -1) { if (picArray.indexOf(fileType) > -1) {
file.attachmentFormat = 'image' file.format = 'image'
} else if (videoarray.indexOf(fileType) > -1) { } else if (videoarray.indexOf(fileType) > -1) {
file.attachmentFormat = 'video' file.format = 'video'
} else if (docArray.indexOf(fileType) > -1) { } else if (docArray.indexOf(fileType) > -1) {
file.attachmentFormat = 'doc' file.format = 'doc'
} else if (mp3Array.indexOf(fileType) > -1) { } else if (mp3Array.indexOf(fileType) > -1) {
file.attachmentFormat = 'voice' file.format = 'voice'
} }
file.url = res.data.url file.url = res.data.url
file.type = fileType file.type = fileType
file.attachmentName = file.name // file.attachmentName = file.name
file.attachmentType = file.type // file.attachmentType = file.type
file.attachmentUrl = file.url // file.attachmentUrl = file.url
file.format = file.attachmentFormat
this.fileList.push(file) this.fileList.push(file)
console.log(this.fileList) console.log(this.fileList)
@ -617,7 +617,6 @@ export default {
}, },
props: { props: {
formType: { //表单操作类型 add新增，edit编辑，detail详情 formType: { //表单操作类型 add新增，edit编辑，detail详情
type: String, type: String,
required: '' required: ''
@ -627,7 +626,6 @@ export default {
required: '' required: ''
}, },
} }
} }
</script> </script>

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

@ -27,7 +27,7 @@
</div> </div>
<div class="div_search"> <div class="div_search">
<span>活动举办频次</span> <span>活动举办频次</span>
<span style="margin-left:30px">每季度一次</span> <span style="margin-left:30px">{{selActType.frequencyDesc?selActType.frequencyDesc:'--'}}</span>
</div> </div>
</div> </div>
@ -47,14 +47,14 @@
width="50"> width="50">
</el-table-column> </el-table-column>
<el-table-column prop="reviewTime" <el-table-column prop="holdTime"
header-align="center" header-align="center"
align="center" align="center"
label="举办活动时间" label="举办活动时间"
width="200"> width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-date-picker v-model="scope.row.reviewTime" <el-date-picker v-model="scope.row.holdTime"
style="width: 175px" style="width: 175px"
size="small" size="small"
format="yyyy-MM-dd hh:mm" format="yyyy-MM-dd hh:mm"
@ -83,14 +83,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="theme" <el-table-column prop="topic"
header-align="center" header-align="center"
align="center" align="center"
label="活动主题" label="活动主题"
width="220"> width="220">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.theme" <el-input v-model="scope.row.topic"
style="width: 195px" style="width: 195px"
size="small" size="small"
placeholder="输入主题"> placeholder="输入主题">
@ -103,25 +103,43 @@
<el-table-column prop="scopeId" <el-table-column prop="scopeId"
header-align="center" header-align="center"
align="center" align="center"
label="参加活动党组织" label="发布活动党组织"
width="220"> width="220">
<template slot-scope="scope"> <template slot-scope="scope">
<el-cascader style="width: 195px" <el-cascader class="item_width_1"
ref="myCascader" ref="myCascader"
v-model="scope.row.scopeIdArray" v-model="scope.row.publichIdArray"
size="small"
:key="iscascaderShow" :key="iscascaderShow"
:options="orgOptions" :options="publishOptions"
:props="optionProps" :props="publichOptionProps"
:show-all-levels="false"
@change="handleChangeScope(scope.$index)"></el-cascader>
</template>
</el-table-column>
<el-table-column prop="scopeId"
header-align="center"
align="center"
label="参加活动党组织"
width="220">
<template slot-scope="scope">
<el-cascader class="item_width_1"
ref="myCascader_join"
v-model="scope.row.joinIdArray"
:key="joinIscascaderShow"
:options="joinOptions"
:props="joinOptionProps"
:show-all-levels="false" :show-all-levels="false"
@change="handleChangeScope"></el-cascader> @change="handleChangeJoinOrg(scope.$index)"></el-cascader>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="joinPerson" <el-table-column prop="joinUserType"
header-align="center" header-align="center"
align="center" align="center"
label="参加人员" label="参加人员"
@ -131,7 +149,7 @@
<el-select style="width: 115px" <el-select style="width: 115px"
size="small" size="small"
v-model="scope.row.joinPerson" v-model="scope.row.joinUserType"
placeholder="请选择" placeholder="请选择"
clearable> clearable>
<el-option v-for="item in joinArray" <el-option v-for="item in joinArray"
@ -143,7 +161,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="autoTime" <el-table-column prop="autoPublicType"
header-align="center" header-align="center"
align="center" align="center"
label="自动发布时间" label="自动发布时间"
@ -152,7 +170,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-select style="width: 135px" <el-select style="width: 135px"
v-model="scope.row.autoTime" v-model="scope.row.autoPublicType"
size="small" size="small"
placeholder="请选择" placeholder="请选择"
filterable filterable
@ -167,7 +185,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="autoNotice" <el-table-column prop="isAutoInformShow"
header-align="center" header-align="center"
align="center" align="center"
label="自动通知" label="自动通知"
@ -177,7 +195,7 @@
<el-checkbox :label="'是'" <el-checkbox :label="'是'"
size="small" size="small"
v-model="scope.row.autoNotice"></el-checkbox> v-model="scope.row.isAutoInformShow"></el-checkbox>
</template> </template>
</el-table-column> </el-table-column>
@ -202,7 +220,7 @@
</div> </div>
<div class="div_btn"> <div class="div_btn">
<el-button @click="handleCancle">取 消</el-button> <el-button @click="handleCancle">取 消</el-button>
<el-button @click="handleCancle">确定</el-button> <el-button @click="handleComfirm">确定</el-button>
</div> </div>
</div> </div>
@ -212,7 +230,7 @@
<script> <script>
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // 引入Loading服务 import { Loading } from 'element-ui' // 引入Loading服务
import { requestPost } from '@/js/dai/request' import { requestPost, requestGet } from '@/js/dai/request'
let loading // 加载动画 let loading // 加载动画
export default { export default {
@ -221,155 +239,151 @@ export default {
tableLoading: false, tableLoading: false,
tableData: [], tableData: [],
actTypeArray: [ actTypeArray: [],
{ selActType: {},
value: '1',
label: '支部党员大会',
fre: 4
},
{
value: '2',
label: '支部委员会',
fre: 12
}
],
actType: "", actType: "",
joinArray: [//参加人员 joinArray: [//参加人员
{ {
valule: 'all', valule: '0',
label: '全体党员' label: '全体党员'
}, },
{
valule: 'branch',
label: '支部委员'
},
],
autoTimeArray: [
{
valule: '3',
label: '活动开始前3天'
},
{
valule: '5',
label: '活动开始前5天'
},
{
valule: '7',
label: '活动开始前7天'
},
{ {
valule: '1', valule: '1',
label: '活动开始前1天' label: '支部委员'
}, },
], ],
orgOptions: [], autoTimeArray: [],
publishOptions: [],
publichIdArray: [],
iscascaderShow: 0, iscascaderShow: 0,
publichOptionProps: {
multiple: false,
value: 'id',
label: 'partyOrgName',
children: 'children',
checkStrictly: true
},
optionProps: { joinOptions: [],
joinIdArray: [],
joinIscascaderShow: 0,
joinOptionProps: {
multiple: true, multiple: true,
value: 'id', value: 'id',
label: 'partyOrgName', label: 'partyOrgName',
children: 'children', children: 'children',
checkStrictly: true checkStrictly: false
}, },
defaultPublishParty: {}
} }
}, },
components: {}, components: {},
mounted () { async mounted () {
await this.getOrgTreeList()
await this.getJoinOrgTreeList()
await this.getCategrayList()
await this.getAutoTimeArray()
await this.getDefaultPublishParty()
}, },
methods: { methods: {
handleClickActType (index) { handleChangeScope (index) {
let onePublish = this.publishOptions[index]
let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
if (obj) {
onePublish.publishPartyOrgId = obj.id//发布活动党组织id
onePublish.publishPartyOrgName = obj.partyOrgName//发布活动党组织名称
onePublish.publishOrgPid = obj.pid//发布活动党组织ID的上级节点
onePublish.publishOrgType = obj.partyOrgType//党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组
onePublish.publishOrgPath = onePublish.publichIdArray.join(',')//PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显
} else {
onePublish.publishPartyOrgId = ''
onePublish.publishPartyOrgName = ''
onePublish.publishOrgPid = ''
onePublish.publishOrgType = ''
onePublish.publishOrgPath = ''
}
}, },
async initTable () { handleChangeJoinOrg (index) {
let oneJoin = this.joinOptions[index]
await this.getOrgTreeList() console.log('value', value)
console.log('joinIdArray', this.joinIdArray)
oneJoin.joinOrgList = []
let selArray = this.$refs["myCascader_join"].getCheckedNodes()
// await this.loadTable() console.log('selArray', selArray)
}, selArray.forEach((element, index) => {
handleAdd () {
let obj = { let obj = {
isNew: true,//是否新增 joinOrgId: element.data.id,
reviewTime: '', orgType: element.data.partyOrgType,
address: '', pid: element.data.pid,
theme: '', joinOrgPath: element.path.join(','),
scopeIdArray: [],
joinPerson: '',
autoTime: '',
autoNotice: true,
} }
this.tableData.push(obj) oneJoin.joinOrgList.push(obj)
}, });
async getOrgTreeList () {
const url = '/resi/partymember/icPartyOrg/getSearchTreelist'
let params = {
customerId: localStorage.getItem('customerId'),
agencyId: localStorage.getItem('agencyId')
};
const { data, code, msg } = await requestGet(url, params); },
console.log('data-orgparty----o', data)
if (code === 0) {
this.orgOptions = data async handleClickActType (index) {
this.selActType = { ...this.actTypeArray[index] }
} else { //首先获取当前年份对应活动类型是否有活动
await this.getTableData()
//如果没有活动，根据字典数据，初始化
if (this.tableData.length === 0) {
for (let i = 0; i < this.selActType.yearCount; i++) {
this.handleAdd()
}
} }
},
//加载form },
async loadTable () { async getTableData () {
this.tableLoading = true this.tableLoading = true
const url = '/gov/org/placepatrolreviewrecord/getlist' // const url = "/icPartyAct/yearSearch";
// const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolreviewrecord/getlist' const url = "http://yapi.elinkservice.cn/mock/245/icPartyAct/yearSearch";
let params = { let params = {
placePatrolRecordId: this.placePatrolRecordId yearId: this.yearId
} }
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params);
this.tableLoading = false this.tableLoading = false
if (code === 0) { if (code === 0) {
let tempArray = []
if (data.list && data.list.length > 0) { data.forEach(item => {
data.list.forEach(item => { if (item.type === actType) {
item.isEdit = false tempArray = []
item.isNew = false
let arrayInspectors = item.inspectors.split(',')
item.inspectorArray = [...arrayInspectors]
let arrayReviewTime = item.reviewTime.split(' ') item.activityList.forEach(actItem => {
item.reviewTime = arrayReviewTime[0] actItem.joinOrgsShow = actItem.joinOrgs.join(',')
});
this.tableData = [...data.list] tempArray.push(actItem)
} else { });
this.tableData = []
} }
});
this.tableData = tempArray
} else { } else {
this.$message.error(msg) this.$message.error(msg);
} }
}, },
async handleComfirm (row, tableIndex) { async handleComfirm () {
let valiMsg = this.validata(row) let valiMsg = this.validata()
if (valiMsg) { if (valiMsg) {
this.$message({ this.$message({
type: 'warning', type: 'warning',
@ -377,16 +391,15 @@ export default {
}) })
return false return false
} }
console.log(this.tableData)
this.addReview(row, tableIndex) // this.addReview(row, tableIndex)
}, },
async addReview (row, tableIndex) { async addReview (row, tableIndex) {
let url = "/gov/org/placepatrolreviewrecord/add" let url = "/gov/org/placepatrolreviewrecord/add"
if (row.placePatrolReviewRecordId) {
url = "/gov/org/placepatrolreviewrecord/edit"
}
let params = JSON.parse(JSON.stringify(row)) let params = JSON.parse(JSON.stringify(row))
params.inspectors = params.inspectorArray.join(',') params.inspectors = params.inspectorArray.join(',')
@ -409,20 +422,27 @@ export default {
}, },
validata (row) { validata () {
let message = '' let message = ''
if (row.reviewTime === '') { console.log(this.tableData)
message = message + '复查时间不能为空；' for (let i = 0; i < this.tableData.length; i++) {
let oneData = this.tableData[i]
if (oneData.holdTime) {
let array = oneData.holdTime.split('-')
oneData.holdYearId = array[0]
oneData.holdMonthId = array[0] + array[1]
} }
if (row.placePatrolTeamId === '') {
message = message + '分队名称不能为空；' oneData.isAutoInform = oneData.isAutoInformShow ? '1' : '0'
}
if (row.inspectorArray.length === 0) { if (oneData.actType === '' || oneData.holdTime || oneData.topic || oneData.address || oneData.publishPartyOrgId
message = message + '检查人员不能为空；' || oneData.joinUserType || oneData.joinIdArray.length === 0) {
message = '第' + (i + 1) + "行填写不完整，请先填写完整！"
break;
} }
if (row.reviewResult === '') {
message = message + '复查结论不能为空；'
} }
return message return message
}, },
@ -447,34 +467,148 @@ export default {
}); });
}, },
async deleteRecord (row, tableIndex) { handleCancle () {
this.$emit('dialogCancle')
},
handleAdd () {
let obj = {
icPartyActId: '',//编辑活动时必传
actType: '',// 活动类型，来源于活动类型接口value
holdYearId: '',//活动开始时间所属年份：yyyy
holdMonthId: '',//活动开始时间所属月份：yyyyMM
holdTime: '',//活动开始时间：yyyy-MM-dd HH:mm:ss
topic: '',// 活动主题
address: '',// 活动地址
latitude: '',//活动地点纬度
longitude: '',// 活动地点经度
autoPublicType: '',//自动发布时间key; 来源于字典表接口
publishPartyOrgId: this.defaultPublishParty.defaultPartyOrgId,// 发布活动党组织id
publishPartyOrgName: this.defaultPublishParty.defaultPartyOrgName,// 发布活动党组织名称
publishOrgPid: this.defaultPublishParty.defaultPartyOrgPid,// 参加活动党组织ID的上级节点
publishOrgType: this.defaultPublishParty.orgType,//党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组
publishOrgPath: this.defaultPublishParty.defaultPartyOrgPath,//PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显
joinUserType: '',//参加人员类型，0：全体党员；1：支部委员
isAutoInform: '',// 是否自动通知参加人员，0否；1是
introduce: '',// 活动介绍
joinOrgList: [],
publichIdArray: this.defaultPublishParty.defaultPartyOrgPath.split(','),
joinIdArray: [],
isAutoInformShow: true
}
this.tableData.push(obj)
},
const url = "/gov/org/placepatrolreviewrecord/del" async getOrgTreeList () {
const url = '/resi/partymember/icPartyOrg/getSearchTreelist'
let params = {
customerId: localStorage.getItem('customerId'),
agencyId: localStorage.getItem('agencyId')
};
const { data, code, msg } = await requestGet(url, params);
console.log('data-orgparty----o', data)
if (code === 0) {
this.publishOptions = data
this.joinOptions = data
this.changeKey(this.joinOptions)
} else {
}
},
changeKey (arr) {
for (var i = 0; i < arr.length; i++) {
arr[i].value = arr[i].userId
arr[i].label = arr[i].userName
if (arr[i].children.length) {
this.changeKey(arr[i].children)
} else {
delete arr[i].children
}
}
},
//加载组织
async getJoinOrgTreeList () {
const url = '/resi/partymember/icPartyOrg/getOrgTreeHaveGroup'
// const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceOrg/selectlist'
let params = { let params = {
placePatrolReviewRecordId: row.placePatrolReviewRecordId agencyId: localStorage.getItem('agencyId')
} }
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
if (code === 0) { if (code === 0) {
// this.$message({ // this.joinOptions = data
// type: "success", } else {
// message: "删除成功" this.$message.error(msg)
// }); }
},
this.tableData.splice(tableIndex, 1); // 字典
async getCategrayList () {
// const url = "/resi/partymember/icPartyAct/acttypelist"
const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/acttypelist"
let params = {}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.actTypeArray = data
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
}, },
handleCancle () { // 自动发布时间
this.$emit('dialogCancle') async getAutoTimeArray () {
const url = "/sys/dict/data/dictlist"
let params = {
dictType: 'icpartyact_auto_publish_time'
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.autoTimeArray = data
} else {
this.$message.error(msg)
}
},
// 获取默认发布党组织
async getDefaultPublishParty () {
const url = "/resi/partymember/icPartyOrg/defaultpartyorg"
// const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyOrg/defaultpartyorg"
let params = {}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.defaultPublishParty = data
this.defaultPublishParty.defaultPartyOrgPath.replaceAll(':', ',')
} else {
this.$message.error(msg)
}
}, },
// 开启加载动画 // 开启加载动画
startLoading () { startLoading () {
loading = Loading.service({ loading = Loading.service({
@ -503,11 +637,11 @@ export default {
}, },
props: { props: {
yearId: {
type: String,
required: true
},
resultList: {
type: Array,
default: []
}
} }
} }
</script> </script>

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

@ -9,20 +9,21 @@
class="div_form"> class="div_form">
<el-form-item label="活动标题" <el-form-item label="活动标题"
prop="principalName" prop="title"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<el-input class="item_width_1" <el-input class="item_width_1"
placeholder="请输入活动标题" placeholder="请输入活动标题"
v-model="formData.principalName"> v-model="formData.title">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="提醒时间" <el-form-item label="提醒时间"
style="display: block" style="display: block"
prop="activityTime" prop="remindTime"
label-width="150px"> label-width="150px">
<el-date-picker v-model="formData.activityTime" <el-date-picker v-model="formData.remindTime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss"
type="datetime" type="datetime"
placeholder="选择时间"> placeholder="选择时间">
</el-date-picker> </el-date-picker>
@ -30,8 +31,8 @@
<el-form-item label="是否公开" <el-form-item label="是否公开"
label-width="150px" label-width="150px"
prop="serviceCategoryKey"> prop="isPublic">
<el-select v-model="formData.serviceCategoryKey" <el-select v-model="formData.isPublic"
placeholder="请选择" placeholder="请选择"
clearable clearable
class="item_width_1"> class="item_width_1">
@ -87,27 +88,22 @@ export default {
formData: { formData: {
serviceCategoryKey: '',//服务分类id title: '',//
serviceProjectId: '',//服务项目id remindTime: '',//
serviceOrgId: '',//服务组织id isPublic: '',//
serviceScope: [],//
principalName: '',//经办人(责任人)姓名
principalContact: '',//经办人联系方式
serviceTimeStart: '',//服务起始时间yyyy-MM-dd
serviceTimeEnd: '',//服务截止时间yyyy-MM-dd
remark: '',// remark: '',//
scheduleId: '',
}, },
gongkaiArray: [ gongkaiArray: [
{ {
valule: '1', valule: '0',
label: '仅自己可见' label: '仅自己可见'
}, },
{ {
valule: '2', valule: '1',
label: '组织内其他人可见' label: '组织内其他人可见'
}, },
@ -141,7 +137,7 @@ export default {
}, 10000) }, 10000)
this.$refs['ref_form'].validate((valid, messageObj) => { this.$refs['ref_form'].validate((valid, messageObj) => {
if (!valid) { if (!valid) {
app.util.validateRule(messageObj)
this.btnDisable = false this.btnDisable = false
} else { } else {
@ -158,10 +154,8 @@ export default {
console.log(this.formData) console.log(this.formData)
const url = '/icSchedule/addOrEdit'
// const url = 'http://yapi.elinkservice.cn/mock/245/icSchedule/addOrEdit'
const url = '/heart/icServiceProject/service/initiate'
// const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'
let params = { let params = {
...this.formData ...this.formData
@ -190,15 +184,11 @@ export default {
resetData () { resetData () {
this.formData = { this.formData = {
serviceCategoryKey: '',//服务分类id title: '',//
serviceProjectId: '',//服务项目id remindTime: '',//
serviceOrgId: '',//服务组织id isPublic: '',//
serviceScope: [],//
principalName: '',//经办人(责任人)姓名
principalContact: '',//经办人联系方式
serviceTimeStart: '',//服务起始时间yyyy-MM-dd
serviceTimeEnd: '',//服务截止时间yyyy-MM-dd
remark: '',// remark: '',//
scheduleId: '',
} }
@ -224,50 +214,13 @@ export default {
dataRule () { dataRule () {
return { return {
serviceCategoryKey: [ title: [
{ required: true, message: '服务类别不能为空', trigger: 'blur' }, { required: true, message: '日程标题不能为空', trigger: 'blur' },
], ],
serviceProjectId: [ remindTime: [
{ required: true, message: '服务项目不能为空', trigger: 'blur' } { required: true, message: '提醒时间不能为空', trigger: 'blur' }
], ],
serviceOrgId: [
{ required: true, message: '服务组织不能为空', trigger: 'blur' }
],
serviceTimeStart: [
{ required: true, message: '服务时间不能为空', trigger: 'blur' }
],
serviceScope: [
{ required: true, message: '服务范围不能为空', trigger: 'blur' }
],
}
},
feedbackDataRule () {
return {
serviceProjectName: [
{ required: true, message: '服务项目不能为空', trigger: 'blur' },
],
serviceGoal: [
{ required: true, message: '服务目标不能为空', trigger: 'blur' }
],
serviceEffect: [
{ required: true, message: '服务效果不能为空', trigger: 'blur' }
],
servicePeopleNumber: [
{ required: true, message: '服务人数不能为空', trigger: 'blur' }
],
serviceStatus: [
{ required: true, message: '服务状态不能为空', trigger: 'blur' }
],
satisfaction: [
{ required: true, message: '满意度不能为空', trigger: 'blur' }
],
address: [
{ required: true, message: '地址不能为空', trigger: 'blur' }
]
} }
}, },

154
src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
View File

@ -10,7 +10,7 @@
<el-form-item label="活动类型" <el-form-item label="活动类型"
prop="serviceCategoryKey"> prop="serviceCategoryKey">
<el-select v-model="formData.year" <el-select v-model="formData.yearId"
placeholder="请选择" placeholder="请选择"
size="small" size="small"
clearable clearable
@ -47,65 +47,67 @@
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
class="table" class="table"
style="width: 100%" style="width: 100%"
:span-method="objectSpanMethod"
:height="maxTableHeight"> :height="maxTableHeight">
<el-table-column label="序号" <!-- <el-table-column label="序号"
fixed="left" fixed="left"
type="index" type="index"
align="center" align="center"
width="50" /> width="50" /> -->
<el-table-column prop="serviceCategoryName" <el-table-column prop="actType"
align="center" align="center"
width="100" width="120"
label="活动类别" label="活动类别"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="serviceProjectName" <el-table-column prop="frequency"
label="举办频次" label="举办频次"
width="120"
align="center" align="center"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="serviceOrgName" <el-table-column prop="holdTime"
align="center" align="center"
width="100" width="150"
label="活动时间" label="活动时间"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="servicePeopleNumber" <el-table-column prop="address"
align="center" align="center"
width="110" min-width="200"
label="活动地点" label="活动地点"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="servicePeopleNumber" <el-table-column prop="topic"
align="center" align="center"
width="110" min-width="200"
label="活动主题" label="活动主题"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="servicePeopleNumber" <el-table-column prop="joinOrgsShow"
align="center" align="center"
width="80" min-width="200"
label="参加活动党支部" label="参加活动党支部"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="servicePeopleNumber" <el-table-column prop="joinTypeValue"
align="center" align="center"
width="80" width="80"
label="参加人员" label="参加人员"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="servicePeopleNumber" <el-table-column prop="autoPublicTime"
align="center" align="center"
width="80" width="120"
label="自动发布时间" label="自动发布时间"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="servicePeopleNumber" <el-table-column prop="isAutoInformValue"
align="center" align="center"
width="80" width="80"
label="自动通知" label="自动通知"
@ -151,6 +153,7 @@
class="dialog-h" class="dialog-h"
@closed="showAdd = false"> @closed="showAdd = false">
<add-rule ref="ref_add_form" <add-rule ref="ref_add_form"
:yearId="formData.yearId"
@handleOk="handleOk" @handleOk="handleOk"
@handleClose="handleClose"></add-rule> @handleClose="handleClose"></add-rule>
</el-dialog> </el-dialog>
@ -190,13 +193,14 @@ export default {
agencyId: '', agencyId: '',
tableData: [], tableData: [],
categrayArray: [], originalData: [],
rowArray: [],//合并行的行数
yearArray: [], yearArray: [],
formData: { formData: {
year: '', yearId: '',
}, },
serviceRecordId: '', activityId: '',
serviceProjectName: '',
showAdd: false, showAdd: false,
@ -220,14 +224,14 @@ export default {
}, },
mounted () { mounted () {
console.log(this.$store.state)
this.user = this.$store.state.user this.user = this.$store.state.user
this.agencyId = this.user.agencyId this.agencyId = this.user.agencyId
this.yearArray = [] this.yearArray = []
let now = new Date() let now = new Date()
let year = now.getFullYear() let year = now.getFullYear()
this.formData.year = year this.formData.yearId = year + ''
for (let i = 0; i < 5; i++) { for (let i = 0; i < 5; i++) {
let obj = { let obj = {
value: (year - i) + '', value: (year - i) + '',
@ -241,6 +245,48 @@ export default {
this.getTableData(); this.getTableData();
}, },
methods: { methods: {
flitterData (arr) {
let spanOneArr = []
let concatOne = 0
arr.forEach((item, index) => {
if (index === 0) {
spanOneArr.push(1)
} else {
if (item.actType === arr[index - 1].actType) { //第一列需合并相同内容的判断条件
spanOneArr[concatOne] += 1
spanOneArr.push(0)
} else {
spanOneArr.push(1)
concatOne = index
};
}
});
return {
one: spanOneArr,
}
},
objectSpanMethod ({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0) { // 判断哪一列
const _row = (this.flitterData(this.tableData).one)[rowIndex]
const _col = _row > 0 ? 1 : 0
return {
rowspan: _row,
colspan: _col
};
}
if (columnIndex === 1) { // 判断哪一列
const _row = (this.flitterData(this.tableData).one)[rowIndex]
const _col = _row > 0 ? 1 : 0
return {
rowspan: _row,
colspan: _col
};
}
},
handleCancle () { handleCancle () {
this.$emit('handleClose') this.$emit('handleClose')
}, },
@ -253,27 +299,21 @@ export default {
this.getTableData(); this.getTableData();
}, },
async handleAdd () { async handleAdd () {
this.formType = 'add' this.formType = 'add'
this.showAdd = true; this.showAdd = true;
},
},
async handleEdit (row) { async handleEdit (row) {
this.formType = 'edit' this.formType = 'edit'
this.showEdit = true this.showEdit = true
}, },
handleClose () { handleClose () {
this.serviceRecordId = ""
this.formType = '' this.formType = ''
this.showAdd = false this.showAdd = false
@ -291,9 +331,9 @@ export default {
async handleDel (row) { async handleDel (row) {
this.serviceRecordId = row.serviceRecordId this.activityId = row.activityId
this.$confirm("确认取消活动?", "提示", { this.$confirm("确认删除活动?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
@ -315,13 +355,14 @@ export default {
async cancelActivity () { async cancelActivity () {
const url = `/heart/icServiceProject/service/cancel/${this.serviceRecordId}`; // const url = '/resi/partymember/icPartyAct/del';
const url = 'http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/del';
let params = [this.activityId]
const { data, code, msg } = await requestPost(url, {}); const { data, code, msg } = await requestPost(url, params);
if (code === 0) { if (code === 0) {
this.$message.success("取消成功！"); this.$message.success("删除成功！");
this.getTableData(); this.getTableData();
} else { } else {
this.$message.error("操作失败！"); this.$message.error("操作失败！");
@ -330,33 +371,34 @@ export default {
async getTableData () { async getTableData () {
this.tableLoading = true this.tableLoading = true
const url = "/heart/icServiceProject/service/recordList"; // const url = "/icPartyAct/yearSearch";
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/recordList"; const url = "http://yapi.elinkservice.cn/mock/245/icPartyAct/yearSearch";
const { data, code, msg } = await requestPost(url, this.formData); const { data, code, msg } = await requestPost(url, this.formData);
this.tableLoading = false this.tableLoading = false
if (code === 0) { if (code === 0) {
let tempArray = []
this.rowArray = []
this.total = data.total || 0; this.originalData = data.concat();
this.tableData = data.list
? data.list.map((item) => {
return item;
})
: [];
this.tableData.forEach(item => { data.forEach(item => {
if (item.operationType === '2') { item.activityList.forEach(actItem => {
item.operationTypeShow = '已转需求' actItem.actType = item.type
} actItem.frequency = item.frequency
if (item.operationType === '1') { actItem.joinOrgsShow = actItem.joinOrgs.join(',')
item.operationTypeShow = '已立项'
} tempArray.push(actItem)
if (item.operationType === '0') { });
item.operationTypeShow = '已回复'
}
this.rowArray.push(item.activityList.length)
}); });
this.tableData = tempArray
} else { } else {
this.$message.error(msg); this.$message.error(msg);
} }

Write Preview
Loading…
Cancel
Save