-
+
+
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
@@ -178,17 +189,53 @@
// gridList: [],
agencyId: '',
- demandOptions:[]
+ demandOptions:[],
+ typeList:[],
+ corganizerList:[]
}
},
components: { Tinymce,UploadImage },
mounted () {
- // this.initMap()
+ this.activityType()
+ this.listServerOrg()
},
methods: {
+ async listServerOrg() {
+ const url = "/actual/base/serviceitem/listServerOrgNewTask";
+ let params = {
+ serverOrgCategoryCode: "",
+ serverOrgType: "party_unit",
+ serverParentOrgCategoryCode: ""
+ };
+
+ let { data, code, msg } = await requestPost(url, params);
+ if (code == 0) {
+ this.corganizerList = data;
+ // console.log("datadata",this.corganizerList)
+ } else if (code >= 8000) {
+ this.$message.error(msg);
+ }
+ },
+ async activityType () {
+ const url = "/actual/base/activityType/page"
+ let params = {
+ // agencyId: this.agencyId
+ pageSize: 20,
+ pageNo: 1,
+ typeName: "",
+ enabled: 0
+ }
+ const { data, code, msg } = await requestPost(url, params)
+ if (code === 0) {
+ this.typeList = data.list
+ } else {
+ this.$message.error(msg)
+ }
+ },
+
handleOnlineRegistration(value) {
console.log(value)
if (value) {
@@ -527,7 +574,7 @@
dataRule () {
return {
serviceMatterList: [
- { required: true, message: '服务事项不能为空', trigger: 'blur' }
+ { required: true, message: '活动名称不能为空', trigger: 'blur' }
],
unitIdList: [
{ required: true, message: '单位名称不能为空', trigger: 'blur' },
diff --git a/src/views/modules/communityParty/activity/eventDetails.vue b/src/views/modules/communityParty/activity/eventDetails.vue
index dcd3675de..5fe539a90 100644
--- a/src/views/modules/communityParty/activity/eventDetails.vue
+++ b/src/views/modules/communityParty/activity/eventDetails.vue
@@ -8,12 +8,12 @@
活动类型:
- 绿色环保-垃圾分类
+ {{ formData.unitName || "--" }}
活动名称:
- 要想环境好，垃圾要分类
+ {{ formData.activityName || "--" }}
@@ -21,12 +21,12 @@
活动时间:
- 2024-03-12 09:00至2024-03-12 12:00
+ {{ formData.startTime || "--" }}至{{ formData.endTime || "--" }}
协办方:
- {{ formData.unitName || "--" }}
+ {{ formData.assistingParty || "--" }}
@@ -34,7 +34,7 @@
活动内容:
- 活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容
+ {{ formData.content || "--" }}
@@ -51,7 +51,7 @@
线上报名:
-
@@ -71,11 +71,11 @@
活动总结：
- 活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容
+ {{ formData.sumUp || "--" }}
活动图片：
-
+
![Image]()
@@ -85,8 +85,7 @@
+
+
-
+
@@ -18,28 +18,28 @@
-
-
+
+
报名名单
-
活动实况
-
-
+
-
-
+
+
-
-
+
+
@@ -58,7 +58,7 @@
+
-
+
-
+
-
+
-
+
- 小程序
- 管理平台
+ 是
+ 否
@@ -118,9 +118,16 @@
@dialogOk="addFormOk">
+
+
+
+
-
@@ -130,6 +137,7 @@
import activityRecords from './activityRecords'
import eventDetails from './eventDetails'
+ import initiateActivity from './initiateActivity'
import util from '@js/util.js';
import { requestPost,requestGet } from "@/js/dai/request";
import { mapGetters } from 'vuex'
@@ -147,25 +155,8 @@
agencyId: '',
gridList: [],//所属网格
unitList: [],//单位list
+ typeList:[],//活动类型
corganizerList:[],//协办方list
- serviceList: [
- {
- id: "1",
- name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。'
- },
- {
- id: "2",
- name: '积极配合'
- },
- {
- id: "3",
- name: '积极配合社区安全巡查员进行'
- },
- {
- id: "4",
- name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。并具备安全意识及设备设施'
- },
- ],//服务list
pickerOptions: { //控制时间范围
disabledDate (time) {
return time.getTime() > (Date.now() - (24 * 60 * 60 * 1000))
@@ -189,6 +180,7 @@
//form相关
formShow: false,
+ initShow:false,
formTitle: '新增活动',
detailShow: false,
@@ -200,7 +192,7 @@
}
},
components: {
- activityRecords, eventDetails
+ activityRecords, eventDetails, initiateActivity
},
async created () {
@@ -214,12 +206,15 @@
//获取建联单位
this.loadUnit()
+ //获取活动类型
+ this.activityType()
+
this.loadGrid()
//获取网格下拉框数据
- this.loadTable()
+ // this.loadTable()
this.listServerOrg()
- this.communityPublicity()
+ this.communityActivityList()
},
@@ -243,26 +238,23 @@
this.$message.error(msg);
}
},
-
- async communityPublicity() {
- const url = "/actual/base/communityPublicity/page";
- let params = {
- "pageSize": 20,
- "pageNo": 1,
- // "title": "",
- // "tagId": "",
- // "startTime": "",
- // "endTime": ""
+ async communityActivityList() {
+ const url = "/actual/base/communityActivity/page";
+
+ let params = {
+ pageSize: this.pageSize,
+ pageNo: this.pageNo,
+ agencyId: this.agencyId,
+ ...this.formData,
};
-
- let { data, code, msg } = await requestGet(url, params);
- console.log("datadatadata",data)
- // if (code == 0) {
- // this.corganizerList = data;
- // console.log("datadata",this.corganizerList)
- // } else if (code >= 8000) {
- // this.$message.error(msg);
- // }
+ let { data, code, msg } = await requestPost(url, params);
+ if (code === 0) {
+ this.total = data.total
+ this.tableData = data.list
+ console.log("datadatadata",this.tableData)
+ } else {
+ this.$message.error(msg)
+ }
},
handleCateCHange(val) {
@@ -302,7 +294,8 @@
return arr;
},
handleSearch () {
- this.loadTable()
+ // this.loadTable()
+ this.communityActivityList()
},
async loadGrid () {
const url = "/gov/org/customergrid/gridoption"
@@ -334,52 +327,34 @@
this.$message.error(msg)
}
},
-
- //获取服务事项下拉框
- async loadService () {
- const url = "/actual/base/serviceitem/dict-list"
- let params = {
- // parentCategoryCode: '1010'
- }
-
- const { data, code, msg } = await requestPost(url, params)
-
- if (code === 0) {
- this.serviceList = data
-
- } else {
- this.$message.error(msg)
- }
-
- },
- //展示表格
- async loadTable () {
- this.tableLoading = true
- const url = "/actual/base/icpartyactivity/search"
- // const url = "/actual/base/communityActivity/page"
+
+ async activityType () {
+ const url = "/actual/base/activityType/page"
let params = {
- agencyId: this.agencyId,
- pageSize: this.pageSize,
- pageNo: this.pageNo,
- ...this.formData
+ // agencyId: this.agencyId
+ pageSize: 20,
+ pageNo: 1,
+ typeName: "",
+ enabled: 0
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
- this.total = data.total
- this.tableData = data.list
+ this.typeList = data.list
} else {
this.$message.error(msg)
}
- this.tableLoading = false
},
-
-
diaClose () {
this.$refs.ref_form.resetData()
this.formShow = false
},
+ diaInitClose() {
+
+ this.$refs.ref_form.resetData()
+ this.initShow = false
+ },
detailClosed () {
console.log(this.$refs.ref_detail)
@@ -406,6 +381,14 @@
this.$refs.ref_form.initForm('add', null)
})
},
+ handleInitAdd () {
+ this.formTitle = '新增'
+
+ this.initShow = true
+ this.$nextTick(() => {
+ this.$refs.ref_form.initForm('add', null)
+ })
+ },
// startProcess () {
// this.formTitle = '新增'
@@ -426,9 +409,19 @@
addFormCancle () {
this.formShow = false
},
+ addFormCancleInit () {
+ this.initShow = false
+ },
addFormOk () {
this.formShow = false
- this.loadTable()
+ // this.loadTable()
+ this.communityActivityList()
+
+ },
+ addFormOkInit () {
+ this.initShow = false
+ // this.loadTable()
+ this.communityActivityList()
},
@@ -466,7 +459,8 @@
message: "删除成功"
});
- this.loadTable()
+ // this.loadTable()
+ this.communityActivityList()
} else {
this.$message.error(msg)
}
@@ -476,16 +470,18 @@
resetSearch () {
this.timeRange = []
this.formData = {
- gridId: '',
- unitName: '',
- serviceMatter: '',
- type: '',
- contact: '',
- contactMobile: ''
+ activityName: "",
+ status: 0,
+ typtId: "",
+ startTime: "",
+ endTime: "",
+ address: "",
+ assistingParty: ""
}
- this.pageSize = 10
- this.pageNo = 0
- this.loadTable()
+ this.pageSize = 20
+ this.pageNo = 1
+ // this.loadTable()
+ this.communityActivityList()
},
//导出表格
@@ -583,7 +579,8 @@
message: "导入成功"
});
- this.loadTable()
+ // this.loadTable()
+ this.communityActivityList()
} else {
this.$message.error(msg)
}
@@ -602,17 +599,18 @@
this.formData.startTime = ''
this.formData.endTime = ''
}
-
},
handleSizeChange (val) {
this.pageSize = val
this.pageNo = 1
- this.loadTable()
+ // this.loadTable()
+ this.communityActivityList()
},
handleCurrentChange (val) {
this.pageNo = val
- this.loadTable()
+ // this.loadTable()
+ this.communityActivityList()
},
// 开启加载动画
diff --git a/src/views/modules/communityParty/activity/initiateActivity.vue b/src/views/modules/communityParty/activity/initiateActivity.vue
new file mode 100644
index 000000000..56fef782f
--- /dev/null
+++ b/src/views/modules/communityParty/activity/initiateActivity.vue
@@ -0,0 +1,664 @@
+
+
- + 发起活动
+ + 发起活动
+ 活动记录
@@ -69,23 +69,23 @@
style="width: 100%">
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确
+ 定
+
+