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/flowmgr/processQuery1.vue | 119 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 60 insertions(+), 59 deletions(-)
diff --git a/src/views/flowmgr/processQuery1.vue b/src/views/flowmgr/processQuery1.vue
index f3c6060..eb020dd 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>
@@ -85,6 +85,7 @@
// simplePage: true,
searchShow: true,
searchMenuSpan: 7,
+ searchEnter:true,
dialogWidth: '70%',
// tree: true,
border: true,
@@ -96,15 +97,15 @@
dialogClickModal: false,
column: [
{
- label: '娴佺▼绫诲瀷',
- prop: 'processDefinitionKey',
+ label: '娴佺▼鍚嶇О',
+ prop: 'myProcessName',
search: true,
searchType: 'select',
hide: true,
- dicUrl: `/blade-mdm/system/dict/dictionary?code=flow`,
+ dicUrl: `/blade-system/dict-biz/dictionary?code=process_name`,
props: {
label: 'dictValue',
- value: 'remark',
+ value: 'dictValue',
},
},
{
@@ -148,7 +149,7 @@
{
label: '娴佺▼鍚嶇О',
prop: '',
- width: 80,
+ width: 85,
render: ({ row }) => {
return h('p',
{
@@ -159,9 +160,9 @@
}
},
{
- label: '宸ヨ壓鐗堟',
+ label: '鎵规鍙�',
prop: 'variables.craftEdition',
- width: 80,
+ width: 70,
render: ({ row }) => {
return h('span', {}, row?.variables?.craftEdition || '');
}
@@ -310,12 +311,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: '鍒涘缓鏃堕棿',
@@ -331,16 +332,11 @@
return h('p',{'class': 'margin0'}, row?.variables?.title)
}
},
+
{
- label: '娴佺▼鍚嶇О',
- prop: '',
- render: ({ row }) => {
- return h('p',{'class': 'margin0'}, row?.variables.myProcessName)
- }
- },
- {
- label: '宸ヨ壓鐗堟',
+ label: '鎵规鍙�',
prop: 'variables.craftEdition',
+
render: ({ row }) => {
return h('p',{'class': 'margin0'}, row?.variables?.craftEdition || '');
}
@@ -541,41 +537,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) {
@@ -640,7 +641,7 @@
createTimeBegin: params.createTimeBegin || undefined,
createTimeEnd: params.createTimeEnd || undefined,
keyword: params.keyword || undefined,
- processDefinitionKey: params.processDefinitionKey || undefined
+ myProcessName: params.myProcessName || undefined
}
this.query = data
this.onLoad(this.page, data);
@@ -654,7 +655,7 @@
createTimeBegin: params.createTimeBegin,
createTimeEnd: params.createTimeEnd,
keyword: params.keyword || '',
- processDefinitionKey: params.processDefinitionKey || ''
+ myProcessName: params.myProcessName || ''
}
this.onLoad(this.page, data);
done();
@@ -678,7 +679,7 @@
createTimeBegin: params.createTimeBegin,
createTimeEnd: params.createTimeEnd,
keyword: params.keyword || '',
- processDefinitionKey: params.processDefinitionKey || ''
+ myProcessName: params.myProcessName || ''
};
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(data, params)).then(res => {
--
Gitblit v1.9.3