From 42395f9f2bd77d6db78a9466db2733f4bcf3e811 Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期二, 08 七月 2025 23:35:19 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb

---
 src/views/dataex/mdmprogramimp.vue |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/dataex/mdmprogramimp.vue b/src/views/dataex/mdmprogramimp.vue
index 139e30d..3eff4f0 100644
--- a/src/views/dataex/mdmprogramimp.vue
+++ b/src/views/dataex/mdmprogramimp.vue
@@ -54,20 +54,20 @@
           //   hide: true
           // },
           {
-            label: '浠诲姟缂栧彿',
-            prop: 'programNo'
+            label: '鍥惧彿',
+            prop: 'drawingNo'
+          },
+          {
+            label: '绋嬪簭缂栧彿',
+            prop: 'code',
           },
           {
             label: '绋嬪簭鍚嶇О',
-            prop: 'programName',
+            prop: 'name',
           },
           {
-            label: '鏂囦欢鍒拌揪鏃堕棿',
-            prop: 'fileBackTime',
-          },
-          {
-            label: '鏂囦欢鏁版嵁搴撶紪鍙�',
-            prop: 'id',
+            label: '鏈哄簥缂栧彿',
+            prop: 'machineCode',
           },
           // {
           //   label: '澶勭悊鐘舵��',
@@ -108,7 +108,7 @@
               res: 'data',
             },
             tip: '',
-            action: '/blade-mdm/program/dncsendback/upload',
+            action: '/blade-mdm/program/mdmimport/upload',
           },
         ],
       },
@@ -141,7 +141,7 @@
           ids: selection.join(","),
         }
         axios({
-          url: '/blade-mdm/program/mdmimport/upload',
+          url: '/blade-mdm/program/mdmimport/accept',
           method: 'post',
           params: obj,
         }).then(

--
Gitblit v1.9.3