From 7d93a844cb9d2757d7087c716b8f78e3b34baa81 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 26 八月 2025 21:29:45 +0800
Subject: [PATCH] 的地方
---
src/views/flowmgr/processQuery1.vue | 77 +++++++++++++------------
src/views/flowmgr/processQuery2.vue | 72 +++++++++--------------
2 files changed, 70 insertions(+), 79 deletions(-)
diff --git a/src/views/flowmgr/processQuery1.vue b/src/views/flowmgr/processQuery1.vue
index 3563c50..631940a 100644
--- a/src/views/flowmgr/processQuery1.vue
+++ b/src/views/flowmgr/processQuery1.vue
@@ -26,10 +26,10 @@
<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="handleAction(scope.row, scope.index, 1)">瀹℃壒琛ㄦ墦鍗�
+ <el-button type="primary" text size="default" v-if="scope.row.processDefinitionKey === 'dispatch' || scope.row.processDefinitionKey === 'program-cure'"
+ @click.stop="handleApproveTable(scope.row, scope.index)">瀹℃壒琛ㄦ墦鍗�
</el-button>
- <el-button type="danger" text size="default" @click.stop="handleAction(scope.row, scope.index, 0)">鍒犻櫎
+ <el-button type="danger" text size="default" @click.stop="handleDelete(scope.row, scope.index, 0)">鍒犻櫎
</el-button>
</template>
@@ -536,41 +536,46 @@
});
done();
},
- handleAction(row, index, flag) {
- if (flag === 0) {
- // 澶勭悊鎺ュ彈鎴栨嫆缁濇搷浣�
- let ids = [row.id].toString();
- this.$confirm('纭畾灏嗛�夋嫨鏁版嵁鍒犻櫎?', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- })
- .then(() => {
- deleteRow({ processInstanceId: row.processInstanceId,id:row.processInstanceId }).then(res => {
- this.onLoad(this.page, this.query);
- })
+ handleDelete(row, index, flag) {
+
+ // 澶勭悊鎺ュ彈鎴栨嫆缁濇搷浣�
+ let ids = [row.id].toString();
+ this.$confirm('纭畾灏嗛�夋嫨鏁版嵁鍒犻櫎?', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ })
+ .then(() => {
+ deleteRow({ processInstanceId: row.processInstanceId,id:row.processInstanceId }).then(res => {
+ this.onLoad(this.page, this.query);
})
- } else if (flag === 1) {
- printRow({ processInstanceId: row.processInstanceId })
- this.$confirm('鏄惁瀵煎嚭?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- }).then(() => {
- console.log(this.selection)
- NProgress.start();
- exportBlobPost(
- `/blade-mdm/flow/mgr/export-approve-table`,
- { processInstanceId: row.processInstanceId },
- { processInstanceId: row.processInstanceId },
- ).then(res => {
- let name = res.headers['content-disposition'].split('filename=')[1]
- console.log(res.headers['content-disposition'].split('filename=')[1]);
- downloadFile(res.data, `瀹℃壒鎵撳嵃-${name}`);
- NProgress.done();
- });
+ })
+
+
+ },
+ handleApproveTable(row, index,) {
+ //瀹℃壒琛ㄤ笅杞�
+
+ this.$confirm('鏄惁瀵煎嚭瀹℃壒琛�?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }).then(() => {
+ console.log(this.selection)
+ NProgress.start();
+ exportBlobPost(
+ `/blade-mdm/flow/mgr/export-approve-table`,
+ { processInstanceId: row.processInstanceId },
+ { 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) {
diff --git a/src/views/flowmgr/processQuery2.vue b/src/views/flowmgr/processQuery2.vue
index 43384db..16e6177 100644
--- a/src/views/flowmgr/processQuery2.vue
+++ b/src/views/flowmgr/processQuery2.vue
@@ -18,7 +18,9 @@
<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)">瀹℃壒琛ㄦ墦鍗�
+ </el-button>
</template>
</avue-crud>
@@ -539,7 +541,7 @@
})
})
} else if (flag === 1) {
- printRow({ processInstanceId: row.processInstanceId })
+
this.$confirm('鏄惁瀵煎嚭?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -561,51 +563,35 @@
}
},
+ handleApproveTable(row, index,) {
+ //瀹℃壒琛ㄤ笅杞�
+
+ this.$confirm('鏄惁瀵煎嚭瀹℃壒琛�?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }).then(() => {
+ console.log(this.selection)
+ NProgress.start();
+ exportBlobPost(
+ `/blade-mdm/flow/mgr/export-approve-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;
},
- // exportWebSite() {
- // if (this.selectedList.length === 0) {
- // this.$message.warning('璇峰厛閫夋嫨闇�瑕佸鍑虹殑鏁版嵁');
- // return;
- // }
- // this.$confirm('鏄惁瀵煎嚭?', '鎻愮ず', {
- // confirmButtonText: '纭畾',
- // cancelButtonText: '鍙栨秷',
- // type: 'warning',
- // }).then(() => {
- // NProgress.start();
- // exportBlob(
- // `/blade-mdm/machineback/filehandle/export-to-inner`,
- // {
- // ids: this.selectedList.map(item => item.id).join(','),
- // }
- // ).then(res => {
- // downloadXls(res.data, `瀵煎嚭鍥炰紶娑夊瘑缃�${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
- // NProgress.done();
- // });
- // });
- // },
- // exportExcel() {
- // if (this.selectedList.length === 0) {
- // this.$message.warning('璇峰厛閫夋嫨闇�瑕佸鍑虹殑鏁版嵁');
- // return;
- // }
- // this.$confirm('鏄惁瀵煎嚭?', '鎻愮ず', {
- // confirmButtonText: '纭畾',
- // cancelButtonText: '鍙栨秷',
- // type: 'warning',
- // }).then(() => {
- // NProgress.start();
- // exportBlob(
- // `/blade-mdm/machineback/filehandle/export-excel?${this.website.tokenHeader}=${getToken()}`
- // ).then(res => {
- // downloadXls(res.data, `瀵煎嚭鏈哄簥鍥炰紶绋嬪簭${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
- // NProgress.done();
- // });
- // });
- // },
+
searchChange(params, done) {
let data = {}
this.query = params;
--
Gitblit v1.9.3