diff --git a/src/api/model/wf.js b/src/api/model/wf.js index f6341b5c..4c92fd22 100644 --- a/src/api/model/wf.js +++ b/src/api/model/wf.js @@ -176,7 +176,13 @@ export default { req: async function(id){ return await http.get( `${config.API_URL}/wf/ticketflow/${id}/`); } - } + }, + retryScript: { + name: "重试脚本", + req: async function(id){ + return await http.post(`${config.API_URL}/wf/ticket/${id}/retry_script/`); + } + }, }, field:{ list: { diff --git a/src/views/wf/allwork.vue b/src/views/wf/allwork.vue index b9dbd269..3ba1df54 100644 --- a/src/views/wf/allwork.vue +++ b/src/views/wf/allwork.vue @@ -51,7 +51,6 @@ data() { return { list: [], - actstate_: { 0: "草稿中", 1: "进行中", @@ -81,14 +80,14 @@ }, handleShow(row) { let cateType = row.workflow_.key; - let projectId='',operation=null; - if(cateType==='visit'){ - projectId = row.ticket_data.visit; - }else if(cateType==='rparty'){ - projectId = row.ticket_data.rpj; - }else{ - operation = row.ticket_data.operation?row.ticket_data.operation:null; - projectId = row.ticket_data.opl; + let projectId = '', operation = null; + if (cateType === 'visit') { + projectId = row.ticket_data.visit; + } else if (cateType === 'rparty') { + projectId = row.ticket_data.rpj; + } else { + operation = row.ticket_data.operation ? row.ticket_data.operation : null; + projectId = row.ticket_data.opl; } this.$router.push({ name: "visitdetail", @@ -96,8 +95,8 @@ id: row.id, type: 'show', projectId: projectId, - catetype:cateType, - operation:operation + catetype: cateType, + operation: operation }, }); }, diff --git a/src/views/wf/ccwork.vue b/src/views/wf/ccwork.vue index f7a80bca..ba37be18 100644 --- a/src/views/wf/ccwork.vue +++ b/src/views/wf/ccwork.vue @@ -1,92 +1,103 @@ diff --git a/src/views/wf/worked.vue b/src/views/wf/worked.vue index 00c843d1..3ff92586 100644 --- a/src/views/wf/worked.vue +++ b/src/views/wf/worked.vue @@ -49,7 +49,6 @@ data() { return { list: [], - actstate_: { 0: "草稿中", 1: "进行中", @@ -75,13 +74,24 @@ this.list = res; }, handleShow(row) { + let cateType = row.workflow_.key; + let projectId = '', operation = null; + if (cateType === 'visit') { + projectId = row.ticket_data.visit; + } else if (cateType === 'rparty') { + projectId = row.ticket_data.rpj; + } else { + operation = row.ticket_data.operation ? row.ticket_data.operation : null; + projectId = row.ticket_data.opl; + } this.$router.push({ name: "visitdetail", query: { id: row.id, type: 'show', - projectId: row.ticket_data.visit, - catetype: row.workflow_.key + projectId: projectId, + catetype: cateType, + operation: operation }, }); }, diff --git a/src/views/wf/workflow.vue b/src/views/wf/workflow.vue index 606317cd..e1060a65 100644 --- a/src/views/wf/workflow.vue +++ b/src/views/wf/workflow.vue @@ -17,9 +17,9 @@ - - - + + +