|
@@ -638,7 +638,7 @@
|
|
|
} else if (row.status === '4') {
|
|
|
status = 'reapplyFlag'
|
|
|
}
|
|
|
- if (this.commonJS.isNotEmpty(row.isPreInvoice) && row.isPreInvoice === '1'){
|
|
|
+ // if (this.commonJS.isNotEmpty(row.isPreInvoice) && row.isPreInvoice === '1'){
|
|
|
// taskService.getTaskDef({ procDefId: this.processDefinitionIdPreInvoice,
|
|
|
// businessId: row.id,
|
|
|
// businessTable: 'cw_finance_invoice'}).then((data) => {
|
|
@@ -660,30 +660,30 @@
|
|
|
// }
|
|
|
// })
|
|
|
// })
|
|
|
- }else {
|
|
|
- taskService.getTaskDef({ procDefId: this.processDefinitionId,
|
|
|
- businessId: row.id,
|
|
|
- businessTable: 'cw_finance_invoice'}).then((data) => {
|
|
|
- this.$router.push({
|
|
|
- path: '/flowable/task/TaskForm',
|
|
|
- query: {
|
|
|
- ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
|
|
|
- procDefId: this.processDefinitionId,
|
|
|
- procDefKey: this.procDefKey,
|
|
|
- title: title,
|
|
|
- formType: data.formType,
|
|
|
- formUrl: data.formUrl,
|
|
|
- formTitle: processTitle,
|
|
|
- businessTable: 'finance_invoice',
|
|
|
- businessId: row.id,
|
|
|
- isShow: 'false',
|
|
|
- status: status,
|
|
|
- routePath: '/cw/invoice/InvoiceList'
|
|
|
- }
|
|
|
- })
|
|
|
- })
|
|
|
- }
|
|
|
-
|
|
|
+ // }else {
|
|
|
+ //
|
|
|
+ // }
|
|
|
+ taskService.getTaskDef({ procDefId: this.processDefinitionId,
|
|
|
+ businessId: row.id,
|
|
|
+ businessTable: 'cw_finance_invoice'}).then((data) => {
|
|
|
+ this.$router.push({
|
|
|
+ path: '/flowable/task/TaskForm',
|
|
|
+ query: {
|
|
|
+ ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
|
|
|
+ procDefId: this.processDefinitionId,
|
|
|
+ procDefKey: this.procDefKey,
|
|
|
+ title: title,
|
|
|
+ formType: data.formType,
|
|
|
+ formUrl: data.formUrl,
|
|
|
+ formTitle: processTitle,
|
|
|
+ businessTable: 'finance_invoice',
|
|
|
+ businessId: row.id,
|
|
|
+ isShow: 'false',
|
|
|
+ status: status,
|
|
|
+ routePath: '/cw/invoice/InvoiceList'
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
|
|
|
},
|
|
|
// 发起发票作废审批
|
|
@@ -725,7 +725,7 @@
|
|
|
if (row.status === '6' || row.status === '7' || row.status === '8' || row.status === '9') {
|
|
|
this.invoiceInvalidDetail(row)
|
|
|
} else {
|
|
|
- if (this.commonJS.isNotEmpty(row.isPreInvoice) && row.isPreInvoice === '1'){
|
|
|
+ // if (this.commonJS.isNotEmpty(row.isPreInvoice) && row.isPreInvoice === '1'){
|
|
|
// taskService.getTaskDef({
|
|
|
// procInsId: row.procInsId,
|
|
|
// procDefId: this.processDefinitionIdPreInvoice
|
|
@@ -743,7 +743,7 @@
|
|
|
// }
|
|
|
// })
|
|
|
// })
|
|
|
- }else {
|
|
|
+ // }else {
|
|
|
taskService.getTaskDef({
|
|
|
procInsId: row.procInsId,
|
|
|
procDefId: this.processDefinitionId
|
|
@@ -761,7 +761,7 @@
|
|
|
}
|
|
|
})
|
|
|
})
|
|
|
- }
|
|
|
+ // }
|
|
|
|
|
|
}
|
|
|
}
|