diff --git a/src/assets/img/party-helper.gif b/src/assets/img/party-helper.gif
new file mode 100644
index 000000000..9e03c5238
Binary files /dev/null and b/src/assets/img/party-helper.gif differ
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
index 8291b79e5..3d1239377 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
@@ -9,7 +9,7 @@
+ prop="publishPartyOrgId">
-
+
-
+
至
-
-
+
-
+
+ prop="isPublish">
@@ -115,10 +114,13 @@
添加日程提醒
-
-
+ size="small">导出
+
+
-
-
-
-
-
-
+
+ 已发布
+ 未发布
+
+
- 查看
+ 发布
- 修改 -->
+ 修改
- 删除 -->
+ 删除
@@ -222,6 +249,7 @@
@closed="showAdd = false">
@@ -267,11 +295,9 @@ export default {
let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
let nowData = Date.now()
- if (this.formData.serviceTimeStart) {
- let serviceTimeStart = new Date(this.formData.serviceTimeStart)
- return time.getTime() > nowData || time.getTime() < serviceTimeStart || time.getTime() === serviceTimeStart
- } else {
- return time.getTime() > nowData
+ if (this.formData.startDate) {
+ let startDate = new Date(this.formData.startDate)
+ return time.getTime() < startDate || time.getTime() === startDate
}
}
@@ -289,38 +315,23 @@ export default {
categrayArray: [],
statusArray: [
{
- value: "in_service",
+ value: "0",
label: "未发布",
},
{
- value: "completed",
+ value: "1",
label: "已发布",
},
],
- satisfyArray: [
- {
- value: "bad",
- label: "不满意",
- },
- {
- value: "good",
- label: "基本满意",
- },
- {
- value: "perfect",
- label: "非常满意",
- },
-
- ],
formData: {
- serviceCategoryKey: '',//服务类别id
- serviceProjectName: '',//项目名称
- serviceOrgName: '',//服务组织名称
- serviceTimeStart: '',//服务开始时间yyyy-MM-dd
- serviceTimeEnd: '',//服务结束时间yyyy-MM-dd
- serviceStatus: '',//服务状态。in_service服务中；completed:已完成
- satisfaction: '',//满意度.不满意:bad、基本满意:good、非常满意:perfect
+ publishPartyOrgId: '',//发布活动党组织；所属党组织
+ actType: '',//活动类型
+ startDate: '',//活动开始时间20220817
+ endDate: '',//活动结束时间20220817
+ isPublish: '',//活动状态。0未完成；1:已完成
+ address: '',
+ topic: '',
},
pageNo: 1,
@@ -329,11 +340,10 @@ export default {
endPickerOptions: {
disabledDate: endDisabledDate
},
- startPickerOptions: {
- disabledDate: startDisabledDate
- },
- serviceRecordId: '',
- serviceProjectName: '',
+ // startPickerOptions: {
+ // disabledDate: startDisabledDate
+ // },
+
orgOptions: [],
orgOptionProps: {
@@ -351,7 +361,8 @@ export default {
showSchedule: false,
showType: 'list',
-
+ icPartyActId: '',
+ selection: []
};
},
computed: {
@@ -363,13 +374,7 @@ export default {
...mapGetters(["clientHeight", "iframeHeight"]),
},
watch: {
- "formData.serviceTimeEnd": function (val) {
- if (val && val != '') {
- let arrayTemp = val.split(' ')
- this.formData.serviceTimeEnd = arrayTemp[0] + ' 23:59:59'
- }
- },
},
mounted () {
console.log(this.$store.state)
@@ -402,11 +407,12 @@ export default {
},
handleChangeAgency (val) {
+
let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
if (obj) {
-
+ this.formData.publishPartyOrgId = obj.id
} else {
-
+ this.formData.publishPartyOrgId = ''
}
},
@@ -434,11 +440,10 @@ export default {
},
// 字典
async getCategrayList () {
- const url = "/sys/dict/data/dictlist"
+ const url = "/resi/partymember/icPartyAct/acttypelist"
+ // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/acttypelist"
- let params = {
- dictType: 'ic_service_type'
- }
+ let params = {}
const { data, code, msg } = await requestPost(url, params)
@@ -451,12 +456,15 @@ export default {
async handleAdd () {
+ this.icPartyActId = ''
this.addDiaTitle = '新增活动计划'
this.formType = 'add'
this.showAdd = true;
},
async handlePublish (row) {
+ this.icPartyActId = row.icPartyActId
+
this.$confirm("确认发布活动?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -479,7 +487,8 @@ export default {
async publishActivity () {
- const url = `/heart/icServiceProject/service/cancel/${this.serviceRecordId}`;
+ const url = `/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, {});
@@ -493,7 +502,15 @@ export default {
},
+ async handleDetail (row) {
+ this.icPartyActId = row.icPartyActId
+ this.addDiaTitle = '查看活动计划'
+ this.formType = 'detail'
+ this.showAdd = true
+
+ },
async handleEdit (row) {
+ this.icPartyActId = row.icPartyActId
this.addDiaTitle = '修改活动计划'
this.formType = 'edit'
this.showAdd = true
@@ -518,9 +535,9 @@ export default {
async handleDel (row) {
- this.serviceRecordId = row.serviceRecordId
+ this.icPartyActId = row.icPartyActId
- this.$confirm("确认取消服务?", "提示", {
+ this.$confirm("活动删除后不可恢复，您确定要删除吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
@@ -542,23 +559,79 @@ export default {
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 = []
+ params.push(this.icPartyActId)
- const { data, code, msg } = await requestPost(url, {});
+ const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
- this.$message.success("取消成功！");
+ this.$message.success("删除成功！");
this.getTableData();
} else {
this.$message.error("操作失败！");
}
},
+ selectAll (selection) {
+ this.selection = selection
+
+ },
+ selectionChange (selection) {
+ this.selection = selection
+
+ },
+
+ deleteBatch () {
+ if (this.selection.length > 0) {
+ this.$confirm("确认删除选择的活动?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ this.deleteActBatch()
+ })
+ .catch(err => {
+ if (err == "cancel") {
+ // this.$message({
+ // type: "info",
+ // message: "已取消删除"
+ // });
+ }
+
+ });
+ } else {
+ this.$message.warning('请先选择要删除的活动')
+ }
+ },
+
+ async deleteActBatch () {
+ let params = []
+ this.selection.forEach(element => {
+
+ params.push(element.icPartyActId)
+ });
+
+ const url = "/resi/partymember/icPartyAct/del";
+ // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/del";
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ this.$message.success("删除成功！");
+ this.getTableData();
+ } else {
+ this.$message.error('操作失败！')
+ }
+ },
+
async getTableData () {
this.tableLoading = true
- const url = "/heart/icServiceProject/service/recordList";
- // const url = "http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/recordList";
+ const url = "/resi/partymember/icPartyAct/page-list";
+ // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/page-list";
const { pageSize, pageNo, formData } = this;
const { data, code, msg } = await requestPost(url, {
pageSize,
@@ -594,7 +667,8 @@ export default {
},
async handleExport () {
- const url = "/gov/project/icEvent/export";
+ const url = "/resi/partymember/icPartyAct/export-act";
+ // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/export-act";
const { pageSize, pageNo, formData } = this;
axios({
url: window.SITE_CONFIG["apiURL"] + url,
@@ -641,14 +715,15 @@ export default {
},
resetSearch () {
+ this.agencyIdArray = []
this.formData = {
- serviceCategoryKey: '',
- serviceProjectName: '',
- serviceOrgName: '',
- serviceTimeStart: '',
- serviceTimeEnd: '',
- serviceStatus: '',
- satisfaction: ''
+ publishPartyOrgId: '',//发布活动党组织；所属党组织
+ actType: '',//活动类型
+ startDate: '',//活动开始时间20220817
+ endDate: '',//活动结束时间20220817
+ isPublish: '',//活动状态。
+ address: '',
+ topic: '',
}
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
index 9764df454..3306fa6ae 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
@@ -6,17 +6,17 @@
:inline="true"
:model="formData"
:rules="dataRule"
+ :disabled="formType==='detail'"
class="div_form">
-
+
-
@@ -26,40 +26,41 @@
-
+ v-model="formData.topic">
+ v-model="formData.address">
@@ -72,26 +73,45 @@
-
- {{formData.publishPartyOrgName}}
+
+
+ {{formData.joinNames}}
+
+
@@ -105,15 +125,15 @@
+ v-model="isAutoInform">
+ v-model="formData.introduce">
{
+
+ let obj = {
+ joinOrgId: element.data.id,
+ orgType: element.data.partyOrgType,
+ pid: element.data.pid,
+ joinOrgPath: element.path.join(':'),
+ joinOrgName: element.data.partyOrgName,
+ }
+ this.formData.joinOrgList.push(obj)
+ });
+
+ },
+
+ async handleComfirm () {
+
+ this.btnDisable = true
+ setTimeout(() => {
+ this.btnDisable = false
+ }, 10000)
+ this.$refs['ref_form'].validate((valid, messageObj) => {
+ if (!valid) {
+ // app.util.validateRule(messageObj)
+ this.btnDisable = false
+ } else {
+ this.addActivity()
+ }
+
+ })
+
+ },
+
+ async addActivity () {
+ // debugger
+
+ if (this.isAutoInform) {
+ this.formData.isAutoInform = '1'
+ } else {
+ this.formData.isAutoInform = '0'
+ }
+ this.formData.attachmentList = [...this.fileList]
+
+
+ if (this.formType === 'add') {
+ this.formData.icPartyActId = ''
+ }
+ console.log(this.formData)
+ const url = '/resi/partymember/icPartyAct/addOrUpdate'
+ // const url = 'http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/addOrUpdate'
let params = {
- dictType: 'ic_service_type'
+
+ ...this.formData
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
- this.categrayArray = data
+ this.$message.success('操作成功')
+ this.resetData()
+ this.$emit('handleOk')
} else {
this.$message.error(msg)
}
},
- async getOrgTreeList () {
+ async loadInfo () {
+ 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 = '/resi/partymember/icPartyOrg/getSearchTreelist'
- let params = {
- customerId: localStorage.getItem('customerId'),
- agencyId: localStorage.getItem('agencyId')
- };
+ let params = {}
+
+ const { data, code, msg } = await requestPost(url, params)
- const { data, code, msg } = await requestGet(url, params);
- console.log('data-orgparty----o', data)
if (code === 0) {
+ this.formData = { ...data }
- this.orgOptions = data
+ this.formData.publichIdArray = data.publishOrgPath.split(':')
+ this.formData.joinIdArray = []
+ this.formData.joinNames = ''
+ data.joinOrgList.forEach(element => {
+ this.formData.joinIdArray.push(element.joinOrgPath.split(':'))
+ this.formData.joinNames = this.formData.joinNames + element.joinOrgName + ','
- } else {
- }
+ });
+ if (this.formData.joinNames) {
+ this.formData.joinNames = this.formData.joinNames.substring(0, this.formData.joinNames.length - 1)
+ }
+ this.isAutoInform = this.formData.isAutoInform == '1'
+
+ this.fileList = [... this.formData.attachmentList]
+ } else {
+ this.$message.error(msg)
+ }
},
+ // 活动类型
+ async getCategrayList () {
+ const url = "/resi/partymember/icPartyAct/acttypelist"
+ // const url = "http://yapi.elinkservice.cn/mock/245/resi/partymember/icPartyAct/acttypelist"
- handleChangeScope (value) {
- this.formData.serviceScope = []
- let selArray = this.$refs["myCascader"].getCheckedNodes()
- selArray.forEach(element => {
+ let params = {}
- let obj = {
- objectType: element.data.objectType === 'grid' ? 'grid' : element.data.objectType === 'neighborhood' ? 'neighborhood' : 'agency',
- objectId: element.data.objectId,
- objectName: element.data.objectName,
- }
- this.formData.serviceScope.push(obj)
- });
+ const { data, code, msg } = await requestPost(url, params)
+ if (code === 0) {
+ this.categrayArray = data
+ } else {
+ this.$message.error(msg)
+ }
},
+ // 自动发布时间
+ async getAutoTimeArray () {
+ const url = "/sys/dict/data/dictlist"
- //加载组织
- async loadOrgList () {
- const url = '/heart/icServiceOrg/selectlist'
- // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceOrg/selectlist'
let params = {
- serviceType: this.formData.serviceCategoryKey,
-
+ dictType: 'icpartyact_auto_publish_time'
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
- this.orgList = data
+ this.autoTimeArray = data
+
+ this.autoTimeArray.forEach(element => {
+ element.value = parseInt(element.value)
+ });
} else {
this.$message.error(msg)
}
},
- async handleComfirm () {
-
- if (this.formType === 'add') {
- this.handleAdd()
- } else if (this.formType === 'feedback') {
-
- }
- },
-
- async handleAdd () {
-
- this.btnDisable = true
- setTimeout(() => {
- this.btnDisable = false
- }, 10000)
- this.$refs['ref_form'].validate((valid, messageObj) => {
- if (!valid) {
- app.util.validateRule(messageObj)
- this.btnDisable = false
- } else {
+ async getOrgTreeList () {
+ const url = '/resi/partymember/icPartyOrg/getSearchTreelist'
+ let params = {
+ customerId: localStorage.getItem('customerId'),
+ agencyId: localStorage.getItem('agencyId')
+ };
- this.addActivity()
+ 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 {
+ }
- })
},
- async addActivity () {
-
-
-
- console.log(this.formData)
- // return false
- const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
- if (this.formData.principalContact && regPhone.test(this.formData.principalContact) === false) {
- this.btnDisable = false
- this.$message({
- type: 'warning',
- message: '请输入正确的手机号码'
- })
- return false;
+ 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
+ }
}
+ },
-
- const url = '/heart/icServiceProject/service/initiate'
- // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'
+ //加载组织
+ async getJoinOrgTreeList () {
+ const url = '/resi/partymember/icPartyOrg/getOrgTreeHaveGroup'
+ // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceOrg/selectlist'
let params = {
+ agencyId: localStorage.getItem('agencyId')
- ...this.formData
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
- this.$message.success('发起成功')
- this.resetData()
- this.$emit('handleOk')
+ // this.joinOptions = data
} else {
this.$message.error(msg)
}
},
-
beforeUpload (file) {
const array = file.name.split('.')
const extension = array[array.length - 1]
@@ -449,21 +536,23 @@ export default {
const mp3Array = ['mp3']
if (picArray.indexOf(fileType) > -1) {
- file.attachmentFormat = 'image'
+ file.format = 'image'
} else if (videoarray.indexOf(fileType) > -1) {
- file.attachmentFormat = 'video'
+ file.format = 'video'
} else if (docArray.indexOf(fileType) > -1) {
- file.attachmentFormat = 'doc'
+ file.format = 'doc'
} else if (mp3Array.indexOf(fileType) > -1) {
- file.attachmentFormat = 'voice'
+ file.format = 'voice'
}
file.url = res.data.url
file.type = fileType
- file.attachmentName = file.name
- file.attachmentType = file.type
- file.attachmentUrl = file.url
+ // file.attachmentName = file.name
+ // file.attachmentType = file.type
+ // file.attachmentUrl = file.url
+ file.format = file.attachmentFormat
+
this.fileList.push(file)
console.log(this.fileList)
@@ -491,17 +580,30 @@ export default {
resetData () {
- this.formData = {
- serviceCategoryKey: '',//服务分类id
- serviceProjectId: '',//服务项目id
- serviceOrgId: '',//服务组织id
- serviceScope: [],//
- principalName: '',//经办人(责任人)姓名
- principalContact: '',//经办人联系方式
- serviceTimeStart: '',//服务起始时间yyyy-MM-dd
- serviceTimeEnd: '',//服务截止时间yyyy-MM-dd
- remark: '',//
+ this.formData = {
+ icPartyActId: '',//编辑活动时必传
+ actType: '',// 活动类型，来源于活动类型接口value
+ holdYearId: '',//活动开始时间所属年份：yyyy
+ holdMonthId: '',//活动开始时间所属月份：yyyyMM
+ holdTime: '',//活动开始时间：yyyy-MM-dd HH:mm:ss
+ topic: '',// 活动主题
+ address: '',// 活动地址
+ latitude: '',//活动地点纬度
+ longitude: '',// 活动地点经度
+ autoPublicType: '',//自动发布时间key; 来源于字典表接口
+ publishPartyOrgId: '',// 发布活动党组织id
+ publishPartyOrgName: '',// 发布活动党组织名称
+ publishOrgPid: '',// 参加活动党组织ID的上级节点
+ publishOrgType: '',//党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组
+ publishOrgPath: '',//PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显
+ joinUserType: '',//参加人员类型，0：全体党员；1：支部委员
+ isAutoInform: '',// 是否自动通知参加人员，0否；1是
+ introduce: '',// 活动介绍
+ joinOrgList: [],
+ attachmentList: [],
+ joinIdArray: [],
+ publichIdArray: []
}
@@ -526,21 +628,30 @@ export default {
dataRule () {
return {
- serviceCategoryKey: [
- { required: true, message: '服务类别不能为空', trigger: 'blur' },
+ actType: [
+ { required: true, message: '活动类型不能为空', trigger: 'change' },
],
- serviceProjectId: [
- { required: true, message: '服务项目不能为空', trigger: 'blur' }
+ holdTime: [
+ { required: true, message: '活动举办时间不能为空', trigger: 'change' }
],
- serviceOrgId: [
- { required: true, message: '服务组织不能为空', trigger: 'blur' }
+ topic: [
+ { required: true, message: '活动主题不能为空', trigger: 'change' }
+ ],
+ address: [
+ { required: true, message: '活动地点不能为空', trigger: 'change' }
+ ],
+ autoPublicType: [
+ { required: true, message: '自动发布时间不能为空', trigger: 'change' }
+ ],
+ joinUserType: [
+ { required: true, message: '参加人员不能为空', trigger: 'change' }
],
- serviceTimeStart: [
- { required: true, message: '服务时间不能为空', trigger: 'blur' }
+ joinIdArray: [
+ { required: true, message: '参加活动党组织不能为空', trigger: 'change' }
],
- serviceScope: [
- { required: true, message: '服务范围不能为空', trigger: 'blur' }
+ publichIdArray: [
+ { required: true, message: '发布活动党组织不能为空', trigger: 'change' }
],
}
@@ -550,12 +661,14 @@ export default {
},
props: {
-
formType: { //表单操作类型 add新增，edit编辑，detail详情
type: String,
required: ''
},
-
+ icPartyActId: {
+ type: String,
+ required: ''
+ },
}
}
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
index 3f127f111..fadb90c7d 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
@@ -27,7 +27,7 @@
活动举办频次
- 每季度一次
+ {{selActType.frequencyDesc?selActType.frequencyDesc:'--'}}
@@ -47,18 +47,18 @@
width="50">
-
-
@@ -83,14 +83,14 @@
-
+ min-width="220">
-
@@ -103,25 +103,43 @@
-
+ @change="handleChangeScope(scope.$index)">
+
+
+
+
+
-
+
+
+
-
-
+ v-model="scope.row.isAutoInformShow">
@@ -201,8 +219,11 @@
- 取 消
- 确定
+ 取 消
+ 确定
@@ -212,7 +233,7 @@
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
index de2ae9a3d..8b366d438 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/scheduleForm.vue
@@ -8,21 +8,22 @@
:rules="dataRule"
class="div_form">
-
+ v-model="formData.title">
-
@@ -30,8 +31,8 @@
-
+
@@ -43,7 +44,7 @@
-
@@ -87,27 +88,22 @@ export default {
formData: {
- serviceCategoryKey: '',//服务分类id
- serviceProjectId: '',//服务项目id
- serviceOrgId: '',//服务组织id
- serviceScope: [],//
- principalName: '',//经办人(责任人)姓名
- principalContact: '',//经办人联系方式
- serviceTimeStart: '',//服务起始时间yyyy-MM-dd
- serviceTimeEnd: '',//服务截止时间yyyy-MM-dd
+ title: '',//
+ remindTime: '',//
+ isPublic: '',//
remark: '',//
-
+ scheduleId: '',
},
gongkaiArray: [
{
- valule: '1',
+ value: '0',
label: '仅自己可见'
},
{
- valule: '2',
+ value: '1',
label: '组织内其他人可见'
},
@@ -141,7 +137,7 @@ export default {
}, 10000)
this.$refs['ref_form'].validate((valid, messageObj) => {
if (!valid) {
- app.util.validateRule(messageObj)
+
this.btnDisable = false
} else {
@@ -158,10 +154,8 @@ export default {
console.log(this.formData)
-
-
- const url = '/heart/icServiceProject/service/initiate'
- // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'
+ const url = '/resi/partymember/icSchedule/addOrEdit'
+ // const url = 'http://yapi.elinkservice.cn/mock/245/icSchedule/addOrEdit'
let params = {
...this.formData
@@ -190,15 +184,11 @@ export default {
resetData () {
this.formData = {
- serviceCategoryKey: '',//服务分类id
- serviceProjectId: '',//服务项目id
- serviceOrgId: '',//服务组织id
- serviceScope: [],//
- principalName: '',//经办人(责任人)姓名
- principalContact: '',//经办人联系方式
- serviceTimeStart: '',//服务起始时间yyyy-MM-dd
- serviceTimeEnd: '',//服务截止时间yyyy-MM-dd
+ title: '',//
+ remindTime: '',//
+ isPublic: '',//
remark: '',//
+ scheduleId: '',
}
@@ -224,50 +214,16 @@ export default {
dataRule () {
return {
- serviceCategoryKey: [
- { required: true, message: '服务类别不能为空', trigger: 'blur' },
- ],
- serviceProjectId: [
- { required: true, message: '服务项目不能为空', trigger: 'blur' }
- ],
-
- serviceOrgId: [
- { required: true, message: '服务组织不能为空', trigger: 'blur' }
- ],
- serviceTimeStart: [
- { required: true, message: '服务时间不能为空', trigger: 'blur' }
- ],
- serviceScope: [
- { required: true, message: '服务范围不能为空', trigger: 'blur' }
+ title: [
+ { required: true, message: '日程标题不能为空', trigger: 'change' },
],
-
- }
- },
- feedbackDataRule () {
- return {
-
- serviceProjectName: [
- { required: true, message: '服务项目不能为空', trigger: 'blur' },
+ remindTime: [
+ { required: true, message: '提醒时间不能为空', trigger: 'change' }
],
- serviceGoal: [
- { required: true, message: '服务目标不能为空', trigger: 'blur' }
+ isPublic: [
+ { required: true, message: '是否公开不能为空', trigger: 'change' }
],
- 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' }
- ]
}
},
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
index 0235765f6..148fe6c87 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
@@ -10,7 +10,7 @@
-
-
+ width="50" /> -->
-
-
-
-
-
-
+
+
+
+
-
-
+
-
+
+ 是
+ 否
+
+
- 查看
+
+ 修改
- 删除
@@ -151,6 +178,7 @@
class="dialog-h"
@closed="showAdd = false">
@@ -165,6 +193,7 @@
@closed="showEdit = false">
@@ -190,13 +219,14 @@ export default {
agencyId: '',
tableData: [],
- categrayArray: [],
+ originalData: [],
+ rowArray: [],//合并行的行数
+
yearArray: [],
formData: {
- year: '',
+ yearId: '',
},
- serviceRecordId: '',
- serviceProjectName: '',
+ icPartyActId: '',
showAdd: false,
@@ -220,14 +250,14 @@ export default {
},
mounted () {
- console.log(this.$store.state)
+
this.user = this.$store.state.user
this.agencyId = this.user.agencyId
this.yearArray = []
let now = new Date()
let year = now.getFullYear()
- this.formData.year = year
+ this.formData.yearId = year + ''
for (let i = 0; i < 5; i++) {
let obj = {
value: (year - i) + '',
@@ -241,6 +271,48 @@ export default {
this.getTableData();
},
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 () {
this.$emit('handleClose')
},
@@ -253,27 +325,28 @@ export default {
this.getTableData();
},
-
-
async handleAdd () {
this.formType = 'add'
this.showAdd = true;
- },
-
+ },
+ async handleDetail (row) {
+ this.icPartyActId = row.icPartyActId
+ this.addDiaTitle = '查看活动计划'
+ this.formType = 'detail'
+ this.showEdit = true
+ },
async handleEdit (row) {
-
+ this.icPartyActId = row.icPartyActId
this.formType = 'edit'
this.showEdit = true
},
-
handleClose () {
- this.serviceRecordId = ""
this.formType = ''
this.showAdd = false
@@ -291,9 +364,9 @@ export default {
async handleDel (row) {
- this.serviceRecordId = row.serviceRecordId
+ this.icPartyActId = row.icPartyActId
- this.$confirm("确认取消活动?", "提示", {
+ this.$confirm("活动删除后不可恢复，您确定要删除吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
@@ -315,13 +388,14 @@ export default {
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.icPartyActId]
- const { data, code, msg } = await requestPost(url, {});
+ const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
- this.$message.success("取消成功！");
+ this.$message.success("删除成功！");
this.getTableData();
} else {
this.$message.error("操作失败！");
@@ -330,33 +404,45 @@ export default {
async getTableData () {
this.tableLoading = true
- const url = "/heart/icServiceProject/service/recordList";
- // const url = "http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/recordList";
+ const url = "/resi/partymember/icPartyAct/yearSearch";
+ // const url = "http://yapi.elinkservice.cn/mock/245/icPartyAct/yearSearch";
const { data, code, msg } = await requestPost(url, this.formData);
this.tableLoading = false
if (code === 0) {
+ let tempArray = []
+ this.rowArray = []
- this.total = data.total || 0;
- this.tableData = data.list
- ? data.list.map((item) => {
- return item;
- })
- : [];
+ this.originalData = data.concat();
+
+ data.forEach(item => {
+ item.activityList.forEach(actItem => {
+ actItem.actType = item.typeValue
+ actItem.frequency = item.frequency
+
+ if (actItem.joinOrgList && actItem.joinOrgList.length > 0) {
+
+ let arr = []
+ actItem.joinOrgList.forEach(element => {
+ arr.push(element.joinOrgName)
+ });
+ actItem.joinOrgsShow = arr.join(',')
+ } else {
+ actItem.joinOrgsShow = ''
+ }
- this.tableData.forEach(item => {
- if (item.operationType === '2') {
- item.operationTypeShow = '已转需求'
- }
- if (item.operationType === '1') {
- item.operationTypeShow = '已立项'
- }
- if (item.operationType === '0') {
- item.operationTypeShow = '已回复'
- }
+ tempArray.push(actItem)
+ });
+
+ this.rowArray.push(item.activityList.length)
});
+
+ this.tableData = tempArray
+
+
+
} else {
this.$message.error(msg);
}
diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue
index 93c020d7c..74a482bd4 100644
--- a/src/views/modules/partymember/icpartyorg-add-or-update.vue
+++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue
@@ -37,6 +37,7 @@
0 && this.dataForm.mySelectOrg) {
this.dataForm.orgPid = this.dataForm.mySelectOrg[this.dataForm.mySelectOrg.length - 1]
- this.dataForm.orgPids = ''
+ this.dataForm.orgPids = this.$refs.myOrg.getCheckedNodes()[0].data.orgPids;
this.dataForm.mySelectOrg.forEach(element => {
this.dataForm.orgPids = this.dataForm.orgPids ? this.dataForm.orgPids + ':' + element : element
});
@@ -330,7 +331,7 @@
})
},
getInfoAgencyLisy(){
- this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.agencyId, orgType: this.dataForm.partyOrgType}}).then(({data: res}) => {
+ this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.dataForm.pid?this.dataForm.pid:this.agencyId, orgType: this.dataForm.partyOrgType}}).then(({data: res}) => {
if (res.code !== 0) {
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
}
diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index 776585349..d61f13ce6 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -25,7 +25,7 @@
size="small"
class="div-table-button--detail">{{'查看党员'}}
新增下级