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

yangys

2025-08-24 2a120264875c70aefcb96327918898fda218c2f9

 src/views/tasks/machinereturnfiles.vue

@@ -65,18 +65,15 @@
            prop: 'programName',
            hide: true
          },
          {
            label: '文件编号',
            prop: ''
        {
            label: '文件名称',
            prop: 'name',
          },
          {
            label: '机床号',
            prop: 'machineCode',
          },
          {
            label: '文件名称',
            prop: 'name',
          },
          
          {
            label: '文件固化状态',
            prop: 'isCured',
@@ -84,11 +81,11 @@
          {
            label: '文件到达时间',
            prop: 'arrivedTime',
          },
          },/*
          {
            label: '文件数据库编号',
            prop: '',
          },
          },*/
          {
            label: '关键信息',
            prop: 'keyword',