From b311b3cfee0a4635c236eea6c5870d805a29a160 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 22 九月 2025 13:09:31 +0800
Subject: [PATCH] 优化导出工控网

---
 src/views/flowmgr/programonmachine.vue |   56 ++++++++++++++++++++++++++++++++------------------------
 1 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/src/views/flowmgr/programonmachine.vue b/src/views/flowmgr/programonmachine.vue
index 7ee1686..948a825 100644
--- a/src/views/flowmgr/programonmachine.vue
+++ b/src/views/flowmgr/programonmachine.vue
@@ -106,7 +106,7 @@
                     {
                         label: '宸ュ簭鐗堟',
                         prop: 'processEdition',
-                        width: 80,
+                        width: 82,
                         render: ({ row }) => {
                             return h('span', {}, row?.variables?.processEdition || '');
                         }
@@ -122,20 +122,46 @@
                     {
                         label: '浠诲姟杞﹂棿',
                         prop: 'workshop',
-                        width: 80,
+                        width: 82,
                         render: ({ row }) => {
                             return h('p',{'class': 'margin0'}, row?.variables?.workshop || '');
                         }
                     },
                     {
+                        label: '鏈哄簥',
+                        prop: '',
+                        render: ({ row }) => {
+                            return h('p',
+                                {
+                                    attrs: {},
+                                    class: {},
+                                    style: {},
+                                }, row?.variables?.machineCode)
+                        },
+                        renderForm: ({ row }) => {
+                            return h('span', {
+                                attrs: {},
+                                class: {},
+                                style: {},
+                            }, row?.variables?.machineCode || '');
+                        }
+                    },
+                    {
                         label: '杩囩▼鍗″彿',
                         prop: '',
-                        width: 80,
+                        width: 82,
                         render: ({ row }) => {
                             return h('p',{'class': 'margin0'}, row?.variables?.processCard || '');
                         },
                     },
-					
+					{
+                        label: '涓存椂鏇存敼鍗�',
+                        prop: '',
+                        width: 95,
+                        render: ({ row }) => {
+                            return h('p',{'class': 'margin0'}, row?.variables?.deviation || '');
+                        },
+                    },
 					{
                         label: '浜у搧鍨嬪彿',
                         prop: '',
@@ -157,25 +183,7 @@
                         }
                     },
 					
-                    {
-                        label: '鏈哄簥',
-                        prop: '',
-                        render: ({ row }) => {
-                            return h('p',
-                                {
-                                    attrs: {},
-                                    class: {},
-                                    style: {},
-                                }, row?.variables?.machineCode)
-                        },
-                        renderForm: ({ row }) => {
-                            return h('span', {
-                                attrs: {},
-                                class: {},
-                                style: {},
-                            }, row?.variables?.machineCode || '');
-                        }
-                    },
+                    
                     {
                         label: '鍒涘缓鏃堕棿',
                         prop: 'processCreateTime',
@@ -258,7 +266,7 @@
                 ...this.query,
                 endTimeBegin: this.query?.endTime?.[0] || undefined,
                 endTimeEnd: this.query?.endTime?.[1] || undefined,
-                drawingNo: params.drawingNo || '',
+                //drawingNo: params.drawingNo || '',
             };
             this.loading = true;
             getList(page.currentPage, page.pageSize, Object.assign(data, params)).then(res => {

--
Gitblit v1.9.3