Z 1 jaar geleden
bovenliggende
commit
42f4b0e823
40 gewijzigde bestanden met toevoegingen van 133 en 91 verwijderingen
  1. 2 2
      src/BIZComponents/processSubmitDialog/processSubmitDialog.vue
  2. 3 2
      src/views/bpm/handleTask/components/bomApprover/submit.vue
  3. 5 4
      src/views/bpm/handleTask/components/bomApproverJSYY/submit.vue
  4. 4 3
      src/views/bpm/handleTask/components/bomApproverJSdevice/submit.vue
  5. 3 2
      src/views/bpm/handleTask/components/businessOpportunity/submit.vue
  6. 3 2
      src/views/bpm/handleTask/components/certificateQualifications/submit.vue
  7. 3 2
      src/views/bpm/handleTask/components/changeManagement/submit.vue
  8. 3 2
      src/views/bpm/handleTask/components/contactQC/submit.vue
  9. 3 2
      src/views/bpm/handleTask/components/contractBook/submit.vue
  10. 3 2
      src/views/bpm/handleTask/components/doc/submit.vue
  11. 3 2
      src/views/bpm/handleTask/components/entrust/submit.vue
  12. 4 3
      src/views/bpm/handleTask/components/equipmentDisposal/submit.vue
  13. 3 2
      src/views/bpm/handleTask/components/exceptionManagement/exceptionList/submit.vue
  14. 3 2
      src/views/bpm/handleTask/components/financialManage/feeManage/feeApplication/submit.vue
  15. 3 2
      src/views/bpm/handleTask/components/financialManage/invoiceManage/submit.vue
  16. 3 2
      src/views/bpm/handleTask/components/financialManage/payableManage/submit.vue
  17. 3 2
      src/views/bpm/handleTask/components/financialManage/receivableManage/submit.vue
  18. 5 3
      src/views/bpm/handleTask/components/ingredientOutbound/submit.vue
  19. 3 2
      src/views/bpm/handleTask/components/inquiryManage/submit.vue
  20. 3 2
      src/views/bpm/handleTask/components/lossOverflowReport/submit.vue
  21. 3 2
      src/views/bpm/handleTask/components/materialPlan/submit.vue
  22. 3 2
      src/views/bpm/handleTask/components/outsourcedWarehousingNoProcurement/submit.vue
  23. 3 3
      src/views/bpm/handleTask/components/purchaseNeedManage/submit.vue
  24. 3 2
      src/views/bpm/handleTask/components/purchaseOrder/invoice/submit.vue
  25. 5 3
      src/views/bpm/handleTask/components/purchaseOrder/outSourceSend/submit.vue
  26. 5 3
      src/views/bpm/handleTask/components/purchaseOrder/outSourceSendCk/submit.vue
  27. 3 2
      src/views/bpm/handleTask/components/purchaseOrder/outsourceSendReturnGoods/submit.vue
  28. 3 2
      src/views/bpm/handleTask/components/purchaseOrder/returnGoods/submit.vue
  29. 3 2
      src/views/bpm/handleTask/components/purchaseOrder/submit.vue
  30. 3 2
      src/views/bpm/handleTask/components/purchasePlanManage/submit.vue
  31. 3 2
      src/views/bpm/handleTask/components/quotation/submit.vue
  32. 3 2
      src/views/bpm/handleTask/components/saleOrder/entrustedReceive/submit.vue
  33. 3 2
      src/views/bpm/handleTask/components/saleOrder/entrustedReceiveReturnGoods/submit.vue
  34. 3 2
      src/views/bpm/handleTask/components/saleOrder/invoice/submit.vue
  35. 3 2
      src/views/bpm/handleTask/components/saleOrder/saleReturnGoods/submit.vue
  36. 3 2
      src/views/bpm/handleTask/components/saleOrder/submit.vue
  37. 5 3
      src/views/bpm/handleTask/components/selectedCollectionOutbound/submit.vue
  38. 5 4
      src/views/bpm/handleTask/components/sparePartsApply/submit.vue
  39. 3 2
      src/views/bpm/handleTask/components/supplierManage/submit.vue
  40. 3 2
      src/views/bpm/handleTask/components/transportManager/shipManage/submit.vue

+ 2 - 2
src/BIZComponents/processSubmitDialog/processSubmitDialog.vue

@@ -6,7 +6,7 @@
     :title="title"
     append-to-body
     :close-on-click-modal="false"
-    :width="isRight ? '800px' : '350px'"
+    :width="isRight ? '800px' : '450px'"
     :before-close="cancel"
   >
     <div style="display: flex; height: 100%; justify-content: space-between">
@@ -544,7 +544,7 @@ this.postOptions.push(...response.data);
 
   .form-box {
     max-height: 500px;
-    min-width: 300px;
+    min-width: 400px;
     overflow: auto;
   }
   ::v-deep .el-dialog {

+ 3 - 2
src/views/bpm/handleTask/components/bomApprover/submit.vue

@@ -27,7 +27,7 @@
 
 <script>
 
-import { approveTaskWithVariables } from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 import { notPass } from '@/api/bpm/components/bomApprover';
 
 // 流程实例的详情页,可用于审批
@@ -73,7 +73,8 @@ export default {
 
       if (status == 1) {
 
-        approveTaskWithVariables({
+        let API = !!status ? approveTaskWithVariables : rejectTask;
+        API({
           businessId: this.businessId,
           id: this.taskId,
           reason: this.form.reason,

+ 5 - 4
src/views/bpm/handleTask/components/bomApproverJSYY/submit.vue

@@ -40,7 +40,7 @@
 </template>
 
 <script>
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
   import { jsBomNotPass, batchUpdate } from '@/api/bpm/components/bomApprover';
 
   // 流程实例的详情页,可用于审批
@@ -82,7 +82,7 @@
           ) {
             let LL = await this.getTableValue();
             let bol = LL.every((m) => m.supplierId);
-      
+
             if (!bol) {
               this.$message.error('请选择供应商!');
               return;
@@ -90,8 +90,9 @@
 
           }
 
- 
-          approveTaskWithVariables({
+
+          let API = !!status ? approveTaskWithVariables : rejectTask;
+          API({
             businessId: this.businessId,
             id: this.taskId,
             reason: this.form.reason,

+ 4 - 3
src/views/bpm/handleTask/components/bomApproverJSdevice/submit.vue

@@ -40,7 +40,7 @@
 </template>
 
 <script>
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
   import { deviceNotPass, batchUpdate } from '@/api/bpm/components/bomApprover';
 
 
@@ -79,14 +79,15 @@
       },
       async _approveTaskWithVariables(status) {
         if (status == 1) {
-          approveTaskWithVariables({
+          let API = !!status ? approveTaskWithVariables : rejectTask;
+          API({
             businessId: this.businessId,
             id: this.taskId,
             reason: this.form.reason,
             variables: { pass: true }
           }).then((res) => {
             if (res.data.code != '-1') {
-    
+
               this.updateDate()
 
               this.$emit('handleAudit', {

+ 3 - 2
src/views/bpm/handleTask/components/businessOpportunity/submit.vue

@@ -108,7 +108,7 @@ import {
   UpdateInformation,
   cancel
 } from '@/api/bpm/components/saleManage/businessOpportunity';
-import {approveTaskWithVariables} from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 import {listAllUserBind} from '@/api/system/organization';
 // 流程实例的详情页,可用于审批
 export default {
@@ -315,7 +315,8 @@ export default {
         variables['technicianId'] = this.form.technicianId;
       }
 
-      approveTaskWithVariables({
+      let API = !!status ? approveTaskWithVariables : rejectTask;
+      API({
         id: this.taskId,
         reason: this.form.reason,
         variables

+ 3 - 2
src/views/bpm/handleTask/components/certificateQualifications/submit.vue

@@ -71,7 +71,7 @@
 
 <script>
 import { cancel} from '@/api/bpm/components/supplierManage/contact';
-import {approveTaskWithVariables} from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 import {listAllUserBind} from '@/api/system/organization';
 
 // 流程实例的详情页,可用于审批
@@ -130,7 +130,8 @@ export default {
       let variables = {
         pass: !!status
       };
-      approveTaskWithVariables({
+      let API = !!status ? approveTaskWithVariables : rejectTask;
+      API({
         id: this.taskId,
         reason: this.form.reason,
         variables

+ 3 - 2
src/views/bpm/handleTask/components/changeManagement/submit.vue

@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { approveTaskWithVariables } from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 import dictMixins from '@/mixins/dictMixins';
 import { questionSave } from '@/api/bpm/components/changeManagement/question';
 import { requestSave } from '@/api/bpm/components/changeManagement/request';
@@ -108,7 +108,8 @@ export default {
       let variables = {
         pass: !!status
       };
-      approveTaskWithVariables({
+      let API = !!status ? approveTaskWithVariables : rejectTask;
+      API({
         id: this.taskId,
         reason: this.form.reason,
         variables

+ 3 - 2
src/views/bpm/handleTask/components/contactQC/submit.vue

@@ -71,7 +71,7 @@
 
 <script>
 import { cancel} from '@/api/bpm/components/supplierManage/contact';
-import {approveTaskWithVariables} from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 import {listAllUserBind} from '@/api/system/organization';
 
 // 流程实例的详情页,可用于审批
@@ -130,7 +130,8 @@ export default {
       let variables = {
         pass: !!status
       };
-      approveTaskWithVariables({
+      let API = !!status ? approveTaskWithVariables : rejectTask;
+      API({
         id: this.taskId,
         reason: this.form.reason,
         variables

+ 3 - 2
src/views/bpm/handleTask/components/contractBook/submit.vue

@@ -70,7 +70,7 @@
 
 <script>
   import { UpdateInformation, cancel } from '@/api/bpm/components/contractManage/contractBook';
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
 
   // 流程实例的详情页,可用于审批
@@ -141,7 +141,8 @@
           pass: !!status
         };
 
-        approveTaskWithVariables({
+        let API = !!status ? approveTaskWithVariables : rejectTask;
+        API({
           id: this.taskId,
           reason: this.form.reason,
           variables

+ 3 - 2
src/views/bpm/handleTask/components/doc/submit.vue

@@ -52,7 +52,7 @@
 </template>
 
 <script>
-import { approveTaskWithVariables } from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 // 流程实例的详情页,可用于审批
 export default {
   name: '',
@@ -100,7 +100,8 @@ export default {
         pass: !!status
       };
 
-      approveTaskWithVariables({
+      let API = !!status ? approveTaskWithVariables : rejectTask;
+      API({
         id: this.taskId,
         reason: this.form.reason,
         variables

+ 3 - 2
src/views/bpm/handleTask/components/entrust/submit.vue

@@ -112,7 +112,7 @@
 </template>
 
 <script>
-import { approveTaskWithVariables } from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 import dictMixins from '@/mixins/dictMixins';
 import { save } from '@/api/bpm/components/entrust';
 
@@ -178,7 +178,8 @@ export default {
       let variables = {
         pass: !!status
       };
-      approveTaskWithVariables({
+      let API = !!status ? approveTaskWithVariables : rejectTask;
+      API({
         id: this.taskId,
         reason: this.form.reason,
         variables

+ 4 - 3
src/views/bpm/handleTask/components/equipmentDisposal/submit.vue

@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { approveTaskWithVariables } from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 import dictMixins from '@/mixins/dictMixins';
 import { save } from '@/api/bpm/components/equipmentDisposal';
 // 流程实例的详情页,可用于审批
@@ -89,7 +89,7 @@ export default {
       //申请人申请
       if (this.taskDefinitionKey === 'fqr') {
         const data = await this.getTableValue();
-        
+
         // return
         if (data) {
           await save(data);
@@ -101,7 +101,8 @@ export default {
       let variables = {
         pass: !!status
       };
-      approveTaskWithVariables({
+      let API = !!status ? approveTaskWithVariables : rejectTask;
+      API({
         id: this.taskId,
         reason: this.form.reason,
         variables

+ 3 - 2
src/views/bpm/handleTask/components/exceptionManagement/exceptionList/submit.vue

@@ -99,7 +99,7 @@
 </template>
 
 <script>
-import { approveTaskWithVariables } from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 import { listAllUserBind } from '@/api/system/organization';
 import { update } from '@/api/bpm/components/exceptionManagement';
 import dictMixins from '@/mixins/dictMixins';
@@ -167,7 +167,8 @@ export default {
           data.relationJson = [data.relationJson];
 
           await update(data);
-          await approveTaskWithVariables({
+           let API = !!status ? approveTaskWithVariables : rejectTask;
+        await  API({
             id: this.taskId,
             reason: this.form.reason,
             variables: {

+ 3 - 2
src/views/bpm/handleTask/components/financialManage/feeManage/feeApplication/submit.vue

@@ -71,7 +71,7 @@
 
 <script>
 import {cancel} from "@/api/bpm/components/financialManage/fee-manage/fee-application";
-import {approveTaskWithVariables} from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 
 // 流程实例的详情页,可用于审批
 export default {
@@ -131,7 +131,8 @@ export default {
       let variables = {
         pass: !!status
       };
-      approveTaskWithVariables({
+      let API = !!status ? approveTaskWithVariables : rejectTask;
+      API({
         id: this.taskId,
         reason: this.form.reason,
         variables

+ 3 - 2
src/views/bpm/handleTask/components/financialManage/invoiceManage/submit.vue

@@ -71,7 +71,7 @@
 
 <script>
 import {cancel} from "@/api/bpm/components/financialManage/invoiceManage";
-import {approveTaskWithVariables} from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 
 // 流程实例的详情页,可用于审批
 export default {
@@ -131,7 +131,8 @@ export default {
       let variables = {
         pass: !!status
       };
-      approveTaskWithVariables({
+      let API = !!status ? approveTaskWithVariables : rejectTask;
+      API({
         id: this.taskId,
         reason: this.form.reason,
         variables

+ 3 - 2
src/views/bpm/handleTask/components/financialManage/payableManage/submit.vue

@@ -71,7 +71,7 @@
 
 <script>
 import {cancel} from "@/api/bpm/components/financialManage/invoiceManage";
-import {approveTaskWithVariables} from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 
 // 流程实例的详情页,可用于审批
 export default {
@@ -129,7 +129,8 @@ export default {
       let variables = {
         pass: !!status
       };
-      approveTaskWithVariables({
+      let API = !!status ? approveTaskWithVariables : rejectTask;
+      API({
         id: this.taskId,
         reason: this.form.reason,
         variables

+ 3 - 2
src/views/bpm/handleTask/components/financialManage/receivableManage/submit.vue

@@ -71,7 +71,7 @@
 
 <script>
 import {cancel} from "@/api/bpm/components/financialManage/invoiceManage";
-import {approveTaskWithVariables} from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 
 // 流程实例的详情页,可用于审批
 export default {
@@ -129,7 +129,8 @@ export default {
       let variables = {
         pass: !!status
       };
-      approveTaskWithVariables({
+      let API = !!status ? approveTaskWithVariables : rejectTask;
+      API({
         id: this.taskId,
         reason: this.form.reason,
         variables

+ 5 - 3
src/views/bpm/handleTask/components/ingredientOutbound/submit.vue

@@ -55,7 +55,7 @@
   // import outin from '@/api/warehouseManagement/outin';
   import storageApi from '@/api/warehouseManagement';
   import { cancel } from '@/api/bpm/components/purchasingManage/outSourceSend';
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 
   // 流程实例的详情页,可用于审批
   export default {
@@ -124,7 +124,8 @@
             this.isLoading = true;
             const res = await storageApi.outStorage(storageData);
             if (res.code == 0) {
-              approveTaskWithVariables({
+              let API = !!status ? approveTaskWithVariables : rejectTask;
+              API({
                 id: this.taskId,
                 reason: this.form.reason,
                 variables: {
@@ -160,7 +161,8 @@
         let variables = {
           pass: !!status
         };
-        approveTaskWithVariables({
+        let API = !!status ? approveTaskWithVariables : rejectTask;
+        API({
           id: this.taskId,
           reason: this.form.reason,
           variables

+ 3 - 2
src/views/bpm/handleTask/components/inquiryManage/submit.vue

@@ -71,7 +71,7 @@
 
 <script>
   import { UpdateInformation, cancel } from '@/api/bpm/components/purchasingManage/inquiryManage';
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
 
   // 流程实例的详情页,可用于审批
@@ -149,7 +149,8 @@
           pass: !!status
         };
 
-        approveTaskWithVariables({
+        let API = !!status ? approveTaskWithVariables : rejectTask;
+        API({
           id: this.taskId,
           reason: this.form.reason,
           variables

+ 3 - 2
src/views/bpm/handleTask/components/lossOverflowReport/submit.vue

@@ -38,7 +38,7 @@
 </template>
 
 <script>
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
   import storageApi from '@/api/warehouseManagement';
   // 流程实例的详情页,可用于审批
   export default {
@@ -138,7 +138,8 @@
         let variables = {
           pass: !!status
         };
-        approveTaskWithVariables({
+        let API = !!status ? approveTaskWithVariables : rejectTask;
+        API({
           id: this.taskId,
           reason: this.form.reason,
           variables

+ 3 - 2
src/views/bpm/handleTask/components/materialPlan/submit.vue

@@ -42,7 +42,7 @@
 <script>
 
 import { apspurchaseplan, cancel } from '@/api/bpm/components/apsMeterialPlan';
-import { approveTaskWithVariables } from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 import { listAllUserBind } from '@/api/system/organization';
 
 // 流程实例的详情页,可用于审批
@@ -117,7 +117,8 @@ export default {
           }
         });
       } else if (status == 0) {
-        approveTaskWithVariables({
+        let API =  rejectTask;
+        API({
           id: this.taskId,
           reason: this.form.reason,
           pass: false

+ 3 - 2
src/views/bpm/handleTask/components/outsourcedWarehousingNoProcurement/submit.vue

@@ -139,7 +139,7 @@
     getReceiveSaleOrderrecordDetail,
     cancel
   } from '@/api/bpm/components/purchasingManage/purchaseorderreceive';
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
   import { getWarehouseListByIds } from '@/api/bpm/components/saleManage/saleorder';
   import {
     getOutInBySourceBizNo,
@@ -308,7 +308,8 @@
           variables['qualityInspector'] = this.form.qualityInspector;
         }
 
-        approveTaskWithVariables({
+        let API =  rejectTask;
+        API({
           id: this.taskId,
           reason: this.form.reason,
           variables

+ 3 - 3
src/views/bpm/handleTask/components/purchaseNeedManage/submit.vue

@@ -50,7 +50,7 @@
 
 <script>
   import { UpdateInformation, cancel } from '@/api/bpm/components/purchasingManage/purchaseNeedManage';
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 
   // 流程实例的详情页,可用于审批
   export default {
@@ -108,8 +108,8 @@
         let variables = {
           pass: !!status
         };
-
-        approveTaskWithVariables({
+        let API = !!status ? approveTaskWithVariables : rejectTask
+        API({
           id: this.taskId,
           reason: this.form.reason,
           variables

+ 3 - 2
src/views/bpm/handleTask/components/purchaseOrder/invoice/submit.vue

@@ -130,7 +130,7 @@
     getReceiveSaleOrderrecordDetail,
     cancel
   } from '@/api/bpm/components/purchasingManage/purchaseorderreceive';
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
   import { getWarehouseListByIds } from '@/api/bpm/components/saleManage/saleorder';
   import {
     getOutInBySourceBizNo,
@@ -304,7 +304,8 @@
           variables['qualityInspector'] = this.form.qualityInspector;
         }
 
-        approveTaskWithVariables({
+        let API = rejectTask;
+        API({
           id: this.taskId,
           reason: this.form.reason,
           variables

+ 5 - 3
src/views/bpm/handleTask/components/purchaseOrder/outSourceSend/submit.vue

@@ -78,7 +78,7 @@
 <script>
   import storageApi from '@/api/warehouseManagement';
   import { cancel } from '@/api/bpm/components/purchasingManage/outSourceSend';
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
   import { getWarehouseListByIds } from '@/api/bpm/components/saleManage/saleorder';
 
   // 流程实例的详情页,可用于审批
@@ -155,7 +155,8 @@
             this.isLoading = true;
             const res = await storageApi.outStorage(storageData);
             if (res.code == 0) {
-              approveTaskWithVariables({
+              let API = !!status ? approveTaskWithVariables : rejectTask;
+              API({
                 id: this.taskId,
                 reason: this.form.reason,
                 variables: {
@@ -184,7 +185,8 @@
           pass: !!status,
           storemanIds
         };
-        approveTaskWithVariables({
+        let API = !!status ? approveTaskWithVariables : rejectTask;
+        API({
           id: this.taskId,
           reason: this.form.reason,
           variables

+ 5 - 3
src/views/bpm/handleTask/components/purchaseOrder/outSourceSendCk/submit.vue

@@ -54,7 +54,7 @@
 <script>
   import storageApi from '@/api/warehouseManagement';
   import { cancel } from '@/api/bpm/components/purchasingManage/outSourceSend';
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 
   // 流程实例的详情页,可用于审批
   export default {
@@ -113,7 +113,8 @@
             this.isLoading = true;
             const res = await storageApi.outStorage(storageData);
             if (res.code == 0) {
-              approveTaskWithVariables({
+              let API = !!status ? approveTaskWithVariables : rejectTask;
+              API({
                 id: this.taskId,
                 reason: this.form.reason,
                 variables: {
@@ -149,7 +150,8 @@
         let variables = {
           pass: !!status
         };
-        approveTaskWithVariables({
+        let API = !!status ? approveTaskWithVariables : rejectTask;
+        API({
           id: this.taskId,
           reason: this.form.reason,
           variables

+ 3 - 2
src/views/bpm/handleTask/components/purchaseOrder/outsourceSendReturnGoods/submit.vue

@@ -90,7 +90,7 @@
     uploadReceipt,
     cancel
   } from '@/api/bpm/components/purchasingManage/returnGoods';
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
   import { getReturnSaleOrderrecordDetail } from '@/api/bpm/components/purchasingManage/returnGoods';
   import { getOutInBySourceBizNo } from '@/api/classifyManage';
   import outin from '@/api/warehouseManagement/outin';
@@ -189,7 +189,8 @@
           pass: !!status
         };
 
-        approveTaskWithVariables({
+        let API = !!status ? approveTaskWithVariables : rejectTask;
+        API({
           id: this.taskId,
           reason: this.form.reason,
           variables

+ 3 - 2
src/views/bpm/handleTask/components/purchaseOrder/returnGoods/submit.vue

@@ -98,7 +98,7 @@
     uploadReceipt,
     cancel
   } from '@/api/bpm/components/purchasingManage/returnGoods';
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
   import { getReturnSaleOrderrecordDetail } from '@/api/bpm/components/purchasingManage/returnGoods';
   import { getOutInBySourceBizNo } from '@/api/classifyManage';
   import storageApi from '@/api/warehouseManagement';
@@ -213,7 +213,8 @@
           pass: !!status
         };
 
-        approveTaskWithVariables({
+        let API = !!status ? approveTaskWithVariables : rejectTask;
+        API({
           id: this.taskId,
           reason: this.form.reason,
           variables

+ 3 - 2
src/views/bpm/handleTask/components/purchaseOrder/submit.vue

@@ -71,7 +71,7 @@
 
 <script>
 import {UpdateInformation, cancel} from '@/api/bpm/components/purchasingManage/purchaseOrder';
-import {approveTaskWithVariables} from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 import {listAllUserBind} from '@/api/system/organization';
 
 // 流程实例的详情页,可用于审批
@@ -142,7 +142,8 @@ export default {
         pass: !!status
       };
 
-      approveTaskWithVariables({
+      let API = !!status ? approveTaskWithVariables : rejectTask;
+      API({
         id: this.taskId,
         reason: this.form.reason,
         variables

+ 3 - 2
src/views/bpm/handleTask/components/purchasePlanManage/submit.vue

@@ -97,7 +97,7 @@
 </template>
 
 <script>
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
   import { assign, cancel,UpdateInformation } from '@/api/bpm/components/purchasingManage/purchasePlanManage';
 
@@ -173,7 +173,8 @@
           }
           await UpdateInformation(arr);
         }
-        approveTaskWithVariables({
+        let API = !!status ? approveTaskWithVariables : rejectTask;
+        API({
           id: this.taskId,
           reason: this.form.reason,
           variables:{

+ 3 - 2
src/views/bpm/handleTask/components/quotation/submit.vue

@@ -113,7 +113,7 @@
     UpdateInformation,
     cancel
   } from '@/api/bpm/components/saleManage/quotation';
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
   import headList from '@/components/headList';
   // 流程实例的详情页,可用于审批
@@ -215,7 +215,8 @@
           variables['technicianId'] = technicianId;
         }
 
-        approveTaskWithVariables({
+        let API = !!status ? approveTaskWithVariables : rejectTask;
+        API({
           id: this.taskId,
           reason: this.form.reason,
           variables

+ 3 - 2
src/views/bpm/handleTask/components/saleOrder/entrustedReceive/submit.vue

@@ -119,7 +119,7 @@
   // import outin from '@/api/warehouseManagement/outin';
   import storageApi from '@/api/warehouseManagement';
   import { cancel } from '@/api/bpm/components/saleManage/entrustedReceive';
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
   import { getWarehouseListByIds } from '@/api/bpm/components/saleManage/saleorder';
 
   // 流程实例的详情页,可用于审批
@@ -279,7 +279,8 @@
         if (this.form.qualityInspector) {
           variables['qualityInspector'] = this.form.qualityInspector;
         }
-        approveTaskWithVariables({
+        let API = !!status ? approveTaskWithVariables : rejectTask;
+        API({
           id: this.taskId,
           reason: this.form.reason,
           variables

+ 3 - 2
src/views/bpm/handleTask/components/saleOrder/entrustedReceiveReturnGoods/submit.vue

@@ -67,7 +67,7 @@
     saleReturnProcessCancel,
     getWarehouseListByIds
   } from '@/api/bpm/components/saleManage/saleorder';
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
 
   // 流程实例的详情页,可用于审批
@@ -186,7 +186,8 @@
           pass: !!status
         };
         if (storemanIds) variables.storemanIds = storemanIds;
-        approveTaskWithVariables({
+        let API = !!status ? approveTaskWithVariables : rejectTask;
+        API({
           id: this.taskId,
           reason: this.form.reason,
           variables

+ 3 - 2
src/views/bpm/handleTask/components/saleOrder/invoice/submit.vue

@@ -90,7 +90,7 @@
     getWarehouseListByIds,
     saleSendProcessCancel
   } from '@/api/bpm/components/saleManage/saleorder';
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
   import { getOutInBySourceBizNo } from '@/api/classifyManage';
   import outin from '@/api/warehouseManagement/outin';
   import { data } from 'ele-admin/lib/ele-pro-table';
@@ -235,7 +235,8 @@
         if (storemanIds) {
           variables['storemanIds'] = storemanIds;
         }
-        approveTaskWithVariables({
+        let API = !!status ? approveTaskWithVariables : rejectTask;
+        API({
           id: this.taskId,
           reason: this.form.reason,
           variables

+ 3 - 2
src/views/bpm/handleTask/components/saleOrder/saleReturnGoods/submit.vue

@@ -95,7 +95,7 @@
     saleReturnProcessCancel,
     getReturnSaleOrderrecordDetail
   } from '@/api/bpm/components/saleManage/saleorder';
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
   import { getOutInBySourceBizNo } from '@/api/classifyManage';
   // import outin from "@/api/warehouseManagement/outin";
@@ -217,7 +217,8 @@
         let variables = {
           pass: !!status
         };
-        approveTaskWithVariables({
+        let API = !!status ? approveTaskWithVariables : rejectTask;
+        API({
           id: this.taskId,
           reason: this.form.reason,
           variables

+ 3 - 2
src/views/bpm/handleTask/components/saleOrder/submit.vue

@@ -71,7 +71,7 @@
 
 <script>
   import { UpdateInformation, saleOrderProcessCancel } from '@/api/bpm/components/saleManage/saleorder';
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 
   // 流程实例的详情页,可用于审批
   export default {
@@ -134,7 +134,8 @@
           pass: !!status
         };
 
-        approveTaskWithVariables({
+        let API = !!status ? approveTaskWithVariables : rejectTask;
+        API({
           id: this.taskId,
           reason: this.form.reason,
           variables

+ 5 - 3
src/views/bpm/handleTask/components/selectedCollectionOutbound/submit.vue

@@ -64,7 +64,7 @@
 <script>
   import storageApi from '@/api/warehouseManagement';
   import { cancel } from '@/api/bpm/components/purchasingManage/outSourceSend';
-  import { approveTaskWithVariables } from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 
   // 流程实例的详情页,可用于审批
   export default {
@@ -137,7 +137,8 @@
             this.isLoading = true;
             const res = await storageApi.outStorage(storageData);
             if (res.code == 0) {
-              approveTaskWithVariables({
+              let API = !!status ? approveTaskWithVariables : rejectTask;
+              API({
                 id: this.taskId,
                 reason: this.form.reason,
                 variables: {
@@ -173,7 +174,8 @@
         let variables = {
           pass: !!status
         };
-        approveTaskWithVariables({
+        let API = !!status ? approveTaskWithVariables : rejectTask;
+        API({
           id: this.taskId,
           reason: this.form.reason,
           variables

+ 5 - 4
src/views/bpm/handleTask/components/sparePartsApply/submit.vue

@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { approveTaskWithVariables } from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 import dictMixins from '@/mixins/dictMixins';
 import { save } from '@/api/bpm/components/sparePartsApply/index.js';
 
@@ -95,12 +95,12 @@ export default {
       //申请人申请
       if (this.taskDefinitionKey === 'fqr') {
         const data = await this.getTableValue();
-        
+
         // return
         if (data) {
           await save(data);
         }
-        
+
       }
       await this._approveTaskWithVariables(status);
     },
@@ -108,7 +108,8 @@ export default {
       let variables = {
         pass: !!status
       };
-      approveTaskWithVariables({
+      let API = !!status ? approveTaskWithVariables : rejectTask;
+      API({
         id: this.taskId,
         reason: this.form.reason,
         variables

+ 3 - 2
src/views/bpm/handleTask/components/supplierManage/submit.vue

@@ -71,7 +71,7 @@
 
 <script>
 import { cancel} from '@/api/bpm/components/supplierManage/contact';
-import {approveTaskWithVariables} from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 import {listAllUserBind} from '@/api/system/organization';
 
 // 流程实例的详情页,可用于审批
@@ -130,7 +130,8 @@ export default {
       let variables = {
         pass: !!status
       };
-      approveTaskWithVariables({
+      let API = !!status ? approveTaskWithVariables : rejectTask;
+      API({
         id: this.taskId,
         reason: this.form.reason,
         variables

+ 3 - 2
src/views/bpm/handleTask/components/transportManager/shipManage/submit.vue

@@ -71,7 +71,7 @@
 
 <script>
 import {cancel} from "@/api/bpm/components/transportManager/shipManage";
-import {approveTaskWithVariables} from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
 
 // 流程实例的详情页,可用于审批
 export default {
@@ -130,7 +130,8 @@ export default {
       let variables = {
         pass: !!status
       };
-      approveTaskWithVariables({
+      let API = !!status ? approveTaskWithVariables : rejectTask;
+      API({
         id: this.taskId,
         reason: this.form.reason,
         variables