diff --git a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
index 1dfd818b9..88092983a 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
@@ -537,7 +537,7 @@ export default {
this.icPartyActId = row.icPartyActId
- this.$confirm("确认取消活动?", "提示", {
+ this.$confirm("活动删除后不可恢复，您确定要删除吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
index afd6f90e5..5d56d4d18 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
@@ -286,7 +286,7 @@ export default {
handleChangeScope (value) {
let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
- debugger
+
if (obj) {
this.formData.publishPartyOrgId = obj.id//发布活动党组织id
this.formData.publishPartyOrgName = obj.partyOrgName//发布活动党组织名称
@@ -345,9 +345,6 @@ export default {
async addActivity () {
// debugger
- // if (this.formData.autoPublicType && typeof (this.formData.autoPublicType) == 'string') {
- // this.formData.autoPublicType = parseInt(this.formData.autoPublicType)
- // }
if (this.isAutoInform) {
this.formData.isAutoInform = '1'
@@ -371,9 +368,9 @@ export default {
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
- // this.$message.success('操作成功')
- // this.resetData()
- // this.$emit('handleOk')
+ this.$message.success('操作成功')
+ this.resetData()
+ this.$emit('handleOk')
} else {
this.$message.error(msg)
}
@@ -395,7 +392,9 @@ export default {
data.joinOrgList.forEach(element => {
this.formData.joinIdArray.push(element.joinOrgPath.split(':'))
});
+ this.isAutoInform = this.formData.isAutoInform == '1'
+ this.fileList = [... this.formData.attachmentList]
} else {
this.$message.error(msg)
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
index 24f2a5205..38b6dabe6 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
@@ -57,8 +57,8 @@
@@ -87,7 +87,7 @@
header-align="center"
align="center"
label="活动主题"
- width="220">
+ min-width="220">
- 取 消
- 确定
+ 取 消
+ 确定
@@ -293,47 +296,11 @@ export default {
methods: {
handleChangeScope (index) {
- let onePublish = this.publishOptions[index]
-
- let obj = this.$refs["myCascader" + index].getCheckedNodes()[0].data
- console.log('obj', obj)
- 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 = ''
- }
+
},
handleChangeJoinOrg (value, index) {
- this.tableData[index].joinOrgList = []
-
- let selArray = this.$refs["myCascader_join" + index].getCheckedNodes()
-
- console.log('value', value)
- console.log('index', index)
- console.log('selArray', selArray)
-
- selArray.forEach(element => {
-
- let obj = {
- joinOrgId: element.data.id,
- orgType: element.data.partyOrgType,
- pid: element.data.pid,
- joinOrgName: element.data.partyOrgName,
- joinOrgPath: element.path.join(':'),
- }
- this.tableData[index].joinOrgList.push(obj)
- });
-
},
async handleClickActType (index) {
@@ -342,6 +309,7 @@ export default {
//首先获取当前年份对应活动类型是否有活动
await this.getTableData()
//如果没有活动，根据字典数据，初始化
+
if (this.tableData.length === 0) {
for (let i = 0; i < this.selActType.yearCount; i++) {
this.handleAdd()
@@ -365,11 +333,19 @@ export default {
let tempArray = []
data.forEach(item => {
+
if (item.type === this.actType) {
tempArray = []
item.activityList.forEach(actItem => {
- actItem.joinOrgsShow = actItem.joinOrgs.join(',')
+ actItem.publichIdArray = actItem.publishOrgPath.split(':')
+
+ actItem.joinIdArray = []
+ actItem.joinOrgList.forEach(element => {
+ actItem.joinIdArray.push(element.joinOrgPath.split(':'))
+ });
+
+ item.isAutoInform = item.isAutoInform == '1'
tempArray.push(actItem)
});
@@ -378,7 +354,10 @@ export default {
});
+
+
this.tableData = tempArray
+ console.log(' this.tableData', this.tableData)
} else {
@@ -387,6 +366,8 @@ export default {
},
async handleComfirm () {
+ this.disposeParty()
+
let valiMsg = this.validata()
if (valiMsg) {
this.$message({
@@ -396,25 +377,22 @@ export default {
return false
}
console.log(this.tableData)
- // this.addReview(row, tableIndex)
+ this.addPlan()
},
- async addReview (row, tableIndex) {
+ async addPlan () {
+ let url = "/resi/partymember/icPartyAct/batch-add"
- let url = "/gov/org/placepatrolreviewrecord/add"
-
-
- let params = JSON.parse(JSON.stringify(row))
-
+ let params = {
+ delActIds: [],
+ actList: this.tableData
+ }
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
- let array = data.reviewTime.split(' ')
-
-
-
+ this.$emit('handleOk')
} else {
this.$message.error(msg)
@@ -422,6 +400,28 @@ export default {
},
+ disposeParty () {
+ this.tableData.forEach((tableItem, index) => {
+ //参会党组织
+ tableItem.joinOrgList = []
+ let selJoinArray = this.$refs["myCascader_join" + index].getCheckedNodes()
+ console.log('selJoinArray', selJoinArray)
+
+ selJoinArray.forEach(joinItem => {
+
+ let obj = {
+ joinOrgId: joinItem.data.id,
+ orgType: joinItem.data.partyOrgType,
+ pid: joinItem.data.pid,
+ joinOrgName: joinItem.data.partyOrgName,
+ joinOrgPath: joinItem.path.join(':'),
+ }
+ tableItem.joinOrgList.push(obj)
+ });
+
+
+ });
+ },
validata () {
let message = ''
console.log(this.tableData)
@@ -436,8 +436,8 @@ export default {
oneData.isAutoInform = oneData.isAutoInformShow ? '1' : '0'
- if (oneData.actType === '' || oneData.holdTime || oneData.topic || oneData.address || oneData.publishPartyOrgId
- || oneData.joinUserType || oneData.joinIdArray.length === 0) {
+ if (oneData.actType === '' || oneData.holdTime === '' || oneData.topic === '' || oneData.address === '' || oneData.publishPartyOrgId === ''
+ || oneData.joinUserType === '' || oneData.joinIdArray.length === 0) {
message = '第' + (i + 1) + "行填写不完整，请先填写完整！"
break;
}
@@ -448,15 +448,18 @@ export default {
async handleDelete (row, tableIndex) {
- this.$confirm("确认删除?", "提示", {
+ this.$confirm("活动删除后不可恢复，您确定要删除吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
-
- this.tableData.splice(tableIndex, 1);
-
+ if (row.icPartyActId) {
+ this.icPartyActId = row.icPartyActId
+ this.delPlan(tableIndex)
+ } else {
+ this.tableData.splice(tableIndex, 1);
+ }
})
.catch(err => {
@@ -467,8 +470,28 @@ export default {
});
},
+ async delPlan (tableIndex) {
+
+ const url = "/resi/partymember/icPartyAct/del";
+ // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/del";
+ let params = []
+ params.push(this.icPartyActId)
+
+
+ const { data, code, msg } = await requestPost(url, params);
+
+ if (code === 0) {
+ this.$message.success("删除成功！");
+ this.tableData.splice(tableIndex, 1);
+ // this.getTableData();
+ } else {
+ this.$message.error("操作失败！");
+ }
+ },
+
+
handleCancle () {
- this.$emit('dialogCancle')
+ this.$emit('handleClose')
},
@@ -502,8 +525,8 @@ export default {
introduce: '',// 活动介绍
joinOrgList: [],
- // publichIdArray: this.defaultPublishParty.defaultPartyOrgPath.split(':'),
- publichIdArray: ['1536584227130798081'],
+ publichIdArray: this.defaultPublishParty.defaultPartyOrgPath.split(':'),
+ // publichIdArray: ['1536584227130798081'],
joinIdArray: [],
isAutoInformShow: true
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
index ec7034675..a7b0897eb 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
@@ -79,22 +79,28 @@
+
+
{
item.activityList.forEach(actItem => {
- actItem.actType = item.type
+ actItem.actType = item.typeValue
actItem.frequency = item.frequency
if (actItem.joinOrgList && actItem.joinOrgList.length > 0) {