Browse Source

添加搜索历史记录

FinalYu 1 năm trước cách đây
mục cha
commit
27a7a4677b

+ 1 - 0
chuanyi_client2/src/views/report_template/index.vue

@@ -449,6 +449,7 @@
             <el-date-picker
                 v-model="itemConditionForm.dateRange"
                 type="datetimerange"
+                :clearable="false"
                 range-separator="至"
                 start-placeholder="开始时间"
                 end-placeholder="结束时间"

+ 15 - 1
chuanyi_client2/src/views/run_config/index.vue

@@ -382,11 +382,19 @@
         :close-on-click-modal="false"
         :append-to-body="true">
       <div style="height: 60vh;">
+        <div style="margin-bottom: 10px; float: right;">
+          <el-input placeholder="请输入报表名称"
+                    v-model="searchHistoryTxt"
+                    style="margin-left: 5px; width: 300px;"
+                    prefix-icon="el-icon-search">
+          </el-input>
+          <el-button type="primary" style="margin-left: 5px;" @click="searchHistoryReportEvent">查询</el-button>
+        </div>
         <el-table
             :data="reportHistoryData" border :stripe="true"
             :header-cell-style="{background: '#E8E8E8'}"
             @sort-change="sortChange1"
-            style="width: 100%; height: calc(100% - 50px); overflow: auto;">
+            style="width: 100%; height: calc(100% - 100px); overflow: auto;">
           <el-table-column
               align="center"
               sortable="custom"
@@ -581,6 +589,7 @@ export default {
       },
       searchValue: null,
       searchTxt: '',
+      searchHistoryTxt: '',
       reportOptions: [{
         label: '所有报表',
         value: -1
@@ -723,6 +732,10 @@ export default {
       this.reportHistoryPage = val
       this.historyReport()
     },
+    searchHistoryReportEvent() {
+      this.reportHistoryPage = 1
+      this.historyReport()
+    },
     changeReportTypeEvent(val) {
       this.reportPage = 1
       this.searchValue = val
@@ -1926,6 +1939,7 @@ export default {
       let params = {
         'page': this.reportHistoryPage,
         'limit': this.reportHistoryLimit,
+        'reportTableName': this.searchHistoryTxt,
         'autoTableId': this.chooseMyReport.id
       }
       getAutoChReportTable(params).then(res => {