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

李喆(开发组)

2025-07-07 202cee04088a8f98f9b070935d57c473cbf02b54

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

 src/views/tasks/machinereturnfileop.vue

@@ -76,7 +76,7 @@

                    {
                        label: '程序编号',
                        prop: 'programName',
                        prop: 'code',
                    },
                    {
                        label: '回传机床',
@@ -85,14 +85,14 @@

                    {
                        label: '文件名称',
                        prop: '',
                        formatter: (val, value, label) => {
                            return `${val?.variables?.machineCode}`;
                        },
                        prop: 'name'
                    },
                    {
                        label: '文件固化状态',
                        prop: 'machineCode',
                        prop: 'isCured',
                        formatter: (val, value, label) => {
                            return `${val==0?'未固化':"已固化"}`;
                        },
                    },
                    {
                        label: '文件到达时间',
@@ -100,11 +100,7 @@
                        type: 'datetime',
                        format: 'YYYY-MM-DD HH:mm:ss',
                        valueFormat: 'YYYY-MM-DD HH:mm:ss',
                    },
                    {
                        label: '文件数据库编号',
                        prop: '',
                    },
                    }
                ],
            }
        }