From 7e394d280c921445ab71a4a368146504595531c7 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期四, 28 八月 2025 21:14:13 +0800
Subject: [PATCH] 搜索
---
src/views/flow/todolist.vue | 149 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 96 insertions(+), 53 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index e274b21..0b8a2c7 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -6,12 +6,12 @@
@selection-change="selectionTransferTask">
<template #menu-left>
- <el-button type="primary" v-if="permission.auto_dispatch" plain @click="reassign(2)">鑷姩娲惧伐
+ <el-button type="primary" :disabled="this.transferTaskSelection.length==0" v-if="permission.auto_dispatch" plain @click="reassign(2)">鑷姩娲惧伐
</el-button>
- <el-button type="primary" v-if="permission.manual_dispatch" plain @click="reassign(1)">鎵嬪姩娲惧伐
+ <el-button type="primary" :disabled="this.transferTaskSelection.length==0" v-if="permission.manual_dispatch" plain @click="reassign(1)">鎵嬪姩娲惧伐
</el-button>
- <el-button type="primary" plain @click="reassign(0)">閲嶆柊鎸囨淳</el-button>
- <el-button type="primary" v-if="permission.batch_approve" plain @click="reassign(3)">鎵归噺瀹℃壒
+ <el-button type="primary" :disabled="this.transferTaskSelection.length==0" plain @click="reassign(0)">閲嶆柊鎸囨淳</el-button>
+ <el-button type="primary" :disabled="this.transferTaskSelection.length==0" v-if="permission.batch_approve" plain @click="reassign(3)">鎵归噺瀹℃壒
</el-button>
</template>
<template #menu="scope">
@@ -47,8 +47,10 @@
</div>
</el-drawer>
</basic-container>
+ <div>
+ <!--<top-todo ref="topTodoComponent" />-->
+ </div>
</template>
-
<script>
import { getList, approve, getAssignee,reassgin,manualDispatch,autoDispatch,getPrevius,batchApprove } from '@/api/flow/todolist';
import { mapGetters } from 'vuex';
@@ -56,6 +58,8 @@
import TodolistLeft from './components/TodolistLeft.vue';
import TodolistRightTop from './components/TodolistRightTop.vue';
import processTrace from './components/process-trace.vue';
+
+//import top-todo from '../../page/index/LoadGood.vue';
export default {
components: {
TodolistLeft,
@@ -67,6 +71,8 @@
activeName: 'approve',
applist: [],
assigneeData: [],
+ allAssigneeData: [],
+ managerAssigneeData: [],//鏁版帶绠＄悊鍛樿鑹茬殑瀹℃壒鐢ㄦ埛
row: {},
approveBox: false,
formApprove: {
@@ -93,8 +99,6 @@
label: '鍙戦�佺粰',
prop: 'assignee',
type: 'select',
- // dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
- // dicFlag: true,
props: {
label: 'name',
value: 'id',
@@ -106,15 +110,6 @@
dicData: [
],
- // rules: [{ required: true, message: '璇烽�夋嫨涓嬩竴瀹℃壒鐢ㄦ埛', trigger: 'blur' }],
- },
- {
- label: '宸ュ簭鐗堟',
- prop: 'processEdition',
- type: 'input',
- span: 24,
- // disabled: true,
- display: false,// 闅愯棌鏄剧ず
// rules: [{ required: true, message: '璇烽�夋嫨涓嬩竴瀹℃壒鐢ㄦ埛', trigger: 'blur' }],
},
{
@@ -155,6 +150,7 @@
columnBtn: false,
tip: false,
// simplePage: true,
+ searchEnter:true,
searchShow: true,
searchMenuSpan: 6,
dialogWidth: '60%',
@@ -304,8 +300,6 @@
prop: 'newAssigneeId',
filterable:true,
type: 'select',
- // dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
- // dicFlag: true,
props: {
label: 'name',
value: 'id',
@@ -331,24 +325,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) {
@@ -377,39 +356,65 @@
},
},
mounted() {
- getAssignee().then(res => {
- this.assigneeData = res.data.data;
- this.optionApprove.column[1].dicData = this.assigneeData;
- this.reassignOption.column[1].dicData = this.assigneeData;
- })
- this.setApproveBtn()
+ //this.setApproveBtn(row)
+ getAssignee({
+ taskId: 0,
+ }).then(res => {
+ //if(row.taskDefinitionKey === '')
+ this.assigneeData = res.data.data;
+ this.reassignOption.column[1].dicData = this.assigneeData;
+ });
},
methods: {
// 璁剧疆瀹℃壒缁撴灉鐨勭姸鎬�
- setApproveBtn () {
+ setApproveBtn (row) {
// 1.瀹℃壒鐣岄潰radio鏂囨湰淇敼锛屾櫘閫氳妭鐐圭殑2涓猺adio鏂囨湰 閫氳繃锛坅pprove=Y),涓嶉�氳繃(鐜板湪鐨勯┏鍥�)(approve=N)
+
this.optionApprove.column[0].dicData = [
{ label: '閫氳繃', value: 'Y' },
{ label: '涓嶉�氳繃', value: 'N' },
];
switch (this.row.taskDefinitionKey) {
case 'teamLeaderTask': // 浠诲姟娲惧伐
- case 'cureProgramTask': // 鍥哄寲缂栧埗
this.optionApprove.column[0].dicData = [
{ label: '閫氳繃', value: 'Y' },
{ label: '缁撴潫', value: 'N' },
];
break;
- case 'confirmIsUseableTask': // 妫�鏌ョ▼搴忔槸鍚﹀彲鐢�
+ case 'appendProgrammingTask': // 琛ュ厖娴佺▼鐨� 缂栫▼鑺傜偣
this.optionApprove.column[0].dicData = [
{ label: '閫氳繃', value: 'Y' },
- { label: '涓嶉�氳繃', value: 'N' },
- { label: '椹冲洖', value: 'R' },
+ { label: '缁撴潫', value: 'E' },
+ ];
+ break;
+ case 'cureProgramTask': // 鍥哄寲缂栧埗,鍙互閫氳繃锛堢粰鏍″锛夛紱涓嶉�氳繃N锛堢粰绋嬪簭绠＄悊鍛橈級
+ this.optionApprove.column[0].dicData = [
+ { label: '閫氳繃', value: 'Y' },
+ { label: '涓嶉�氳繃', value: 'N' },//缁欑▼搴忕鐞嗗憳
+
+ ];
+ break;
+ case 'confirmIsUseableTask': // 妫�鏌ョ▼搴忔槸鍚﹀彲鐢紝椹冲洖鏄粰
+ this.optionApprove.column[0].dicData = [
+ { label: '鍙敤', value: 'Y' }, //缁欐牎瀵�
+ { label: '涓嶅彲鐢�', value: 'N' },//缁欑紪鍒�
+ { label: '椹冲洖', value: 'R' },//缁欓┏鍥炵粍闀�
+ ];
+ break;
+ case 'programmingTask': //璇曞垏 缂栧埗鑺傜偣
+ this.optionApprove.column[0].dicData = [
+ { label: '閫氳繃', value: 'Y' },
+ { label: '涓嶉�氳繃', value: 'N' },//缁欑粍闀�
+ { label: '缁撴潫', value: 'E' },//缁撴潫娴佺▼
+ ];
+ break;
+ case 'programMgrConfirm'://鍥哄寲娴佺▼ 绋嬪簭绠＄悊鍛橈紝鍙兘缁撴潫
+ this.optionApprove.column[0].dicData = [
+ { label: '缁撴潫', value: 'E' },
];
break;
case 'seniorApproveTask': // 楂樺笀瀹℃牳
case 'approveTask': // 楂樺笀瀹℃牳
-
default:
this.optionApprove.column[0].dicData = [
{ label: '閫氳繃', value: 'Y' },
@@ -419,19 +424,28 @@
}
},
setAssignee (row, approve) {
+
+ if (["cureProgramTask"].includes(row.taskDefinitionKey)) {
+ if(approve === 'N'){
+ this.optionApprove.column[1].dicData = this.managerAssigneeData;
+ }else{
+ //this.assigneeData = this.allAssigneeData;
+ this.optionApprove.column[1].dicData = this.allAssigneeData;
+ }
+ }
if (approve === 'Y') {//瀹℃壒閫氳繃鐨勬儏鍐�
this.optionApprove.column[1].disabled = false;
- if (["check", 'cureCheckTask','repalceCheckTask'].includes(row.taskDefinitionKey)) {// 鏍″鑺傜偣
+ if (["check", 'cureCheckTask','repalceCheckTask','appendCheckTask'].includes(row.taskDefinitionKey)) {// 鏍″鑺傜偣
this.formApprove.assignee = row.variables.senior;
- } else if (["programmingTask",'cureProgramTask','repalceProgrammingTask'].includes(row.taskDefinitionKey)) {// 缂栧埗鑺傜偣
+ } else if (["programmingTask",'cureProgramTask','repalceProgrammingTask','appendProgrammingTask'].includes(row.taskDefinitionKey)) {// 缂栧埗鑺傜偣
this.formApprove.assignee = row.variables.checker;
} else if (row.taskDefinitionKey == "teamLeaderTask") {// 浠诲姟娲惧伐(缁勯暱)
this.optionApprove.column[1].disabled = false;
this.formApprove.assignee = row.variables.programmer
} else if (row.taskDefinitionKey == "confirmIsUseableTask") {//鍒ゆ柇绋嬪簭鏄惁鍙敤鑺傜偣锛岄兘鏄彂閫佺粰鏍″
this.formApprove.assignee = row.variables.checker
- } else if (["approveTask", 'seniorApproveTask','replaceApprove','unlockApproveTask'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
+ } else if (["approveTask", 'seniorApproveTask','replaceApprove','unlockApproveTask','appendApproveTask'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
this.optionApprove.column[1].disabled = true;//鏈�鍚庝竴涓妭鐐�"鍙戦�佺粰" 绂佺敤
this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃娴佺▼鐩存帴缁撴潫
}else if('unlockProgramConfirm'==row.taskDefinitionKey){
@@ -443,10 +457,10 @@
//鏍规嵁鍦ㄧ嚎鏂囨。34琛岋紝'鍙戦�佺粰'鏄鐢紝浣嗘湁榛樿閫夐」
this.optionApprove.column[1].disabled = true;
- if (["approveTask", 'seniorApproveTask','replaceApprove','unlockApproveTask'].includes(row.taskDefinitionKey)) {
+ if (["approveTask", 'seniorApproveTask','replaceApprove','unlockApproveTask','appendApproveTask'].includes(row.taskDefinitionKey)) {
//瀹℃壒鑺傜偣锛屼笉閫氳繃缁欑紪鍒讹細缂栧埗鏄矗浠讳汉锛屼笉缁欐牎瀵逛簡
this.formApprove.assignee = row.variables.programmer;
- } else if(["check", 'cureCheckTask','repalceCheckTask'].includes(row.taskDefinitionKey)){
+ } else if(["check", 'cureCheckTask','repalceCheckTask','appendCheckTask'].includes(row.taskDefinitionKey)){
//鏍″鑺傜偣,涓婁竴姝ユ槸缂栫▼
this.formApprove.assignee = row.variables.programmer;
}else if (["programmingTask"].includes(row.taskDefinitionKey)) {
@@ -455,7 +469,14 @@
}else if(["cureProgramTask"].includes(row.taskDefinitionKey)) {
//鍥哄寲缂栧埗鑺傜偣锛屼笉閫氳繃缁欐暟鎺х鐞嗗憳
//TODO 鎸夋壘瑙掕壊瀹氫綅缁欏叾涓竴涓暟鎺х鐞嗗憳
- this.formApprove.assignee = '';
+ 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;
+ }
+ }
+ //this.formApprove.assignee = '';
}else if(["confirmIsUseableTask"].includes(row.taskDefinitionKey)) {
//鍒ゆ柇鏄惁鍙敤鑺傜偣锛屼笉鍙敤锛岀粰缂栧埗
this.formApprove.assignee = row.variables.programmer;
@@ -470,6 +491,10 @@
//鍒ゆ柇绋嬪簭鏄惁鍙敤鑺傜偣锛岄┏鍥烇紝缁欑粍闀�
this.formApprove.assignee = row.variables.teamLeader;
}
+ }else if(approve === 'E'){//END 缁撴潫娴佺▼锛屼笉鍙�夊鐞嗕汉
+ //椹冲洖锛岀洰鍓嶅彧鏈夋鏌ョ▼搴忔槸鍚﹀彲鐢ㄨ妭鐐�
+ this.optionApprove.column[1].disabled = true;//澶勭悊浜洪�夐」绂佺敤
+ this.formApprove.assignee = ''
}
},
@@ -477,6 +502,7 @@
this.transferTaskSelection = list;
},
reassign(val) {// 閲嶆柊鎸囨淳
+
this.reassignType = val;
if (this.transferTaskSelection.length === 0) {
this.$message.warning('璇烽�夋嫨闇�瑕佹搷浣滅殑浠诲姟');
@@ -632,13 +658,30 @@
}
},
handleAction(row, index) {
+ getAssignee({
+ taskId: row.taskId,
+ }).then(res => {
+ //if(row.taskDefinitionKey === '')
+ this.assigneeData = res.data.data;
+ this.allAssigneeData = res.data.data;
+ //鍒濆鍖栨暟鎺х鐞嗗憳鐨勬暟缁�
+ for(var i=0;i<this.allAssigneeData.length;i++){
+ if(this.allAssigneeData[i].manager == true){
+ this.managerAssigneeData[this.managerAssigneeData.length] = this.allAssigneeData[i];
+ }
+ }
+ this.optionApprove.column[1].dicData = this.assigneeData;
+ this.reassignOption.column[1].dicData = this.assigneeData;
+ })
this.formApprove = {
comment: '',
approve: 'Y', // 榛樿鍚�
}
this.approveBox = true;
this.row = row
+
this.setAssignee(row, this.formApprove.approve);
+ this.setApproveBtn(row);
console.log('handleAction', row, index);
},
handleSubmit(form, done) {
@@ -740,7 +783,7 @@
}
.left {
- width: 400px;
+ width: 40%;
}
.right {
--
Gitblit v1.9.3