From d5f64a57677aa427372bde6322bdec0fd5cc105d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 18 八月 2025 22:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/flow/todolist.vue | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index d1f7ad8..99e45ba 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -423,9 +423,12 @@
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'){
//涓嶉�氳繃鐨勬儏鍐�
@@ -435,11 +438,14 @@
if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {
//瀹℃壒鑺傜偣锛屼笂涓�姝ユ槸鏍″
this.formApprove.assignee = row.variables.checker;
- }else if(["check", 'cureCheckTask','repalceCheckTask'].includes(row.taskDefinitionKey)){
+ }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璁剧疆=''
@@ -447,7 +453,8 @@
}else if(["confirmIsUseableTask"].includes(row.taskDefinitionKey)) {
//鍒ゆ柇鏄惁鍙敤鑺傜偣锛屼笉鍙敤锛岀粰缂栧埗
this.formApprove.assignee = row.variables.programmer;
- }if(['teamLeaderTask'].includes(row.taskDefinitionKey)){
+ }if(['teamLeaderTask','repalceProgrammingTask','unlockProgramConfirm'].includes(row.taskDefinitionKey)){
+ //鍒濆鑺傜偣涓嶉�氳繃灏辨槸缁撴潫娴佺▼锛屽鐞嗕汉涓虹┖
this.formApprove.assignee = '';
}
--
Gitblit v1.9.3