feat(工作流): 增加作废功能

src/api/bpm/components/apsMeterialPlan/index.js

@@ -0,0 +1,21 @@
+import request from '@/utils/request';
+
+export function apspurchaseplan(data) {
+  return request({
+    url: '/bpm/apspurchaseplan/assign',
+    method: 'POST',
+    data: data
+  });
+}
+
+/**
+ * 流程作废
+ */
+export async function cancel(data) {
+  const res = await request.put(`/bpm/apspurchaseplan/notPass`, data);
+  if (res.data.code == 0) {
+    return Promise.resolve(res.data);
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+

src/api/bpm/components/contractManage/contractBook.js

@@ -39,3 +39,14 @@ export async function getTableList(params) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+/**
+ * 流程作废
+ */
+export async function cancel(data) {
+  const res = await request.put(`/bpm/contractApprove/notPass`, data);
+  if (res.data.code == 0) {
+    return Promise.resolve(res.data);
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/bpm/components/financialManage/fee-manage/fee-application/index.js

@@ -28,3 +28,14 @@ export async function finFeeApplySubmit(data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+/**
+ * 流程作废
+ */
+export async function cancel(data) {
+  const res = await request.put(`/bpm/finFeeApply/notPass`, data);
+  if (res.data.code == 0) {
+    return Promise.resolve(res.data);
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/bpm/components/purchasingManage/inquiryManage.js

@@ -54,3 +54,13 @@ export async function generateContract(data) {
   return Promise.reject(new Error(res.data.message));
 }
 
+/**
+ * 流程作废
+ */
+export async function cancel(data) {
+  const res = await request.put(`/bpm/purchaseInquiryApprove/notPass`, data);
+  if (res.data.code == 0) {
+    return Promise.resolve(res.data);
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/bpm/components/purchasingManage/purchaseNeedManage.js

@@ -31,5 +31,15 @@ export async function UpdateInformation(data) {
   return res.data
 }
 
+/**
+ * 流程作废
+ */
+export async function cancel(data) {
+  const res = await request.put(`/bpm/purchaseRequirementApprove/notPass`, data);
+  if (res.data.code == 0) {
+    return Promise.resolve(res.data);
+  }
+  return Promise.reject(new Error(res.data.message));
+}
 
 

src/api/bpm/components/purchasingManage/purchaseOrder.js

@@ -30,3 +30,13 @@ export async function UpdateInformation(data) {
   return res.data
 }
 
+/**
+ * 流程作废
+ */
+export async function cancel(data) {
+  const res = await request.put(`/bpm/purchaseOrderApprove/notPass`, data);
+  if (res.data.code == 0) {
+    return Promise.resolve(res.data);
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/bpm/components/purchasingManage/purchasePlanManage.js

@@ -24,3 +24,14 @@ export async function assign(data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+/**
+ * 流程作废
+ */
+export async function cancel(data) {
+  const res = await request.put(`/bpm/purchasePlanApprove/cancel`, data);
+  if (res.data.code == 0) {
+    return Promise.resolve(res.data);
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/bpm/components/purchasingManage/purchaseorderreceive.js

@@ -43,4 +43,16 @@ export async function UpdateReceiveInformation(data) {
 //       return res.data.data;
 //     }
 //     return Promise.reject(new Error(res.data.message));
-//   }
+//   }
+
+
+/**
+ * 流程作废
+ */
+export async function cancel(data) {
+  const res = await request.put(`/bpm/purchaseReceiveApprove/cancel`, data);
+  if (res.data.code == 0) {
+    return Promise.resolve(res.data);
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/bpm/components/purchasingManage/returnGoods.js

@@ -68,4 +68,13 @@ export async function uploadReceipt(data) {
   return Promise.reject(new Error(res.data.message));
 }
 
-
+/**
+ * 流程作废
+ */
+export async function cancel(data) {
+  const res = await request.put(`/bpm/purchaseReturnApprove/cancel`, data);
+  if (res.data.code == 0) {
+    return Promise.resolve(res.data);
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/bpm/components/saleManage/businessOpportunity.js

@@ -91,3 +91,14 @@ export async function salesmanApprove(data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+/**
+ * 流程作废
+ */
+export async function cancel(data) {
+  const res = await request.put(`/bpm/businessOpportunityApprove/notPass`, data);
+  if (res.data.code == 0) {
+    return Promise.resolve(res.data);
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/bpm/components/saleManage/contact.js

@@ -83,4 +83,15 @@ export async function contactTypeTree(data) {
     return res.data;
   }
   return Promise.reject(new Error(res.data.message));
-}
+}
+
+/**
+ * 流程作废
+ */
+export async function cancel(data) {
+  const res = await request.put(`/bpm/contactlistapply/cancel`, data);
+  if (res.data.code == 0) {
+    return Promise.resolve(res.data);
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/bpm/components/saleManage/quotation.js

@@ -95,3 +95,14 @@ export async function salesmanApprove(data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+/**
+ * 流程作废
+ */
+export async function cancel(data) {
+  const res = await request.put(`/bpm/quoteApprove/notPass`, data);
+  if (res.data.code == 0) {
+    return Promise.resolve(res.data);
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/bpm/components/saleManage/saleorder.js

@@ -337,3 +337,59 @@ export async function updateReceiptAPI(data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+
+/**
+ * 对账单 流程作废
+ */
+export async function accountStatementProcessCancel(data) {
+  const res = await request.put(`/bpm/accountStatementApprove/notPass`, data);
+  if (res.data.code == 0) {
+    return Promise.resolve(res.data);
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 销售订单 流程作废
+ */
+export async function saleOrderProcessCancel(data) {
+  const res = await request.put(`/bpm/salesOrderApprove/notPass`, data);
+  if (res.data.code == 0) {
+    return Promise.resolve(res.data);
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 销售退货处理单 流程作废
+ */
+export async function returnHandleProcessCancel(data) {
+  const res = await request.put(`/bpm/salesOrderReturnHandle/notPass`, data);
+  if (res.data.code == 0) {
+    return Promise.resolve(res.data);
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 销售发货单 流程作废
+ */
+export async function saleSendProcessCancel(data) {
+  const res = await request.put(`/bpm/salesOrderSendApprove/notPass`, data);
+  if (res.data.code == 0) {
+    return Promise.resolve(res.data);
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 销售退货单 流程作废
+ */
+export async function saleReturnProcessCancel(data) {
+  const res = await request.put(`/bpm/salesOrderReturnApprove/notPass`, data);
+  if (res.data.code == 0) {
+    return Promise.resolve(res.data);
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/bpm/task.js

@@ -114,14 +114,6 @@ export function approveTaskWithVariables(data) {
   });
 }
 
-export function apspurchaseplan(data) {
-  return request({
-    url: '/bpm/apspurchaseplan/assign',
-    method: 'POST',
-    data: data
-  });
-}
-
 export function outApproveNotPass(data) {
   return request({
     url: '/bpm/outApprove/notPass',

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

@@ -68,6 +68,13 @@
       >驳回
       </el-button>
 
+      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+        <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i></span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+
       <!-- <el-button
         icon="el-icon-circle-close"
         type="danger"
@@ -98,7 +105,8 @@
 <script>
 import {
   updateProduct,
-  UpdateInformation
+  UpdateInformation,
+  cancel
 } from '@/api/bpm/components/saleManage/businessOpportunity';
 import {approveTaskWithVariables} from '@/api/bpm/task';
 import {listAllUserBind} from '@/api/system/organization';
@@ -319,7 +327,29 @@ export default {
           resolve(await data);
         });
       });
-    }
+    },
+
+    //更多
+    handleCommand(command) {
+      if (command === 'cancel') {
+        this.$confirm("是否确认作废？", {
+          type: 'warning',
+          cancelButtonText: '取消',
+          confirmButtonText: '确定'
+        }).then(() => {
+          cancel({
+            id: this.taskId,
+            reason: this.form.reason,
+            businessId: this.businessId,
+          }).then(() => {
+            this.$emit('handleClose');
+          }).catch(() => {
+            this.$message.error("流程作废失败");
+          });
+        }).catch(() => {});
+      }
+    },
+
   }
 };
 </script>

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

@@ -33,19 +33,19 @@
         @click="handleAudit(0)"
         >不通过
       </el-button>
-      <el-button
-        icon="el-icon-edit-outline"
-        type="primary"
-        size="mini"
-        @click="handleUpdateAssignee"
-        >转办
-      </el-button>
+
+      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+        <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i></span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
     </div>
   </el-col>
 </template>
 
 <script>
-  import { managerApprove } from '@/api/bpm/components/saleManage/contact';
+  import { managerApprove, cancel } from '@/api/bpm/components/saleManage/contact';
 
   // 流程实例的详情页，可用于审批
   export default {
@@ -84,7 +84,29 @@
         });
 
         // this.dialogVisible = false;
-      }
+      },
+
+      //更多
+      handleCommand(command) {
+        if (command === 'cancel') {
+          this.$confirm("是否确认作废？", {
+            type: 'warning',
+            cancelButtonText: '取消',
+            confirmButtonText: '确定'
+          }).then(() => {
+            cancel({
+              id: this.taskId,
+              reason: this.form.reason,
+              businessId: this.businessId,
+            }).then(() => {
+              this.$emit('handleClose');
+            }).catch(() => {
+              this.$message.error("流程作废失败");
+            });
+          }).catch(() => {});
+        }
+      },
+
     }
   };
 </script>

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

@@ -35,6 +35,12 @@
         >驳回
       </el-button>
 
+      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+        <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i></span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
       <!-- <el-button
         icon="el-icon-circle-close"
         type="danger"
@@ -63,7 +69,7 @@
 </template>
 
 <script>
-  import { UpdateInformation } from '@/api/bpm/components/contractManage/contractBook';
+  import { UpdateInformation, cancel } from '@/api/bpm/components/contractManage/contractBook';
   import { approveTaskWithVariables } from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
 
@@ -83,9 +89,6 @@
       id: {
         default: ''
       },
-      id: {
-        default: ''
-      },
       taskDefinitionKey: {
         default: ''
       }
@@ -158,7 +161,29 @@
             resolve(await data);
           });
         });
-      }
+      },
+
+      //更多
+      handleCommand(command) {
+        if (command === 'cancel') {
+          this.$confirm("是否确认作废？", {
+            type: 'warning',
+            cancelButtonText: '取消',
+            confirmButtonText: '确定'
+          }).then(() => {
+            cancel({
+              id: this.taskId,
+              reason: this.form.reason,
+              businessId: this.businessId,
+            }).then(() => {
+              this.$emit('handleClose');
+            }).catch(() => {
+              this.$message.error("流程作废失败");
+            });
+          }).catch(() => {});
+        }
+      },
+
     }
   };
 </script>

src/views/bpm/handleTask/components/financialManage/feeManage/feeApplication/submit.vue

@@ -35,6 +35,13 @@
       >驳回
       </el-button>
 
+      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+        <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i></span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+
       <!-- <el-button
         icon="el-icon-circle-close"
         type="danger"
@@ -63,7 +70,7 @@
 </template>
 
 <script>
-import {UpdateInformation} from '@/api/bpm/components/saleManage/saleorder';
+import {cancel} from "@/api/bpm/components/financialManage/fee-manage/fee-application";
 import {approveTaskWithVariables} from '@/api/bpm/task';
 
 // 流程实例的详情页，可用于审批
@@ -144,7 +151,29 @@ export default {
           resolve(await data);
         });
       });
-    }
+    },
+
+    //更多
+    handleCommand(command) {
+      if (command === 'cancel') {
+        this.$confirm("是否确认作废？", {
+          type: 'warning',
+          cancelButtonText: '取消',
+          confirmButtonText: '确定'
+        }).then(() => {
+          cancel({
+            id: this.taskId,
+            reason: this.form.reason,
+            businessId: this.businessId,
+          }).then(() => {
+            this.$emit('handleClose');
+          }).catch(() => {
+            this.$message.error("流程作废失败");
+          });
+        }).catch(() => {});
+      }
+    },
+
   }
 };
 </script>

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

@@ -35,6 +35,13 @@
         >驳回
       </el-button>
 
+      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+        <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i></span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+
       <!-- <el-button
         icon="el-icon-circle-close"
         type="danger"
@@ -63,7 +70,7 @@
 </template>
 
 <script>
-  import { UpdateInformation } from '@/api/bpm/components/purchasingManage/inquiryManage';
+  import { UpdateInformation, cancel } from '@/api/bpm/components/purchasingManage/inquiryManage';
   import { approveTaskWithVariables } from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
 
@@ -83,9 +90,6 @@
       id: {
         default: ''
       },
-      id: {
-        default: ''
-      },
       taskDefinitionKey: {
         default: ''
       }
@@ -165,7 +169,29 @@
             resolve(await data);
           });
         });
-      }
+      },
+
+      //更多
+      handleCommand(command) {
+        if (command === 'cancel') {
+          this.$confirm("是否确认作废？", {
+            type: 'warning',
+            cancelButtonText: '取消',
+            confirmButtonText: '确定'
+          }).then(() => {
+            cancel({
+              id: this.taskId,
+              reason: this.form.reason,
+              businessId: this.businessId,
+            }).then(() => {
+              this.$emit('handleClose');
+            }).catch(() => {
+              this.$message.error("流程作废失败");
+            });
+          }).catch(() => {});
+        }
+      },
+
     }
   };
 </script>

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

@@ -26,6 +26,13 @@
       <el-button icon="el-icon-circle-close" type="danger" size="mini" @click="handleAudit(0)">驳回
       </el-button>
 
+      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+        <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i></span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+
 
     </div>
 
@@ -34,7 +41,8 @@
 
 <script>
 
-import { apspurchaseplan, approveTaskWithVariables } from '@/api/bpm/task';
+import { apspurchaseplan, cancel } from '@/api/bpm/components/apsMeterialPlan';
+import { approveTaskWithVariables } from '@/api/bpm/task';
 import { listAllUserBind } from '@/api/system/organization';
 
 // 流程实例的详情页，可用于审批
@@ -131,7 +139,29 @@ export default {
           resolve(await data);
         });
       });
-    }
+    },
+
+    //更多
+    handleCommand(command) {
+      if (command === 'cancel') {
+        this.$confirm("是否确认作废？", {
+          type: 'warning',
+          cancelButtonText: '取消',
+          confirmButtonText: '确定'
+        }).then(() => {
+          cancel({
+            id: this.taskId,
+            reason: this.form.reason,
+            businessId: this.businessId,
+          }).then(() => {
+            this.$emit('handleClose');
+          }).catch(() => {
+            this.$message.error("流程作废失败");
+          });
+        }).catch(() => {});
+      }
+    },
+
   }
 };
 </script>

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

@@ -36,35 +36,20 @@
         >驳回
       </el-button>
 
-      <!-- <el-button
-        icon="el-icon-circle-close"
-        type="danger"
-        size="mini"
-        @click="handleBackList"
-        >退回
-      </el-button> -->
-      <!-- <el-button
-        icon="el-icon-circle-close"
-        type="danger"
-        size="mini"
-        @click="handleAudit(0)"
-        v-if="taskDefinitionKey != 'productionSupervisorApprove1'"
-        >不通过
-      </el-button>
-      <el-button
-        icon="el-icon-edit-outline"
-        type="primary"
-        size="mini"
-        v-if="taskDefinitionKey != 'productionSupervisorApprove1'"
-        @click="handleUpdateAssignee"
-        >转办
-      </el-button> -->
+      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+        <span class="el-dropdown-link">
+          更多<i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
     </div>
   </el-col>
 </template>
 
 <script>
-  import { UpdateInformation } from '@/api/bpm/components/purchasingManage/purchaseNeedManage';
+  import { UpdateInformation, cancel } from '@/api/bpm/components/purchasingManage/purchaseNeedManage';
   import { approveTaskWithVariables } from '@/api/bpm/task';
 
   // 流程实例的详情页，可用于审批
@@ -83,9 +68,6 @@
       id: {
         default: ''
       },
-      id: {
-        default: ''
-      },
       taskDefinitionKey: {
         default: ''
       }
@@ -147,7 +129,29 @@
             resolve(await data);
           });
         });
-      }
+      },
+
+      //更多
+      handleCommand(command) {
+        if (command === 'cancel') {
+          this.$confirm("是否确认作废？", {
+            type: 'warning',
+            cancelButtonText: '取消',
+            confirmButtonText: '确定'
+          }).then(() => {
+            cancel({
+              id: this.taskId,
+              reason: this.form.reason,
+              businessId: this.businessId,
+            }).then(() => {
+              this.$emit('handleClose');
+            }).catch(() => {
+              this.$message.error("流程作废失败");
+            });
+          }).catch(() => {});
+        }
+      },
+
     }
   };
 </script>

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

@@ -33,6 +33,14 @@
         @click="handleAudit(0)">驳回
       </el-button>
 
+      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+        <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i></span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+
+
       <!-- <el-button
         icon="el-icon-circle-close"
         type="danger"
@@ -63,7 +71,7 @@
 <script>
 import {
   approveTaskWithVariablesAPI, updateAccountReceiptAPI,
-  updateAccountStatementAPI, updateReceiveAndPayInfoAPI,
+  updateAccountStatementAPI, updateReceiveAndPayInfoAPI, accountStatementProcessCancel
 } from '@/api/bpm/components/saleManage/saleorder';
 import {approveTaskWithVariables} from '@/api/bpm/task';
 // import { listAllUserBind } from '@/api/system/organization';
@@ -151,7 +159,29 @@ export default {
           resolve(await data);
         });
       });
-    }
+    },
+
+    //更多
+    handleCommand(command) {
+      if (command === 'cancel') {
+        this.$confirm("是否确认作废？", {
+          type: 'warning',
+          cancelButtonText: '取消',
+          confirmButtonText: '确定'
+        }).then(() => {
+          accountStatementProcessCancel({
+            id: this.taskId,
+            reason: this.form.reason,
+            businessId: this.businessId,
+          }).then(() => {
+            this.$emit('handleClose');
+          }).catch(() => {
+            this.$message.error("流程作废失败");
+          });
+        }).catch(() => {});
+      }
+    },
+
   }
 };
 </script>

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

@@ -82,6 +82,13 @@
         >驳回
       </el-button>
 
+      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+        <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i></span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+
       <!-- <el-button
         icon="el-icon-circle-close"
         type="danger"
@@ -124,7 +131,8 @@
 <script>
   import {
     UpdateReceiveInformation,
-    getReceiveSaleOrderrecordDetail
+    getReceiveSaleOrderrecordDetail,
+    cancel
   } from '@/api/bpm/components/purchasingManage/purchaseorderreceive';
   import { approveTaskWithVariables } from '@/api/bpm/task';
   import { getWarehouseListByIds } from '@/api/bpm/components/saleManage/saleorder';
@@ -308,7 +316,29 @@
             resolve(await data);
           });
         });
-      }
+      },
+
+      //更多
+      handleCommand(command) {
+        if (command === 'cancel') {
+          this.$confirm("是否确认作废？", {
+            type: 'warning',
+            cancelButtonText: '取消',
+            confirmButtonText: '确定'
+          }).then(() => {
+            cancel({
+              id: this.taskId,
+              reason: this.form.reason,
+              businessId: this.businessId,
+            }).then(() => {
+              this.$emit('handleClose');
+            }).catch(() => {
+              this.$message.error("流程作废失败");
+            });
+          }).catch(() => {});
+        }
+      },
+
     }
   };
 </script>

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

@@ -53,6 +53,13 @@
         >驳回
       </el-button>
 
+      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+        <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i></span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+
       <!-- <el-button
         icon="el-icon-circle-close"
         type="danger"
@@ -83,7 +90,8 @@
 <script>
   import {
     UpdateReturnInformation,
-    uploadReceipt
+    uploadReceipt,
+    cancel
   } from '@/api/bpm/components/purchasingManage/returnGoods';
   import { approveTaskWithVariables } from '@/api/bpm/task';
   import { getReturnSaleOrderrecordDetail } from '@/api/bpm/components/purchasingManage/returnGoods';
@@ -226,7 +234,29 @@
             resolve(await data);
           });
         });
-      }
+      },
+
+      //更多
+      handleCommand(command) {
+        if (command === 'cancel') {
+          this.$confirm("是否确认作废？", {
+            type: 'warning',
+            cancelButtonText: '取消',
+            confirmButtonText: '确定'
+          }).then(() => {
+            cancel({
+              id: this.taskId,
+              reason: this.form.reason,
+              businessId: this.businessId,
+            }).then(() => {
+              this.$emit('handleClose');
+            }).catch(() => {
+              this.$message.error("流程作废失败");
+            });
+          }).catch(() => {});
+        }
+      },
+
     }
   };
 </script>

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

@@ -35,6 +35,13 @@
       >驳回
       </el-button>
 
+      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+        <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i></span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+
       <!-- <el-button
         icon="el-icon-circle-close"
         type="danger"
@@ -63,7 +70,7 @@
 </template>
 
 <script>
-import {UpdateInformation} from '@/api/bpm/components/purchasingManage/purchaseOrder';
+import {UpdateInformation, cancel} from '@/api/bpm/components/purchasingManage/purchaseOrder';
 import {approveTaskWithVariables} from '@/api/bpm/task';
 import {listAllUserBind} from '@/api/system/organization';
 
@@ -83,9 +90,6 @@ export default {
     id: {
       default: ''
     },
-    id: {
-      default: ''
-    },
     taskDefinitionKey: {
       default: ''
     }
@@ -158,7 +162,29 @@ export default {
           resolve(await data);
         });
       });
-    }
+    },
+
+    //更多
+    handleCommand(command) {
+      if (command === 'cancel') {
+        this.$confirm("是否确认作废？", {
+          type: 'warning',
+          cancelButtonText: '取消',
+          confirmButtonText: '确定'
+        }).then(() => {
+          cancel({
+            id: this.taskId,
+            reason: this.form.reason,
+            businessId: this.businessId,
+          }).then(() => {
+            this.$emit('handleClose');
+          }).catch(() => {
+            this.$message.error("流程作废失败");
+          });
+        }).catch(() => {});
+      }
+    },
+
   }
 };
 </script>

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

@@ -50,6 +50,16 @@
         @click="handleAudit(1)"
         >通过
       </el-button>
+
+      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+                  <span class="el-dropdown-link">
+                    更多<i class="el-icon-arrow-down el-icon--right"></i>
+                  </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+
       <!-- <el-button
         icon="el-icon-circle-close"
         type="danger"
@@ -88,7 +98,7 @@
 <script>
   import { approveTaskWithVariables } from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
-  import { assign } from '@/api/bpm/components/purchasingManage/purchasePlanManage';
+  import { assign, cancel } from '@/api/bpm/components/purchasingManage/purchasePlanManage';
 
   // 流程实例的详情页，可用于审批
   export default {
@@ -106,9 +116,6 @@
       id: {
         default: ''
       },
-      id: {
-        default: ''
-      },
       taskDefinitionKey: {
         default: ''
       }
@@ -167,7 +174,29 @@
             title: status === 0 ? '驳回' : ''
           });
         }
-      }
+      },
+
+      //更多
+      handleCommand(command) {
+        if (command === 'cancel') {
+          this.$confirm("是否确认作废？", {
+            type: 'warning',
+            cancelButtonText: '取消',
+            confirmButtonText: '确定'
+          }).then(() => {
+            cancel({
+              id: this.taskId,
+              reason: this.form.reason,
+              businessId: this.businessId,
+            }).then(() => {
+              this.$emit('handleClose');
+            }).catch(() => {
+              this.$message.error("流程作废失败");
+            });
+          }).catch(() => {});
+        }
+      },
+
     }
   };
 </script>

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

@@ -72,6 +72,13 @@
         >驳回
       </el-button>
 
+      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+        <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i></span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+
       <!-- <el-button
         icon="el-icon-circle-close"
         type="danger"
@@ -103,7 +110,8 @@
 <script>
   import {
     updateTech,
-    UpdateInformation
+    UpdateInformation,
+    cancel
   } from '@/api/bpm/components/saleManage/quotation';
   import { approveTaskWithVariables } from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
@@ -124,9 +132,6 @@
       id: {
         default: ''
       },
-      id: {
-        default: ''
-      },
       taskDefinitionKey: {
         default: ''
       }
@@ -230,7 +235,29 @@
             resolve(await data);
           });
         });
-      }
+      },
+
+      //更多
+      handleCommand(command) {
+        if (command === 'cancel') {
+          this.$confirm("是否确认作废？", {
+            type: 'warning',
+            cancelButtonText: '取消',
+            confirmButtonText: '确定'
+          }).then(() => {
+            cancel({
+              id: this.taskId,
+              reason: this.form.reason,
+              businessId: this.businessId,
+            }).then(() => {
+              this.$emit('handleClose');
+            }).catch(() => {
+              this.$message.error("流程作废失败");
+            });
+          }).catch(() => {});
+        }
+      },
+
     }
   };
 </script>

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

@@ -33,6 +33,13 @@
         @click="handleAudit(0)">驳回
       </el-button>
 
+      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+        <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i></span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+
       <!-- <el-button
         icon="el-icon-circle-close"
         type="danger"
@@ -63,7 +70,7 @@
 <script>
 import {
   approveTaskWithVariablesAPI, updateAccountReceiptAPI,
-  updateAccountStatementAPI, updateReceiveAndPayInfoAPI,
+  updateAccountStatementAPI, updateReceiveAndPayInfoAPI, accountStatementProcessCancel
 } from '@/api/bpm/components/saleManage/saleorder';
 import {approveTaskWithVariables} from '@/api/bpm/task';
 // import { listAllUserBind } from '@/api/system/organization';
@@ -151,7 +158,30 @@ export default {
           resolve(await data);
         });
       });
-    }
+    },
+
+
+    //更多
+    handleCommand(command) {
+      if (command === 'cancel') {
+        this.$confirm("是否确认作废？", {
+          type: 'warning',
+          cancelButtonText: '取消',
+          confirmButtonText: '确定'
+        }).then(() => {
+          accountStatementProcessCancel({
+            id: this.taskId,
+            reason: this.form.reason,
+            businessId: this.businessId,
+          }).then(() => {
+            this.$emit('handleClose');
+          }).catch(() => {
+            this.$message.error("流程作废失败");
+          });
+        }).catch(() => {});
+      }
+    },
+
   }
 };
 </script>

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

@@ -62,6 +62,14 @@
         @click="handleAudit(0)"
         >驳回
       </el-button>
+
+      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+        <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i></span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+
     </div>
   </el-col>
 </template>
@@ -71,7 +79,8 @@
   import {
     approveTaskWithVariablesAPI,
     saleReturnUpdateAPI,
-    updateReceiptAPI
+    updateReceiptAPI,
+    returnHandleProcessCancel,
   } from '@/api/bpm/components/saleManage/saleorder';
   import { listAllUserBind } from '@/api/system/organization';
   import { EventBus } from './eventBus.js';
@@ -476,11 +485,33 @@
             resolve(await data);
           });
         });
-      }
+      },
+
+      //更多
+      handleCommand(command) {
+        if (command === 'cancel') {
+          this.$confirm("是否确认作废？", {
+            type: 'warning',
+            cancelButtonText: '取消',
+            confirmButtonText: '确定'
+          }).then(() => {
+            returnHandleProcessCancel({
+              id: this.taskId,
+              reason: this.form.reason,
+              businessId: this.businessId,
+            }).then(() => {
+              this.$emit('handleClose');
+            }).catch(() => {
+              this.$message.error("流程作废失败");
+            });
+          }).catch(() => {});
+        }
+      },
+
     },
     beforeDestroy() {
       EventBus.$off('getActiveCompValue');
-    }
+    },
   };
 </script>
 

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

@@ -57,6 +57,8 @@
         >驳回
       </el-button>
 
+
+
       <!-- <el-button
         icon="el-icon-circle-close"
         type="danger"
@@ -88,7 +90,8 @@
   import {
     UpdateSendInformation,
     getSendSaleOrderrecordDetail,
-    getWarehouseListByIds
+    getWarehouseListByIds,
+    saleSendProcessCancel,
   } from '@/api/bpm/components/saleManage/saleorder';
   import { approveTaskWithVariables } from '@/api/bpm/task';
   import { getOutInBySourceBizNo } from '@/api/classifyManage';
@@ -111,9 +114,6 @@
       id: {
         default: ''
       },
-      id: {
-        default: ''
-      },
       taskDefinitionKey: {
         default: ''
       }
@@ -252,7 +252,29 @@
             resolve(await data);
           });
         });
-      }
+      },
+
+      //更多
+      handleCommand(command) {
+        if (command === 'cancel') {
+          this.$confirm("是否确认作废？", {
+            type: 'warning',
+            cancelButtonText: '取消',
+            confirmButtonText: '确定'
+          }).then(() => {
+            saleSendProcessCancel({
+              id: this.taskId,
+              reason: this.form.reason,
+              businessId: this.businessId,
+            }).then(() => {
+              this.$emit('handleClose');
+            }).catch(() => {
+              this.$message.error("流程作废失败");
+            });
+          }).catch(() => {});
+        }
+      },
+
     }
   };
 </script>

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

@@ -46,6 +46,12 @@
         v-if="!['starter'].includes(taskDefinitionKey)&&outInData.verifyStatus!=1"
         >驳回
       </el-button>
+      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+        <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i></span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
 
       <!-- <el-button
         icon="el-icon-circle-close"
@@ -78,7 +84,8 @@
   import {
     UpdateReturnInformation,
     getWarehouseListByIds,
-    approve
+    approve,
+    saleReturnProcessCancel,
   } from '@/api/bpm/components/saleManage/saleorder';
   import { approveTaskWithVariables } from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
@@ -205,7 +212,29 @@
             resolve(await data);
           });
         });
-      }
+      },
+
+      //更多
+      handleCommand(command) {
+        if (command === 'cancel') {
+          this.$confirm("是否确认作废？", {
+            type: 'warning',
+            cancelButtonText: '取消',
+            confirmButtonText: '确定'
+          }).then(() => {
+            saleReturnProcessCancel({
+              id: this.taskId,
+              reason: this.form.reason,
+              businessId: this.businessId,
+            }).then(() => {
+              this.$emit('handleClose');
+            }).catch(() => {
+              this.$message.error("流程作废失败");
+            });
+          }).catch(() => {});
+        }
+      },
+
     }
   };
 </script>

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

@@ -35,6 +35,13 @@
         >驳回
       </el-button>
 
+      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
+        <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i></span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+
       <!-- <el-button
         icon="el-icon-circle-close"
         type="danger"
@@ -63,7 +70,7 @@
 </template>
 
 <script>
-  import { UpdateInformation } from '@/api/bpm/components/saleManage/saleorder';
+  import { UpdateInformation, saleOrderProcessCancel } from '@/api/bpm/components/saleManage/saleorder';
   import { approveTaskWithVariables } from '@/api/bpm/task';
 
   // 流程实例的详情页，可用于审批
@@ -147,7 +154,29 @@
             resolve(await data);
           });
         });
-      }
+      },
+
+      //更多
+      handleCommand(command) {
+        if (command === 'cancel') {
+          this.$confirm("是否确认作废？", {
+            type: 'warning',
+            cancelButtonText: '取消',
+            confirmButtonText: '确定'
+          }).then(() => {
+            saleOrderProcessCancel({
+              id: this.taskId,
+              reason: this.form.reason,
+              businessId: this.businessId,
+            }).then(() => {
+              this.$emit('handleClose');
+            }).catch(() => {
+              this.$message.error("流程作废失败");
+            });
+          }).catch(() => {});
+        }
+      },
+
     }
   };
 </script>

src/views/bpm/handleTask/index.vue

@@ -50,6 +50,7 @@
             @handleUpdateAssignee="handleUpdateAssignee(item)"
             @handleBackList="handleBackList(item)"
             @submit="submit"
+            @handleClose="handleClose"
             ref="subForm"
           ></async-sub-form-component>
         </div>