流程作废

src/views/bpm/handleTask/components/commodityManagement/submit.vue

@@ -49,7 +49,7 @@
 </template>
 
 <script>
-  import { approveTaskWithVariables, rejectTask } from '@/api/bpm/task';
+  import { approveTaskWithVariables, rejectTask,cancelTask } from '@/api/bpm/task';
 
   // 流程实例的详情页，可用于审批
   export default {
@@ -123,8 +123,9 @@
             confirmButtonText: '确定'
           })
             .then(() => {
-              cancel({
-                id: this.taskId,
+              cancelTask({
+                taskId: this.taskId,
+                id: this.id,
                 reason: this.form.reason,
                 businessId: this.businessId
               })

src/views/bpm/handleTask/components/doc/submit.vue

@@ -52,7 +52,7 @@
 </template>
 
 <script>
-import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask,cancelTask} from '@/api/bpm/task';
 // 流程实例的详情页，可用于审批
 export default {
   name: '',
@@ -124,8 +124,9 @@ export default {
           confirmButtonText: '确定'
         })
           .then(() => {
-            cancel({
-              id: this.taskId,
+            cancelTask({
+              id: this.id,
+              taskId: this.taskId,
               reason: this.form.reason,
               businessId: this.businessId
             })

src/views/bpm/handleTask/components/financialManage/invoiceManage/submit.vue

@@ -71,7 +71,7 @@
 
 <script>
 import {cancel} from "@/api/bpm/components/financialManage/invoiceManage";
-import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask,cancelTask} from '@/api/bpm/task';
 
 // 流程实例的详情页，可用于审批
 export default {
@@ -162,8 +162,9 @@ export default {
           cancelButtonText: '取消',
           confirmButtonText: '确定'
         }).then(() => {
-          cancel({
-            id: this.taskId,
+          cancelTask({
+            id: this.id,
+            taskId: this.taskId,
             reason: this.form.reason,
             businessId: this.businessId,
           }).then(() => {

src/views/bpm/handleTask/components/financialManage/payableManage/submit.vue

@@ -71,7 +71,7 @@
 
 <script>
 import {cancel} from "@/api/bpm/components/financialManage/invoiceManage";
-import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask,cancelTask} from '@/api/bpm/task';
 
 // 流程实例的详情页，可用于审批
 export default {
@@ -160,8 +160,9 @@ export default {
           cancelButtonText: '取消',
           confirmButtonText: '确定'
         }).then(() => {
-          cancel({
-            id: this.taskId,
+          cancelTask({
+            id: this.id,
+            taskId: this.taskId,
             reason: this.form.reason,
             businessId: this.businessId,
           }).then(() => {

src/views/bpm/handleTask/components/financialManage/receivableManage/submit.vue

@@ -70,7 +70,7 @@
 
 <script>
 import {cancel} from "@/api/bpm/components/financialManage/invoiceManage";
-import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask,cancelTask} from '@/api/bpm/task';
 
 // 流程实例的详情页，可用于审批
 export default {
@@ -159,8 +159,9 @@ export default {
           cancelButtonText: '取消',
           confirmButtonText: '确定'
         }).then(() => {
-          cancel({
-            id: this.taskId,
+          cancelTask({
+            id: this.id,
+            taskId: this.taskId,
             reason: this.form.reason,
             businessId: this.businessId,
           }).then(() => {

src/views/bpm/handleTask/components/marketManagem/submit.vue

@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask,cancelTask} from '@/api/bpm/task';
 import { save } from '@/api/bpm/components/marketManagem/index';
 // 流程实例的详情页，可用于审批
 export default {
@@ -135,8 +135,9 @@ export default {
           confirmButtonText: '确定'
         })
           .then(() => {
-            cancel({
-              id: this.taskId,
+            cancelTask({
+              id: this.id,
+              taskId: this.taskId,
               reason: this.form.reason,
               businessId: this.businessId
             })

src/views/bpm/handleTask/components/materialPlan/submit.vue

@@ -56,7 +56,7 @@
         icon="el-icon-circle-close"
         type="danger"
         size="mini"
-        @click="handleAudit(0)"
+        @click="rejectTask(0)"
         >驳回
       </el-button>
 
@@ -80,7 +80,7 @@
     apspurchaseplan,
     cancel
   } from '@/api/bpm/components/apsMeterialPlan';
-  import { approveTaskWithVariables, rejectTask } from '@/api/bpm/task';
+  import { approveTaskWithVariables, rejectTask,cancelTask } from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
 
   // 流程实例的详情页，可用于审批
@@ -128,6 +128,20 @@
 
         this._approveTaskWithVariables(status);
       },
+      rejectTask(status){
+        rejectTask({
+            id: this.taskId,
+            reason: this.form.reason,
+            pass: false
+          }).then((res) => {
+            if (res.data.code != '-1') {
+              this.$emit('handleAudit', {
+                status,
+                title: '驳回'
+              });
+            }
+          });
+      },
       async _approveTaskWithVariables(status) {
         if (status == 1) {
           apspurchaseplan({
@@ -179,8 +193,9 @@
             confirmButtonText: '确定'
           })
             .then(() => {
-              cancel({
-                id: this.taskId,
+              cancelTask({
+                taskId: this.taskId,
+                id: this.id,
                 reason: this.form.reason,
                 businessId: this.businessId
               })

src/views/bpm/handleTask/components/purchaseOrder/accountstatement/submit.vue

@@ -72,7 +72,7 @@ import {
   approveTaskWithVariablesAPI, updateAccountReceiptAPI,
   updateAccountStatementAPI, updateReceiveAndPayInfoAPI, accountStatementProcessCancel
 } from '@/api/bpm/components/saleManage/saleorder';
-import {approveTaskWithVariables,rejectTask} from '@/api/bpm/task';
+import {approveTaskWithVariables,rejectTask,cancelTask} from '@/api/bpm/task';
 
 // 流程实例的详情页，可用于审批
 export default {
@@ -183,8 +183,9 @@ export default {
           cancelButtonText: '取消',
           confirmButtonText: '确定'
         }).then(() => {
-          accountStatementProcessCancel({
-            id: this.taskId,
+          cancelTask({
+            id: this.id,
+            taskId: this.taskId,
             reason: this.form.reason,
             businessId: this.businessId,
           }).then(() => {

src/views/bpm/handleTask/components/purchaseOrder/invoice/submit.vue

@@ -130,7 +130,7 @@
     getReceiveSaleOrderrecordDetail,
     cancel
   } from '@/api/bpm/components/purchasingManage/purchaseorderreceive';
-  import { approveTaskWithVariables, rejectTask } from '@/api/bpm/task';
+  import { approveTaskWithVariables, rejectTask,cancelTask } from '@/api/bpm/task';
   import { getWarehouseListByIds } from '@/api/bpm/components/saleManage/saleorder';
   import {
     getOutInBySourceBizNo,
@@ -337,8 +337,9 @@
             confirmButtonText: '确定'
           })
             .then(() => {
-              cancel({
-                id: this.taskId,
+              cancelTask({
+                id: this.id,
+                taskId: this.taskId,
                 reason: this.form.reason,
                 businessId: this.businessId
               })

src/views/bpm/handleTask/components/purchaseOrder/outSourceSend/submit.vue

@@ -76,7 +76,7 @@
 <script>
   import storageApi from '@/api/warehouseManagement';
   import { cancel } from '@/api/bpm/components/purchasingManage/outSourceSend';
-  import { approveTaskWithVariables, rejectTask } from '@/api/bpm/task';
+  import { approveTaskWithVariables, rejectTask,cancelTask } from '@/api/bpm/task';
   import { getWarehouseListByIds } from '@/api/bpm/components/saleManage/saleorder';
 
   // 流程实例的详情页，可用于审批
@@ -232,8 +232,9 @@
             confirmButtonText: '确定'
           })
             .then(() => {
-              cancel({
-                id: this.taskId,
+              cancelTask({
+                id: this.id,
+                taskId: this.taskId,
                 reason: this.form.reason,
                 businessId: this.businessId
               })

src/views/bpm/handleTask/components/purchaseOrder/outsourceSendReturnGoods/submit.vue

@@ -90,7 +90,7 @@
     uploadReceipt,
     cancel
   } from '@/api/bpm/components/purchasingManage/returnGoods';
-  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask,cancelTask} from '@/api/bpm/task';
   import { getReturnSaleOrderrecordDetail } from '@/api/bpm/components/purchasingManage/returnGoods';
   import { getOutInBySourceBizNo } from '@/api/classifyManage';
   import outin from '@/api/warehouseManagement/outin';
@@ -221,8 +221,9 @@
             confirmButtonText: '确定'
           })
             .then(() => {
-              cancel({
-                id: this.taskId,
+              cancelTask({
+                id: this.id,
+                taskId: this.taskId,
                 reason: this.form.reason,
                 businessId: this.businessId
               })

src/views/bpm/handleTask/components/purchaseOrder/returnGoods/submit.vue

@@ -88,7 +88,7 @@
     uploadReceipt,
     cancel
   } from '@/api/bpm/components/purchasingManage/returnGoods';
-  import { approveTaskWithVariables, rejectTask } from '@/api/bpm/task';
+  import { approveTaskWithVariables, rejectTask,cancelTask } from '@/api/bpm/task';
   import { getReturnSaleOrderrecordDetail } from '@/api/bpm/components/purchasingManage/returnGoods';
   import { getOutInBySourceBizNo } from '@/api/classifyManage';
   import storageApi from '@/api/warehouseManagement';
@@ -248,8 +248,9 @@
             confirmButtonText: '确定'
           })
             .then(() => {
-              cancel({
-                id: this.taskId,
+              cancelTask({
+                id: this.id,
+                taskId: this.taskId,
                 reason: this.form.reason,
                 businessId: this.businessId
               })

src/views/bpm/handleTask/components/purchaseOrder/submit.vue

@@ -79,7 +79,7 @@
     UpdateInformation,
     cancel
   } from '@/api/bpm/components/purchasingManage/purchaseOrder';
-  import { approveTaskWithVariables, rejectTask } from '@/api/bpm/task';
+  import { approveTaskWithVariables, rejectTask,cancelTask } from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
 
   // 流程实例的详情页，可用于审批
@@ -182,8 +182,9 @@
             confirmButtonText: '确定'
           })
             .then(() => {
-              cancel({
-                id: this.taskId,
+              cancelTask({
+                id: this.id,
+                taskId: this.taskId,
                 reason: this.form.reason,
                 businessId: this.businessId
               })

src/views/bpm/handleTask/components/purchasePlanManage/submit.vue

@@ -120,7 +120,7 @@
 </template>
 
 <script>
-  import { approveTaskWithVariables, rejectTask } from '@/api/bpm/task';
+  import { approveTaskWithVariables, rejectTask,cancelTask } from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
   import {
     assign,
@@ -282,8 +282,9 @@
             confirmButtonText: '确定'
           })
             .then(() => {
-              cancel({
-                id: this.taskId,
+              cancelTask({
+                id: this.id,
+                taskId: this.taskId,
                 reason: this.form.reason,
                 businessId: this.businessId
               })

src/views/bpm/handleTask/components/quotation/submit.vue

@@ -113,7 +113,7 @@
     UpdateInformation,
     cancel
   } from '@/api/bpm/components/saleManage/quotation';
-  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask,cancelTask} from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
   import headList from '@/components/headList';
   // 流程实例的详情页，可用于审批
@@ -246,8 +246,9 @@
             cancelButtonText: '取消',
             confirmButtonText: '确定'
           }).then(() => {
-            cancel({
-              id: this.taskId,
+            cancelTask({
+              id: this.id,
+              taskId: this.taskId,
               reason: this.form.reason,
               businessId: this.businessId,
             }).then(() => {

src/views/bpm/handleTask/components/saleOrder/accountstatement/submit.vue

@@ -71,7 +71,7 @@ import {
   approveTaskWithVariablesAPI, updateAccountReceiptAPI,
   updateAccountStatementAPI, updateReceiveAndPayInfoAPI, accountStatementProcessCancel
 } from '@/api/bpm/components/saleManage/saleorder';
-import {approveTaskWithVariables,rejectTask} from '@/api/bpm/task';
+import {approveTaskWithVariables,rejectTask,cancelTask} from '@/api/bpm/task';
 
 // 流程实例的详情页，可用于审批
 export default {
@@ -183,8 +183,9 @@ export default {
           cancelButtonText: '取消',
           confirmButtonText: '确定'
         }).then(() => {
-          accountStatementProcessCancel({
-            id: this.taskId,
+          cancelTask({
+            id: this.id,
+            taskId: this.taskId,
             reason: this.form.reason,
             businessId: this.businessId,
           }).then(() => {

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/submit.vue

@@ -86,7 +86,7 @@
     updateReceiptAPI,
     returnHandleProcessCancel
   } from '@/api/bpm/components/saleManage/saleorder';
-  import {rejectTask} from '@/api/bpm/task';
+  import {rejectTask,cancelTask} from '@/api/bpm/task';
 
   import { listAllUserBind } from '@/api/system/organization';
   import { EventBus } from './eventBus.js';
@@ -540,8 +540,9 @@
             confirmButtonText: '确定'
           })
             .then(() => {
-              returnHandleProcessCancel({
-                id: this.taskId,
+              cancelTask({
+                id: this.id,
+                taskId: this.taskId,
                 reason: this.form.reason,
                 businessId: this.businessId
               })

src/views/bpm/handleTask/components/saleOrder/invoice/submit.vue

@@ -61,7 +61,7 @@
     getWarehouseListByIds,
     saleSendProcessCancel
   } from '@/api/bpm/components/saleManage/saleorder';
-  import { approveTaskWithVariables, rejectTask } from '@/api/bpm/task';
+  import { approveTaskWithVariables, rejectTask,cancelTask } from '@/api/bpm/task';
   import { getOutInBySourceBizNo } from '@/api/classifyManage';
   import outin from '@/api/warehouseManagement/outin';
   import { data } from 'ele-admin/lib/ele-pro-table';
@@ -253,8 +253,9 @@
             confirmButtonText: '确定'
           })
             .then(() => {
-              saleSendProcessCancel({
-                id: this.taskId,
+              cancelTask({
+                taskId: this.taskId,
+                id: this.id,
                 reason: this.form.reason,
                 businessId: this.businessId
               })

src/views/bpm/handleTask/components/saleOrder/invoiceConfirm/submit.vue

@@ -67,7 +67,7 @@
     getWarehouseListByIds,
     saleSendProcessCancel
   } from '@/api/bpm/components/saleManage/saleorder';
-  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask,cancelTask} from '@/api/bpm/task';
   import { getOutInBySourceBizNo } from '@/api/classifyManage';
   import outin from '@/api/warehouseManagement/outin';
   import { data } from 'ele-admin/lib/ele-pro-table';
@@ -243,8 +243,9 @@
             confirmButtonText: '确定'
           })
             .then(() => {
-              saleSendProcessCancel({
-                id: this.taskId,
+              cancelTask({
+                id: this.id,
+                taskId: this.taskId,
                 reason: this.form.reason,
                 businessId: this.businessId
               })

src/views/bpm/handleTask/components/saleOrder/returnGoods/submit.vue

@@ -86,7 +86,7 @@
     approve,
     saleReturnProcessCancel,
   } from '@/api/bpm/components/saleManage/saleorder';
-  import { approveTaskWithVariables,rejectTask } from '@/api/bpm/task';
+  import { approveTaskWithVariables,rejectTask,cancelTask } from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
 
   // 流程实例的详情页，可用于审批
@@ -225,8 +225,9 @@
             cancelButtonText: '取消',
             confirmButtonText: '确定'
           }).then(() => {
-            saleReturnProcessCancel({
-              id: this.taskId,
+            cancelTask({
+              id: this.id,
+              taskId: this.taskId,
               reason: this.form.reason,
               businessId: this.businessId,
             }).then(() => {

src/views/bpm/handleTask/components/saleOrder/saleReturnGoods/submit.vue

@@ -95,7 +95,7 @@
     saleReturnProcessCancel,
     getReturnSaleOrderrecordDetail
   } from '@/api/bpm/components/saleManage/saleorder';
-  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask,cancelTask} from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
   import { getOutInBySourceBizNo } from '@/api/classifyManage';
   // import outin from "@/api/warehouseManagement/outin";
@@ -257,8 +257,9 @@
             confirmButtonText: '确定'
           })
             .then(() => {
-              saleReturnProcessCancel({
-                id: this.taskId,
+              cancelTask({
+                id: this.id,
+                taskId: this.taskId,
                 reason: this.form.reason,
                 businessId: this.businessId
               })

src/views/bpm/handleTask/components/saleOrder/submit.vue

@@ -71,7 +71,7 @@
 
 <script>
   import { UpdateInformation, saleOrderProcessCancel } from '@/api/bpm/components/saleManage/saleorder';
-  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask,cancelTask} from '@/api/bpm/task';
 
   // 流程实例的详情页，可用于审批
   export default {
@@ -165,8 +165,9 @@
             cancelButtonText: '取消',
             confirmButtonText: '确定'
           }).then(() => {
-            saleOrderProcessCancel({
-              id: this.taskId,
+            cancelTask({
+              taskId: this.taskId,
+              id: this.id,
               reason: this.form.reason,
               businessId: this.businessId,
             }).then(() => {

src/views/bpm/handleTask/components/targetManage/salesTarget/submit.vue

@@ -46,7 +46,7 @@
 
 <script>
   import { cancel } from '@/api/bpm/components/supplierManage/contact';
-  import { approveTaskWithVariables, rejectTask } from '@/api/bpm/task';
+  import { approveTaskWithVariables, rejectTask,cancelTask } from '@/api/bpm/task';
 
   // 流程实例的详情页，可用于审批
   export default {
@@ -120,8 +120,9 @@
             confirmButtonText: '确定'
           })
             .then(() => {
-              cancel({
-                id: this.taskId,
+              cancelTask({
+                id: this.id,
+                taskId: this.taskId,
                 reason: this.form.reason,
                 businessId: this.businessId
               })