From 400fc8829bbfc163417f16d11083f7ad78049938 Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期三, 06 八月 2025 15:11:22 +0800
Subject: [PATCH] 1

---
 src/views/flow/todolist.vue |   57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 568b4ab..5e5b316 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,6 +43,7 @@
     },
     data() {
         return {
+            
             applist: [],
             assigneeData: [],
             row: {},
@@ -89,7 +89,20 @@
                         span: 24,
                         prop: 'comment',
                         type: 'textarea',
-                        rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
+                        // rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
+                        rules: [
+                            {
+                            validator: (rule, value, callback) => {
+                                console.log('-------',this.formApprove)
+                                if (value === '' && this.formApprove.approve !== 'Y') {
+                                    callback(new Error('璇疯緭鍏ュ娉�'));
+                                } else {
+                                    callback();
+                                }
+                            },
+                            trigger: 'blur'
+                            }
+                        ]
                     },
                 ],
             },
@@ -102,6 +115,7 @@
             query: {},
             loading: true,
             option: {
+                rowKey: "taskId",
                 addBtn: false,
                 editBtn: false,
                 delBtn: false,
@@ -137,16 +151,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: '鏈哄簥',
@@ -189,7 +216,7 @@
                     {
                         label: '鏂囦欢',
                         width: 200,
-                        prop: '',
+                        prop: 'file',
                     },
                     {
                         label: '鍒拌揪鏃堕棿',
@@ -310,9 +337,11 @@
                     this.reassignBox = false;
                     this.$refs?.reassginform?.resetForm();
                     this.onLoad(this.page, this.query);
+                    done()
 
                 }).catch(err => {
                     console.error(err);
+                    done()
                 })
             });
             done();
@@ -338,17 +367,29 @@
             console.log('handleAction', row, index);
         },
         handleSubmit(form, done) {
+            if(this.row.taskDefinitionKey === 'programmingTask') {
+                // if(this.applist.length !== 1) {
+                //     done();
+                //     return this.$message.success('璇烽�夋嫨1涓▼搴�');
+                // }
+            }
             approve({
                 ...this.formApprove,
                 taskId: this.row.taskId,
                 processInstanceId: this.row.processInstanceId,
-                programIds: this.row.taskDefinitionKey === 'programmingTask' ? this.applist.map(v => v.id).join(',') : '',
+                // programIds: this.row.taskDefinitionKey === 'programmingTask' ? this.applist.map(v => v.id).join(',') : '',
             }).then(res => {
+                if(res.data.code !== 200) {
+                    this.$message.error(res.data.msg);
+                    done();
+                    return;
+                }
                 this.$message.success('瀹℃壒鎴愬姛');
                 this.approveBox = false;
                 this.onLoad(this.page, this.query);
                 done();
             }).catch(err => {
+                done();
                 console.error(err);
             });
         },

--
Gitblit v1.9.3