yangys
2025-08-13 9d754853b524dcfeff524cad92d869cbdf24b2b5
src/views/tasks/machinereturnfileop.vue
@@ -11,7 +11,7 @@
            @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" @selection-change="selectionChange">
            <template #menu-left>
                <el-button type="primary" plain @click="exportWebSite">导出回传涉密网</el-button>
                <el-button type="primary" plain @click="reassign">挂载车床程序库</el-button>
                <!--<el-button type="primary" plain @click="reassign">挂载车床程序库</el-button>-->
                <el-button type="primary" plain @click="exportExcel">导出到EXCEL</el-button>
            </template>
            <template #menu="scope">
@@ -62,31 +62,17 @@
                menu: false,
                dialogClickModal: false,
                column: [
                    {
                        label: '确认时间',
                        prop: 'confirmTime',
                        type: 'datetime',
                        format: 'YYYY-MM-DD HH:mm:ss',
                        valueFormat: 'YYYY-MM-DD HH:mm:ss',
                        search: true,
                        searchRange: true,
                        searchSpan: 8,
                        hide: true,
                    },
                    {
                        label: '程序编号',
                        prop: 'code',
               {
                        label: '文件名称',
                        prop: 'name'
                    },
                    {
                        label: '回传机床',
                        prop: 'machineCode',
                    },
                    {
                        label: '文件名称',
                        prop: 'name'
                    },
                    {
                        label: '文件固化状态',
                        prop: 'isCured',
@@ -100,7 +86,25 @@
                        type: 'datetime',
                        format: 'YYYY-MM-DD HH:mm:ss',
                        valueFormat: 'YYYY-MM-DD HH:mm:ss',
                    }
                    },
               {
                        label: '确认时间',
                        prop: 'determineTime',
                        type: 'datetime',
                        format: 'YYYY-MM-DD HH:mm:ss',
                        valueFormat: 'YYYY-MM-DD HH:mm:ss',
                        search: true,
                        searchRange: true,
                        searchSpan: 8,
                        hide: false,
                    }/*,
                    {
                        label: '接收x时间',
                        prop: 'determineTime',
                        type: 'datetime',
                        format: 'YYYY-MM-DD HH:mm:ss',
                        valueFormat: 'YYYY-MM-DD HH:mm:ss',
                    }*/
                ],
                selectedList: [],
            }
@@ -127,7 +131,7 @@
                        ids: this.selectedList.map(item => item.id).join(','),
                    }
                ).then(res => {
                    downloadXls(res.data, `导出回传涉密网${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
                    downloadXls(res.data, `工控网回传程序${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.zip`);
                    NProgress.done();
                });
            });
@@ -146,7 +150,7 @@
                exportBlob(
                    `/blade-mdm/machineback/filehandle/export-excel?${this.website.tokenHeader}=${getToken()}`
                ).then(res => {
                    downloadXls(res.data, `导出机床回传程序${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
                    downloadXls(res.data, `机床回传程序列表${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
                    NProgress.done();
                });
            });