From f0644263d72f9503a50bad1034f51f2fce974d56 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期二, 17 六月 2025 19:35:58 +0800
Subject: [PATCH] 主制计划表

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

diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index fc0148b..d8efadd 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -1,8 +1,8 @@
 <template>
     <basic-container>
         <avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud"
-            @search-change="searchChange" @search-reset="searchReset"
-            @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+            @search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
+            @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
             <template #menu-left>
                 <el-button type="primary" plain @click="reassign">閲嶆柊鎸囨淳
                 </el-button>
@@ -41,7 +41,7 @@
             optionApprove: {
                 labelWidth: 100,
                 column: [
-                    
+
                     {
                         label: '瀹℃壒缁撴灉',
                         prop: 'approve',
@@ -52,6 +52,21 @@
                             { label: '椹冲洖', value: 'N' },
                         ],
                         rules: [{ required: true, message: '璇烽�夋嫨瀹℃壒缁撴灉', trigger: 'blur' }],
+                    },
+                    {
+                        label: '涓嬩竴瀹℃壒鐢ㄦ埛',
+                        prop: 'assignee',
+                        type: 'select',
+                        dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
+                        props: {
+                            label: 'name',
+                            value: 'id',
+                        },
+                        span: 24,
+                        dicData: [
+                            
+                        ],
+                        // rules: [{ required: true, message: '璇烽�夋嫨涓嬩竴瀹℃壒鐢ㄦ埛', trigger: 'blur' }],
                     },
                     {
                         label: '澶囨敞',
@@ -70,8 +85,6 @@
             form: {},
             query: {},
             loading: true,
-            selectionList: [],
-            parentId: 0,
             page: {
                 pageSize: 10,
                 currentPage: 1,
@@ -94,6 +107,7 @@
                 // viewBtn: true,
                 menuWidth: 320,
                 dialogClickModal: false,
+
                 column: [
                     {
                         label: '鍒涘缓鏃堕棿',
@@ -124,12 +138,6 @@
                             },
                         ],
                     },
-
-                    {
-                        label: '缂栧彿',
-                        prop: 'taskId',
-                        width: 100,
-                    },
                     {
                         label: '浠诲姟鍚嶇О',
                         prop: 'taskName',
@@ -140,24 +148,23 @@
                         width: 100,
                         prop: 'processDefinitionName',
                     },
-                    {
-                        label: '瀹炰緥缂栧彿',
-                        width: 100,
-                        type: 'processInstanceId',
-                    },
+                    
                     {
                         label: '鏈哄簥',
                         width: 100,
-                        type: 'tree',
+                        prop: '',
+                        formatter: (val, value, label) => {
+                            return `${val?.variables?.machineCode}`;
+                        },
                     },
                     {
                         label: '鍒涘缓浜�',
                         width: 100,
-                        type: 'tree',
+                        prop: '',
                     },
                     {
                         label: '鍒涘缓鏃堕棿',
-                        width: 100,
+                        width: 200,
                         prop: 'createTime',
                     },
                     {
@@ -167,7 +174,7 @@
                     },
                     {
                         label: '鍒拌揪鎻忚堪',
-                        width: 100,
+                        width: 200,
                         prop: 'comment',
                     },
                     {
@@ -216,7 +223,7 @@
             this.row = row
             console.log('handleAction', row, index);
         },
-        handleSubmit (form,done) {
+        handleSubmit(form, done) {
             approve({
                 ...this.formApprove,
                 taskId: this.row.taskId,
@@ -237,8 +244,8 @@
             this.query = params;
             this.page.currentPage = 1;
             console.log('searchChange', params);
-            params.createTimeBegin = params.createTime[0] || '';
-            params.createTimeEnd = params.createTime[1] || '';
+            params.createTimeBegin = params?.createTime?.[0] || '';
+            params.createTimeEnd = params?.createTime?.[1] || '';
             console.log(params);
             this.onLoad(this.page, params);
             done();

--
Gitblit v1.9.3