|
@@ -194,7 +194,7 @@ const rowTaskName = async (row) => {
|
|
if (row.formDataId) {
|
|
if (row.formDataId) {
|
|
taskReviewInfo.value = row
|
|
taskReviewInfo.value = row
|
|
const { error, code, data } = await tasksApi.queryApprovalParameter({
|
|
const { error, code, data } = await tasksApi.queryApprovalParameter({
|
|
- parallelProcessInstanceId: row['parallelProcessInstanceId'] || '',
|
|
|
|
|
|
+ parallelProcessInstanceId: row['processInstanceId'] || '',
|
|
formDataId: row.formDataId,
|
|
formDataId: row.formDataId,
|
|
approvalType: row.approvalType,
|
|
approvalType: row.approvalType,
|
|
})
|
|
})
|
|
@@ -361,7 +361,7 @@ const saveCompleteApprovalTask = async () => {
|
|
const { error, code } = await tasksApi.saveCompleteApprovalTask({
|
|
const { error, code } = await tasksApi.saveCompleteApprovalTask({
|
|
...taskReviewForm.value,
|
|
...taskReviewForm.value,
|
|
taskId: DataInfo['id'] || '',
|
|
taskId: DataInfo['id'] || '',
|
|
- parallelProcessInstanceId: DataInfo['parallelProcessInstanceId'] || '',
|
|
|
|
|
|
+ parallelProcessInstanceId: DataInfo['processInstanceId'] || '',
|
|
formDataId: DataInfo['formDataId'] || '',
|
|
formDataId: DataInfo['formDataId'] || '',
|
|
approvalType: DataInfo['approvalType'],
|
|
approvalType: DataInfo['approvalType'],
|
|
}, false)
|
|
}, false)
|
|
@@ -386,7 +386,7 @@ const batchCompleteApprovalTask = async () => {
|
|
let taskIds = arrToKey(rows, 'id', ',')
|
|
let taskIds = arrToKey(rows, 'id', ',')
|
|
let approvalType = arrToKey(rows, 'approvalType', ',')
|
|
let approvalType = arrToKey(rows, 'approvalType', ',')
|
|
let formDataId = arrToKey(rows, 'formDataId', ',')
|
|
let formDataId = arrToKey(rows, 'formDataId', ',')
|
|
- let parallelProcessInstanceIds = arrToKey(rows, 'parallelProcessInstanceId', ',')
|
|
|
|
|
|
+ let parallelProcessInstanceIds = arrToKey(rows, 'processInstanceId', ',')
|
|
const { error, code } = await tasksApi.batchCompleteApprovalTask({
|
|
const { error, code } = await tasksApi.batchCompleteApprovalTask({
|
|
...taskReviewForm.value,
|
|
...taskReviewForm.value,
|
|
taskIds,
|
|
taskIds,
|