[update] 修改bug80730
This commit is contained in:
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user