|
@@ -29,43 +29,6 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="是否完成" prop="whetherComplete">
|
|
|
- <el-select v-model="queryParams.whetherComplete" placeholder="请选择任务是否完成" clearable>
|
|
|
- <el-option
|
|
|
- v-for="dict in dict.type.sys_job_complete"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.label"
|
|
|
- :value="dict.value"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="任务员工" prop="empno">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.empno"
|
|
|
- placeholder="请输入员工工号"
|
|
|
- clearable
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="任务大类" prop="jobType">
|
|
|
- <el-select v-model="queryParams.jobType" placeholder="请选择任务大类" clearable>
|
|
|
- <el-option
|
|
|
- v-for="dict in dict.type.sys_oa"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.label"
|
|
|
- :value="dict.value"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="任务小类" prop="jobTypeS">
|
|
|
- <el-select v-model="queryParams.jobTypeS" placeholder="请选择任务小类" clearable>
|
|
|
- <el-option
|
|
|
- v-for="dict in dict.type.sys_oa_s"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.label"
|
|
|
- :value="dict.value"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </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>
|
|
@@ -143,7 +106,6 @@
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
<el-table-column label="任务编号" width="100" align="center" prop="jobId" />
|
|
|
<el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
|
|
|
- <el-table-column label="员工工号" align="center" prop="empno" :show-overflow-tooltip="true" />
|
|
|
<el-table-column label="任务组名" align="center" prop="jobGroup">
|
|
|
<template slot-scope="scope">
|
|
|
<dict-tag :options="dict.type.sys_job_group" :value="scope.row.jobGroup"/>
|
|
@@ -161,7 +123,6 @@
|
|
|
></el-switch>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="是否完成" align="center" prop="whetherComplete" :show-overflow-tooltip="true" />
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
@@ -413,7 +374,7 @@ import Crontab from '@/components/Crontab'
|
|
|
export default {
|
|
|
components: { Crontab },
|
|
|
name: "Job",
|
|
|
- dicts: ['sys_job_complete', 'sys_job_group', 'sys_job_status', 'sys_oa','sys_oa_s', 'sys_yes_no'],
|
|
|
+ dicts: ['sys_job_group', 'sys_job_status', 'sys_oa','sys_oa_s','sys_yes_no'],
|
|
|
data() {
|
|
|
return {
|
|
|
pickerOptions: {
|
|
@@ -478,8 +439,7 @@ export default {
|
|
|
cont:undefined,
|
|
|
timeout:undefined,
|
|
|
status: undefined,
|
|
|
- duration:undefined,
|
|
|
- whetherComplete:undefined
|
|
|
+ duration:undefined
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {},
|
|
@@ -542,15 +502,11 @@ export default {
|
|
|
/** 查询定时任务列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
- // this.queryParams.jobTypeS = "数据备份"
|
|
|
listJob(this.queryParams).then(response => {
|
|
|
- console.log(response,'response')
|
|
|
this.jobList = response.rows;
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
|
});
|
|
|
- console.log(this.queryParams,'this.queryParams')
|
|
|
- console.log(this.jobList,'this.jobList')
|
|
|
},
|
|
|
// 任务组名字典翻译
|
|
|
jobGroupFormat(row, column) {
|
|
@@ -566,16 +522,12 @@ export default {
|
|
|
this.form = {
|
|
|
jobId: undefined,
|
|
|
jobName: undefined,
|
|
|
- empno:undefined,
|
|
|
jobGroup: undefined,
|
|
|
- jobType: undefined,
|
|
|
- jobTypeS: undefined,
|
|
|
invokeTarget: undefined,
|
|
|
cronExpression: undefined,
|
|
|
misfirePolicy: 1,
|
|
|
concurrent: 1,
|
|
|
- status: "0",
|
|
|
- whetherComplete:undefined
|
|
|
+ status: "0"
|
|
|
};
|
|
|
this.resetForm("form");
|
|
|
},
|