From 9809f91f0ef51a2dbaf50a874768368e1f71284c Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 22 Oct 2021 17:40:37 +0800
Subject: [PATCH] +时间范围搜索
---
src/views/qualificationExamination/qualificationExamination.vue | 50 ++++++++++++
src/views/onSiteInspection/company.vue | 55 ++++++++++++-
src/styles/element-ui.scss | 4 +
src/views/onSiteInspection/securityStaff.vue | 55 ++++++++++++-
src/views/qualificationExamination/scoreInquiry.vue | 56 ++++++++++++-
5 files changed, 203 insertions(+), 17 deletions(-)
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 50c9547..029e480 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -624,3 +624,7 @@
.el-date-picker__header-label {
color: #fff !important;
}
+
+.witerFontColorInput .el-range-input {
+ color: #fff !important;
+}
diff --git a/src/views/onSiteInspection/company.vue b/src/views/onSiteInspection/company.vue
index 0c41f00..ac662c1 100644
--- a/src/views/onSiteInspection/company.vue
+++ b/src/views/onSiteInspection/company.vue
@@ -2,11 +2,11 @@
* @Author: Morpheus
* @Date: 2021-07-07 17:30:05
* @Last Modified by: liu
- * @Last Modified time: 2021-10-22 16:38:09
+ * @Last Modified time: 2021-10-22 17:27:38
* menu-name 单位检查
*/
<template>
- <basic-container>
+ <basic-container class="witerFontColorInput">
<avue-crud
:option="option"
:table-loading="loading"
@@ -97,7 +97,7 @@
prop: "examinerDeptName",
searchLabelWidth: 90,
searchSpan: 4,
- search: true,
+ // search: true,
overHidden: true,
// // display: false,
// width: 200,
@@ -105,7 +105,29 @@
// overHidden: true,
},
// {
-
+ {
+ label: "检查时间",
+ prop: "releaseTimeRange",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchValue: [this.getStartTime(), this.getEndTime()],
+ searchRange: true,
+ searchSpan: 6,
+ searchLabelWidth: 80,
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入时间",
+ trigger: "blur",
+ },
+ ],
+ },
{
label: "检查日期",
prop: "reviewtime",
@@ -134,7 +156,7 @@
prop: "results",
searchLabelWidth: 90,
searchSpan: 4,
- search: true,
+ // search: true,
// // display: false,
// width: 200,
// labelWidth: 120,
@@ -173,6 +195,27 @@
},
},
methods: {
+ getStartTime() {
+ if (
+ this.$route.query.startTime != undefined &&
+ this.$route.query.startTime != null &&
+ this.$route.query.startTime != ""
+ ) {
+ return this.$route.query.startTime;
+ }
+ return "";
+ },
+ getEndTime() {
+ if (
+ this.$route.query.endTime != undefined &&
+ this.$route.query.endTime != null &&
+ this.$route.query.endTime != ""
+ ) {
+ return this.$route.query.endTime;
+ }
+ return "";
+ },
+
rowSave(row, done, loading) {
adddata(row).then(
() => {
@@ -236,6 +279,8 @@
this.onLoad(this.page);
},
searchChange(params, done) {
+ params["startTime"] = params.releaseTimeRange[0];
+ params["endTime"] = params.releaseTimeRange[1];
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
diff --git a/src/views/onSiteInspection/securityStaff.vue b/src/views/onSiteInspection/securityStaff.vue
index 7a1e13e..78d39d5 100644
--- a/src/views/onSiteInspection/securityStaff.vue
+++ b/src/views/onSiteInspection/securityStaff.vue
@@ -2,11 +2,11 @@
* @Author: Morpheus
* @Date: 2021-07-07 17:30:05
* @Last Modified by: liu
- * @Last Modified time: 2021-10-22 16:36:47
+ * @Last Modified time: 2021-10-22 17:27:32
* menu-name 保安员检查
*/
<template>
- <basic-container>
+ <basic-container class="witerFontColorInput">
<avue-crud
:option="option"
:table-loading="loading"
@@ -169,7 +169,7 @@
prop: "examinerDeptName",
searchLabelWidth: 90,
searchSpan: 4,
- search: true,
+ // search: true,
// overHidden: true,
// type: "date",
// format: "yyyy-MM-dd",
@@ -184,7 +184,29 @@
// // display: false,
// width: 180,
},
-
+ {
+ label: "检查时间",
+ prop: "releaseTimeRange",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchValue: [this.getStartTime(), this.getEndTime()],
+ searchRange: true,
+ searchSpan: 6,
+ searchLabelWidth: 80,
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入时间",
+ trigger: "blur",
+ },
+ ],
+ },
{
label: "检查日期",
prop: "reviewtime",
@@ -219,7 +241,7 @@
prop: "result",
searchLabelWidth: 90,
searchSpan: 4,
- search: true,
+ // search: true,
// labelWidth: 120,
// display: false,
},
@@ -282,6 +304,27 @@
},
},
methods: {
+ getStartTime() {
+ if (
+ this.$route.query.startTime != undefined &&
+ this.$route.query.startTime != null &&
+ this.$route.query.startTime != ""
+ ) {
+ return this.$route.query.startTime;
+ }
+ return "";
+ },
+ getEndTime() {
+ if (
+ this.$route.query.endTime != undefined &&
+ this.$route.query.endTime != null &&
+ this.$route.query.endTime != ""
+ ) {
+ return this.$route.query.endTime;
+ }
+ return "";
+ },
+
rowSave(row, done, loading) {
adddata(row).then(
() => {
@@ -345,6 +388,8 @@
this.onLoad(this.page);
},
searchChange(params, done) {
+ params["startTime"] = params.releaseTimeRange[0];
+ params["endTime"] = params.releaseTimeRange[1];
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
diff --git a/src/views/qualificationExamination/qualificationExamination.vue b/src/views/qualificationExamination/qualificationExamination.vue
index 003061a..b86de46 100644
--- a/src/views/qualificationExamination/qualificationExamination.vue
+++ b/src/views/qualificationExamination/qualificationExamination.vue
@@ -2,11 +2,11 @@
* @Author: Morpheus
* @Date: 2021-07-07 17:30:05
* @Last Modified by: liu
- * @Last Modified time: 2021-10-11 14:54:11
+ * @Last Modified time: 2021-10-22 17:27:47
* menu-name 监管信息
*/
<template>
- <basic-container>
+ <basic-container class="witerFontColorInput">
<avue-crud
:option="option"
:table-loading="loading"
@@ -114,6 +114,29 @@
},
],
display: false,
+ },
+ {
+ label: "审查时间",
+ prop: "releaseTimeRange",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchValue: [this.getStartTime(), this.getEndTime()],
+ searchRange: true,
+ searchSpan: 6,
+ searchLabelWidth: 80,
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入时间",
+ trigger: "blur",
+ },
+ ],
},
// {
// label: "性别",
@@ -298,6 +321,27 @@
},
},
methods: {
+ getStartTime() {
+ if (
+ this.$route.query.startTime != undefined &&
+ this.$route.query.startTime != null &&
+ this.$route.query.startTime != ""
+ ) {
+ return this.$route.query.startTime;
+ }
+ return "";
+ },
+ getEndTime() {
+ if (
+ this.$route.query.endTime != undefined &&
+ this.$route.query.endTime != null &&
+ this.$route.query.endTime != ""
+ ) {
+ return this.$route.query.endTime;
+ }
+ return "";
+ },
+
rowSave(row, done, loading) {
adddata(row).then(
() => {
@@ -361,6 +405,8 @@
this.onLoad(this.page);
},
searchChange(params, done) {
+ params["startTime"] = params.releaseTimeRange[0];
+ params["endTime"] = params.releaseTimeRange[1];
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
diff --git a/src/views/qualificationExamination/scoreInquiry.vue b/src/views/qualificationExamination/scoreInquiry.vue
index db5c50b..6affe39 100644
--- a/src/views/qualificationExamination/scoreInquiry.vue
+++ b/src/views/qualificationExamination/scoreInquiry.vue
@@ -2,11 +2,11 @@
* @Author: Morpheus
* @Date: 2021-07-07 17:30:05
* @Last Modified by: liu
- * @Last Modified time: 2021-09-22 17:02:18
+ * @Last Modified time: 2021-10-22 17:27:19
* menu-name 监管信息
*/
<template>
- <basic-container>
+ <basic-container class="witerFontColorInput">
<avue-crud
:option="option"
:table-loading="loading"
@@ -77,14 +77,14 @@
{
label: "姓名",
prop: "securityName",
- searchSpan: 4,
+ searchSpan: 3,
search: true,
},
{
label: "考试名称",
prop: "examName",
search: true,
- searchSpan: 6,
+ searchSpan: 5,
// slot: true,
// display: false,
},
@@ -159,9 +159,32 @@
// display: false,
},
{
+ label: "考试时间",
+ prop: "releaseTimeRange",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchValue: [this.getStartTime(), this.getEndTime()],
+ searchRange: true,
+ searchSpan: 6,
+ searchLabelWidth: 80,
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入时间",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
label: "是否合格",
prop: "qualified",
- searchSpan: 4,
+ searchSpan: 3,
search: true,
type: "select",
dicData: [
@@ -218,6 +241,27 @@
},
},
methods: {
+ getStartTime() {
+ if (
+ this.$route.query.startTime != undefined &&
+ this.$route.query.startTime != null &&
+ this.$route.query.startTime != ""
+ ) {
+ return this.$route.query.startTime;
+ }
+ return "";
+ },
+ getEndTime() {
+ if (
+ this.$route.query.endTime != undefined &&
+ this.$route.query.endTime != null &&
+ this.$route.query.endTime != ""
+ ) {
+ return this.$route.query.endTime;
+ }
+ return "";
+ },
+
rowSave(row, done, loading) {
adddata(row).then(
() => {
@@ -281,6 +325,8 @@
this.onLoad(this.page);
},
searchChange(params, done) {
+ params["startTime"] = params.releaseTimeRange[0];
+ params["endTime"] = params.releaseTimeRange[1];
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
--
Gitblit v1.9.3