Browse Source

111

feature
jiangyy 3 years ago
parent
commit
31836bf505
  1. 2
      src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
  2. 33
      src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
  3. 4
      src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue

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

@ -316,7 +316,7 @@ export default {
orgType: element.data.partyOrgType, orgType: element.data.partyOrgType,
pid: element.data.pid, pid: element.data.pid,
joinOrgPath: element.path.join(':'), joinOrgPath: element.path.join(':'),
joinOrgName: element.data.datapartyOrgName, joinOrgName: element.data.partyOrgName,
} }
this.formData.joinOrgList.push(obj) this.formData.joinOrgList.push(obj)
}); });

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

@ -109,7 +109,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-cascader class="item_width_1" <el-cascader class="item_width_1"
ref="myCascader" :ref="'myCascader'+scope.$index"
v-model="scope.row.publichIdArray" v-model="scope.row.publichIdArray"
:key="iscascaderShow" :key="iscascaderShow"
:options="publishOptions" :options="publishOptions"
@ -244,11 +244,11 @@ export default {
actType: "", actType: "",
joinArray: [// joinArray: [//
{ {
valule: '0', value: '0',
label: '全体党员' label: '全体党员'
}, },
{ {
valule: '1', value: '1',
label: '支部委员' label: '支部委员'
}, },
], ],
@ -295,7 +295,7 @@ export default {
handleChangeScope (index) { handleChangeScope (index) {
let onePublish = this.publishOptions[index] let onePublish = this.publishOptions[index]
debugger debugger
let obj = this.$refs["myCascader" + index][0].getCheckedNodes()[0].data let obj = this.$refs["myCascader" + index].getCheckedNodes()[0].data
if (obj) { if (obj) {
onePublish.publishPartyOrgId = obj.id//id onePublish.publishPartyOrgId = obj.id//id
onePublish.publishPartyOrgName = obj.partyOrgName// onePublish.publishPartyOrgName = obj.partyOrgName//
@ -312,11 +312,11 @@ export default {
}, },
handleChangeJoinOrg (index) { handleChangeJoinOrg (index) {
let oneJoin = this.joinOptions[index]
oneJoin.joinOrgList = [] this.tableData[index].joinOrgList = []
let selArray = this.$refs["myCascader_join" + index][0].getCheckedNodes() let selArray = this.$refs["myCascader_join" + index].getCheckedNodes()
console.log('index', index)
console.log('selArray', selArray) console.log('selArray', selArray)
selArray.forEach((element, index) => { selArray.forEach((element, index) => {
@ -325,9 +325,10 @@ export default {
joinOrgId: element.data.id, joinOrgId: element.data.id,
orgType: element.data.partyOrgType, orgType: element.data.partyOrgType,
pid: element.data.pid, pid: element.data.pid,
joinOrgName: element.data.partyOrgName,
joinOrgPath: element.path.join(':'), joinOrgPath: element.path.join(':'),
} }
oneJoin.joinOrgList.push(obj) this.tableData[index].joinOrgList.push(obj)
}); });
}, },
@ -348,8 +349,8 @@ export default {
}, },
async getTableData () { async getTableData () {
this.tableLoading = true this.tableLoading = true
// const url = "/icPartyAct/yearSearch"; const url = "/resi/partymember/icPartyAct/yearSearch";
const url = "http://yapi.elinkservice.cn/mock/245/icPartyAct/yearSearch";
let params = { let params = {
yearId: this.yearId yearId: this.yearId
} }
@ -361,7 +362,7 @@ export default {
let tempArray = [] let tempArray = []
data.forEach(item => { data.forEach(item => {
if (item.type === actType) { if (item.type === this.actType) {
tempArray = [] tempArray = []
item.activityList.forEach(actItem => { item.activityList.forEach(actItem => {
@ -498,11 +499,13 @@ export default {
introduce: '',// introduce: '',//
joinOrgList: [], joinOrgList: [],
publichIdArray: this.defaultPublishParty.defaultPartyOrgPath.split(':'), // publichIdArray: this.defaultPublishParty.defaultPartyOrgPath.split(':'),
joinIdArray: [], publichIdArray: ['1536584227130798081'],
joinIdArray: ['1536584227130798081'],
isAutoInformShow: true isAutoInformShow: true
} }
this.tableData.push(obj) this.tableData.push(obj)
}, },
@ -561,8 +564,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 = {}

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

@ -99,11 +99,11 @@ export default {
gongkaiArray: [ gongkaiArray: [
{ {
valule: '0', value: '0',
label: '仅自己可见' label: '仅自己可见'
}, },
{ {
valule: '1', value: '1',
label: '组织内其他人可见' label: '组织内其他人可见'
}, },

Loading…
Cancel
Save