From cafa9ae77da5ae18db0336a353a79a639b7cc299 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 17 八月 2025 10:32:46 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb

---
 src/views/flowmgr/programexport.vue |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/views/flowmgr/programexport.vue b/src/views/flowmgr/programexport.vue
index 73d902b..3a60048 100644
--- a/src/views/flowmgr/programexport.vue
+++ b/src/views/flowmgr/programexport.vue
@@ -88,17 +88,27 @@
                         prop: 'title',
                     },
                     {
-                        label: '鍥惧彿',
+                        label: '闆剁粍浠跺彿',
                         prop: 'drawingNo',
                     },
                     {
-                        label: '鍥惧彿鐗堟',
-                        prop: 'drawingNoEdition',
+                        label: '宸ュ簭鍙�',
+                        prop: 'processNo',
+                    },
+                    
+                    {
+                        label: '宸ュ簭鐗堟',
+                        prop: 'processEdition',
                     },
                     {
                         label: '宸ュ簭鍚嶇О',
                         prop: 'processName',
                     },
+                    {
+                        label: '鍥惧彿鐗堟',
+                        prop: 'drawingNoEdition',
+                    },
+                    
                     {
                         label: '绋嬪簭鍚嶇О',
                         prop: 'name',
@@ -146,17 +156,26 @@
                         prop: 'title',
                     },
                     {
-                        label: '鍥惧彿',
+                        label: '闆剁粍浠跺彿',
                         prop: 'drawingNo',
                     },
                     {
-                        label: '鍥惧彿鐗堟',
-                        prop: 'drawingNoEdition',
+                        label: '宸ュ簭鍙�',
+                        prop: 'processNo',
+                    },
+                    {
+                        label: '宸ュ簭鐗堟',
+                        prop: 'processEdition',
                     },
                     {
                         label: '宸ュ簭鍚嶇О',
                         prop: 'processName',
                     },
+                    {
+                        label: '鍥惧彿鐗堟',
+                        prop: 'drawingNoEdition',
+                    },
+                    
                     {
                         label: '绋嬪簭鍚嶇О',
                         prop: 'name',
@@ -274,7 +293,7 @@
                     {},
                     {ids: this.selection.map(item => item.id)},
                 ).then(res => {
-				    //console.log('status='+res.status)
+				    console.log('status='+res.status)
 					if(res.status == 200){
 					   //console.log(res.data);
 						

--
Gitblit v1.9.3