|
@@ -21,7 +21,8 @@
|
|
|
<el-form-item label="家族名称" prop="familyId">
|
|
|
<span v-if="family">{{ family.fullName }}</span>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="事件标题" prop="title"><el-input v-model="queryParams.title" placeholder="请输入标题" clearable @keyup.enter.native="handleQuery" /></el-form-item>
|
|
|
+ <!-- <el-form-item label="事件标题" prop="title"><el-input v-model="queryParams.title" placeholder="请输入标题" clearable @keyup.enter.native="handleQuery" /></el-form-item> -->
|
|
|
+ <el-form-item label="事件内容" prop="contents"><el-input v-model="queryParams.contents" placeholder="请输入标题" clearable @keyup.enter.native="handleQuery" /></el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
@@ -80,11 +81,12 @@
|
|
|
</el-table-column>
|
|
|
<!-- <el-table-column label="事件标题" align="center" prop="title" /> -->
|
|
|
<el-table-column label="事件内容" align="center" prop="contents" />
|
|
|
- <el-table-column label="大事件发生日期" align="center" prop="createTime" width="180">
|
|
|
+ <el-table-column label="大事件发生日期" align="center" prop="title" />
|
|
|
+ <!-- <el-table-column label="大事件发生日期" align="center" prop="createTime" width="180">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
|
|
|
</template>
|
|
|
- </el-table-column>
|
|
|
+ </el-table-column> -->
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
@@ -135,8 +137,8 @@
|
|
|
<el-form-item label="事件内容" prop="contents">
|
|
|
<el-input v-model="form.contents" type="textarea" placeholder="请输入内容" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="大事件发生日期" prop="createTime">
|
|
|
- <el-date-picker v-model="form.createTime" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"></el-date-picker>
|
|
|
+ <el-form-item label="大事件发生日期" prop="title">
|
|
|
+ <el-date-picker v-model="form.title" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="备注" prop="remark">
|
|
|
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
|
@@ -189,6 +191,7 @@ export default {
|
|
|
pageSize: 10,
|
|
|
familyId: null,
|
|
|
title: null,
|
|
|
+ contents: null
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: { id: undefined },
|
|
@@ -253,6 +256,7 @@ export default {
|
|
|
listEvents(this.queryParams).then(response => {
|
|
|
this.eventsList = response.rows;
|
|
|
this.total = response.total;
|
|
|
+ this.total = response.contents;
|
|
|
this.loading = false;
|
|
|
});
|
|
|
},
|