From 2781142ab67deba83925da706ca26b7f8ea1a759 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 04 九月 2025 15:42:24 +0800
Subject: [PATCH] 审批用户列表改为树形
---
src/views/flowmgr/processQuery1.vue | 187 +++++++++++++++++++++-------------------------
1 files changed, 86 insertions(+), 101 deletions(-)
diff --git a/src/views/flowmgr/processQuery1.vue b/src/views/flowmgr/processQuery1.vue
index f3c6060..6d917fb 100644
--- a/src/views/flowmgr/processQuery1.vue
+++ b/src/views/flowmgr/processQuery1.vue
@@ -20,16 +20,16 @@
<!-- <el-button type="primary" plain @click="exportWebSite">瀵煎嚭鍥炰紶娑夊瘑缃�</el-button> -->
<!-- <el-button type="primary" plain @click="reassign">鎸傝浇杞﹀簥绋嬪簭搴�</el-button> -->
<!-- <el-button type="primary" plain @click="exportExcel">瀵煎嚭鍒癊XCEL</el-button> -->
- <el-button type="primary" plain @click="reassign">閲嶆柊鎸囨淳
- </el-button>
+ <!-- <el-button type="primary" plain @click="reassign">閲嶆柊鎸囨淳</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="handleAction(scope.row, scope.index, 1)">瀹℃壒琛ㄦ墦鍗�
- </el-button>
- <el-button type="danger" text size="default" @click.stop="handleAction(scope.row, scope.index, 0)">鍒犻櫎
+ <!--
+ <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="handleDelete(scope.row, scope.index, 0)">鍒犻櫎
</el-button>
</template>
@@ -82,29 +82,26 @@
viewBtn: false,
columnBtn: false,
tip: false,
- // simplePage: true,
searchShow: true,
searchMenuSpan: 7,
+ searchEnter:true,
dialogWidth: '70%',
- // tree: true,
border: true,
index: true,
- selection: true,
-
- menuWidth: 200,
- // menu: false,
+ selection: false,
+ menuWidth: 100,
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',
},
},
{
@@ -128,6 +125,7 @@
{
label: '鏍囬',
prop: 'variables.title',
+ showOverflowTooltip:true,
width: 150,
render: ({ row }) => {
return h('p',
@@ -148,7 +146,8 @@
{
label: '娴佺▼鍚嶇О',
prop: '',
- width: 80,
+ width: 85,
+ showOverflowTooltip:true,
render: ({ row }) => {
return h('p',
{
@@ -158,12 +157,13 @@
}, row?.variables?.myProcessName)
}
},
+
{
- label: '宸ヨ壓鐗堟',
- prop: 'variables.craftEdition',
- width: 80,
+ label: '闆剁粍浠跺彿',
+ prop: 'drawingNo',
+ width: 82,
render: ({ row }) => {
- return h('span', {}, row?.variables?.craftEdition || '');
+ return h('span', {}, row?.variables?.drawingNo || '');
}
},
{
@@ -177,7 +177,7 @@
{
label: '宸ュ簭鍚嶇О',
prop: 'processName',
- width: 80,
+ width: 82,
render: ({ row }) => {
return h('span', {}, row?.variables?.processName || '');
}
@@ -185,23 +185,23 @@
{
label: '宸ュ簭鐗堟',
prop: 'processEdition',
- width: 80,
+ width: 82,
render: ({ row }) => {
return h('span', {}, row?.variables?.processEdition || '');
}
},
- {
- label: '闆剁粍浠跺彿',
- prop: 'drawingNo',
- width: 80,
+ {
+ label: '鎵规鍙�',
+ prop: 'variables.craftEdition',
+ width: 70,
render: ({ row }) => {
- return h('span', {}, row?.variables?.drawingNo || '');
+ return h('span', {}, row?.variables?.craftEdition || '');
}
},
{
label: '浠诲姟杞﹂棿',
prop: 'workshop',
- width: 80,
+ width: 82,
render: ({ row }) => {
return h('p',{'class': 'margin0'}, row?.variables?.workshop || '');
}
@@ -209,28 +209,9 @@
{
label: '杩囩▼鍗″彿',
prop: 'empty',
- width: 80,
+ width: 82,
},
- {
- label: '鍥惧彿',
- prop: '',
- width: 100,
- render: ({ row }) => {
- return h('p',
- {
- attrs: {},
- class: {},
- style: {},
- }, row?.variables?.drawingNo)
- },
- renderForm: ({ row }) => {
- return h('span', {
- attrs: {},
- class: {},
- style: {},
- }, row?.variables?.drawingNo || '');
- }
- },
+
{
label: '浜у搧鍨嬪彿',
prop: '',
@@ -255,6 +236,7 @@
{
label: '鏈哄簥',
prop: '',
+ showOverflowTooltip:true,
render: ({ row }) => {
return h('p',
{
@@ -279,16 +261,19 @@
{
label: '鍒涘缓鏃堕棿',
prop: 'processCreateTime',
+ showOverflowTooltip:true,
+ width: 82,
},
{
label: '褰撳墠鑺傜偣',
prop: 'taskName',
- width: 90
+ showOverflowTooltip:true,
+ width: 110
},
{
label: '璁″垝鍔犲伐鏃堕棿',
prop: 'planStartTime',
- width: 180,
+ width: 110,
render: ({ row }) => {
return h('span', {}, row?.variables?.planStartTime || '');
}
@@ -310,12 +295,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 +316,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 +521,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 +625,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 +639,7 @@
createTimeBegin: params.createTimeBegin,
createTimeEnd: params.createTimeEnd,
keyword: params.keyword || '',
- processDefinitionKey: params.processDefinitionKey || ''
+ myProcessName: params.myProcessName || ''
}
this.onLoad(this.page, data);
done();
@@ -678,7 +663,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