From 14a859899c6bce862a9ef8dcf725031f717ea628 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 08 一月 2021 10:47:36 +0800
Subject: [PATCH] 代码生成模板支持主子表

---
 ruoyi-ui/src/views/monitor/job/log.vue |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue
index 7346801..e34b635 100644
--- a/ruoyi-ui/src/views/monitor/job/log.vue
+++ b/ruoyi-ui/src/views/monitor/job/log.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="浠诲姟鍚嶇О" prop="jobName">
         <el-input
           v-model="queryParams.jobName"
@@ -65,6 +65,7 @@
       <el-col :span="1.5">
         <el-button
           type="danger"
+          plain
           icon="el-icon-delete"
           size="mini"
           :disabled="multiple"
@@ -75,6 +76,7 @@
       <el-col :span="1.5">
         <el-button
           type="danger"
+          plain
           icon="el-icon-delete"
           size="mini"
           @click="handleClean"
@@ -84,12 +86,14 @@
       <el-col :span="1.5">
         <el-button
           type="warning"
+          plain
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['monitor:jobLog:export']"
+          v-hasPermi="['monitor:job:export']"
         >瀵煎嚭</el-button>
       </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
@@ -127,7 +131,7 @@
     />
 
     <!-- 璋冨害鏃ュ織璇︾粏 -->
-    <el-dialog title="璋冨害鏃ュ織璇︾粏" :visible.sync="open" width="700px">
+    <el-dialog title="璋冨害鏃ュ織璇︾粏" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" label-width="100px" size="mini">
         <el-row>
           <el-col :span="12">
@@ -175,6 +179,8 @@
       ids: [],
       // 闈炲涓鐢�
       multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
       // 鎬绘潯鏁�
       total: 0,
       // 璋冨害鏃ュ織琛ㄦ牸鏁版嵁
@@ -196,9 +202,7 @@
         jobName: undefined,
         jobGroup: undefined,
         status: undefined
-      },
-      // 琛ㄥ崟鍙傛暟
-      form: {}
+      }
     };
   },
   created() {
@@ -262,7 +266,7 @@
         }).then(() => {
           this.getList();
           this.msgSuccess("鍒犻櫎鎴愬姛");
-        }).catch(function() {});
+        })
     },
     /** 娓呯┖鎸夐挳鎿嶄綔 */
     handleClean() {
@@ -275,7 +279,7 @@
         }).then(() => {
           this.getList();
           this.msgSuccess("娓呯┖鎴愬姛");
-        }).catch(function() {});
+        })
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
@@ -288,7 +292,7 @@
           return exportJobLog(queryParams);
         }).then(response => {
           this.download(response.msg);
-        }).catch(function() {});
+        })
     }
   }
 };

--
Gitblit v1.9.3