Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb

lzhe

2025-07-08 42395f9f2bd77d6db78a9466db2733f4bcf3e811

Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb

 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(