elink-star
/
epdc-admin-luzhou
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【市北代码迁移至安宁】【初心互助】-王公峰-2020-09-17

redesign
wanggongfeng 5 years ago
parent
5acd8d6e1f
commit
af4a1eeb25
13 changed files with 339 additions and 166 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 43
      src/views/modules/heart/actbanner.vue
  2. 4
      src/views/modules/heart/actclockpic.vue
  3. 35
      src/views/modules/heart/actinfo-add-or-update.vue
  4. 30
      src/views/modules/heart/actinfo-detail-view.vue
  5. 69
      src/views/modules/heart/actinfo-list.vue
  6. 29
      src/views/modules/heart/actphrase-add-or-update.vue
  7. 40
      src/views/modules/heart/actphrase.vue
  8. 64
      src/views/modules/heart/actuserclock-detail.vue
  9. 86
      src/views/modules/heart/actuserclocklog.vue
  10. 4
      src/views/modules/heart/actuserlog.vue
  11. 86
      src/views/modules/heart/actuserrelation.vue
  12. 5
      src/views/modules/heart/map-select.vue
  13. 4
      src/views/modules/heart/volunteerrank.vue

43
src/views/modules/heart/actbanner.vue
View File

@ -1,21 +1,22 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never" class="aui-card--fill">
<div class="mod-heart__actbanner}"> <div class="mod-heart__actbanner}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<el-form-item label="状态"> <el-form-item label="状态">
<el-select v-model="dataForm.status" placeholder="状态" clearable> <el-select v-model="dataForm.status" placeholder="状态" clearable>
<el-option label="上架" :value="1"></el-option> <el-option label="上架" :value="1"></el-option>
<el-option label="下架" :value="0"></el-option> <el-option label="下架" :value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" <el-form-item label="时间"
prop="startTime"> prop="startTime">
<el-date-picker v-model="dataForm.startTime" <el-date-picker v-model="dataForm.startTime"
type="date" type="date"
:picker-options="pickerBeginDateBefore" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期时间"> placeholder="选择日期时间"
@change="changeTime">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="至" <el-form-item label="至"
@ -26,21 +27,23 @@
:picker-options="pickerBeginDateAfter" :picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期时间"> placeholder="选择日期时间"
@change="changeTime">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column label="序号" type="index" align="center" width="50"></el-table-column> <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
<el-table-column prop="title" label="标题" min-width="400" show-overflow-tooltip header-align="center" align="left"></el-table-column> <el-table-column prop="title" label="标题" header-align="center" align="center" min-width="200" show-overflow-tooltip></el-table-column>
<el-table-column prop="status" label="状态" width="70" :formatter="formatState" header-align="center" align="center"></el-table-column> <el-table-column prop="status" label="状态" :formatter="formatState" header-align="center" align="center" width="100"></el-table-column>
<el-table-column prop="statusTime" label="上下架时间" width="180" header-align="center" align="center"></el-table-column> <el-table-column prop="statusTime" label="上下架时间" header-align="center" align="center" width="180"></el-table-column>
<el-table-column prop="browseNum" label="浏览数量" width="80" header-align="center" align="center"></el-table-column> <el-table-column prop="browseNum" label="浏览数量" header-align="center" align="center" width="100"></el-table-column>
<el-table-column prop="createdTime" label="创建时间" width="180" header-align="center" align="center"></el-table-column> <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center" width="180"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="85"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('heart:actbanner:grounding')" type="text" size="small" @click="changeGroundingHandle(scope.row)">{{ changeGroundingText(scope.row.status) }}</el-button> <el-button v-if="$hasPermission('heart:actbanner:grounding')" type="text" size="small" @click="changeGroundingHandle(scope.row)">{{ changeGroundingText(scope.row.status) }}</el-button>
</template> </template>
@ -79,9 +82,25 @@ export default {
status: '', status: '',
startTime: '', startTime: '',
endTime: '' endTime: ''
},
pickerBeginDateBefore: {
disabledDate: (time) => {
let beginDateVal = this.dataForm.endTime;
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
} }
} }
}, },
pickerBeginDateAfter: {
disabledDate: (time) => {
let EndDateVal = this.dataForm.startTime;
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
}
}
},
}
},
components: { components: {
AddOrUpdate AddOrUpdate
}, },

4
src/views/modules/heart/actclockpic.vue
View File

@ -1,12 +1,12 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never" class="aui-card--fill">
<div class="mod-heart__actclockpic}"> <div class="mod-heart__actclockpic}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<el-form-item> <el-form-item>
<el-input v-model="dataForm.id" placeholder="id" clearable></el-input> <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('heart:actclockpic:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> <el-button v-if="$hasPermission('heart:actclockpic:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>

35
src/views/modules/heart/actinfo-add-or-update.vue
View File

@ -57,6 +57,7 @@
prop="signupEndTime"> prop="signupEndTime">
<el-date-picker v-model="dataForm.signupEndTime" <el-date-picker v-model="dataForm.signupEndTime"
type="datetime" type="datetime"
popper-class="date_picker"
value-format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm"
format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm"
:picker-options="isSignupEndTime" :picker-options="isSignupEndTime"
@ -195,6 +196,7 @@
prop="contacts"> prop="contacts">
<el-input v-model="dataForm.contacts" <el-input v-model="dataForm.contacts"
maxlength="5" maxlength="5"
placeholder="请输入联系人"
style="width:150px"></el-input> style="width:150px"></el-input>
</el-form-item> </el-form-item>
</el-row> </el-row>
@ -203,6 +205,7 @@
prop="tel" > prop="tel" >
<el-input v-model="dataForm.tel" <el-input v-model="dataForm.tel"
maxlength="20" maxlength="20"
placeholder="请输入联系电话"
style="width:200px"></el-input> style="width:200px"></el-input>
</el-form-item> </el-form-item>
</el-row> </el-row>
@ -246,7 +249,7 @@
<el-row> <el-row>
<el-form-item prop="actContent" <el-form-item prop="actContent"
label="活动内容："> label="活动内容：">
<div style="width:1000px"> <div style="width:700px">
<!-- 富文本编辑器, 容器 --> <!-- 富文本编辑器, 容器 -->
<div id="J_quillEditor" class="ql-editor"></div> <div id="J_quillEditor" class="ql-editor"></div>
<!-- 自定义上传图片功能 (使用element upload组件) --> <!-- 自定义上传图片功能 (使用element upload组件) -->
@ -295,7 +298,7 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row style="text-align:center">
<el-form-item label-width="500px"> <el-form-item label-width="500px">
<el-button type="primary" <el-button type="primary"
:disabled="isAble" :disabled="isAble"
@ -356,7 +359,8 @@ export default {
}, },
isSignupEndTime: { isSignupEndTime: {
disabledDate (time) { disabledDate (time) {
return time < Date.now() - 8.64e7 // 8.64e7=1000*60*60*24一天 // return time < Date.now() - 8.64e7 // 8.64e7=1000*60*60*24一天
return time < Date.now()
} }
}, },
isImgRequired: true, isImgRequired: true,
@ -409,6 +413,26 @@ export default {
} }
}, },
created () { created () {
// 初始化报名截止时间
var signupEndTimeDate = new Date(new Date().getTime() + 24 * 60 * 60 * 1000)
var year = signupEndTimeDate.getFullYear().toString()
var month = (signupEndTimeDate.getMonth() + 1).toString()
if (month < 10) {
month = '0' + month
}
var day = signupEndTimeDate.getDate().toString()
if (day < 10) {
day = '0' + day
}
var hours = signupEndTimeDate.getHours().toString()
if (hours < 10) {
hours = '0' + hours
}
var minutes = signupEndTimeDate.getMinutes().toString()
if (minutes < 10) {
minutes = '0' + minutes
}
this.dataForm.signupEndTime = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes
this.$http this.$http
.get(`/sys/user/deptOptions/getByLoginUser`) .get(`/sys/user/deptOptions/getByLoginUser`)
.then(({ data: res }) => { .then(({ data: res }) => {
@ -882,3 +906,8 @@ export default {
} }
} }
</style> </style>
<style lang="scss">
.date_picker .el-button--text span {
display: none;
}
</style>

30
src/views/modules/heart/actinfo-detail-view.vue
View File

@ -131,20 +131,12 @@
<el-row> <el-row>
<el-form-item prop="actContent" <el-form-item prop="actContent"
label="活动内容："> label="活动内容：">
<p v-html="dataForm.actContent"></p> <div style="border:1px solid #EDEFF0">
<p v-html="dataForm.actContent" class="actContent"></p>
</div>
</el-form-item> </el-form-item>
</el-row> </el-row>
<!-- <el-row>-->
<!-- <el-form-item label="banner展示："-->
<!-- prop="isBanner">-->
<!-- <template>-->
<!-- <el-radio v-model="dataForm.isBanner"-->
<!-- label="1">是</el-radio>-->
<!-- <el-radio v-model="dataForm.isBanner"-->
<!-- label="0">否</el-radio>-->
<!-- </template>-->
<!-- </el-form-item>-->
<!-- </el-row>-->
<el-row> <el-row>
<el-form-item label=" " <el-form-item label=" "
v-loading="loading" v-loading="loading"
@ -156,9 +148,10 @@
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label-width="500px"> <el-form-item style="padding-left:40px;">
<el-button size="small" <el-button size="small"
style="width: 95px" style="width: 95px"
type="primary"
@click="back">返回</el-button> @click="back">返回</el-button>
</el-form-item> </el-form-item>
@ -253,3 +246,14 @@ export default {
} }
} }
</script> </script>
<style scoped>
.actContent{
padding: 10px;
}
.actContent >>> span{
word-break: break-all;
}
.actContent >>> img{
width: 98%;
}
</style>

69
src/views/modules/heart/actinfo-list.vue
View File

@ -1,36 +1,41 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never" class="aui-card--fill">
<div class="mod-heart__actinfo}"> <div class="mod-heart__actinfo}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<el-form-item label="状态"> <el-form-item label="发布状态" label-width="70px">
<el-select v-model="dataForm.actStatus" placeholder="状态" clearable> <el-select v-model="dataForm.actStatus" placeholder="状态" clearable>
<el-option label="上架" :value="1"></el-option> <el-option label="上架" :value="1"></el-option>
<el-option label="下架" :value="0"></el-option> <el-option label="下架" :value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="时间" <el-form-item label="标题" label-width="70px">
prop="startTime"> <el-input placeholder="活动标题" @keyup.native="btKeyUpTitle" v-model="dataForm.title" clearable></el-input>
</el-form-item>
<br>
<el-form-item label="发布时间" prop="startTime" label-width="70px">
<el-date-picker v-model="dataForm.startTime" <el-date-picker v-model="dataForm.startTime"
type="date" type="date"
:picker-options="pickerBeginDateBefore" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期时间"> placeholder="选择日期时间"
style="width:200px"
@change="changeTime">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="至" <el-form-item label="至" prop="endTime">
label-width="25px"
prop="endTime">
<el-date-picker v-model="dataForm.endTime" <el-date-picker v-model="dataForm.endTime"
type="date" type="date"
:picker-options="pickerBeginDateAfter" :picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期时间"> placeholder="选择日期时间"
style="width:200px"
@change="changeTime">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('heart:actinfo:add')" type="primary" @click="addAction()">增加活动</el-button> <el-button v-if="$hasPermission('heart:actinfo:add')" type="primary" @click="addAction()">增加活动</el-button>
@ -41,14 +46,14 @@
border border
@selection-change="dataListSelectionChangeHandle" @selection-change="dataListSelectionChangeHandle"
style="width: 100%;"> style="width: 100%;">
<el-table-column label="序号" type="index" align="center" width="50"></el-table-column> <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
<el-table-column prop="title" label="标题" header-align="center" align="left" min-width="400" show-overflow-tooltip></el-table-column> <el-table-column prop="title" label="标题" header-align="center" align="center" min-width="200" show-overflow-tooltip></el-table-column>
<el-table-column prop="signupEndTime" label="报名截止时间" header-align="center" width="180" align="center"></el-table-column> <el-table-column prop="signupEndTime" label="报名截止时间" header-align="center" align="center" width="180"></el-table-column>
<el-table-column prop="actStartTime" label="开始时间" header-align="center" width="180" align="center"></el-table-column> <el-table-column prop="actStartTime" label="开始时间" header-align="center" align="center" width="180"></el-table-column>
<el-table-column prop="actEndTime" label="结束时间" header-align="center" width="180" align="center"></el-table-column> <el-table-column prop="actEndTime" label="结束时间" header-align="center" align="center" width="180"></el-table-column>
<el-table-column prop="publishTime" label="发布时间" header-align="center" width="180" align="center"></el-table-column> <el-table-column prop="publishTime" label="发布时间" header-align="center" align="center" width="180"></el-table-column>
<el-table-column prop="actStatus" label="发布状态" :formatter="formatState" header-align="center" align="center"></el-table-column> <el-table-column prop="actStatus" label="发布状态" :formatter="formatState" header-align="center" align="center" width="100"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<el-button v-if="$hasPermission('heart:actinfo:cancel')" type="text" :disabled="scope.row.actStatus ==='0'? true :false" size="small" @click="cancelHandle(scope.row)">取消活动</el-button> <el-button v-if="$hasPermission('heart:actinfo:cancel')" type="text" :disabled="scope.row.actStatus ==='0'? true :false" size="small" @click="cancelHandle(scope.row)">取消活动</el-button>
@ -101,29 +106,31 @@ export default {
dataForm: { dataForm: {
actStatus: '', actStatus: '',
startTime: '', startTime: '',
endTime: '' endTime: '',
title:'', //新增活动标题查询
}, },
addOrUpdateVisible: false,
actInfoDetailVisible: false,
actUserRelationVisible: false,
actInfoCancelVisible: false,
actUserClockLogVisible: false,
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: (time) => { disabledDate: (time) => {
let beginDateVal = this.dataForm.startTime let beginDateVal = this.dataForm.endTime
if (beginDateVal) { if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime() return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
} }
} }
}, },
pickerBeginDateAfter: { pickerBeginDateAfter: {
disabledDate: (time) => { disabledDate: (time) => {
let EndDateVal = this.dataForm.endTime let EndDateVal = this.dataForm.startTime
if (EndDateVal) { if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime() return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
}
} }
} }
},
time:[],
addOrUpdateVisible: false,
actInfoDetailVisible: false,
actUserRelationVisible: false,
actInfoCancelVisible: false,
actUserClockLogVisible: false
} }
}, },
components: { components: {
@ -141,6 +148,10 @@ export default {
this.$parent.selectComponent = 'ActInfoDetailView' this.$parent.selectComponent = 'ActInfoDetailView'
this.$router.push({ path: '/heart-actinfo', query: { id: id } }) this.$router.push({ path: '/heart-actinfo', query: { id: id } })
}, },
btKeyUpTitle (e) {
e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
this.dataForm.title = e.target.value
},
addAction () { addAction () {
this.$parent.selectComponent = 'ActInfoAdd' this.$parent.selectComponent = 'ActInfoAdd'
this.$router.push( this.$router.push(

29
src/views/modules/heart/actphrase-add-or-update.vue
View File

@ -2,31 +2,34 @@
<el-dialog :visible.sync="visible" <el-dialog :visible.sync="visible"
:title="!dataForm.id ? $t('add') : $t('update')" :title="!dataForm.id ? $t('add') : $t('update')"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false"> :close-on-press-escape="false"
customClass="customWidth">
<el-form :model="dataForm" <el-form :model="dataForm"
:rules="dataRule" :rules="dataRule"
ref="dataForm" ref="dataForm"
@keyup.enter.native="dataFormSubmitHandle()" @keyup.enter.native="dataFormSubmitHandle()"
:label-width="$i18n.locale === 'en-US' ? '120px' : '100px'"> :label-width="$i18n.locale === 'en-US' ? '120px' : '100px'">
<el-form-item label="常用语 :" <el-form-item label="常用语"
prop="phrase"> prop="phrase">
<el-input v-model="dataForm.phrase" <el-input v-model="dataForm.phrase"
maxlength="500" maxlength="500"
show-word-limit placeholder="请输入常用语"
placeholder="常用语"></el-input> style="width:95%;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="编码 :" <el-form-item label="编码"
prop="code"> prop="code">
<el-input type="text" <el-input type="text"
oninput="value=value.replace(/[^0-9.]/g,'')" oninput="value=value.replace(/[^0-9.]/g,'')"
v-model="dataForm.code" v-model="dataForm.code"
maxlength="20" maxlength="20"
placeholder="输入数字编码"></el-input> placeholder="请输入数字编码"
style="width:95%;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="是否显示 :" <el-form-item label="是否显示"
prop="showFlag"> prop="showFlag">
<el-select v-model="dataForm.showFlag" <el-select v-model="dataForm.showFlag"
placeholder="是否显示"> placeholder="是否显示"
style="width:40%;">
<el-option v-for="item in showFlagArr" <el-option v-for="item in showFlagArr"
:key="item.dictValue" :key="item.dictValue"
:label="item.dictName" :label="item.dictName"
@ -35,11 +38,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="sort" <el-form-item prop="sort"
label="显示顺序 :"> label="显示顺序">
<el-input-number v-model="dataForm.sort" <el-input-number v-model="dataForm.sort"
controls-position="right" controls-position="right"
:min="1" :min="1"
label="显示顺序"></el-input-number> label="显示顺序"
style="width:40%;"></el-input-number>
</el-form-item> </el-form-item>
<!-- <el-form-item prop="usageNum" label="使用次数 :"> <!-- <el-form-item prop="usageNum" label="使用次数 :">
<el-input-number v-model="dataForm.usageNum" controls-position="right" :min="0" label="使用次数" disabled="true"></el-input-number> <el-input-number v-model="dataForm.usageNum" controls-position="right" :min="0" label="使用次数" disabled="true"></el-input-number>
@ -169,3 +173,8 @@ export default {
} }
} }
</script> </script>
<style lang="scss">
.customWidth {
width:50%
}
</style>

40
src/views/modules/heart/actphrase.vue
View File

@ -4,20 +4,22 @@
<div class="mod-heart__actphrase}"> <div class="mod-heart__actphrase}">
<el-form :inline="true" <el-form :inline="true"
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataList()"> @keyup.enter.native="getDataListSearch()">
<!--<el-form-item label="ID" prop="id"> <!--<el-form-item label="ID" prop="id">
<el-input v-model="dataForm.id" placeholder="ID" clearable></el-input> <el-input v-model="dataForm.id" placeholder="ID" clearable></el-input>
</el-form-item>--> </el-form-item>-->
<el-form-item label="常用语:" <el-form-item label="常用语"
prop="phrase"> prop="phrase">
<el-input v-model="dataForm.phrase" <el-input v-model="dataForm.phrase"
placeholder="常用语" placeholder="常用语"
@keyup.native="btKeyUpPhrase"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="编码" <el-form-item label="编码"
prop="code"> prop="code">
<el-input v-model="dataForm.code" <el-input v-model="dataForm.code"
placeholder="编码" placeholder="编码"
@keyup.native="btKeyUpCode"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="是否显示" <el-form-item label="是否显示"
@ -33,7 +35,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" <el-button type="primary"
@ -53,37 +55,33 @@
header-align="center" header-align="center"
align="center" align="center"
width="50"></el-table-column> width="50"></el-table-column>
<el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
<el-table-column prop="phrase" <el-table-column prop="phrase"
label="常用语" label="常用语"
min-width="400" show-overflow-tooltip
header-align="center" header-align="center"
align="left"></el-table-column> align="center" show-overflow-tooltip title="phrase" min-width="400"></el-table-column>
<el-table-column prop="code" <el-table-column prop="code"
label="编码" label="编码"
width="80"
header-align="center" header-align="center"
align="center"></el-table-column> align="center" width="100"></el-table-column>
<el-table-column prop="showFlag" <el-table-column prop="showFlag"
label="是否显示" label="是否显示"
width="80"
header-align="center" header-align="center"
align="center" align="center"
:formatter="showFlagFormat"></el-table-column> :formatter="showFlagFormat" width="120"></el-table-column>
<el-table-column prop="sort" <el-table-column prop="sort"
label="显示顺序" label="显示顺序"
width="80"
header-align="center" header-align="center"
align="center"></el-table-column> align="center" width="100"></el-table-column>
<!-- <el-table-column prop="usageNum" label="使用次数" header-align="center" align="center"></el-table-column> --> <!-- <el-table-column prop="usageNum" label="使用次数" header-align="center" align="center"></el-table-column> -->
<el-table-column prop="createdTime" <el-table-column prop="createdTime"
label="创建时间" label="创建时间"
width="180"
header-align="center" header-align="center"
align="center"></el-table-column> align="center" width="180"></el-table-column>
<!--<el-table-column prop="updatedTime"--> <!-- <el-table-column prop="updatedTime"
<!--label="更新时间"--> label="更新时间"
<!--header-align="center"--> header-align="center"
<!--align="center"></el-table-column>--> align="center" width="180"></el-table-column> -->
<el-table-column :label="$t('handle')" <el-table-column :label="$t('handle')"
fixed="right" fixed="right"
header-align="center" header-align="center"
@ -160,6 +158,14 @@ export default {
return '是' return '是'
} }
}, },
btKeyUpPhrase (e) {
e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
this.dataForm.phrase = e.target.value
},
btKeyUpCode (e) {
e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
this.dataForm.code = e.target.value
},
phraseDetailHandle (pheaseId) { phraseDetailHandle (pheaseId) {
this.phraseDetailVisible = true this.phraseDetailVisible = true
this.$nextTick(() => { this.$nextTick(() => {

64
src/views/modules/heart/actuserclock-detail.vue
View File

@ -2,26 +2,28 @@
<div class="project-handle" style="background: #ffffff;"> <div class="project-handle" style="background: #ffffff;">
<div class="project-detail"> <div class="project-detail">
<div v-if="dataForm.oldStatus=='1' || dataForm.oldStatus=='2'"> <div v-if="dataForm.oldStatus=='1' || dataForm.oldStatus=='2'">
<div class="project-detail-tip">处理操作 :</div> <div class="project-detail-tip">处理操作</div>
<el-form <el-form
ref="dataForm" ref="dataForm"
:model="dataForm" :model="dataForm"
:rules="dataRule" :rules="dataRule"
style="width:100%"
@keyup.enter.native="dataFormSubmitHandle()" @keyup.enter.native="dataFormSubmitHandle()"
> >
<el-form-item label="是否加积分 :" prop="status"> <el-form-item label="是否加积分 :" prop="ratiod">
<el-radio v-model="dataForm.status" label="5">确认加积分</el-radio> <el-radio v-model="dataForm.ratiod" label="5">确认加积分</el-radio>
<el-radio v-model="dataForm.status" label="6">拒绝加积分</el-radio> <el-radio v-model="dataForm.ratiod" label="6">拒绝加积分</el-radio>
</el-form-item> </el-form-item>
<el-form-item label="处理意见 :" prop="failureReason"> <el-form-item label="处理意见 :" prop="failureReason">
<el-input <el-input
:rows="4" :rows="4"
v-model="dataForm.failureReason" v-model="dataForm.failureReason"
type="textarea" type="textarea"
style="width: 95% !important"
placeholder="请写明理由，100字以内" placeholder="请写明理由，100字以内"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item style="float: right;"> <el-form-item style="float: right;padding-right:5%">
<el-button <el-button
size="small" size="small"
style="width: 95px" style="width: 95px"
@ -63,7 +65,7 @@
style="width: 100%;" style="width: 100%;"
> >
<el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column> <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
<el-table-column prop="realName" label="报名人" header-align="center" align="center"></el-table-column> <el-table-column prop="realName" label="报名人" min-width=120 show-overflow-tooltip header-align="center" align="center"></el-table-column>
<el-table-column <el-table-column
prop="sex" prop="sex"
label="性别" label="性别"
@ -72,9 +74,9 @@
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column prop="age" label="年龄" header-align="center" align="center"></el-table-column> <el-table-column prop="age" label="年龄" header-align="center" align="center"></el-table-column>
<el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column> <el-table-column prop="mobile" label="联系电话" width=120 header-align="center" align="center"></el-table-column>
<el-table-column prop="clockAddress" label="打卡地点" header-align="center" align="center"></el-table-column> <el-table-column prop="clockAddress" label="打卡地点" min-width=200 show-overflow-tooltip header-align="center" align="center"></el-table-column>
<el-table-column prop="clockDesc" label="打卡描述" header-align="center" align="center"></el-table-column> <el-table-column prop="clockDesc" label="打卡描述" min-width=400 show-overflow-tooltip header-align="center" align="center"></el-table-column>
<el-table-column label="图片" fixed="right" header-align="center" align="center" width="400"> <el-table-column label="图片" fixed="right" header-align="center" align="center" width="400">
<template slot-scope="scope"> <template slot-scope="scope">
<el-image <el-image
@ -138,16 +140,18 @@ export default {
dataForm: { dataForm: {
id: '', id: '',
actId: '', actId: '',
status: '', ratiod: '',
failureReason: '', failureReason: '',
address: '', address: '',
latitude: '', latitude: '',
longitude: '', longitude: '',
radius: 200, radius: 200,
clockPic: [] clockPic: [],
status:'',
}, },
previewImgList: [], previewImgList: [],
isAble: false isAble: false,
ifTime:false,
} }
}, },
mounted () { mounted () {
@ -158,11 +162,11 @@ export default {
computed: { computed: {
dataRule () { dataRule () {
return { return {
status: [ ratiod: [
{ {
required: true, required: true,
message: this.$t('validate.required'), message: this.$t('validate.required'),
trigger: 'blur' trigger: 'change'
} }
], ],
failureReason: [ failureReason: [
@ -279,7 +283,12 @@ export default {
} }
this.dataForm = { this.dataForm = {
...this.dataForm, ...this.dataForm,
...res.data ...res.data,
}
let a = this.dataForm.status //获取积分状态
let b = res.data.oldStatus //获取积分
if (a !="5"&& b!="5"){
this.dataForm.failureReason = '';
} }
// if (res.data.status != '5' && res.data.status != '6') { // if (res.data.status != '5' && res.data.status != '6') {
// this.dataForm.status = '5'; // this.dataForm.status = '5';
@ -292,6 +301,8 @@ export default {
this.getDataList() this.getDataList()
}) })
.catch(() => {}) .catch(() => {})
//判断该活动是否结束
this.activityEndNo();
}, },
capacity (data) { capacity (data) {
if (data.radius > 0 && data.radius <= 25) { if (data.radius > 0 && data.radius <= 25) {
@ -327,9 +338,17 @@ export default {
if (!valid) { if (!valid) {
return false return false
} }
//进行下方打卡详情校验（至少要有一次记录） array == undefined || array.length <= 0
if (this.dataList == undefined || this.dataList.length <= 0){
return this.$message.error('请先确认打卡信息')
}
if (!this.ifTime){
return this.$message.error('请活动结束之后再来增加积分！！！')
}
if (this.dataForm.failureReason.length > 100) { if (this.dataForm.failureReason.length > 100) {
return this.$message.error('处理意见不超过100字') return this.$message.error('处理意见不超过100字')
} }
this.dataForm.status = this.dataForm.ratiod
// this.isAble = true // this.isAble = true
this.$http['post']('/heart/actuserclocklog/pointCheck', this.dataForm) this.$http['post']('/heart/actuserclocklog/pointCheck', this.dataForm)
.then(({ data: res }) => { .then(({ data: res }) => {
@ -356,7 +375,20 @@ export default {
}, },
1000, 1000,
{ leading: true, trailing: false } { leading: true, trailing: false }
) ),
//判断活动是否结束的方法
activityEndNo(){
this.$http.get(`/heart/actinfo/ifTime/${this.dataForm.actId}`)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
let a = res.data;
if (a === "1"){
this.ifTime = true;
}
})
}
} }
} }
</script> </script>

86
src/views/modules/heart/actuserclocklog.vue
View File

@ -4,13 +4,13 @@
<div class="mod-heart__actuserclocklog}"> <div class="mod-heart__actuserclocklog}">
<el-form :inline="true" <el-form :inline="true"
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataList()"> @keyup.enter.native="getDataListSearch()">
<el-form-item> <el-form-item>
<el-button type="primary" <el-button type="primary"
@click="backToActList">返回</el-button> @click="backToActList">返回</el-button>
</el-form-item> </el-form-item>
<div> <div>
<el-form-item label="状态"> <el-form-item label="状态" label-width="68px">
<el-select v-model="dataForm.status" <el-select v-model="dataForm.status"
placeholder="状态" placeholder="状态"
clearable> clearable>
@ -27,25 +27,41 @@
<el-form-item label="姓名"> <el-form-item label="姓名">
<el-input v-model="dataForm.realName" <el-input v-model="dataForm.realName"
placeholder="请输入" placeholder="请输入"
@keyup.native="btKeyUpUsername"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机号"> <el-form-item label="手机号">
<el-input v-model="dataForm.mobile" <el-input v-model="dataForm.mobile"
placeholder="请输入" placeholder="请输入"
@keyup.native="btKeyUpMobile"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="block"> <div class="block">
<span class="demonstration">注册时间</span>&nbsp;&nbsp; <el-form-item label="注册时间" prop="startTime" label-width="70px">
<el-date-picker @change='setRegistTime' <el-date-picker v-model="dataForm.startTime"
v-model="time" type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" format="yyyy-MM-dd"
range-separator="至" placeholder="选择日期时间"
start-placeholder="开始日期" style="width:200px"
end-placeholder="结束日期"></el-date-picker>&nbsp; @change="changeTime">
</el-date-picker>
</el-form-item>
<el-form-item label="至" prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
style="width:200px"
@change="changeTime">
</el-date-picker>
</el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataListSearch()" type="primary">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
@ -62,42 +78,42 @@
<el-table-column prop="realName" <el-table-column prop="realName"
label="报名人" label="报名人"
header-align="center" header-align="center"
align="center"></el-table-column> align="center" width="100"></el-table-column>
<el-table-column prop="sex" <el-table-column prop="sex"
label="性别" label="性别"
:formatter="formatSex" :formatter="formatSex"
header-align="center" header-align="center"
align="center"></el-table-column> align="center" width="50"></el-table-column>
<el-table-column prop="age" <el-table-column prop="age"
label="年龄" label="年龄"
header-align="center" header-align="center"
align="center"></el-table-column> align="center" width="50"></el-table-column>
<el-table-column prop="mobile" <el-table-column prop="mobile"
label="联系电话" label="联系电话"
header-align="center" header-align="center"
align="center"></el-table-column> align="center" width="150"></el-table-column>
<el-table-column prop="clockAddress" <el-table-column prop="clockAddress"
label="打卡地点" label="打卡地点"
header-align="center" header-align="center"
align="center"></el-table-column> align="center" min-width="200" show-overflow-tooltip ></el-table-column>
<el-table-column prop="clockCount" <el-table-column prop="clockCount"
label="打卡次数" label="打卡次数"
header-align="center" header-align="center"
align="center"></el-table-column> align="center" width="100"></el-table-column>
<el-table-column prop="status" <el-table-column prop="status"
label="打卡状态" label="打卡状态"
:formatter="formatState" :formatter="formatState"
header-align="center" header-align="center"
align="center"></el-table-column> align="center" width="100"></el-table-column>
<el-table-column prop="checkPoint" <el-table-column prop="checkPoint"
:formatter="isCheckPoint" :formatter="isCheckPoint"
label="是否发放积分" label="是否发放积分"
header-align="center" header-align="center"
align="center"></el-table-column> align="center" width="120"></el-table-column>
<el-table-column prop="point" <el-table-column prop="point"
label="积分" label="积分"
header-align="center" header-align="center"
align="center"></el-table-column> align="center" width="100"></el-table-column>
<el-table-column :label="$t('handle')" <el-table-column :label="$t('handle')"
fixed="right" fixed="right"
header-align="center" header-align="center"
@ -146,6 +162,22 @@ export default {
startTime: '', startTime: '',
endTime: '' endTime: ''
}, },
pickerBeginDateBefore: {
disabledDate: (time) => {
let beginDateVal = this.dataForm.endTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
}
}
},
pickerBeginDateAfter: {
disabledDate: (time) => {
let EndDateVal = this.dataForm.startTime
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
}
}
},
detailVisible: false, detailVisible: false,
time: '' time: ''
} }
@ -160,18 +192,18 @@ export default {
this.$parent.selectComponent = 'ActInfoList' this.$parent.selectComponent = 'ActInfoList'
this.$router.push({ path: '/heart-actinfo' }) this.$router.push({ path: '/heart-actinfo' })
}, },
btKeyUpUsername (e) {
e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
this.dataForm.username = e.target.value
},
btKeyUpMobile (e) {
e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
this.dataForm.mobile = e.target.value
},
detailHandle (id) { detailHandle (id) {
this.$parent.selectComponent = 'ActUserClockDetail' this.$parent.selectComponent = 'ActUserClockDetail'
this.$router.push({ path: '/heart-actinfo', query: { id: id, actId: this.dataForm.actId } }) this.$router.push({ path: '/heart-actinfo', query: { id: id, actId: this.dataForm.actId } })
}, },
setRegistTime () {
if (this.time === null) {
this.dataForm.startTime = ''
this.dataForm.endTime = ''
}
this.dataForm.startTime = this.time[0]
this.dataForm.endTime = this.time[1]
},
formatState: function (row, column) { formatState: function (row, column) {
let state = row.status let state = row.status
if (state === '0') { if (state === '0') {

4
src/views/modules/heart/actuserlog.vue
View File

@ -1,12 +1,12 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never" class="aui-card--fill">
<div class="mod-heart__actuserlog}"> <div class="mod-heart__actuserlog}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<el-form-item> <el-form-item>
<el-input v-model="dataForm.id" placeholder="id" clearable></el-input> <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('heart:actuserlog:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> <el-button v-if="$hasPermission('heart:actuserlog:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>

86
src/views/modules/heart/actuserrelation.vue
View File

@ -1,12 +1,12 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never" class="aui-card--fill">
<div class="mod-heart__actuserrelation}"> <div class="mod-heart__actuserrelation}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<el-form-item> <el-form-item>
<el-button type="primary" @click="backToActList">返回</el-button> <el-button type="primary" @click="backToActList">返回</el-button>
</el-form-item> </el-form-item>
<div> <div>
<el-form-item label="状态"> <el-form-item label="状态" label-width="68px">
<el-select v-model="dataForm.status" placeholder="状态" clearable> <el-select v-model="dataForm.status" placeholder="状态" clearable>
<el-option label="报名" :value="0"></el-option> <el-option label="报名" :value="0"></el-option>
<el-option label="审核通过" :value="1"></el-option> <el-option label="审核通过" :value="1"></el-option>
@ -16,25 +16,35 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="姓名"> <el-form-item label="姓名">
<el-input v-model="dataForm.realName" placeholder="请输入" clearable></el-input> <el-input v-model="dataForm.realName" @keyup.native="btKeyUpUsername" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机号"> <el-form-item label="手机号">
<el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input> <el-input v-model="dataForm.mobile" @keyup.native="btKeyUpMobile" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="block"> <div class="block">
<span class="demonstration">注册时间</span>&nbsp;&nbsp; <el-form-item label="注册时间" prop="startTime" label-width="90px">
<el-date-picker <el-date-picker v-model="dataForm.startTime"
@change="setRegistTime" type="date"
v-model="time" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" format="yyyy-MM-dd"
range-separator="至" placeholder="选择日期时间"
start-placeholder="开始日期" style="width:200px" @change="changeTime">
end-placeholder="结束日期" </el-date-picker>
></el-date-picker>&nbsp; </el-form-item>
<el-form-item label="至" prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
style="width:200px" @change="changeTime">
</el-date-picker>
</el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataListSearch()" type="primary">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
@ -46,18 +56,19 @@
style="width: 100%;" style="width: 100%;"
> >
<el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column> <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
<el-table-column prop="realName" label="报名人" header-align="center" align="center"></el-table-column> <el-table-column prop="realName" label="报名人" header-align="center" align="center" width="100"></el-table-column>
<el-table-column <el-table-column
prop="sex" prop="sex"
label="性别" label="性别"
:formatter="formatSex" :formatter="formatSex"
header-align="center" header-align="center"
align="center" align="center"
width='50'
></el-table-column> ></el-table-column>
<el-table-column prop="age" label="年龄" header-align="center" align="center"></el-table-column> <el-table-column prop="age" label="年龄" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column> <el-table-column prop="mobile" label="联系电话" header-align="center" align="center" width="150"></el-table-column>
<el-table-column prop="identityNo" label="身份证号" header-align="center" align="center"></el-table-column> <el-table-column prop="identityNo" label="身份证号" header-align="center" align="center" width="200"></el-table-column>
<el-table-column prop="signupTime" label="报名时间" header-align="center" align="center"></el-table-column> <el-table-column prop="signupTime" label="报名时间" header-align="center" align="center" width="180"></el-table-column>
<el-table-column <el-table-column
prop="status" prop="status"
label="状态" label="状态"
@ -65,8 +76,8 @@
header-align="center" header-align="center"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column prop="auditTime" label="审核时间" header-align="center" align="center"></el-table-column> <el-table-column prop="auditTime" label="审核时间" header-align="center" align="center" width="180"></el-table-column>
<el-table-column prop="failureReason" label="原因" header-align="center" align="center"></el-table-column> <el-table-column prop="failureReason" label="原因" header-align="center" align="center" min-width="200" show-overflow-tooltip ></el-table-column>
<el-table-column <el-table-column
:label="$t('handle')" :label="$t('handle')"
fixed="right" fixed="right"
@ -122,7 +133,6 @@ export default {
deleteURL: '/heart/actuserrelation', deleteURL: '/heart/actuserrelation',
deleteIsBatch: true deleteIsBatch: true
}, },
dataForm: { dataForm: {
id: '', id: '',
actId: '', actId: '',
@ -131,6 +141,22 @@ export default {
realName: '', realName: '',
mobile: '' mobile: ''
}, },
pickerBeginDateBefore: {
disabledDate: (time) => {
let beginDateVal = this.dataForm.endTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
}
}
},
pickerBeginDateAfter: {
disabledDate: (time) => {
let EndDateVal = this.dataForm.startTime
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
}
}
},
time: '', time: '',
addOrUpdateVisible: false, addOrUpdateVisible: false,
detailVisible: false detailVisible: false
@ -147,6 +173,14 @@ export default {
this.$parent.selectComponent = 'ActInfoList' this.$parent.selectComponent = 'ActInfoList'
this.$router.push({ path: '/heart-actinfo' }) this.$router.push({ path: '/heart-actinfo' })
}, },
btKeyUpUsername (e) {
e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
this.dataForm.username = e.target.value
},
btKeyUpMobile (e) {
e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
this.dataForm.mobile = e.target.value
},
detailHandle (id) { detailHandle (id) {
this.detailVisible = true this.detailVisible = true
this.$nextTick(() => { this.$nextTick(() => {
@ -154,14 +188,6 @@ export default {
this.$refs.actuserrelationDetail.init() this.$refs.actuserrelationDetail.init()
}) })
}, },
setRegistTime () {
if (this.time === null) {
this.dataForm.startTime = ''
this.dataForm.endTime = ''
}
this.dataForm.startTime = this.time[0]
this.dataForm.endTime = this.time[1]
},
formatState: function (row, column) { formatState: function (row, column) {
let state = row.status let state = row.status

5
src/views/modules/heart/map-select.vue
View File

@ -123,6 +123,11 @@ export default {
map: map map: map
}) })
markerList.push(marker) markerList.push(marker)
// 初始化mark点击事件
that.getAddress(that.dataForm.latitude, that.dataForm.longitude)
qq.maps.event.addListener(marker, 'click', function (event) {
that.addressCheckHandle()
})
// 添加监听事件 获取鼠标单击事件 // 添加监听事件 获取鼠标单击事件
qq.maps.event.addListener(map, 'click', function (event) { qq.maps.event.addListener(map, 'click', function (event) {
that.cleanMarkRadius(markerList, radiusList) that.cleanMarkRadius(markerList, radiusList)

4
src/views/modules/heart/volunteerrank.vue
View File

@ -1,12 +1,12 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never" class="aui-card--fill">
<div class="mod-heart__volunteerrank}"> <div class="mod-heart__volunteerrank}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<el-form-item> <el-form-item>
<el-input v-model="dataForm.id" placeholder="id" clearable></el-input> <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('heart:volunteerrank:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> <el-button v-if="$hasPermission('heart:volunteerrank:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>

Write Preview
Loading…
Cancel
Save