From 597a7fa0913704552bd66e43cedad2dfc6572a98 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 17 八月 2025 16:01:58 +0800
Subject: [PATCH] 修改字段名

---
 src/views/flow/todolist.vue |   48 +++++++++++++++++++++++-------------------------
 1 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 1818285..d1f7ad8 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,
@@ -428,37 +429,34 @@
                 }
             } 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(["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'].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