From 7acbfc9ec91fc7cc6f0f57541331900165311bf5 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期三, 06 八月 2025 20:18:32 +0800
Subject: [PATCH] update

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

diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index a7b53c6..809e9ab 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -9,8 +9,7 @@
                 </el-button>
             </template>
             <template #menu="scope">
-                <el-button type="primary" text size="default" v-if="permission.flow_model_update"
-                    @click.stop="handleAction(scope.row, scope.index)">瀹℃壒
+                <el-button type="primary" text size="default" @click.stop="handleAction(scope.row, scope.index)">瀹℃壒
                 </el-button>
             </template>
         </avue-crud>
@@ -44,13 +43,15 @@
     },
     data() {
         return {
+            
             applist: [],
             assigneeData: [],
             row: {},
             approveBox: false,
             formApprove: {
                 comment: '',
-                approve: '', // 榛樿鍚屾剰
+                approve: 'Y', // 榛樿鍚屾剰
+                assignee: ''
             },
             optionApprove: {
                 labelWidth: 100,
@@ -77,6 +78,7 @@
                             label: 'name',
                             value: 'id',
                         },
+                        filterable: true,
                         span: 24,
                         disabled: false,
                         dicData: [
@@ -115,6 +117,7 @@
             query: {},
             loading: true,
             option: {
+                rowKey: "taskId",
                 addBtn: false,
                 editBtn: false,
                 delBtn: false,
@@ -150,16 +153,29 @@
                             },
                         ],
                     },
+					{
+                        label: '鏍囬',
+                        prop: '',
+                        width: 100,
+						render: ({ row }) => {
+                            return h('p',
+                                {
+                                    attrs: {},
+                                    class: {},
+                                    style: {},
+                                }, row?.variables?.title)
+                        }
+                    },
                     {
-                        label: '浠诲姟鍚嶇О',
+                        label: '娴佺▼鍚嶇О',
                         prop: 'processDefinitionName',
                         width: 100,
-                    },
+                    },/*
                     {
                         label: '娴佺▼绫诲瀷',
                         width: 100,
                         prop: 'categoryName',
-                    },
+                    },*/
 
                     {
                         label: '鏈哄簥',
@@ -266,11 +282,14 @@
         //     });
         // },
         'formApprove.approve'(val) {
-            if (val === 'Y' && this.row.taskDefinitionKey === 'approveTask') {
+            if (val === 'Y' && ["approveTask", 'seniorApproveTask'].includes(this.row.taskDefinitionKey)) {// 楂樺笀
                 this.optionApprove.column[1].disabled = true;
                 this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
-            } else {
-                this.optionApprove.column[1].disabled = false;
+            } else if(val === 'Y'){
+               this.setAssignee(this.row);
+            } else if(val === 'N') {
+                this.formApprove.assignee = ''
+                // this.formApprove.assignee = row.variables.senior;
             }
         },
     },
@@ -332,24 +351,27 @@
             });
             done();
         },
-        handleAction(row, index) {
-            this.formApprove = {
-                comment: '',
-                approve: '', // 榛樿鍚�
-            }
-            this.approveBox = true;
-            this.row = row
-            if (row.taskDefinitionKey == "check") {
+        setAssignee (row) {
+             if (["check", 'cureCheckTask '].includes(row.taskDefinitionKey)) {// 鏍″
                 this.formApprove.assignee = row.variables.senior;
-            } else if (row.taskDefinitionKey == "programmingTask") {
+            } else if (["programmingTask",'cureProgramTask'].includes(row.taskDefinitionKey)) {// 缂栧埗锛屾牎瀵�
                 this.formApprove.assignee = row.variables.checker;
             } else if (row.taskDefinitionKey == "teamLeaderTask") {
                 this.formApprove.assignee = row.variables.programmer
             } else if (row.taskDefinitionKey == "confirmIsUseableTask") {
                 this.formApprove.assignee = row.variables.checker
-            } else if (row.taskDefinitionKey == "approveTask") {
+            } else if (["approveTask", 'seniorApproveTask'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
 
             }
+        },
+        handleAction(row, index) {
+            this.formApprove = {
+                comment: '',
+                approve: 'Y', // 榛樿鍚�
+            }
+            this.approveBox = true;
+            this.row = row
+            this.setAssignee(row);
             console.log('handleAction', row, index);
         },
         handleSubmit(form, done) {
@@ -365,8 +387,8 @@
                 processInstanceId: this.row.processInstanceId,
                 // programIds: this.row.taskDefinitionKey === 'programmingTask' ? this.applist.map(v => v.id).join(',') : '',
             }).then(res => {
-                if(res.code !== 200) {
-                    this.$message.error(res.msg);
+                if(res.data.code !== 200) {
+                    this.$message.error(res.data.msg);
                     done();
                     return;
                 }

--
Gitblit v1.9.3