yangys
2025-08-24 740c606022e8370d4576452e73ffbae36c8b303d
src/views/tasks/machinereturnfileop.vue
@@ -1,7 +1,7 @@
<!--
 * @Date: 2025-06-18 09:17:09
 * @LastEditors: gaoshp
 * @LastEditTime: 2025-07-20 12:27:48
 * @LastEditTime: 2025-08-13 21:23:34
 * @FilePath: /mdmweb/src/views/tasks/machinereturnfileop.vue
-->
<template>
@@ -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();
                });
            });
@@ -156,8 +160,8 @@
            this.query = params;
            this.page.currentPage = 1;
            console.log('searchChange', params);
            params.confirmTimeBegin = params?.confirmTime?.[0] || '';
            params.confirmTimeEnd = params?.confirmTime?.[1] || '';
            params.confirmTimeBegin = params?.determineTime?.[0] || '';
            params.confirmTimeEnd = params?.determineTime?.[1] || '';
            console.log(params);
            // data = {
            //     createTimeBegin: dayjs(params.createTimeBegin).isValid() ? dayjs(params.createTimeBegin).format('YYYY-MM-DD') : '',
@@ -177,8 +181,8 @@
            this.query = params;
            this.page.currentPage = 1;
            data = {
                createTimeBegin: params.createTimeBegin,
                createTimeEnd: params.createTimeEnd,
                createTimeBegin: params.confirmTimeBegin,
                createTimeEnd: params.confirmTimeEnd,
                keyword: params.keyword || ''
            }
            this.onLoad(this.page, data);