Browse Source

审批电签修改

duy 1 year ago
parent
commit
e4fb050b8a
1 changed files with 6 additions and 22 deletions
  1. 6 22
      src/views/tasks/hc-data.vue

+ 6 - 22
src/views/tasks/hc-data.vue

@@ -358,7 +358,7 @@ const queryTaskInfo = async (row, taskids) => {
         window?.$message?.warning(data.msg || 'PDF异常')
     }
 }
-
+const finalArr = ref([])
 //确认审批
 const ConfirmApprovalClick = async () => {
     const formData = taskReviewForm.value
@@ -375,6 +375,7 @@ const ConfirmApprovalClick = async () => {
          
         })
         console.log(objarr, 'objarr')
+        finalArr.value = objarr
     } else if (taskReviewType.value === '2') {
         //上报任务
         if (formData.flag === 'NO' && !formData.comment) {
@@ -392,11 +393,12 @@ const ConfirmApprovalClick = async () => {
                     })
                 })
         console.log(objarr, 'objarr')
+        finalArr.value = objarr
     }
     }
 
         SMSAuthLoading.value = true
-        const { error, code, msg, data } = await tasksApi.batchApproval({ taskArchiveDtoList:objarr }, false)
+        const { error, code, msg, data } = await tasksApi.batchApproval({}, false)
         //判断数据
         SMSAuthLoading.value = false
         if (!error && code === 200 && data === true) {
@@ -453,15 +455,8 @@ const SMSAuthCancel = () => {
 
 //单个审批
 const saveCompleteApprovalTask = async () => {
-    const DataInfo = taskReviewInfo.value
     SMSAuthLoading.value = true
-    const { error, code } = await tasksApi.saveCompleteApprovalTask({
-        ...taskReviewForm.value,
-        taskId: DataInfo['taskId'] || '',
-        parallelProcessInstanceId: DataInfo['parallelProcessInstanceId'] || '',
-        formDataId: DataInfo['formDataId'] || '',
-        approvalType: DataInfo['approvalType'],
-    }, false)
+    const { error, code, msg, data } = await tasksApi.batchApproval({ taskArchiveDtoList:finalArr.value }, false)
     //处理数据
     SMSAuthLoading.value = false
     if (!error && code === 200) {
@@ -478,19 +473,8 @@ const saveCompleteApprovalTask = async () => {
 
 //批量审批
 const batchCompleteApprovalTask = async () => {
-    const rows = checkedRowsRef.value
     SMSAuthLoading.value = true
-    let taskIds = arrToKey(rows, 'taskId', ',')
-    let approvalType = arrToKey(rows, 'approvalType', ',')
-    let formDataId = arrToKey(rows, 'formDataId', ',')
-    let parallelProcessInstanceIds = arrToKey(rows, 'parallelProcessInstanceId', ',')
-    const { error, code } = await tasksApi.batchCompleteApprovalTask({
-        ...taskReviewForm.value,
-        taskIds,
-        approvalType,
-        formDataId,
-        parallelProcessInstanceIds,
-    }, false)
+    const { error, code, msg, data } = await tasksApi.batchApproval({ taskArchiveDtoList:finalArr.value }, false)
     //处理数据
     SMSAuthLoading.value = false
     if (!error && code === 200) {