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/donelist.vue |  192 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 190 insertions(+), 2 deletions(-)

diff --git a/src/views/flow/donelist.vue b/src/views/flow/donelist.vue
index dc1c27c..5453e24 100644
--- a/src/views/flow/donelist.vue
+++ b/src/views/flow/donelist.vue
@@ -9,7 +9,20 @@
         <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" >
+            <template #menu="scope">
+                <el-button type="primary" text size="default" @click.stop="handleView(scope.row, scope.index)">鏌ョ湅</el-button>
+            </template>
         </avue-crud>
+        <el-dialog title="鏌ョ湅璇︽儏" v-model="dialogVisible" width="60%">
+            <avue-form v-model="viewRow" :option="viewFormOption" readonly class="viewRowForm"></avue-form>
+            <el-table :data="tableData" style="width: 100%">
+                <el-table-column prop="assigneeName" label="鎵ц浜�" />
+                <el-table-column prop="taskName" label="浠诲姟鍚嶇О" />
+                <el-table-column prop="comment" label="鎵规敞" />
+                <el-table-column prop="createTime" label="寮�濮嬫椂闂�" />
+                <el-table-column prop="endTime" label="瀹屾垚鏃堕棿" />
+            </el-table>
+        </el-dialog>
     </basic-container>
 </template>
 <script>
@@ -18,8 +31,154 @@
 export default {
     data() {
         return {
+            tableData: [],
+            viewFormOption: {
+                emptyBtn: false,
+                submitBtn: false,
+                menuBtn: false,
+                labelWidth: 100,
+                span: 8,
+                column: [
+                    {
+                        label: '娴佺▼绫诲瀷',
+                        prop: 'processDefinitionKey',
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.processDefinitionKey)
+                        },
+                    },
+                    {
+                        label: '鍒涘缓鏃堕棿',
+                        prop: 'createTime',
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.createTime)
+                        },
+                    },
+                    {
+                        label: '鏍囬',
+                        prop: 'variables.title',
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.variables?.title)
+                        }
+                    },
+                    {
+                        label: '娴佺▼鍚嶇О',
+                        prop: 'processDefinitionName',
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.processDefinitionName)
+                        }
+                    },
+                    {
+                        label: '宸ヨ壓鐗堟',
+                        prop: 'variables.craftEdition',
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.variables?.craftEdition || '');
+                        }
+                    },
+                    {
+                        label: '宸ュ簭鍙�',
+                        prop: 'processNo',
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.variables?.processNo || '');
+                        }
+                    },
+                    {
+                        label: '宸ュ簭鍚嶇О',
+                        prop: 'processName',
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.variables?.processName || '');
+                        }
+                    },
+                    {
+                        label: '宸ュ簭鐗堟',
+                        prop: 'processEdition',
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.variables?.processEdition || '');
+                        }
+                    },
+                    {
+                        label: '闆剁粍浠跺彿',
+                        prop: 'drawingNo',
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.variables?.drawingNo || '');
+                        }
+                    },
+                    {
+                        label: '浠诲姟杞﹂棿',
+                        prop: 'workshop',
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.variables?.workshop || '');
+                        }
+                    },
+                    {
+                        label: '杩囩▼鍗″彿',
+                        prop: 'empty',
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.variables?.empty || '');
+                        }
+                    },
+                    {
+                        label: '鍥惧彿',
+                        prop: 'drawingNo',
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.variables?.drawingNo)
+                        }
+                    },
+                    {
+                        label: '浜у搧鍨嬪彿',
+                        prop: 'productModel',
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.variables?.productModel)
+                        }
+                    },                    
+                    {
+                        label: '鏈哄簥',
+                        prop: 'machineCode',
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.variables?.machineCode)
+                        }
+                    },
+                    {
+                        label: '鍒涘缓浜�',
+                        prop: 'startUserName',
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.startUserName)
+                        }
+                    },
+                    {
+                        label: '鍒涘缓鏃堕棿',
+                        prop: 'processCreateTime',
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.processCreateTime)
+                        }
+                    },
+                    {
+                        label: '褰撳墠鑺傜偣',
+                        prop: 'taskName',
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.taskName)
+                        }
+                    },
+                    {
+                        label: '璁″垝鍔犲伐鏃堕棿',
+                        prop: 'planStartTime',
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.variables?.planStartTime || '');
+                        }
+                    },
+                    {
+                        label: '绋嬪簭鍖呭悕',
+                        prop: 'programPackageName',
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.variables?.programPackageName || '');
+                        }
+                    },
+                ],
+            },
+            viewRow: {},
+            dialogVisible: false,
             loading: false,
             option: {
+                rowKey: "taskId",
                 addBtn: false,
                 editBtn: false,
                 delBtn: false,
@@ -32,7 +191,7 @@
                 index: true,
                 selection: false,
                 // viewBtn: true,
-                menu: false,
+                menu: true,
                 menuWidth: 100,
                 column: [
                     {
@@ -68,8 +227,16 @@
                     },
                     {
                         label: '娴佺▼鍚嶇О',
-                        prop: 'processDefinitionName',
+                        prop: '',
                         width: 100,
+						render: ({ row }) => {
+                            return h('p',
+                                {
+                                    attrs: {},
+                                    class: {},
+                                    style: {},
+                                }, row?.variables?.myProcessName)
+                        }
                     },/*
                     {
                         label: '娴佺▼绫诲瀷',
@@ -148,6 +315,19 @@
         }
     },
     methods: {
+        handleView(row) {
+            console.log(row,1111)
+            this.viewRow = {...row};
+            axios({
+                url: '/blade-mdm/flow/mgr/process-trace',
+                method: 'get',
+                params: {processInstanceId: row.processInstanceId}
+            }).then(
+              res => {
+                this.tableData = res.data.data;
+            });
+            this.dialogVisible = true;
+        },
         currentChange(currentPage) {
             this.page.currentPage = currentPage;
         },
@@ -208,3 +388,11 @@
     }
 }
 </script>
+<style lang="scss">
+.margin0 {
+    margin: 0
+}
+.viewRowForm .el-form-item--default {
+    margin-bottom: 0
+}
+</style>

--
Gitblit v1.9.3