代码改造完成，加入多字典查询方式

src/views/system/timing/index.vue

@@ -1,6 +1,30 @@
 <template>
   <div class="app-container">
-    <eHeader :query="query"/>
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <div v-permission="['ADMIN','JOB_ALL','JOB_CREATE']" style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="dialog = true; isAdd = true">新增</el-button>
+      </div>
+      <!-- 任务日志 -->
+      <div v-permission="['ADMIN','JOB_ALL','JOB_SELECT']" style="display: inline-block;">
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="warning"
+          icon="el-icon-tickets"
+          @click="doLog">执行日志</el-button>
+        <Log ref="log"/>
+      </div>
+    </div>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column :show-overflow-tooltip="true" prop="jobName" width="100px" label="任务名称"/>
@@ -21,7 +45,7 @@
       </el-table-column>
       <el-table-column v-if="checkPermission(['ADMIN','JOB_ALL','JOB_EDIT','JOB_DELETE'])" label="操作" width="180px" align="center">
         <template slot-scope="scope">
-          <edit v-permission="['ADMIN','JOB_ALL','JOB_EDIT']" :data="scope.row" :sup_this="sup_this"/>
+          <el-button v-permission="['ADMIN','JOB_ALL','JOB_EDIT']" size="mini" style="margin-right: 3px;" type="text" @click="edit(scope.row)">编辑</el-button>
           <el-button v-permission="['ADMIN','JOB_ALL','JOB_EDIT']" style="margin-left: -2px" type="text" size="mini" @click="execute(scope.row.id)">执行</el-button>
           <el-button v-permission="['ADMIN','JOB_ALL','JOB_EDIT']" style="margin-left: 3px" type="text" size="mini" @click="updateStatus(scope.row.id,scope.row.isPause ? '恢复' : '暂停')">
             {{ scope.row.isPause ? '恢复' : '暂停' }}
@@ -55,16 +79,31 @@
 <script>
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
-import { del, updateIsPause, execution } from '@/api/timing'
+import { del, updateIsPause, execution, add, edit } from '@/api/timing'
 import { parseTime } from '@/utils/index'
-import eHeader from './module/header'
-import edit from './module/edit'
+import Log from './log'
 export default {
-  components: { eHeader, edit },
+  components: { Log },
   mixins: [initData],
   data() {
     return {
-      delLoading: false, sup_this: this
+      delLoading: false, isAdd: false,
+      loading: false, dialog: false,
+      form: { jobName: '', beanName: '', methodName: '', params: '', cronExpression: '', isPause: 'false', remark: '' }, permissionIds: [],
+      rules: {
+        jobName: [
+          { required: true, message: '请输入任务名称', trigger: 'blur' }
+        ],
+        beanName: [
+          { required: true, message: '请输入Bean名称', trigger: 'blur' }
+        ],
+        methodName: [
+          { required: true, message: '请输入方法名称', trigger: 'blur' }
+        ],
+        cronExpression: [
+          { required: true, message: '请输入Cron表达式', trigger: 'blur' }
+        ]
+      }
     }
   },
   created() {
@@ -124,11 +163,70 @@ export default {
         this.$refs[id].doClose()
         console.log(err.response.data.message)
       })
+    },
+    toQuery() {
+      this.page = 0
+      this.init()
+    },
+    doLog() {
+      this.$refs.log.dialog = true
+      this.$refs.log.doInit()
+    },
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.loading = true
+          if (this.isAdd) {
+            this.doAdd()
+          } else this.doEdit()
+        } else {
+          return false
+        }
+      })
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = { jobName: '', beanName: '', methodName: '', params: '', cronExpression: '', isPause: 'false', remark: '' }
+    },
+    edit(data) {
+      this.isAdd = false
+      this.form = { id: data.id, jobName: data.jobName, beanName: data.beanName, methodName: data.methodName, params: data.params, cronExpression: data.cronExpression, isPause: data.isPause.toString(), remark: data.remark }
+      this.dialog = true
     }
   }
 }
 </script>
-
-<style scoped>
-
-</style>

src/views/system/timing/log.vue

@@ -58,7 +58,7 @@ export default {
   data() {
     return {
       errorInfo: '', errorDialog: false,
-      dialog: false, delLoading: false, sup_this: this,
+      dialog: false, delLoading: false,
       enabledTypeOptions: [
         { key: 'true', display_name: '成功' },
         { key: 'false', display_name: '失败' }

src/views/system/timing/module/edit.vue

@@ -1,36 +0,0 @@
-<template>
-  <div>
-    <el-button size="mini" type="text" @click="to">编辑</el-button>
-    <eForm ref="form" :sup_this="sup_this" :is-add="false"/>
-  </div>
-</template>
-<script>
-import eForm from './form'
-export default {
-  components: { eForm },
-  props: {
-    data: {
-      type: Object,
-      required: true
-    },
-    sup_this: {
-      type: Object,
-      required: true
-    }
-  },
-  methods: {
-    to() {
-      const _this = this.$refs.form
-      _this.form = { id: this.data.id, jobName: this.data.jobName, beanName: this.data.beanName, methodName: this.data.methodName, params: this.data.params, cronExpression: this.data.cronExpression, isPause: this.data.isPause.toString(), remark: this.data.remark }
-      _this.dialog = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-  div{
-    display: inline-block;
-    margin-right: 3px;
-  }
-</style>

src/views/system/timing/module/form.vue

@@ -1,124 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialog" :title="isAdd ? '新增任务' : '编辑任务'" append-to-body width="600px">
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
-      <el-form-item label="任务名称" prop="jobName">
-        <el-input v-model="form.jobName" style="width: 460px;"/>
-      </el-form-item>
-      <el-form-item label="Bean名称" prop="beanName">
-        <el-input v-model="form.beanName" style="width: 460px;"/>
-      </el-form-item>
-      <el-form-item label="执行方法" prop="methodName">
-        <el-input v-model="form.methodName" style="width: 460px;"/>
-      </el-form-item>
-      <el-form-item label="参数内容">
-        <el-input v-model="form.params" style="width: 460px;"/>
-      </el-form-item>
-      <el-form-item label="Cron表达式" prop="cronExpression">
-        <el-input v-model="form.cronExpression" style="width: 460px;"/>
-      </el-form-item>
-      <el-form-item label="任务状态">
-        <el-radio v-model="form.isPause" label="false">启用</el-radio>
-        <el-radio v-model="form.isPause" label="true" >暂停</el-radio>
-      </el-form-item>
-      <el-form-item label="任务描述">
-        <el-input v-model="form.remark" style="width: 460px;" rows="2" type="textarea"/>
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { add, edit } from '@/api/timing'
-export default {
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    },
-    sup_this: {
-      type: Object,
-      default: null
-    }
-  },
-  data() {
-    return {
-      loading: false, dialog: false,
-      form: { jobName: '', beanName: '', methodName: '', params: '', cronExpression: '', isPause: 'false', remark: '' }, permissionIds: [],
-      rules: {
-        jobName: [
-          { required: true, message: '请输入任务名称', trigger: 'blur' }
-        ],
-        beanName: [
-          { required: true, message: '请输入Bean名称', trigger: 'blur' }
-        ],
-        methodName: [
-          { required: true, message: '请输入方法名称', trigger: 'blur' }
-        ],
-        cronExpression: [
-          { required: true, message: '请输入Cron表达式', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          this.loading = true
-          if (this.isAdd) {
-            this.doAdd()
-          } else this.doEdit()
-        } else {
-          return false
-        }
-      })
-    },
-    doAdd() {
-      add(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '添加成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    doEdit() {
-      edit(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '修改成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.sup_this.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = { jobName: '', beanName: '', methodName: '', params: '', cronExpression: '', isPause: 'false', remark: '' }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/views/system/timing/module/header.vue

@@ -1,57 +0,0 @@
-<template>
-  <div class="head-container">
-    <!-- 搜索 -->
-    <el-input v-model="query.value" clearable placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-    <!-- 新增 -->
-    <div v-permission="['ADMIN','JOB_ALL','JOB_CREATE']" style="display: inline-block;margin: 0px 2px;">
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="$refs.form.dialog = true">新增</el-button>
-      <eForm ref="form" :is-add="true"/>
-    </div>
-    <!-- 任务日志 -->
-    <div v-permission="['ADMIN','JOB_ALL','JOB_SELECT']" style="display: inline-block;">
-      <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-tickets"
-        @click="doLog">执行日志</el-button>
-      <Log ref="log"/>
-    </div>
-  </div>
-</template>
-
-<script>
-import eForm from './form'
-import Log from './log'
-// 查询条件
-export default {
-  components: { eForm, Log },
-  props: {
-    query: {
-      type: Object,
-      required: true
-    }
-  },
-  data() {
-    return {
-      downloadLoading: false
-    }
-  },
-  methods: {
-    toQuery() {
-      this.$parent.page = 0
-      this.$parent.init()
-    },
-    doLog() {
-      this.$refs.log.dialog = true
-      this.$refs.log.doInit()
-    }
-  }
-}
-</script>