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/api/flow/todolist.js | 10 ++
src/views/wel/shemi.vue | 29 ++-----
src/views/flow/components/TodolistLeft.vue | 2
src/views/flowmgr/processQuery3.vue | 2
src/views/flow/todolist.vue | 123 ++++++++++++++++++++++--------
src/views/flowmgr/processQuery1.vue | 69 ++++++----------
src/views/flowmgr/processQuery2.vue | 2
7 files changed, 140 insertions(+), 97 deletions(-)
diff --git a/src/api/flow/todolist.js b/src/api/flow/todolist.js
index 060f6ed..7c6d256 100644
--- a/src/api/flow/todolist.js
+++ b/src/api/flow/todolist.js
@@ -43,6 +43,14 @@
});
}
+export const getAssigneeTree = (params) => {
+ return request({
+ url: `/blade-mdm/flow/flow-user-tree?deptId=0`,
+ method: 'get',
+ params,
+ });
+}
+
export const getAppList = (current, size, params) => {
return request({
url: '/blade-mdm/program/ncfile/programpickpage',
@@ -117,6 +125,7 @@
})
}
// 涓婁竴鐜妭瀹℃壒浜�
+/*
export const getPrevius = data => {
return request({
url: '/blade-mdm/flow/previus-approve-user',
@@ -125,6 +134,7 @@
data: {}
})
}
+ */
// 鎵归噺瀹℃壒
export const batchApprove = data => {
return request({
diff --git a/src/views/flow/components/TodolistLeft.vue b/src/views/flow/components/TodolistLeft.vue
index b98283e..6016d67 100644
--- a/src/views/flow/components/TodolistLeft.vue
+++ b/src/views/flow/components/TodolistLeft.vue
@@ -109,7 +109,7 @@
content1: '',
content2: '',
codeDiffFileName1: '鍥炰紶鐗堟湰',
- codeDiffFileName2: '璇曞垏鐗堟湰',
+ codeDiffFileName2: '涓嬪彂鐗堟湰',
showContentId: '',
attForm: {
att: '',
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index c207d0d..e3e2262 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -36,7 +36,9 @@
v-model="activeName"
>
<el-tab-pane label="瀹℃壒" name="approve">
- <avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" />
+ <avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" >
+
+ </avue-form>
</el-tab-pane>
<el-tab-pane label="娴佺▼杞ㄨ抗" name="log">
<processTrace :item="row" v-if="activeName==='log'"></processTrace>
@@ -47,12 +49,9 @@
</div>
</el-drawer>
</basic-container>
- <div>
- <!--<top-todo ref="topTodoComponent" />-->
- </div>
</template>
<script>
-import { getList, approve, getAssignee,reassgin,manualDispatch,autoDispatch,todoChangeNotify,batchApprove } from '@/api/flow/todolist';
+import { getList, approve, getAssignee,getAssigneeTree,reassgin,manualDispatch,autoDispatch,todoChangeNotify,batchApprove } from '@/api/flow/todolist';
import { mapGetters } from 'vuex';
import dayjs from 'dayjs';
import TodolistLeft from './components/TodolistLeft.vue';
@@ -72,13 +71,18 @@
assigneeData: [],
allAssigneeData: [],
managerAssigneeData: [],//鏁版帶绠＄悊鍛樿鑹茬殑瀹℃壒鐢ㄦ埛
+
+ assignee2Data:[],
+
row: {},
approveBox: false,
formApprove: {
comment: '',
- approve: '', // 榛樿鍚屾剰
- assignee: ''
+ approve: '',
+ assignee: '',
},
+
+
optionApprove: {
labelWidth: 100,
column: [
@@ -93,7 +97,7 @@
{ label: '椹冲洖', value: 'N' },
],
rules: [{ required: true, message: '璇烽�夋嫨瀹℃壒缁撴灉', trigger: 'blur' }],
- },
+ },/*
{
label: '鍙戦�佺粰',
prop: 'assignee',
@@ -109,7 +113,24 @@
dicData: [
],
- // rules: [{ required: true, message: '璇烽�夋嫨涓嬩竴瀹℃壒鐢ㄦ埛', trigger: 'blur' }],
+
+ },*/
+ {
+ label: '鍙戦�佺粰',
+ prop: 'assignee',
+ component: 'elTreeSelect',
+ params: {
+ props:{
+ label: 'name',
+ value:'id',
+ disabled: (data) => data.nodeType==='dept',
+ isLeaf: (data) => data.children==null || data.children.length==0,
+ },
+ },
+ display: true,
+ filterable: true,
+ span: 24,
+ disabled: false,
},
{
label: '澶囨敞',
@@ -131,6 +152,7 @@
}
]
},
+
],
},
page: {
@@ -148,12 +170,10 @@
delBtn: false,
columnBtn: false,
tip: false,
- // simplePage: true,
searchEnter:true,
searchShow: true,
searchMenuSpan: 6,
dialogWidth: '60%',
- // tree: true,
border: true,
index: true,
selection: true,
@@ -221,7 +241,7 @@
label: '鏈哄簥',
width: 100,
prop: '',
-
+ showOverflowTooltip:true,
formatter: (val, value, label) => {
return `${val?.variables?.machineCode}`;
},
@@ -242,6 +262,7 @@
search: true,
searchRange: true,
searchSpan: 8,
+ showOverflowTooltip:true,
// hide: true,
},
{
@@ -254,7 +275,8 @@
},
{
label: '褰撳墠鑺傜偣',
- width: 100,
+ width: 120,
+ showOverflowTooltip:true,
prop: 'taskName',
},
{
@@ -302,6 +324,25 @@
{
label: '鍙戦�佺粰',
prop: 'newAssigneeId',
+ component: 'elTreeSelect',
+ params: {
+ props:{
+ label: 'name',
+ value:'id',
+ disabled: (data) => data.nodeType==='dept',
+ isLeaf: (data) => data.children==null || data.children.length==0,
+ },
+ },
+ display: true,
+ filterable: true,
+ span: 24,
+ disabled: false,
+ rules: [{ required: true, message: '璇疯緭鍏ラ�夋嫨', trigger: 'blur' }],
+ },
+ /*
+ {
+ label: '鍙戦�佺粰',
+ prop: 'newAssigneeId',
filterable:true,
type: 'select',
props: {
@@ -315,13 +356,12 @@
],
rules: [{ required: true, message: '璇疯緭鍏ラ�夋嫨', trigger: 'blur' }],
- },
+ },*/
{
label: '澶囨敞',
span: 24,
prop: 'comment',
type: 'textarea',
- // rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
},
],
},
@@ -361,12 +401,30 @@
},
mounted() {
//this.setApproveBtn(row)
+ /*
getAssignee({
taskId: 0,
}).then(res => {
//if(row.taskDefinitionKey === '')
this.assigneeData = res.data.data;
this.reassignOption.column[1].dicData = this.assigneeData;
+ });
+ */
+ getAssigneeTree({
+ taskId: 0,
+ }).then(res => {
+ this.assigneeData = res.data.data;
+ //鍒濆鍖栨暟鎺х鐞嗗憳鐨勬暟缁�
+ for(var i=0;i<this.assigneeData.length;i++){
+ for(var j=0;j<this.assigneeData[i].children.length;j++){
+ if(this.assigneeData[i].children[j].nodeType=='manager'){
+ this.managerAssigneeData[this.managerAssigneeData.length] = this.assigneeData[i].children[j];
+ }
+ }
+ }
+
+ this.optionApprove.column[1].data = this.assigneeData;
+ this.reassignOption.column[1].data = this.assigneeData;
});
},
methods: {
@@ -431,10 +489,10 @@
if (["cureProgramTask"].includes(row.taskDefinitionKey)) {
if(approve === 'N'){
- this.optionApprove.column[1].dicData = this.managerAssigneeData;
+ this.optionApprove.column[1].data = this.managerAssigneeData;
}else{
- //this.assigneeData = this.allAssigneeData;
- this.optionApprove.column[1].dicData = this.allAssigneeData;
+ //this.optionApprove.column[1].dicData = this.allAssigneeData;
+ this.optionApprove.column[1].data = this.assigneeData;
}
}
if (approve === 'Y') {//瀹℃壒閫氳繃鐨勬儏鍐�
@@ -476,13 +534,10 @@
//鍥哄寲缂栧埗鑺傜偣锛屼笉閫氳繃缁欐暟鎺х鐞嗗憳
//TODO 鎸夋壘瑙掕壊瀹氫綅缁欏叾涓竴涓暟鎺х鐞嗗憳
this.optionApprove.column[1].disabled = false;
- for(var i=0;i<this.assigneeData.length;i++){
- if(this.assigneeData[i].manager == true){
- this.formApprove.assignee = this.assigneeData[i].id;
- break;
- }
+
+ if(this.managerAssigneeData.length>0){
+ this.formApprove.assignee = this.managerAssigneeData[0].id;
}
- //this.formApprove.assignee = '';
}else if(["confirmIsUseableTask"].includes(row.taskDefinitionKey)) {
//鍒ゆ柇鏄惁鍙敤鑺傜偣锛屼笉鍙敤锛岀粰缂栧埗
this.formApprove.assignee = row.variables.programmer;
@@ -676,20 +731,24 @@
}
},
handleAction(row, index) {
- getAssignee({
+ getAssigneeTree({
taskId: row.taskId,
}).then(res => {
- //if(row.taskDefinitionKey === '')
+
this.assigneeData = res.data.data;
this.allAssigneeData = res.data.data;
+
+ this.managerAssigneeData=[];
//鍒濆鍖栨暟鎺х鐞嗗憳鐨勬暟缁�
- for(var i=0;i<this.allAssigneeData.length;i++){
- if(this.allAssigneeData[i].manager == true){
- this.managerAssigneeData[this.managerAssigneeData.length] = this.allAssigneeData[i];
+ for(var i=0;i<this.assigneeData.length;i++){
+ for(var j=0;j<this.assigneeData[i].children.length;j++){
+ if(this.assigneeData[i].children[j].nodeType=='manager'){
+ this.managerAssigneeData[this.managerAssigneeData.length] = this.assigneeData[i].children[j];
+ }
}
}
- this.optionApprove.column[1].dicData = this.assigneeData;
- this.reassignOption.column[1].dicData = this.assigneeData;
+ this.optionApprove.column[1].data = this.assigneeData;
+ this.reassignOption.column[1].data = this.assigneeData;
})
this.formApprove = {
comment: '',
@@ -700,7 +759,7 @@
this.setAssignee(row, this.formApprove.approve);
this.setApproveBtn(row);
- console.log('handleAction', row, index);
+ //console.log('handleAction', row, index);
},
handleSubmit(form, done) {
if(this.row.taskDefinitionKey === 'programmingTask') {
diff --git a/src/views/flowmgr/processQuery1.vue b/src/views/flowmgr/processQuery1.vue
index 82c9484..6d917fb 100644
--- a/src/views/flowmgr/processQuery1.vue
+++ b/src/views/flowmgr/processQuery1.vue
@@ -25,9 +25,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' || scope.row.processDefinitionKey === 'program-cure'"
@click.stop="handleApproveTable(scope.row, scope.index)">瀹℃壒琛�
- </el-button>
+ </el-button>-->
<el-button type="danger" text size="default" @click.stop="handleDelete(scope.row, scope.index, 0)">鍒犻櫎
</el-button>
@@ -81,18 +82,14 @@
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: [
{
@@ -128,6 +125,7 @@
{
label: '鏍囬',
prop: 'variables.title',
+ showOverflowTooltip:true,
width: 150,
render: ({ row }) => {
return h('p',
@@ -149,6 +147,7 @@
label: '娴佺▼鍚嶇О',
prop: '',
width: 85,
+ showOverflowTooltip:true,
render: ({ row }) => {
return h('p',
{
@@ -158,12 +157,13 @@
}, row?.variables?.myProcessName)
}
},
+
{
- label: '鎵规鍙�',
- prop: 'variables.craftEdition',
- width: 70,
+ 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 || '');
}
diff --git a/src/views/flowmgr/processQuery2.vue b/src/views/flowmgr/processQuery2.vue
index 8f08508..75fa687 100644
--- a/src/views/flowmgr/processQuery2.vue
+++ b/src/views/flowmgr/processQuery2.vue
@@ -82,7 +82,7 @@
// tree: true,
border: true,
index: true,
- selection: true,
+ selection: false,
menuWidth: 80,
// menu: false,
labelWidth: 90,
diff --git a/src/views/flowmgr/processQuery3.vue b/src/views/flowmgr/processQuery3.vue
index 567692f..e9ce7ea 100644
--- a/src/views/flowmgr/processQuery3.vue
+++ b/src/views/flowmgr/processQuery3.vue
@@ -90,7 +90,7 @@
// tree: true,
border: true,
index: true,
- selection: true,
+ selection: false,
menuWidth: 80,
// menu: false,
diff --git a/src/views/wel/shemi.vue b/src/views/wel/shemi.vue
index 4276ae6..3a48b74 100644
--- a/src/views/wel/shemi.vue
+++ b/src/views/wel/shemi.vue
@@ -1,7 +1,7 @@
<template>
<basic-container>
<div class="norightmenu" v-if="!isSearch">
- <avue-crud :addBtn="false" :option="option" :table-loading="loading" :data="treeData" ref="crud"
+ <avue-crud :addBtn="false" :option="option" :row-style="{height:'20px'}" :cell-style="{padding:'0px'}" :table-loading="loading" :data="treeData" ref="crud"
v-model:search="search" v-model:page="mypage" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad" @tree-load="treeLoad" @row-click="rowClick">
<template #search>
@@ -66,7 +66,7 @@
</avue-crud>
</div>
<div class="norightmenu" v-else>
- <avue-crud :addBtn="false" :option="option" :table-loading="loading" :data="treeData" ref="crud"
+ <avue-crud :addBtn="false" :option="option" :row-style="{height:'20px'}" :cell-style="{padding:'0px'}" :table-loading="loading" :data="treeData" ref="crud"
v-model:search="search" v-model:page="mypage" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad" @tree-load="treeLoad" @row-click="rowClick">
<template #search>
@@ -81,7 +81,7 @@
</el-col>
<el-col :span="4" class="search-data-flex">
<span class="search-data-title">闆剁粍浠跺彿:</span>
- <el-select v-model="searchTreeData.drawingNo" filterable remote reserve-keyword placeholder="闆剁粍浠跺彿"
+ <el-select v-model="searchTreeData.drawingNo" filterable remote reserve-keyword placeholder="杈撳叆鑷冲皯3涓瓧绗﹁繃婊ゆ暟鎹�"
:remote-method="remoteMethod" :loading="searchLoading">
<el-option v-for="item in drawingNoList" :key="item.value" :label="item.label"
:value="item.value" /></el-select>
@@ -756,20 +756,6 @@
if (query && query.length>2) {
this.searchLoading = true;
this.getRemote(query);
- /*
- axios({
- url: '/blade-mdm/program/node/drawing-no-pick',
- method: 'get',
- params: { drawingNo: query }
- }).then(resp => {
- this.searchLoading = false;
- var drawingNoList = [];
- resp.data.data.forEach(item => {
- drawingNoList.push({ label: item, value: item })
- })
- this.drawingNoList = drawingNoList;
- });
- */
} else {
this.drawingNoList = [];
}
@@ -992,8 +978,11 @@
});
},
searchTree() {
- if (this.searchTreeData.programStatus.length == 0) return;
- if (this.searchTreeData.drawingNo == "") return;
+ if (this.searchTreeData.programStatus.length == 0 || this.searchTreeData.drawingNo == ""){
+ this.$message.warning('璇疯緭鍏ョ▼搴忕姸鎬佸拰闆剁粍浠跺彿杩涜鎼滅储');
+ return;
+ }
+
this.treeSearchLoad = true;
this.isSearch = !this.isSearch
this.searchTreeData.status = this.searchTreeData.programStatus.join();
@@ -1504,7 +1493,7 @@
}
.search-data-title {
- font-size: 12px;
+ font-size: 14px;
margin-right: 8px;
display: inline-block;
width: 95px;
--
Gitblit v1.9.3