|
@@ -86,13 +86,26 @@
|
|
|
</template>
|
|
</template>
|
|
|
<!-- 操作列 -->
|
|
<!-- 操作列 -->
|
|
|
<template v-slot:action="{ row }">
|
|
<template v-slot:action="{ row }">
|
|
|
- <el-button
|
|
|
|
|
|
|
+ <!-- <el-button
|
|
|
size="mini"
|
|
size="mini"
|
|
|
type="text"
|
|
type="text"
|
|
|
icon="el-icon-edit"
|
|
icon="el-icon-edit"
|
|
|
@click="handleAudit(row)"
|
|
@click="handleAudit(row)"
|
|
|
>详情</el-button
|
|
>详情</el-button
|
|
|
|
|
+ > -->
|
|
|
|
|
+
|
|
|
|
|
+ <el-popconfirm
|
|
|
|
|
+ class="ele-action"
|
|
|
|
|
+ title="确认撤回吗?"
|
|
|
|
|
+ @confirm="handleWithdraw(row)"
|
|
|
|
|
+ v-if="row.status == 1"
|
|
|
>
|
|
>
|
|
|
|
|
+ <template v-slot:reference>
|
|
|
|
|
+ <el-link type="primary" :underline="false">
|
|
|
|
|
+ 撤回
|
|
|
|
|
+ </el-link>
|
|
|
|
|
+ </template>
|
|
|
|
|
+ </el-popconfirm>
|
|
|
</template>
|
|
</template>
|
|
|
</ele-pro-table>
|
|
</ele-pro-table>
|
|
|
</el-card>
|
|
</el-card>
|
|
@@ -103,7 +116,7 @@
|
|
|
|
|
|
|
|
<script>
|
|
<script>
|
|
|
import dictMixins from '@/mixins/dictMixins';
|
|
import dictMixins from '@/mixins/dictMixins';
|
|
|
-import { getProcessInstancePage } from '@/api/bpm/task';
|
|
|
|
|
|
|
+import { getProcessInstancePage, withdrawTask } from '@/api/bpm/task';
|
|
|
import {getDate} from "@/utils/dateUtils";
|
|
import {getDate} from "@/utils/dateUtils";
|
|
|
// import detail from '@/views/bpm/processInstance/detail.vue';
|
|
// import detail from '@/views/bpm/processInstance/detail.vue';
|
|
|
import detail from '@/views/bpm/done/detailDialog.vue'
|
|
import detail from '@/views/bpm/done/detailDialog.vue'
|
|
@@ -207,16 +220,16 @@ export default {
|
|
|
// showOverflowTooltip: true,
|
|
// showOverflowTooltip: true,
|
|
|
// minWidth: 130
|
|
// minWidth: 130
|
|
|
// },
|
|
// },
|
|
|
- // {
|
|
|
|
|
- // columnKey: 'action',
|
|
|
|
|
- // label: '操作',
|
|
|
|
|
- // width: 230,
|
|
|
|
|
- // align: 'center',
|
|
|
|
|
- // resizable: false,
|
|
|
|
|
- // slot: 'action',
|
|
|
|
|
- // showOverflowTooltip: true,
|
|
|
|
|
- // fixed: 'right'
|
|
|
|
|
- // }
|
|
|
|
|
|
|
+ {
|
|
|
|
|
+ columnKey: 'action',
|
|
|
|
|
+ label: '操作',
|
|
|
|
|
+ width: 230,
|
|
|
|
|
+ align: 'center',
|
|
|
|
|
+ resizable: false,
|
|
|
|
|
+ slot: 'action',
|
|
|
|
|
+ showOverflowTooltip: true,
|
|
|
|
|
+ fixed: 'right'
|
|
|
|
|
+ }
|
|
|
]
|
|
]
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
@@ -259,6 +272,27 @@ export default {
|
|
|
row.processInstance = processInstance;
|
|
row.processInstance = processInstance;
|
|
|
this.$refs.detailRef.open(row);
|
|
this.$refs.detailRef.open(row);
|
|
|
},
|
|
},
|
|
|
|
|
+ handleWithdraw(row) {
|
|
|
|
|
+ console.log(row,'row')
|
|
|
|
|
+ console.log(row.businessId,'row.businessId')
|
|
|
|
|
+ const processDefinitionKey = row.processDefinitionId.split(':')[0]
|
|
|
|
|
+ withdrawTask({
|
|
|
|
|
+ processInstanceId: row.id,
|
|
|
|
|
+ businessId: row.businessId,
|
|
|
|
|
+ processDefinitionKey: processDefinitionKey,
|
|
|
|
|
+ }).then(res => {
|
|
|
|
|
+ console.log(res,'res')
|
|
|
|
|
+ if (res.data.code == 0) {
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ message: '撤回成功',
|
|
|
|
|
+ type: 'success'
|
|
|
|
|
+ });
|
|
|
|
|
+ this.reload();
|
|
|
|
|
+ }
|
|
|
|
|
+ }).catch(err => {
|
|
|
|
|
+
|
|
|
|
|
+ })
|
|
|
|
|
+ },
|
|
|
getTimelineItemType(result) {
|
|
getTimelineItemType(result) {
|
|
|
if (result === '通过') {
|
|
if (result === '通过') {
|
|
|
return 'success';
|
|
return 'success';
|