From ea3dd5dfa7a3c14bc64b803a211a01beb4114d04 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 25 Jan 2024 14:55:37 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug80730?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProcessDetailList.vue | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/components/ProcessDetailList.vue b/src/components/ProcessDetailList.vue
index 4f750465..598bc958 100644
--- a/src/components/ProcessDetailList.vue
+++ b/src/components/ProcessDetailList.vue
@@ -34,25 +34,26 @@
         </a-form>
       </div>
       <div>
+        <!--  rowKey加了id是因为强制撤回的记录没有taskId  -->
         <j-table
           :columns="columns"
           :dataSource="dataSource"
           :can-drag="true"
-          rowKey="taskId"
+          :rowKey="record => {return record.id + ',' + (record.taskId || '')}"
           :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
           :pagination="false"
           :scroll="{x: '100%'}"
           @change="handleTableChange">
 
           <!--  耗时  -->
-          <template v-slot:timeConsuming="{text, record}">
-            <a-tooltip overlay-class-name="tooltip-style">
-              <template slot="title">{{ record.endTime && record.createTime ? computedTimeConsuming(record) : global.emptyLine }}</template>
-              <div class="table-text">
-                {{ record.endTime && record.createTime ? computedTimeConsuming(record) : global.emptyLine }}
-              </div>
-            </a-tooltip>
-          </template>
+          <!--<template v-slot:timeConsuming="{text, record}">-->
+          <!--  <a-tooltip overlay-class-name="tooltip-style">-->
+          <!--    <template slot="title">{{ record.endTime && record.createTime ? computedTimeConsuming(record) : global.emptyLine }}</template>-->
+          <!--    <div class="table-text">-->
+          <!--      {{ record.endTime && record.createTime ? computedTimeConsuming(record) : global.emptyLine }}-->
+          <!--    </div>-->
+          <!--  </a-tooltip>-->
+          <!--</template>-->
 
           <!--审批意见-->
           <template v-slot:approvalOpinion="{text, record}">
@@ -178,8 +179,8 @@ export default {
         {
           title: this.$t('workCenter.processDetail.timeConsuming'),
           width: 150,
-          dataIndex: 'timeConsuming',
-          scopedSlots: { customRender: 'timeConsuming' }
+          dataIndex: 'overTime',
+          scopedSlots: { customRender: 'text' }
         },
         // 审批意见
         {
@@ -287,7 +288,10 @@ export default {
         return
       }
       this.loading = true
-      urgeProcessNode({taskId: this.selectedRowKeys.join(',')}).then(res => {
+      const taskIds = this.selectedRowKeys.map(item => {
+        return item.split(',')[1]
+      })
+      urgeProcessNode({ taskId: taskIds.join(',') }).then(res => {
         if (res.success) {
           this.$message.success(res.message)
         } else {