From 9022fa12f5b1d91571c75f62a145bfc77b8ac6f4 Mon Sep 17 00:00:00 2001
From: konbai <1527468660@qq.com>
Date: Sun, 20 Mar 2022 01:48:04 +0800
Subject: [PATCH] =?UTF-8?q?fix=20--=20=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/workflow/finished.js         | 43 -------------------
 ruoyi-ui/src/api/workflow/process.js          | 41 ++----------------
 ruoyi-ui/src/api/workflow/todo.js             | 43 -------------------
 .../src/views/workflow/task/process/index.vue |  8 ++--
 4 files changed, 6 insertions(+), 129 deletions(-)

diff --git a/ruoyi-ui/src/api/workflow/finished.js b/ruoyi-ui/src/api/workflow/finished.js
index 6dd14ade..cae82088 100644
--- a/ruoyi-ui/src/api/workflow/finished.js
+++ b/ruoyi-ui/src/api/workflow/finished.js
@@ -34,46 +34,3 @@ export function deployStart(deployId) {
     method: 'get',
   })
 }
-
-// 查询流程定义详细
-export function getDeployment(id) {
-  return request({
-    url: '/system/deployment/' + id,
-    method: 'get'
-  })
-}
-
-// 新增流程定义
-export function addDeployment(data) {
-  return request({
-    url: '/system/deployment',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改流程定义
-export function updateDeployment(data) {
-  return request({
-    url: '/system/deployment',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除流程定义
-export function delDeployment(id) {
-  return request({
-    url: '/system/deployment/' + id,
-    method: 'delete'
-  })
-}
-
-// 导出流程定义
-export function exportDeployment(query) {
-  return request({
-    url: '/system/deployment/export',
-    method: 'get',
-    params: query
-  })
-}
diff --git a/ruoyi-ui/src/api/workflow/process.js b/ruoyi-ui/src/api/workflow/process.js
index 67721ae2..7296372d 100644
--- a/ruoyi-ui/src/api/workflow/process.js
+++ b/ruoyi-ui/src/api/workflow/process.js
@@ -53,45 +53,10 @@ export function deployStart(deployId) {
   })
 }
 
-// 查询流程定义详细
-export function getDeployment(id) {
+// 删除流程实例
+export function delProcess(id) {
   return request({
-    url: '/system/deployment/' + id,
-    method: 'get'
-  })
-}
-
-// 新增流程定义
-export function addDeployment(data) {
-  return request({
-    url: '/system/deployment',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改流程定义
-export function updateDeployment(data) {
-  return request({
-    url: '/system/deployment',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除流程定义
-export function delDeployment(id) {
-  return request({
-    url: '/system/deployment/' + id,
+    url: '/workflow/instance/delete/?instanceId=' + id,
     method: 'delete'
   })
 }
-
-// 导出流程定义
-export function exportDeployment(query) {
-  return request({
-    url: '/system/deployment/export',
-    method: 'get',
-    params: query
-  })
-}
diff --git a/ruoyi-ui/src/api/workflow/todo.js b/ruoyi-ui/src/api/workflow/todo.js
index b33ce2fb..c1f85cfc 100644
--- a/ruoyi-ui/src/api/workflow/todo.js
+++ b/ruoyi-ui/src/api/workflow/todo.js
@@ -70,46 +70,3 @@ export function deployStart(deployId) {
     method: 'get',
   })
 }
-
-// 查询流程定义详细
-export function getDeployment(id) {
-  return request({
-    url: '/system/deployment/' + id,
-    method: 'get'
-  })
-}
-
-// 新增流程定义
-export function addDeployment(data) {
-  return request({
-    url: '/system/deployment',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改流程定义
-export function updateDeployment(data) {
-  return request({
-    url: '/system/deployment',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除流程定义
-export function delDeployment(id) {
-  return request({
-    url: '/system/deployment/' + id,
-    method: 'delete'
-  })
-}
-
-// 导出流程定义
-export function exportDeployment(query) {
-  return request({
-    url: '/system/deployment/export',
-    method: 'get',
-    params: query
-  })
-}
diff --git a/ruoyi-ui/src/views/workflow/task/process/index.vue b/ruoyi-ui/src/views/workflow/task/process/index.vue
index c7285d4a..a2b04455 100644
--- a/ruoyi-ui/src/views/workflow/task/process/index.vue
+++ b/ruoyi-ui/src/views/workflow/task/process/index.vue
@@ -155,13 +155,11 @@
 <script>
 import {
   getDeployment,
-  delDeployment,
   addDeployment,
   updateDeployment,
   exportDeployment,
-  flowRecord
 } from "@/api/workflow/finished";
-import { myProcessList,stopProcess } from "@/api/workflow/process";
+import { myProcessList, stopProcess, delProcess } from "@/api/workflow/process";
 import {listDefinition} from "@/api/workflow/definition";
 import { listCategory } from '@/api/workflow/category';
 export default {
@@ -344,13 +342,13 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
+      const ids = row.procInsId;
       this.$confirm('是否确认删除流程定义编号为"' + ids + '"的数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        return delDeployment(ids);
+        return delProcess(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");