From 18f783a34f5e3b1b1c5b9b74ec91dcbfc7c19963 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 23 七月 2024 11:11:42 +0800
Subject: [PATCH] 报备时间搜索bug
---
src/views/system/report/index.vue | 13 +++++--------
src/views/system/work-order/index.vue | 2 +-
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index b739190..963de47 100644
--- a/src/views/system/report/index.vue
+++ b/src/views/system/report/index.vue
@@ -236,11 +236,9 @@
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
- // 鏁呴殰绫诲瀷鏃堕棿鑼冨洿
+ // 鎶ュ鏃堕棿鑼冨洿
daterangeCreateTime: [],
expirTime: [],
- // 鏁呴殰绫诲瀷鏃堕棿鑼冨洿
- daterangeAuditingTime: [],
auditingOpen: false,
auditingForm: {
id: null,
@@ -335,13 +333,12 @@
/** 鏌ヨ鎶ュ鍒楄〃 */
getList() {
this.loading = true;
- if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+ if (this.daterangeCreateTime && this.daterangeCreateTime.length > 0) {
this.queryParams["beginCreateTime"] = this.daterangeCreateTime[0];
this.queryParams["endCreateTime"] = this.daterangeCreateTime[1];
- }
- if (null != this.daterangeAuditingTime && '' != this.daterangeAuditingTime) {
- this.queryParams["beginAuditingTime"] = this.daterangeAuditingTime[0];
- this.queryParams["endAuditingTime"] = this.daterangeAuditingTime[1];
+ } else {
+ this.queryParams["beginCreateTime"] = null;
+ this.queryParams["endCreateTime"] = null;
}
listReport(this.queryParams).then(response => {
this.reportList = response.data.records;
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index 43a89ca..a8bbdd9 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -44,7 +44,7 @@
</el-col>
</el-row>
- <el-row :gutter="20">
+ <el-row :gutter="20" v-loading="loading">
<el-col :xl="6" :lg="8" :md="12" :sm="24" v-for="item in workOrderList" :key="item.id"
style="margin-bottom: 20px;"
>
--
Gitblit v1.8.0