From a17e6ab98307f5f0d4677b13a03f62244f6a6a8e Mon Sep 17 00:00:00 2001
From: Raod <1130305001@qq.com>
Date: Wed, 26 Jan 2022 14:11:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=B6=E4=BD=9C=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/controller/param/ReportParam.java   |  6 ++++++
 report-ui/src/views/reportManage/index.vue     | 18 +++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/param/ReportParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/param/ReportParam.java
index dcb8a1f3..87c066aa 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/param/ReportParam.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/param/ReportParam.java
@@ -20,6 +20,10 @@ public class ReportParam extends PageParam implements Serializable{
     @Query(QueryEnum.LIKE)
     private String reportName;
 
+    /** 报表作者 */
+    @Query(QueryEnum.LIKE)
+    private String reportAuthor;
+
     /** 报表编码 */
     @Query(QueryEnum.LIKE)
     private String reportCode;
@@ -27,4 +31,6 @@ public class ReportParam extends PageParam implements Serializable{
     /** 报表类型 */
     @Query(QueryEnum.EQ)
     private String reportType;
+
+
 }
diff --git a/report-ui/src/views/reportManage/index.vue b/report-ui/src/views/reportManage/index.vue
index d40c9554..e94f74ad 100644
--- a/report-ui/src/views/reportManage/index.vue
+++ b/report-ui/src/views/reportManage/index.vue
@@ -1,6 +1,6 @@
 <!--
  * @Descripttion: 报表设计--报表管理
- * @version: 
+ * @version:
  * @Author: qianlishi
  * @Date: 2021-12-11 14:48:27
  * @LastEditors: qianlishi
@@ -85,6 +85,11 @@ export default {
             inputType: "input",
             label: "报表编码",
             field: "reportCode"
+          },
+          {
+            inputType: "input",
+            label: "制作人",
+            field: "reportAuthor"
           }
         ],
         // 操作按钮
@@ -182,6 +187,17 @@ export default {
             ],
             disabled: "disableOnEdit"
           },
+          {
+            label: "制作人", //名称
+            placeholder: "",
+            field: "reportAuthor",
+            editField: "reportAuthor",
+            inputType: "input",
+            rules: [
+              { min: 1, max: 100, message: "不超过100个字符", trigger: "blur" }
+            ],
+            disabled: false
+          },
           {
             label: "描述", //报表描述
             placeholder: "",