feat(ems): 增加日期范围查询功能

- 在多个页面中添加日期范围选择器,支持开始日期和结束日期的选择- 后端 mapper 文件中增加对日期范围查询的支持
-优化查询逻辑,优先使用日期范围进行筛选
- 调整表格样式,增加行hover效果
boardTest
zch 3 weeks ago
parent 943558fac3
commit c45b197de6

@ -36,7 +36,7 @@ $base-sub-menu-background:#000c17;
$base-sub-menu-hover:#001528;
*/
$base-sidebar-width: 200px;
$base-sidebar-width: 290px;
// the :export directive is the magic sauce for webpack
// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass

@ -1,15 +1,26 @@
<template>
<div class="app-container">
<!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="日期" prop="date">
<el-input
v-model="queryParams.date"
placeholder="请输入日期"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<!-- <el-form-item label="日期" prop="date">-->
<!-- <el-input-->
<!-- v-model="queryParams.date"-->
<!-- placeholder="请输入日期"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="记录时间">
<el-date-picker
v-model="daterange"
style="width: 340px"
value-format="yyyy/MM/dd"
type="daterange"
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
></el-date-picker>
</el-form-item>
<el-form-item label="位置" prop="location">
<!-- <el-form-item label="位置" prop="location">
<el-input
v-model="queryParams.location"
placeholder="请输入位置"
@ -82,12 +93,12 @@
clearable
@keyup.enter.native="handleQuery"
/>
</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 icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form> -->
</el-form>
<!-- 操作提示 -->
<!-- <el-alert
@ -169,7 +180,7 @@
:data="dailyFaultRecordList"
@selection-change="handleSelectionChange"
@row-contextmenu="handleRowContextMenu"
class="fault-record-table"
class="el-table--enable-row-hover fault-record-table"
tooltip-effect="dark"
:header-cell-style="{ backgroundColor: '#f5f7fa', color: '#606266' }"
>
@ -402,6 +413,7 @@
mixins: [clearAllMixin],
data() {
return {
daterange:[],
//
loading: true,
//
@ -434,7 +446,8 @@
faultOccurrenceTime: null,
handlingCompletionTime: null,
handlingDuration: null,
remarks: null
remarks: null,
params: {}
},
//
form: {},
@ -504,6 +517,21 @@
/** 查询日常故障记录列表 */
getList() {
this.loading = true;
//
if (!this.queryParams.params) {
this.queryParams.params = {};
}
if (this.daterange && this.daterange.length === 2) {
this.queryParams.params.beginDate = this.daterange[0];
this.queryParams.params.endDate = this.daterange[1];
} else {
//
delete this.queryParams.params.beginDate;
delete this.queryParams.params.endDate;
}
listDailyFaultRecord(this.queryParams).then(response => {
this.dailyFaultRecordList = response.rows;
this.total = response.total;
@ -540,6 +568,7 @@
},
/** 重置按钮操作 */
resetQuery() {
this.daterange = [];
this.resetForm("queryForm");
this.handleQuery();
},
@ -795,4 +824,9 @@
display: none !important;
}
}
.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
background-color: #0264f7;
color: #fff;
}
</style>

@ -1,5 +1,23 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="故障日期">
<el-date-picker
v-model="daterange"
style="width: 340px"
value-format="yyyy/MM/dd"
type="daterange"
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
></el-date-picker>
</el-form-item>
<el-form-item>
<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-form-item>
</el-form>
<!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="故障日期" prop="faultDate">
<el-input
@ -349,6 +367,7 @@
mixins: [clearAllMixin],
data() {
return {
daterange: [],
//
loading: true,
//
@ -380,7 +399,8 @@
faultOccurrenceTime: null,
handlingDuration: null,
mainComponentsRepaired: null,
remarks: null
remarks: null,
params: {}
},
//
form: {},
@ -450,6 +470,21 @@
/** 查询故障处置记录列表 */
getList() {
this.loading = true;
//
if (!this.queryParams.params) {
this.queryParams.params = {};
}
if (this.daterange && this.daterange.length === 2) {
this.queryParams.params.beginDate = this.daterange[0];
this.queryParams.params.endDate = this.daterange[1];
} else {
//
delete this.queryParams.params.beginDate;
delete this.queryParams.params.endDate;
}
listFaultHandlingRecord(this.queryParams).then(response => {
this.faultHandlingRecordList = response.rows;
this.total = response.total;
@ -485,6 +520,7 @@
},
/** 重置按钮操作 */
resetQuery() {
this.daterange = [];
this.resetForm("queryForm");
this.handleQuery();
},

@ -1,6 +1,17 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="登记日期">
<el-date-picker
v-model="daterange"
style="width: 340px"
value-format="yyyy/MM/dd"
type="daterange"
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
></el-date-picker>
</el-form-item>
<!-- <el-form-item label="日期" prop="date">-->
<!-- <el-input-->
<!-- v-model="queryParams.date"-->
@ -366,6 +377,7 @@
mixins: [clearAllMixin],
data() {
return {
daterange: [],
//
clearAllConfig: {
moduleKey: 'sparePartsRegistration',
@ -402,7 +414,8 @@
storageLocation: null,
registrar: null,
warehouseConfirmation: null,
remarks: null
remarks: null,
params: {}
},
//
form: {},
@ -464,6 +477,21 @@
/** 查询动力能源部行输科废旧备件登记列表 */
getList() {
this.loading = true;
//
if (!this.queryParams.params) {
this.queryParams.params = {};
}
if (this.daterange && this.daterange.length === 2) {
this.queryParams.params.beginDate = this.daterange[0];
this.queryParams.params.endDate = this.daterange[1];
} else {
//
delete this.queryParams.params.beginDate;
delete this.queryParams.params.endDate;
}
listSparePartsRegistration(this.queryParams).then(response => {
this.sparePartsRegistrationList = response.rows;
this.total = response.total;
@ -496,6 +524,7 @@
},
/** 重置按钮操作 */
resetQuery() {
this.daterange = [];
this.resetForm("queryForm");
this.handleQuery();
},

@ -1,14 +1,25 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="日期" prop="date">
<el-form-item label="使用日期">
<el-date-picker
v-model="daterange"
style="width: 340px"
value-format="yyyy/MM/dd"
type="daterange"
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
></el-date-picker>
</el-form-item>
<!-- <el-form-item label="日期" prop="date">
<el-input
v-model="queryParams.date"
placeholder="请输入日期"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item> -->
<el-form-item label="备件名称" prop="sparePartName">
<el-input
v-model="queryParams.sparePartName"
@ -423,6 +434,7 @@
mixins: [clearAllMixin],
data() {
return {
daterange: [],
//
clearAllConfig: {
moduleKey: 'sparePartsUsageRecord',
@ -464,7 +476,8 @@
warehouseManagerConfirmation: null,
inventoryStatus: null,
departmentWarehouse: null,
remarks: null
remarks: null,
params: {}
},
//
form: {},
@ -529,6 +542,21 @@
/** 查询动力能源部行输科备件领用更换记录列表 */
getList() {
this.loading = true;
//
if (!this.queryParams.params) {
this.queryParams.params = {};
}
if (this.daterange && this.daterange.length === 2) {
this.queryParams.params.beginDate = this.daterange[0];
this.queryParams.params.endDate = this.daterange[1];
} else {
//
delete this.queryParams.params.beginDate;
delete this.queryParams.params.endDate;
}
listSparePartsUsageRecord(this.queryParams).then(response => {
this.sparePartsUsageRecordList = response.rows;
this.total = response.total;
@ -566,6 +594,7 @@
},
/** 重置按钮操作 */
resetQuery() {
this.daterange = [];
this.resetForm("queryForm");
this.handleQuery();
},

@ -1,5 +1,23 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="作业日期">
<el-date-picker
v-model="daterange"
style="width: 340px"
value-format="yyyy/MM/dd"
type="daterange"
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
></el-date-picker>
</el-form-item>
<el-form-item>
<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-form-item>
</el-form>
<!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="日期" prop="date">
<el-input
@ -481,6 +499,7 @@
mixins: [clearAllMixin],
data() {
return {
daterange: [],
//
clearAllConfig: {
moduleKey: 'supervisionChecklist',
@ -524,7 +543,8 @@
outsourcingUnitResponsiblePerson: null,
workOrderChangeContent: null,
isWorkOrderClosedLoop: null,
remarks: null
remarks: null,
params: {}
},
//
form: {},
@ -589,6 +609,21 @@
/** 查询动力能源部监督检查清单列表 */
getList() {
this.loading = true;
//
if (!this.queryParams.params) {
this.queryParams.params = {};
}
if (this.daterange && this.daterange.length === 2) {
this.queryParams.params.beginDate = this.daterange[0];
this.queryParams.params.endDate = this.daterange[1];
} else {
//
delete this.queryParams.params.beginDate;
delete this.queryParams.params.endDate;
}
listSupervisionChecklist(this.queryParams).then(response => {
this.supervisionChecklistList = response.rows;
this.total = response.total;
@ -630,6 +665,7 @@
},
/** 重置按钮操作 */
resetQuery() {
this.daterange = [];
this.resetForm("queryForm");
this.handleQuery();
},

Loading…
Cancel
Save