From 498df4ec49c9469d535c494039586ff30c3b23a6 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 30 八月 2025 21:17:13 +0800
Subject: [PATCH] 机床搜索回车生效

---
 src/views/tasks/machinereturnfileop.vue |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/views/tasks/machinereturnfileop.vue b/src/views/tasks/machinereturnfileop.vue
index 4b23d70..6be9474 100644
--- a/src/views/tasks/machinereturnfileop.vue
+++ b/src/views/tasks/machinereturnfileop.vue
@@ -71,18 +71,30 @@
                         label: '鍥炰紶鏈哄簥',
                         prop: 'machineCode',
                     },
-
-                    
                     {
-                        label: '鏂囦欢鍥哄寲鐘舵��',
-                        prop: 'isCured',
-                        formatter: (val, value, label) => {
-                            return `${val==0?'鏈浐鍖�':"宸插浐鍖�"}`;
-                        },
+                        label: '绋嬪簭鐘舵��',
+                        prop: 'programStatus',
+                        render: ({ row,value }) => {
+                            var txt = '鏈煡';
+                            switch(row.programStatus){
+                                case 1:
+                                txt = '璇曞垏';
+                                break;
+                                case 2:
+                                txt = '鍥哄寲';
+                                break;
+                                case 3:
+                                txt = '鍋忕';
+                                break;
+                                default:
+                                txt = '鏈煡';
+                            }
+                            return txt;
+                        }
                     },
                     {
                         label: '鏂囦欢鍒拌揪鏃堕棿',
-                        prop: 'arrivedTime',
+                        prop: 'fileCreateTime',
                         type: 'datetime',
                         format: 'YYYY-MM-DD HH:mm:ss',
                         valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -126,7 +138,7 @@
             }).then(() => {
                 NProgress.start();
                 exportBlob(
-                    `/blade-mdm/machineback/filehandle/export-to-inner`,
+                    `/blade-mdm/machinefile/filehandle/export-to-inner`,
                     {
                         ids: this.selectedList.map(item => item.id).join(','),
                     }
@@ -148,7 +160,7 @@
             }).then(() => {
                 NProgress.start();
                 exportBlob(
-                    `/blade-mdm/machineback/filehandle/export-excel?${this.website.tokenHeader}=${getToken()}`
+                    `/blade-mdm/machinefile/filehandle/export-excel?${this.website.tokenHeader}=${getToken()}`
                 ).then(res => {
                     downloadXls(res.data, `鏈哄簥鍥炰紶绋嬪簭鍒楄〃${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
                     NProgress.done();

--
Gitblit v1.9.3