From 2596f7a9c843de0bd8adad2d7b0b5a68de7d0af8 Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期四, 04 九月 2025 20:53:16 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/flowmgr/processQuery2.vue | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/src/views/flowmgr/processQuery2.vue b/src/views/flowmgr/processQuery2.vue
index 16e6177..75fa687 100644
--- a/src/views/flowmgr/processQuery2.vue
+++ b/src/views/flowmgr/processQuery2.vue
@@ -12,16 +12,19 @@
@selection-change="selectionChange">
<template #menu-left>
- <!-- <el-button type="primary" plain @click="exportWebSite">瀵煎嚭鍥炰紶娑夊瘑缃�</el-button> -->
-
+
</template>
<template #menu="scope">
<el-button type="primary" text size="default" @click.stop="customView(scope.row, scope.index, 0)">鏌ョ湅
</el-button>
+ <!--
<el-button type="primary" text size="default" v-if="scope.row.processDefinitionKey === 'dispatch'"
- @click.stop="handleApproveTable(scope.row, scope.index)">瀹℃壒琛ㄦ墦鍗�
+ @click.stop="handleApproveTable(scope.row, scope.index)">瀹℃壒琛�
</el-button>
-
+ <el-button type="primary" text size="default" v-if="scope.row.processDefinitionKey === 'program-cure'"
+ @click.stop="handleConfirmTable(scope.row, scope.index)">纭琛�
+ </el-button>
+ -->
</template>
</avue-crud>
<el-dialog title="鎸囨淳" append-to-body v-model="reassignBox" width="30%">
@@ -79,7 +82,7 @@
// tree: true,
border: true,
index: true,
- selection: true,
+ selection: false,
menuWidth: 80,
// menu: false,
labelWidth: 90,
@@ -150,7 +153,7 @@
}
},
{
- label: '宸ヨ壓鐗堟',
+ label: '鎵规鍙�',
prop: 'variables.craftEdition',
width: 80,
render: ({ row }) => {
@@ -324,7 +327,7 @@
},
{
- label: '宸ヨ壓鐗堟',
+ label: '鎵规鍙�',
prop: 'variables.craftEdition',
render: ({ row }) => {
return h('p',{'class': 'margin0'}, row?.variables?.craftEdition || '');
@@ -565,7 +568,6 @@
},
handleApproveTable(row, index,) {
//瀹℃壒琛ㄤ笅杞�
-
this.$confirm('鏄惁瀵煎嚭瀹℃壒琛�?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -587,6 +589,30 @@
},
+ handleConfirmTable(row, index,) {
+ //纭琛ㄤ笅杞�
+ this.$confirm('鏄惁瀵煎嚭纭琛�?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }).then(() => {
+ console.log(this.selection)
+ NProgress.start();
+ exportBlobPost(
+ `/blade-mdm/flow/mgr/export-confirm-table`,
+ { processInstanceId: row.processInstanceId }
+ ).then(res => {
+ let name = res.headers['content-disposition'].split('filename=')[1]
+ console.log(res.headers['content-disposition'].split('filename=')[1]);
+ name = decodeURI(name)
+ downloadFile(res.data, `${name}`);
+ NProgress.done();
+ });
+ });
+
+
+ },
+
selectionChange(list) {
console.log('selectionChange', list);
this.selectedList = list;
--
Gitblit v1.9.3