From 9a67287742dd3c5daca25cf53c7752aa98f8c8c3 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Sun, 24 Nov 2024 11:11:51 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=9F=A5=E7=9C=8B=20update=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E6=B5=81=E7=A8=8B=E5=AE=9A=E4=B9=89=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workflow/processInstance/index.ts     | 12 +++++++++-
 src/components/Process/approvalRecord.vue     |  1 +
 .../workflow/processDefinition/index.vue      | 22 ++++++++++---------
 src/views/workflow/task/allTaskWaiting.vue    | 17 +++++++-------
 4 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/src/api/workflow/processInstance/index.ts b/src/api/workflow/processInstance/index.ts
index 8b3f8d9..3efbca3 100644
--- a/src/api/workflow/processInstance/index.ts
+++ b/src/api/workflow/processInstance/index.ts
@@ -1,7 +1,6 @@
 import request from '@/utils/request';
 import { ProcessInstanceQuery, ProcessInstanceVO } from '@/api/workflow/processInstance/types';
 import { AxiosPromise } from 'axios';
-import { number } from 'vue-types';
 
 /**
  * 查询运行中实例列表
@@ -111,6 +110,17 @@ export const cancelProcessApply = (businessKey: string) => {
   });
 };
 
+/**
+ * 获取流程变量
+ * @param businessKey 业务id
+ * @returns
+ */
+export const getInstanceVariable = (instanceId: string) => {
+  return request({
+    url: `/workflow/processInstance/getInstanceVariable/${instanceId}`,
+    method: 'get'
+  });
+};
 export default {
   getPageByRunning,
   getPageByFinish,
diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index dec8ec3..9585fab 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -23,6 +23,7 @@
               <el-table-column prop="message" label="审批意见" sortable align="center"></el-table-column>
               <el-table-column prop="createTime" label="开始时间" sortable align="center"></el-table-column>
               <el-table-column prop="updateTime" label="结束时间" sortable align="center"></el-table-column>
+              <el-table-column prop="runDuration" label="运行时常" sortable align="center"></el-table-column>
               <el-table-column prop="attachmentList" label="附件" sortable align="center">
                 <template #default="scope">
                   <el-popover v-if="scope.row.attachmentList && scope.row.attachmentList.length > 0" placement="right" :width="310" trigger="click">
diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue
index 18b92fc..cedb38a 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -107,16 +107,18 @@
                       历史版本
                     </el-button>
                   </el-col>
-                  <el-button
-                    v-if="scope.row.isPublish === 0 || scope.row.isPublish === 9"
-                    link
-                    type="primary"
-                    size="small"
-                    icon="CircleCheck"
-                    @click="handlePublish(scope.row)"
-                    >发布流程</el-button
-                  >
-                  <el-button v-else link type="primary" size="small" icon="CircleClose" @click="handleUnPublish(scope.row)">取消发布</el-button>
+                  <el-col :span="1.5">
+                    <el-button
+                      v-if="scope.row.isPublish === 0 || scope.row.isPublish === 9"
+                      link
+                      type="primary"
+                      size="small"
+                      icon="CircleCheck"
+                      @click="handlePublish(scope.row)"
+                      >发布流程</el-button
+                    >
+                    <el-button v-else link type="primary" size="small" icon="CircleClose" @click="handleUnPublish(scope.row)">取消发布</el-button>
+                  </el-col>
                 </el-row>
                 <el-row :gutter="10" class="mb8">
                   <el-col :span="1.5">
diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue
index dc1fb33..f85b24d 100644
--- a/src/views/workflow/task/allTaskWaiting.vue
+++ b/src/views/workflow/task/allTaskWaiting.vue
@@ -125,10 +125,11 @@
 </template>
 
 <script lang="ts" setup>
-import { getPageByAllTaskWait, getPageByAllTaskFinish, updateAssignee, getInstanceVariable } from '@/api/workflow/task';
+import { getPageByAllTaskWait, getPageByAllTaskFinish, updateAssignee } from '@/api/workflow/task';
+import { getInstanceVariable } from '@/api/workflow/processInstance';
 import MultiInstanceUser from '@/components/Process/multiInstanceUser.vue';
 import UserSelect from '@/components/UserSelect';
-import { TaskQuery, TaskVO, VariableVo } from '@/api/workflow/task/types';
+import { TaskQuery, FlowTaskVO, VariableVo } from '@/api/workflow/task/types';
 import workflowCommon from '@/api/workflow/workflowCommon';
 import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
 //审批记录组件
@@ -176,14 +177,14 @@ const queryParams = ref<TaskQuery>({
 const tab = ref('waiting');
 
 //加签
-const addMultiInstanceUser = (row: TaskVO) => {
+const addMultiInstanceUser = (row: FlowTaskVO) => {
   if (multiInstanceUserRef.value) {
     title.value = '加签人员';
     multiInstanceUserRef.value.getAddMultiInstanceList(row.id, []);
   }
 };
 //减签
-const deleteMultiInstanceUser = (row: TaskVO) => {
+const deleteMultiInstanceUser = (row: FlowTaskVO) => {
   if (multiInstanceUserRef.value) {
     title.value = '减签人员';
     multiInstanceUserRef.value.getDeleteMultiInstanceList(row.id);
@@ -253,12 +254,12 @@ const submitCallback = async (data) => {
   }
 };
 //查询流程变量
-const handleInstanceVariable = async (row: TaskVO) => {
+const handleInstanceVariable = async (row: FlowTaskVO) => {
   variableLoading.value = true;
   variableVisible.value = true;
-  processDefinitionName.value = row.processDefinitionName;
-  let data = await getInstanceVariable(row.id);
-  variableList.value = data.data;
+  processDefinitionName.value = row.flowName;
+  let data = await getInstanceVariable(row.instanceId);
+  variableList.value = data.data.variableList;
   variableLoading.value = false;
 };
 /** 查看按钮操作 */