diff --git a/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue b/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue index a2ece99e..a7f7649f 100644 --- a/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue +++ b/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue @@ -11,35 +11,20 @@ - - - @@ -61,14 +46,14 @@ - - 地图标绘 + + + + @@ -77,7 +62,7 @@ + end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00']"> @@ -88,7 +73,7 @@ + end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00']"> @@ -152,60 +137,76 @@ export default { detail: '', lng: '', lat: '', + address: '', clockRange: '', + intoTime: [], + intoBegintime: '', + intoEndtime: '', + intoIntegral: '', + exitTime: [], + exitBegintime: '', + exitEndtime: '', + exitIntegral: '', }, formRules: { - title: [{required: true, message: "请输入标题", trigger: "blur"}], - organizationName: [{required: true, message: "请选择党组织", trigger: "blur"}], - electionMethod: [{required: true, message: "请选择选举方式", trigger: "blur"}], - chooseNumber: [{required: true, message: "请输入应选人数", trigger: "blur"}], - votingDate: [{required: true, message: "请选择投票日期", trigger: "blur"}], - candidateUsers: [{required: true,validator: validLocation, trigger: "blur"}], - voteUsers: [{required: true,validator: validLocation, trigger: "blur"}], + title: [{required: true, message: "请输入活动名称", trigger: "blur"}], + location: [{required: true, validator: validLocation, trigger: "blur"}], + clockRange: [{required: true, message: "请输入打卡范围", trigger: "blur"}], + intoTime: [{required: true, message: "请选择进场打卡时间", trigger: "blur"}], + intoIntegral: [{required: true, message: "请输入进场得积分", trigger: "blur"}], + exitTime: [{required: true, message: "请选择离场打卡时间", trigger: "blur"}], + exitIntegral: [{required: true, message: "请输入离场得积分", trigger: "blur"}], }, id: '', isEdit: false, info: {}, - candidateUsersList: '', - voteUsersList: '', - chooseCandidateList: [], - chooseVoteList: [], - areaRootId: '', map: null, placeSearch: null, placeDetail: { lng: '', lat: '', + address: '' }, showMap: false, searchPlace: '', } }, created() { + this.$dict.load('activityStatus') if(this.params && this.params.id) { this.id = this.params.id this.getDetail() } - this.areaRootId = [this.user.info.areaId.substr(0, 6), '000000'].join("") - // this.initMap() + this.areaRootId = this.user.info.areaId }, computed: { ...mapState(['user']) }, + watch: { + 'form.intoTime': { + handler(val) { + if(val) { + this.form.intoBegintime = val[0] + this.form.intoEndtime = val[1] + } + } + }, + 'form.exitTime': { + handler(val) { + if(val) { + this.form.exitBegintime = val[0] + this.form.exitEndtime = val[1] + } + } + } + }, methods: { selectMap() { this.form.lng = this.placeDetail.lng this.form.lat = this.placeDetail.lat + this.form.address = this.placeDetail.address this.showMap = false }, - getCorpLocation() { - this.instance.post('/app/appdvcpconfig/getCorpLocation').then((res) => { - if (res.code == 0) { - this.initMap(res.data) - } - }) - }, - initMap() { AMapLoader.load({ key: '54a02a43d9828a8f9cd4f26fe281e74e', @@ -215,7 +216,6 @@ export default { this.map = new AMap.Map('map', { resizeEnable: true, zooms: [6, 20], - // center: [lng, lat], zoom: 11, }) this.placeSearch = new AMap.PlaceSearch({ map: this.map }) @@ -243,7 +243,6 @@ export default { }) }, - movePosition(center) { if (this.map) { this.map.clearMap() @@ -257,7 +256,6 @@ export default { this.map.setFitView() } }, - cancel (isRefresh) { this.$emit('change', { type: 'activitiesList', @@ -276,12 +274,12 @@ export default { }).then((res) => { if(res?.data) { this.form = res.data - this.form.organizationName = res.data.partyOrganizations[0].name + this.form.intoTime = [res.data.intoBegintime,res.data.intoEndtime] + this.form.exitTime = [res.data.exitBegintime,res.data.exitEndtime] + // this.form.intoTime[1] = res.data.intoEndtime + // this.form.exitTime[0] = res.data.exitBegintime + // this.form.exitTime[1] = res.data.exitEndtime this.info = res.data - this.candidateUsersList = res.data.candidateUsers.map(v=> v.name) - this.voteUsersList = res.data.voteUsers.map(v=> v.name) - this.chooseCandidateList = res.data.candidateUsers - this.chooseVoteList = res.data.voteUsers } }) }, @@ -299,15 +297,6 @@ export default { confirm() { this.$refs.form.validate((valid) => { if (valid) { - if(this.form.electionMethod == 0) { - if(this.form.chooseNumber != this.form.candidateUsers.length) { - return this.$message.error('候选人数与应选人数应相等') - } - } else if(this.form.electionMethod == 1) { - if(this.form.chooseNumber >= this.form.candidateUsers.length) { - return this.$message.error('候选人数应多于应选人数') - } - } this.instance.post(`/appactivityinfo/addOrUpdate`,{ ...this.form }).then(res => { @@ -352,6 +341,10 @@ export default { font-size: 13px; } + .amap-container { + height: 380px; + } + ::v-deep .mapDialog { .el-dialog__body { padding: 0; diff --git a/project/tianfuxing/AppActivitiesManagement/components/activitiesList.vue b/project/tianfuxing/AppActivitiesManagement/components/activitiesList.vue index 2b1016c1..b96863f7 100644 --- a/project/tianfuxing/AppActivitiesManagement/components/activitiesList.vue +++ b/project/tianfuxing/AppActivitiesManagement/components/activitiesList.vue @@ -12,7 +12,7 @@ @@ -40,7 +40,7 @@ export default { } }, created () { - this.$dict.load('electionStatus', 'electionMethod').then(()=> { + this.$dict.load('activityStatus').then(()=> { this.getList() }) }, @@ -51,7 +51,7 @@ export default { {prop: "createUserName", label: "创建人", align: "center"}, {prop: "intoBegintime", label: "开始结束时间", align: "center", render: (h, {row}) => h('p',{textAlign:'center'}, `${row.intoBegintime}至${row.exitEndtime}`)}, - {prop: "status", label: "活动状态", align: "center",dict:"electionMethod"}, + {prop: "status", label: "活动状态", align: "center",dict:"activityStatus"}, { slot: "options", }, ] } @@ -78,7 +78,7 @@ export default { }) }, handleDelete(id) { - this.$confirm('确定删除该数据？').then(() => { + this.$confirm('确定删除该活动？').then(() => { this.instance.post(`/appactivityinfo/delete?ids=${id}`).then(res=>{ if(res.code == 0) { this.$message.success('删除成功！') @@ -87,24 +87,12 @@ export default { }) }) }, - // 开启、结束 - startEnd(id, status) { - let title = '' - let bool = null - let tips = '' - if(status == 0) { - title = '未到投票开始时间，确定要提前开始吗？' - bool = true - tips = '开启成功' - } else if(status == 1) { - title = '投票正在进行中，确定要提前结束吗？' - bool = false - tips = '结束成功' - } - this.$confirm(title).then(() => { - this.instance.post(`/app/appgeneralelectioninfo/start-end?id=${id}&start=${bool}`).then(res=>{ + // 结束 + stopBtn(id) { + this.$confirm('确定要结束该活动吗？').then(() => { + this.instance.post(`/appactivityinfo/stop?id=${id}`).then(res=>{ if(res.code == 0) { - this.$message.success(tips) + this.$message.success('结束成功！') this.getList() } })