diff --git a/src/api/plugin/workflow/workorder.js b/src/api/plugin/workflow/workorder.js index 8689184..e0a4469 100644 --- a/src/api/plugin/workflow/workorder.js +++ b/src/api/plugin/workflow/workorder.js @@ -46,7 +46,7 @@ export const taskList = (query) => { export const taskRemove = (query) => { return request({ url: `${prefix2}/remove`, - method: 'get', + method: 'post', params:query }) } diff --git a/src/const/workflow/crontab.js b/src/const/workflow/crontab.js index 84b15a6..aa5b251 100644 --- a/src/const/workflow/crontab.js +++ b/src/const/workflow/crontab.js @@ -17,7 +17,6 @@ export const tableOption = { searchMenuSpan: 3, //控制搜索按钮 columnBtn: false, refreshBtn: false, - // dialogCustomClass: "custom", header: false, menuWidth:200, column: [ @@ -42,7 +41,6 @@ export const tableOption = { align: "left", overHidden: true, }, - // 改 { type: "input", label: "操作对象", @@ -50,13 +48,6 @@ export const tableOption = { align: "left", overHidden: true, }, - // { - // type: "input", - // label: "当前责任人", - // prop: "currentResponsiblePerson", - // align: "left", - // overHidden: true, - // }, { type: "input", label: "管理部门", @@ -87,7 +78,6 @@ export const tableOption = { format: "yyyy-MM-dd HH:mm", valueFormat: "yyyy-MM-dd HH:mm:ss", }, - // 改 { type: "input", label: "重复模式", @@ -95,12 +85,11 @@ export const tableOption = { align: "left", overHidden: true, }, - // 改 { label: "终止日期", type: "datetime", overHidden: true, - prop: "expectedCompletionTime", + prop: "breakTime", format: "yyyy-MM-dd HH:mm", valueFormat: "yyyy-MM-dd HH:mm:ss", }, diff --git a/src/views/maintenance/database1.vue b/src/views/maintenance/database1.vue index 8b426d9..04ae84c 100644 --- a/src/views/maintenance/database1.vue +++ b/src/views/maintenance/database1.vue @@ -5,7 +5,7 @@
{ if (res.data.data === "类似任务已经发起过,是否要强制发起") { this.$confirm(res.data.data + "?", "提示", { @@ -253,7 +253,7 @@ export default { }) .then(() => { // 强制发起重复任务 - startProcess({ ...form, forcestart: 1,isauto:0 }) + startProcess({ ...form, forcestart: "1",isauto:"0" }) .then((res) => { if (isExForm === true) { resolve(done); diff --git a/src/views/plugin/workflow/process/components/form.vue b/src/views/plugin/workflow/process/components/form.vue index 141db50..93868eb 100644 --- a/src/views/plugin/workflow/process/components/form.vue +++ b/src/views/plugin/workflow/process/components/form.vue @@ -251,9 +251,6 @@ export default { this.companyChange(id); } }); - // getTaskLevel().then(res=> { - // this.taskLevelList = res.data.data - // }) getTaskParent().then((res) => { this.taskParentList = res.data.data; if (this.$route.query.parent) { @@ -280,6 +277,7 @@ export default { // 任务父类 taskParentChange(id) { getTaskTypeData({ parentId: id }).then((res) => { + console.log(this.option.column) const renwuzhonglei = this.findObject( this.option.column, "renwuzhonglei" diff --git a/src/views/plugin/workflow/process/crontab.vue b/src/views/plugin/workflow/process/crontab.vue index d57b8f9..2e95133 100644 --- a/src/views/plugin/workflow/process/crontab.vue +++ b/src/views/plugin/workflow/process/crontab.vue @@ -109,6 +109,7 @@ >详情 终止 { - taskRemove(row.id).then((res) => { + taskRemove({ids: row.id}).then((res) => { this.$message.success("任务终止成功!"); this.onLoad(); });