From 8ba602b2f08724c1b92ef1e90f89a6fa33861577 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 30 八月 2025 11:52:31 +0800
Subject: [PATCH] 锁定加上锁定原因
---
src/views/flow/donelist.vue | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/src/views/flow/donelist.vue b/src/views/flow/donelist.vue
index 661781d..892e10e 100644
--- a/src/views/flow/donelist.vue
+++ b/src/views/flow/donelist.vue
@@ -11,7 +11,9 @@
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" >
<template #menu="scope">
<el-button type="primary" text size="default" @click.stop="handleView(scope.row, scope.index)">鏌ョ湅</el-button>
+ <el-button type="primary" :disabled="scope.row.processIsFinished==='true'" v-if="permission.withdraw_button" text size="default" @click.stop="handleWithdraw(scope.row, scope.index)">鎾ゅ洖</el-button>
</template>
+
</avue-crud>
<el-dialog title="鏌ョ湅璇︽儏" v-model="dialogVisible" width="60%">
<avue-form v-model="viewRow" :option="viewFormOption" readonly class="viewRowForm"></avue-form>
@@ -69,7 +71,7 @@
}
},
{
- label: '宸ヨ壓鐗堟',
+ label: '鎵规鍙�',
prop: 'variables.craftEdition',
render: ({ row }) => {
return h('p',{'class': 'margin0'}, row?.variables?.craftEdition || '');
@@ -194,7 +196,7 @@
selection: false,
// viewBtn: true,
menu: true,
- menuWidth: 100,
+ menuWidth: 120,
column: [
{
label: '鍏抽敭瀛�',
@@ -217,7 +219,7 @@
{
label: '鏍囬',
prop: '',
- width: 100,
+ width: 200,
render: ({ row }) => {
return h('p',
{
@@ -261,7 +263,7 @@
},
{
label: '鍒涘缓鏃堕棿',
- width: 200,
+ width: 100,
prop: 'processCreateTime',
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
@@ -273,7 +275,7 @@
},
{
label: '寮�濮嬫椂闂�',
- width: 200,
+ width: 100,
prop: 'createTime',
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
@@ -285,11 +287,12 @@
},
{
label: '缁撴潫鏃堕棿',
- width: 200,
+ width: 100,
prop: 'endTime',
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ sortable:true,
search: false,
searchRange: true,
searchSpan: 8,
@@ -297,7 +300,7 @@
},
{
label: '浠诲姟鍚嶇О',
- width: 200,
+ width: 100,
prop: 'taskName',
},
{
@@ -329,6 +332,34 @@
this.tableData = res.data.data;
});
this.dialogVisible = true;
+ },
+ handleWithdraw(row) {
+ //console.log(row,row.processInstanceId)
+ this.$confirm('纭瑕佹挙鍥炲悧锛�', '', {
+ confirmButtonText: this.$t('submitText'),
+ cancelButtonText: this.$t('cancelText'),
+ type: 'warning',
+ }).then(() => {
+ axios({
+ url: '/blade-mdm/flow/mgr/withdraw',
+ method: 'get',
+ params: {processInstanceId: row.processInstanceId}
+ }).then(res => {
+ if(res.data.code !== 200) {
+ this.$message.error(res.data.msg);
+ return;
+ }
+ this.$message.success('鎿嶄綔鎴愬姛');
+ }).catch(err => {
+ console.error(err);
+ done()
+ });
+
+ }).catch(() => {
+ console.log('>>>>>>')
+ // this.$message.info('宸插彇娑堟搷浣�');
+ done();
+ });
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
@@ -386,7 +417,14 @@
this.loading = false;
});
},
+ at1(){
+ console.log('computed')
+ }
+ },
+ computed: {
+
+ ...mapGetters(['userInfo', 'permission']),
}
}
</script>
--
Gitblit v1.9.3