Commit 43236cd6 authored by “lixuyan”'s avatar “lixuyan”

修改已办任务

parent 79fc2568
...@@ -269,9 +269,11 @@ export default { ...@@ -269,9 +269,11 @@ export default {
}, },
addData(data, totalElements) { addData(data, totalElements) {
data.forEach((item) => { data.forEach((item) => {
if (item.taskCount > 0) {
this.taskList.push({ this.taskList.push({
...item ...item
}) })
}
}) })
this.pagination.total = totalElements this.pagination.total = totalElements
}, },
...@@ -303,6 +305,16 @@ export default { ...@@ -303,6 +305,16 @@ export default {
// this.$emit('getTaskDetail', item ? { id: item.id, processInstanceId: item.processInstanceId, title: item.title } : null) // this.$emit('getTaskDetail', item ? { id: item.id, processInstanceId: item.processInstanceId, title: item.title } : null)
if (item.type === 'FitOut' || item.type === 'CheckOut' || item.type === 'DMIR' || item.type === 'Dispatch') { if (item.type === 'FitOut' || item.type === 'CheckOut' || item.type === 'DMIR' || item.type === 'Dispatch') {
this.goModule(item) this.goModule(item)
} else {
if (item.taskType === '装配任务' || item.taskType === '检验任务') {
this.$router.push({
path: '/dee-mes/completed-tasks',
query: {
title: item.taskType,
showMenu: false,
showTag: 'false'
}
})
} else { } else {
this.$router.push({ this.$router.push({
path: '/dee-task-center/workflow/task-center/home', path: '/dee-task-center/workflow/task-center/home',
...@@ -313,9 +325,11 @@ export default { ...@@ -313,9 +325,11 @@ export default {
taskDefinitionKey: item.taskKey, taskDefinitionKey: item.taskKey,
type: this.type type: this.type
} }
})
}
// path: `/task-detail-${item.id}`, // path: `/task-detail-${item.id}`,
// query: { id: item.id, insId: item.processInstanceId, title: item.title, showMenu: false } // query: { id: item.id, insId: item.processInstanceId, title: item.title, showMenu: false }
})
} }
}, },
async goModule(module) { async goModule(module) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment