From ce70bd97c7f2577f0978b39b9da1ccdd8d5b768f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 九月 2025 22:50:14 +0800
Subject: [PATCH] 机床增加设备编号
---
src/views/flow/donelist.vue | 66 +++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 16 deletions(-)
diff --git a/src/views/flow/donelist.vue b/src/views/flow/donelist.vue
index 314eb6e..0d5d503 100644
--- a/src/views/flow/donelist.vue
+++ b/src/views/flow/donelist.vue
@@ -11,7 +11,8 @@
@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' || scope.row.flag.toLowerCase().indexOf('program')>-1" v-if="permission.withdraw_button" text size="default" @click.stop="handleWithdraw(scope.row, scope.index)">鎾ゅ洖</el-button>
+ <el-button type="primary" :disabled="scope.row.processIsFinished==='true' || (scope.row.currentTaskKeys.toLowerCase().indexOf('program')==-1 && scope.row.currentTaskKeys.toLowerCase().indexOf('useable')==-1)" v-if="permission.takeback_button" text size="default" @click.stop="handleTakeBack(scope.row, scope.index)">鍙栧洖</el-button>
+ <el-button type="primary" :disabled="scope.row.processIsFinished==='true' || scope.row.currentTaskKeys.toLowerCase().indexOf('program')>-1" v-if="permission.withdraw_button" text size="default" @click.stop="handleWithdraw(scope.row, scope.index)">鎾ゅ洖</el-button>
</template>
</avue-crud>
@@ -43,12 +44,12 @@
labelWidth: 100,
span: 8,
column: [
- {
- label: '娴佺▼绫诲瀷',
- prop: 'processDefinitionKey',
+ {
+ label: '娴佺▼鍚嶇О',
+ prop: '',
render: ({ row }) => {
- return h('p',{'class': 'margin0'}, row?.processDefinitionKey)
- },
+ return h('p',{'class': 'margin0'}, row?.variables?.myProcessName)
+ }
},
{
label: '鍒涘缓鏃堕棿',
@@ -64,13 +65,7 @@
return h('p',{'class': 'margin0'}, row?.variables?.title)
}
},
- {
- label: '娴佺▼鍚嶇О',
- prop: 'processDefinitionName',
- render: ({ row }) => {
- return h('p',{'class': 'margin0'}, row?.processDefinitionName)
- }
- },
+
{
label: '鎵规鍙�',
prop: 'variables.craftEdition',
@@ -115,9 +110,9 @@
},
{
label: '杩囩▼鍗″彿',
- prop: 'empty',
+ prop: '',
render: ({ row }) => {
- return h('p',{'class': 'margin0'}, row?.variables?.empty || '');
+ return h('p',{'class': 'margin0'}, row?.variables?.processCard || '');
}
},
{
@@ -176,6 +171,13 @@
return h('p',{'class': 'margin0'}, row?.variables?.programPackageName || '');
}
},
+ {
+ label: '涓存椂鏇存敼鍗曞彿',
+ prop: '',
+ render: ({ row }) => {
+ return h('p',{'class': 'margin0'}, row?.variables?.deviation || '');
+ }
+ },
],
},
viewRow: {},
@@ -210,7 +212,7 @@
{
label: '鐘舵��',
prop: 'status',
- //cleerable:true,
+ hide: true,
search: true,
type: 'select',
dicData: [
@@ -344,6 +346,38 @@
});
this.dialogVisible = true;
},
+ handleTakeBack(row){
+ //缁勯暱鍙栧洖
+ this.$confirm('纭瑕佸彇鍥炲悧锛�', '', {
+ confirmButtonText: this.$t('submitText'),
+ cancelButtonText: this.$t('cancelText'),
+ type: 'warning',
+ }).then(() => {
+ axios({
+ url: '/blade-mdm/flow/mgr/takeback',
+ method: 'get',
+ params: {processInstanceId: row.processInstanceId}
+ }).then(res => {
+ if(res.data.code !== 200) {
+ this.$message.error(res.data.msg);
+ return;
+ }
+ this.$message.success('鎿嶄綔鎴愬姛');
+
+ todoChangeNotify();
+
+ this.refreshChange();
+ }).catch(err => {
+ console.error(err);
+ //done()
+ });
+
+ }).catch(() => {
+ console.log('>>>>>>')
+ // this.$message.info('宸插彇娑堟搷浣�');
+ //done();
+ });
+ },
handleWithdraw(row) {
//console.log(row,row.processInstanceId)
this.$confirm('纭瑕佹挙鍥炲悧锛�', '', {
--
Gitblit v1.9.3