|
@@ -25,22 +25,17 @@
|
|
@keyup.enter.native="handleQuery"
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="开始时间" prop="startTime">
|
|
|
|
- <el-date-picker clearable
|
|
|
|
- v-model="queryParams.startTime"
|
|
|
|
- type="date"
|
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
|
- placeholder="请选择开始时间">
|
|
|
|
- </el-date-picker>
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="结束时间" prop="endTime">
|
|
|
|
- <el-date-picker clearable
|
|
|
|
- v-model="queryParams.endTime"
|
|
|
|
- type="date"
|
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
|
- placeholder="请选择结束时间">
|
|
|
|
- </el-date-picker>
|
|
|
|
- </el-form-item>
|
|
|
|
|
|
+ <el-form-item label="创建时间">
|
|
|
|
+ <el-date-picker
|
|
|
|
+ v-model="dateRange"
|
|
|
|
+ style="width: 240px"
|
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
|
+ type="daterange"
|
|
|
|
+ range-separator="-"
|
|
|
|
+ start-placeholder="开始日期"
|
|
|
|
+ end-placeholder="结束日期"
|
|
|
|
+ ></el-date-picker>
|
|
|
|
+ </el-form-item>
|
|
<el-form-item>
|
|
<el-form-item>
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
@@ -115,6 +110,7 @@ export default {
|
|
name: "Activitylog",
|
|
name: "Activitylog",
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
|
|
+ dateRange: [],
|
|
// 遮罩层
|
|
// 遮罩层
|
|
loading: true,
|
|
loading: true,
|
|
// 选中数组
|
|
// 选中数组
|
|
@@ -162,7 +158,7 @@ export default {
|
|
/** 查询活动记录列表 */
|
|
/** 查询活动记录列表 */
|
|
getList() {
|
|
getList() {
|
|
this.loading = true;
|
|
this.loading = true;
|
|
- listActivitylog(this.queryParams).then(response => {
|
|
|
|
|
|
+ listActivitylog(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
|
|
this.activitylogList = response.rows.map(e => {
|
|
this.activitylogList = response.rows.map(e => {
|
|
e.pointStatus = e.pointStatus == 0 ? '未发放' : '已发放';
|
|
e.pointStatus = e.pointStatus == 0 ? '未发放' : '已发放';
|
|
e.checkinStatus = e.checkinStatus == 0 ? '报名' : '签到';
|
|
e.checkinStatus = e.checkinStatus == 0 ? '报名' : '签到';
|