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/flow/todolist.vue | 184 +++++++++++++++++++++++++++++++--------------
1 files changed, 127 insertions(+), 57 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 9a5189a..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>
@@ -48,14 +50,14 @@
</el-drawer>
</basic-container>
</template>
-
<script>
-import { getList, approve, getAssignee,reassgin,manualDispatch,autoDispatch,getPrevius,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';
import TodolistRightTop from './components/TodolistRightTop.vue';
import processTrace from './components/process-trace.vue';
+
export default {
components: {
TodolistLeft,
@@ -69,13 +71,18 @@
assigneeData: [],
allAssigneeData: [],
managerAssigneeData: [],//鏁版帶绠＄悊鍛樿鑹茬殑瀹℃壒鐢ㄦ埛
+
+ assignee2Data:[],
+
row: {},
approveBox: false,
formApprove: {
comment: '',
- approve: '', // 榛樿鍚屾剰
- assignee: ''
+ approve: '',
+ assignee: '',
},
+
+
optionApprove: {
labelWidth: 100,
column: [
@@ -90,7 +97,7 @@
{ label: '椹冲洖', value: 'N' },
],
rules: [{ required: true, message: '璇烽�夋嫨瀹℃壒缁撴灉', trigger: 'blur' }],
- },
+ },/*
{
label: '鍙戦�佺粰',
prop: 'assignee',
@@ -106,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: '澶囨敞',
@@ -128,6 +152,7 @@
}
]
},
+
],
},
page: {
@@ -145,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,
@@ -218,6 +241,7 @@
label: '鏈哄簥',
width: 100,
prop: '',
+ showOverflowTooltip:true,
formatter: (val, value, label) => {
return `${val?.variables?.machineCode}`;
},
@@ -238,6 +262,7 @@
search: true,
searchRange: true,
searchSpan: 8,
+ showOverflowTooltip:true,
// hide: true,
},
{
@@ -250,18 +275,23 @@
},
{
label: '褰撳墠鑺傜偣',
- width: 100,
+ width: 120,
+ showOverflowTooltip:true,
prop: 'taskName',
},
{
label: '鏂囦欢',
width: 200,
prop: 'file',
+ showOverflowTooltip:true,
},
{
label: '鍒拌揪鏃堕棿',
width: 120,
prop: 'createTime',
+ showOverflowTooltip:true,
+
+
},
{
label: '鍒拌揪鎻忚堪',
@@ -294,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: {
@@ -307,13 +356,12 @@
],
rules: [{ required: true, message: '璇疯緭鍏ラ�夋嫨', trigger: 'blur' }],
- },
+ },*/
{
label: '澶囨敞',
span: 24,
prop: 'comment',
type: 'textarea',
- // rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
},
],
},
@@ -321,24 +369,9 @@
};
},
watch: {
- // 'form.category'() {
- // const category = func.toInt(this.form.category);
- // this.$refs.crud.option.column.filter(item => {
- // if (item.prop === 'path') {
- // item.rules[0].required = category === 1;
- // }
- // if (item.prop === 'isOpen') {
- // item.disabled = category === 2;
- // }
- // });
- // },
+
'formApprove.approve'(val) {
this.setAssignee(this.row, val);
- // if(val === 'Y' && ['confirmIsUseableTask'].includes(this.row.taskDefinitionKey) && this.row.variables.isProcessEditionSame=='N') {
- // // this.optionApprove.column[2].display = true; // 鏄剧ず宸ュ簭鐗堟
- // } else {
- // this.optionApprove.column[2].display = false; // 闅愯棌宸ュ簭鐗堟
- // }
},
'reassignForm.approve'(val) {
@@ -368,10 +401,35 @@
},
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: {
- // 璁剧疆瀹℃壒缁撴灉鐨勭姸鎬�
- setApproveBtn (row) {
+
+ setApproveBtn (row) { // 璁剧疆瀹℃壒缁撴灉鐨勭姸鎬�
// 1.瀹℃壒鐣岄潰radio鏂囨湰淇敼锛屾櫘閫氳妭鐐圭殑2涓猺adio鏂囨湰 閫氳繃锛坅pprove=Y),涓嶉�氳繃(鐜板湪鐨勯┏鍥�)(approve=N)
this.optionApprove.column[0].dicData = [
@@ -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') {//瀹℃壒閫氳繃鐨勬儏鍐�
@@ -462,11 +520,13 @@
this.optionApprove.column[1].disabled = true;
if (["approveTask", 'seniorApproveTask','replaceApprove','unlockApproveTask','appendApproveTask'].includes(row.taskDefinitionKey)) {
- //瀹℃壒鑺傜偣锛屼笉閫氳繃缁欑紪鍒讹細缂栧埗鏄矗浠讳汉锛屼笉缁欐牎瀵逛簡
- this.formApprove.assignee = row.variables.programmer;
+ //瀹℃壒鑺傜偣锛屼笉閫氳繃缁欑紪鍒讹細缂栧埗鏄矗浠讳汉锛岀粰瀹為檯缂栫▼鍛�
+ //this.formApprove.assignee = row.variables.programmer;
+ this.formApprove.assignee = row.variables.actProgrammer;//缁欏疄闄呯紪绋嬪憳
} else if(["check", 'cureCheckTask','repalceCheckTask','appendCheckTask'].includes(row.taskDefinitionKey)){
//鏍″鑺傜偣,涓婁竴姝ユ槸缂栫▼
- this.formApprove.assignee = row.variables.programmer;
+ //this.formApprove.assignee = row.variables.programmer;
+ this.formApprove.assignee = row.variables.actProgrammer;//缁欏疄闄呯紪绋嬪憳
}else if (["programmingTask"].includes(row.taskDefinitionKey)) {
// 璇曞垏缂栧埗鑺傜偣,涓婁竴姝ユ槸缁勯暱
this.formApprove.assignee = row.variables.teamLeader;
@@ -474,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;
@@ -506,6 +563,7 @@
this.transferTaskSelection = list;
},
reassign(val) {// 閲嶆柊鎸囨淳
+ //var 0:鎵归噺杞淳锛�1锛氭墜鍔ㄦ淳宸ワ紱2锛氳嚜鍔ㄦ淳宸ワ紱3锛氭壒閲忓鎵�
this.reassignType = val;
if (this.transferTaskSelection.length === 0) {
this.$message.warning('璇烽�夋嫨闇�瑕佹搷浣滅殑浠诲姟');
@@ -531,7 +589,7 @@
}
this.$message.success('鎿嶄綔鎴愬姛');
this.onLoad(this.page, this.query);
-
+ todoChangeNotify();
}).catch(err => {
this.$message.success('鎿嶄綔澶辫触');
})
@@ -539,6 +597,7 @@
// this.$message.info('宸插彇娑堟搷浣�');
});
} else {
+ //0閲嶆柊鎸囨淳 3鎵归噺瀹℃壒 锛�1鎵嬪姩娲惧伐
this.reassignBox = true;
if(val === 3) {//鎵归噺瀹℃壒鏃� 鏄剧ず閫氳繃椹冲洖
@@ -549,9 +608,14 @@
this.reassignOption.column[1].disabled = true;
this.reassignOption.column[1].display = true;
} else {
+ //0
this.reassignOption.column[0].display = false;
this.reassignForm.approve = '';
+ if(val === 0 || val === 1) {//0閲嶆柊鎸囨淳 1鎵嬪姩娲惧伐 ,闇�瑕佹樉绀哄鐞嗕汉
+ this.reassignOption.column[1].disabled = false;
+ this.reassignOption.column[1].display = true;
+ }
}
if(val ===1) {
this.reassignForm.newAssigneeId = this.transferTaskSelection[0].variables.programmer;
@@ -583,6 +647,8 @@
this.reassignBox = false;
this.$refs?.reassginform?.resetForm();
this.onLoad(this.page, this.query);
+
+ todoChangeNotify();
done()
}).catch(err => {
@@ -615,6 +681,8 @@
this.reassignBox = false;
this.$refs?.reassginform?.resetForm();
this.onLoad(this.page, this.query);
+
+ todoChangeNotify();
done()
}).catch(err => {
@@ -647,6 +715,8 @@
this.reassignBox = false;
this.$refs?.reassginform?.resetForm();
this.onLoad(this.page, this.query);
+
+ todoChangeNotify();
done()
}).catch(err => {
@@ -661,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: '',
@@ -685,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') {
@@ -708,6 +782,8 @@
this.$message.success('瀹℃壒鎴愬姛');
this.approveBox = false;
this.onLoad(this.page, this.query);
+
+ todoChangeNotify();//椤堕儴寰呭姙鏁伴噺鍒锋柊
done();
}).catch(err => {
done();
@@ -721,12 +797,6 @@
console.log('searchChange', params);
params.createTimeBegin = params?.processCreateTime?.[0] || '';
params.createTimeEnd = params?.processCreateTime?.[1] || '';
- console.log(params);
- // data = {
- // createTimeBegin: dayjs(params.createTimeBegin).isValid() ? dayjs(params.createTimeBegin).format('YYYY-MM-DD') : '',
- // createTimeEnd: dayjs(params.createTimeEnd).isValid() ? dayjs(params.createTimeEnd).format('YYYY-MM-DD') : '',
- // keyword: params.keyword || ''
- // }
data = {
createTimeBegin: params.createTimeBegin,
createTimeEnd: params.createTimeEnd,
--
Gitblit v1.9.3