From e48b6e06a96686104855116e490bb1ea05ff3584 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Sat, 24 Aug 2024 11:35:38 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=B7=BB=E5=8A=A0=E4=BB=A3=E5=8A=9E?=
 =?UTF-8?q?=E4=BA=BA=EF=BC=8C=E8=B0=83=E6=95=B4=E6=8F=90=E4=BA=A4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Process/submitVerify.vue      | 28 +++++++-------------
 src/views/workflow/processInstance/index.vue |  8 +++---
 src/views/workflow/task/taskWaiting.vue      | 16 +++++------
 3 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index 09fc82e..8bdf95f 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -8,7 +8,7 @@
           <el-checkbox label="3" name="type">短信</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
-      <el-form-item v-if="task.businessStatus === 'waiting'" label="附件">
+      <el-form-item v-if="task.flowStatus === 1" label="附件">
         <fileUpload v-model="form.fileId" :file-type="['doc', 'xls', 'ppt', 'txt', 'pdf', 'xlsx', 'docx', 'zip']" :file-size="'20'" />
       </el-form-item>
       <el-form-item label="抄送">
@@ -17,33 +17,23 @@
           {{ user.userName }}
         </el-tag>
       </el-form-item>
-      <el-form-item v-if="task.businessStatus === 'waiting'" label="审批意见">
+      <el-form-item v-if="task.flowStatus === 1" label="审批意见">
         <el-input v-model="form.message" type="textarea" resize="none" />
       </el-form-item>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
         <el-button :disabled="buttonDisabled" type="primary" @click="handleCompleteTask"> 提交 </el-button>
-        <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="primary" @click="openDelegateTask"> 委托 </el-button>
-        <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="primary" @click="openTransferTask"> 转办 </el-button>
-        <el-button
-          v-if="task.businessStatus === 'waiting' && task.multiInstance"
-          :disabled="buttonDisabled"
-          type="primary"
-          @click="addMultiInstanceUser"
-        >
+        <el-button v-if="task.flowStatus === 1" :disabled="buttonDisabled" type="primary" @click="openDelegateTask"> 委托 </el-button>
+        <el-button v-if="task.flowStatus === 1" :disabled="buttonDisabled" type="primary" @click="openTransferTask"> 转办 </el-button>
+        <el-button v-if="task.flowStatus === 1 && task.multiInstance" :disabled="buttonDisabled" type="primary" @click="addMultiInstanceUser">
           加签
         </el-button>
-        <el-button
-          v-if="task.businessStatus === 'waiting' && task.multiInstance"
-          :disabled="buttonDisabled"
-          type="primary"
-          @click="deleteMultiInstanceUser"
-        >
+        <el-button v-if="task.flowStatus === 1 && task.multiInstance" :disabled="buttonDisabled" type="primary" @click="deleteMultiInstanceUser">
           减签
         </el-button>
-        <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleTerminationTask"> 终止 </el-button>
-        <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleBackProcessOpen"> 退回 </el-button>
+        <el-button v-if="task.flowStatus === 1" :disabled="buttonDisabled" type="danger" @click="handleTerminationTask"> 终止 </el-button>
+        <el-button v-if="task.flowStatus === 1" :disabled="buttonDisabled" type="danger" @click="handleBackProcessOpen"> 退回 </el-button>
         <el-button :disabled="buttonDisabled" @click="cancel">取消</el-button>
       </span>
     </template>
@@ -58,7 +48,7 @@
 
     <!-- 驳回开始 -->
     <el-dialog v-model="backVisible" draggable title="驳回" width="40%" :close-on-click-modal="false">
-      <el-form v-if="task.businessStatus === 'waiting'" v-loading="backLoading" :model="backForm" label-width="120px">
+      <el-form v-if="task.flowStatus === 1" v-loading="backLoading" :model="backForm" label-width="120px">
         <el-form-item label="驳回节点">
           <el-select v-model="backForm.targetActivityId" clearable placeholder="请选择" style="width: 300px">
             <el-option v-for="item in taskNodeList" :key="item.nodeId" :label="item.nodeName" :value="item.nodeId" />
diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue
index 4f4c88e..5a18d50 100644
--- a/src/views/workflow/processInstance/index.vue
+++ b/src/views/workflow/processInstance/index.vue
@@ -61,12 +61,12 @@
             <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
             <el-table-column :show-overflow-tooltip="true" align="center" label="流程定义名称">
               <template #default="scope">
-                <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
+                <span>{{ scope.row.flowName }}v{{ scope.row.version }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="processDefinitionKey" label="流程定义KEY"></el-table-column>
+            <el-table-column align="center" prop="flowCode" label="流程定义KEY"></el-table-column>
             <el-table-column align="center" prop="processDefinitionVersion" label="版本号" width="90">
-              <template #default="scope"> v{{ scope.row.processDefinitionVersion }}.0</template>
+              <template #default="scope"> v{{ scope.row.version }}</template>
             </el-table-column>
             <el-table-column v-if="tab === 'running'" align="center" prop="isSuspended" label="状态" min-width="70">
               <template #default="scope">
@@ -151,7 +151,7 @@ import {
   deleteFinishAndHisInstance,
   deleteRunInstance
 } from '@/api/workflow/processInstance';
-import { getListByKey, migrationDefinition } from '@/api/workflow/definition';
+import { migrationDefinition } from '@/api/workflow/definition';
 import { listCategory } from '@/api/workflow/category';
 import { CategoryVO } from '@/api/workflow/category/types';
 import { ProcessInstanceQuery, ProcessInstanceVO } from '@/api/workflow/processInstance/types';
diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue
index 3d3ff8a..0d3e5c5 100644
--- a/src/views/workflow/task/taskWaiting.vue
+++ b/src/views/workflow/task/taskWaiting.vue
@@ -38,23 +38,21 @@
         </el-table-column>
         <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
         <el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
-        <!-- <el-table-column align="center" prop="assigneeName" label="办理人">
+        <el-table-column align="center" prop="assigneeName" label="办理人">
           <template #default="scope">
-            <template v-if="scope.row.participantVo && scope.row.assignee === null">
-              <el-tag v-for="(item, index) in scope.row.participantVo.candidateName" :key="index" type="success">
-                {{ item }}
+            <template v-if="scope.row.userDTOList && scope.row.userDTOList.length > 0">
+              <el-tag v-for="(item, index) in scope.row.userDTOList" :key="index" type="success">
+                {{ item.nickName }}
               </el-tag>
             </template>
             <template v-else>
-              <el-tag type="success">
-                {{ scope.row.assigneeName || '无' }}
-              </el-tag>
+              <el-tag type="success"> 无 </el-tag>
             </template>
           </template>
-        </el-table-column> -->
+        </el-table-column>
         <el-table-column align="center" label="流程状态" min-width="70">
           <template #default="scope">
-            <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
+            <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="createTime" label="创建时间" width="160"></el-table-column>