From 549ebb53247d7288700c1af23a74443019285276 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 18 八月 2025 21:04:41 +0800
Subject: [PATCH] backimport2增加查询条件
---
src/views/flow/todolist.vue | 57 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 1818285..99e45ba 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -294,6 +294,7 @@
{
label: '鍙戦�佺粰',
prop: 'newAssigneeId',
+ filterable:true,
type: 'select',
// dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
// dicFlag: true,
@@ -422,43 +423,47 @@
this.formApprove.assignee = row.variables.programmer
} else if (row.taskDefinitionKey == "confirmIsUseableTask") {//鍒ゆ柇绋嬪簭鏄惁鍙敤鑺傜偣锛岄兘鏄彂閫佺粰鏍″
this.formApprove.assignee = row.variables.checker
- } else if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
+ } else if (["approveTask", 'seniorApproveTask','replaceApprove','unlockApproveTask'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
this.optionApprove.column[1].disabled = true;//鏈�鍚庝竴涓妭鐐�"鍙戦�佺粰" 绂佺敤
this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃娴佺▼鐩存帴缁撴潫
+ }else if('unlockProgramConfirm'==row.taskDefinitionKey){
+ //瑙ｉ攣娴佺▼锛岀紪绋嬪鏍�,榛樿缁欓珮甯�
+ this.formApprove.assignee = row.variables.senior;
}
} else if(approve === 'N'){
//涓嶉�氳繃鐨勬儏鍐�
- //鏍规嵁鍦ㄧ嚎鏂囨。34琛岋紝椹冲洖'鍙戦�佺粰'鏄鐢紝浣嗘湁榛樿閫夐」
+ //鏍规嵁鍦ㄧ嚎鏂囨。34琛岋紝'鍙戦�佺粰'鏄鐢紝浣嗘湁榛樿閫夐」
this.optionApprove.column[1].disabled = true;
- //this.formApprove.assignee = ''
- //if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {
- //鏁版帶绋嬪簭瀹℃牳(楂樺笀)锛屾槸鏈�鍚庝竴涓妭鐐癸紝涓嶉�氳繃 閮芥槸绂佺敤'鍙戦�佺粰'锛岀洿鎺ョ粰 鏍″浜哄憳
- //this.optionApprove.column[1].disabled = true;
- //}
- if(["cureProgramTask"].includes(row.taskDefinitionKey)) {
+ if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {
+ //瀹℃壒鑺傜偣锛屼笂涓�姝ユ槸鏍″
+ this.formApprove.assignee = row.variables.checker;
+ }else if (['unlockApproveTask'].includes(row.taskDefinitionKey)){
+ //瑙ｉ攣娴佺▼楂樺笀瀹℃壒鑺傜偣锛屽師璺繑鍥炵粰缂栫▼浜哄憳
+ this.formApprove.assignee = row.variables.programmer;
+ } else if(["check", 'cureCheckTask','repalceCheckTask'].includes(row.taskDefinitionKey)){
+ //鏍″鑺傜偣,涓婁竴姝ユ槸缂栫▼
+ this.formApprove.assignee = row.variables.programmer;
+ }else if (["programmingTask"].includes(row.taskDefinitionKey)) {
+ // 璇曞垏缂栧埗鑺傜偣,涓婁竴姝ユ槸缁勯暱
+ this.formApprove.assignee = row.variables.teamLeader;
+ }else if(["cureProgramTask"].includes(row.taskDefinitionKey)) {
//鍥哄寲缂栧埗鑺傜偣锛屼笉閫氳繃灏辩粨鏉熶簡锛宎ssignee璁剧疆=''
this.formApprove.assignee = '';
+ }else if(["confirmIsUseableTask"].includes(row.taskDefinitionKey)) {
+ //鍒ゆ柇鏄惁鍙敤鑺傜偣锛屼笉鍙敤锛岀粰缂栧埗
+ this.formApprove.assignee = row.variables.programmer;
+ }if(['teamLeaderTask','repalceProgrammingTask','unlockProgramConfirm'].includes(row.taskDefinitionKey)){
+ //鍒濆鑺傜偣涓嶉�氳繃灏辨槸缁撴潫娴佺▼锛屽鐞嗕汉涓虹┖
+ this.formApprove.assignee = '';
}
- if(["teamLeaderTask" ,'repalceProgrammingTask'].includes(row.taskDefinitionKey)) {
- //缁勯暱锛屾浛鎹㈡祦绋嬬殑绋嬪簭缂栧埗锛岀鐢�'鍙戦�佺粰'
- //this.optionApprove.column[1].disabled = true;
- }else {
- //闄や簡缁勯暱锛屾浛鎹㈡祦绋嬬殑缂栧埗锛屽叾浠栬妭鐐圭殑涓嶉�氳繃锛岄兘鏄粰涓婁竴涓楠ょ殑澶勭悊浜�
- if(!["cureProgramTask"].includes(row.taskDefinitionKey)) {
- //闈炲浐鍖栫紪鍒惰妭鐐癸紝闇�瑕佸垵濮嬪寲榛樿澶勭悊浜�
- getPrevius({processInstanceId: row.processInstanceId}).then(res => {
- console.log(res)
- if(res.data.code === 200) {
- this.formApprove.assignee = res.data.data // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
- }
- });
- }
-
+
+ }else if(approve === 'R'){
+ //椹冲洖锛岀洰鍓嶅彧鏈夋鏌ョ▼搴忔槸鍚﹀彲鐢ㄨ妭鐐�
+ if(["confirmIsUseableTask"].includes(row.taskDefinitionKey)) {
+ //鍒ゆ柇绋嬪簭鏄惁鍙敤鑺傜偣锛岄┏鍥烇紝缁欑粍闀�
+ this.formApprove.assignee = row.variables.teamLeader;
}
-
-
-
}
},
--
Gitblit v1.9.3