From 727971fc438644a9a540e1b0e98834def92799d3 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 16 八月 2025 23:26:07 +0800
Subject: [PATCH] 导出dnc增加工序号

---
 src/views/flow/todolist.vue |   68 +++++++++++++++++++++++----------
 1 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 57d8b44..d1f7ad8 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -198,8 +198,16 @@
                     },
                     {
                         label: '娴佺▼鍚嶇О',
-                        prop: 'processDefinitionName',
+                        prop: '',
                         width: 100,
+						render: ({ row }) => {
+                            return h('p',
+                                {
+                                    attrs: {},
+                                    class: {},
+                                    style: {},
+                                }, row?.variables?.myProcessName)
+                        }
                     },/*
                     {
                         label: '娴佺▼绫诲瀷',
@@ -286,6 +294,7 @@
                     {
                         label: '鍙戦�佺粰',
                         prop: 'newAssigneeId',
+                        filterable:true,
                         type: 'select',
                         // dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
                         // dicFlag: true,
@@ -402,34 +411,51 @@
             }
         },
         setAssignee (row, approve) {
-            if (approve === 'Y') {
-                if (["check", 'cureCheckTask '].includes(row.taskDefinitionKey)) {// 鏍″
+            if (approve === 'Y') {//瀹℃壒閫氳繃鐨勬儏鍐�
+
+                this.optionApprove.column[1].disabled = false;
+                if (["check", 'cureCheckTask','repalceCheckTask'].includes(row.taskDefinitionKey)) {// 鏍″鑺傜偣
                     this.formApprove.assignee = row.variables.senior;
-                } else if (["programmingTask",'cureProgramTask'].includes(row.taskDefinitionKey)) {// 缂栧埗锛屾牎瀵�
+                } else if (["programmingTask",'cureProgramTask','repalceProgrammingTask'].includes(row.taskDefinitionKey)) {// 缂栧埗鑺傜偣
                     this.formApprove.assignee = row.variables.checker;
-                } else if (row.taskDefinitionKey == "teamLeaderTask") {// 浠诲姟娲惧伐
+                } else if (row.taskDefinitionKey == "teamLeaderTask") {// 浠诲姟娲惧伐(缁勯暱)
+                    this.optionApprove.column[1].disabled = false;
                     this.formApprove.assignee = row.variables.programmer
-                } else if (row.taskDefinitionKey == "confirmIsUseableTask") {
+                } else if (row.taskDefinitionKey == "confirmIsUseableTask") {//鍒ゆ柇绋嬪簭鏄惁鍙敤鑺傜偣锛岄兘鏄彂閫佺粰鏍″
                     this.formApprove.assignee = row.variables.checker
                 } else if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
-                    this.optionApprove.column[1].disabled = true;
-                    this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
+                    this.optionApprove.column[1].disabled = true;//鏈�鍚庝竴涓妭鐐�"鍙戦�佺粰" 绂佺敤
+                    this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃娴佺▼鐩存帴缁撴潫
                 }
             } else if(approve === 'N'){
-                this.formApprove.assignee = ''
-                if(row.taskDefinitionKey == "teamLeaderTask") {
-                    this.optionApprove.column[1].display = false;
+                //涓嶉�氳繃鐨勬儏鍐�
+                //鏍规嵁鍦ㄧ嚎鏂囨。34琛岋紝'鍙戦�佺粰'鏄鐢紝浣嗘湁榛樿閫夐」
+                this.optionApprove.column[1].disabled = true;
+
+                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 (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
-                    this.optionApprove.column[1].disabled = true;
-                    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