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 | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index 3bdc812..963de47 100644
--- a/src/views/system/report/index.vue
+++ b/src/views/system/report/index.vue
@@ -18,8 +18,8 @@
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-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -60,7 +60,8 @@
<div class="info-item">
<div class="info-label">涓婃姤鏉愭枡</div>
<div class="info-list">
- <div class="list-item" v-for="file in formatFileList(scope.row.reportMaterials)" :key="file" @click="showFile(file)">
+ <div class="list-item" v-for="file in formatFileList(scope.row.reportMaterials)" :key="file"
+ @click="showFile(file)">
<div class="item-icon">
<i class="el-icon-document"></i>
</div>
@@ -141,7 +142,7 @@
<editor v-model="form.reportContent" :min-height="192" />
</el-form-item>
<el-form-item label="涓婃姤鏉愭枡" prop="reportMaterials">
- <file-upload v-model="form.reportMaterials" />
+ <file-upload v-model="form.reportMaterials" :fileType='fileType' />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -176,7 +177,7 @@
<el-date-picker v-model="auditingForm.endCreateTime" disabled />
</el-form-item>
<el-form-item label="鎶ュ鍐呭">
- <el-input type="textarea" v-html="auditingForm.reportContent" disabled />
+ <span v-html="auditingForm.reportContent"></span>
</el-form-item>
<el-form-item label="涓婃姤鏉愭枡">
<el-link
@@ -211,6 +212,8 @@
name: "Report",
data() {
return {
+ fileType: ["doc", "xls", "xlsx", "ppt", "txt", "pdf", "png", "jpg"],
+
// 鐐逛綅list
pointList: [],
// 閬僵灞�
@@ -233,11 +236,9 @@
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
- // 鏁呴殰绫诲瀷鏃堕棿鑼冨洿
+ // 鎶ュ鏃堕棿鑼冨洿
daterangeCreateTime: [],
expirTime: [],
- // 鏁呴殰绫诲瀷鏃堕棿鑼冨洿
- daterangeAuditingTime: [],
auditingOpen: false,
auditingForm: {
id: null,
@@ -332,16 +333,15 @@
/** 鏌ヨ鎶ュ鍒楄〃 */
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;
+ this.reportList = response.data.records;
this.total = response.total;
this.loading = false;
});
--
Gitblit v1.8.0