From 217bffa9704f2938391977605dcaae1a8baae86f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 10 九月 2025 16:00:41 +0800
Subject: [PATCH] 修改首页搜索错误
---
src/views/tasks/machinereturnfileop.vue | 98 ++++++++++++++++++++++++++++--------------------
1 files changed, 57 insertions(+), 41 deletions(-)
diff --git a/src/views/tasks/machinereturnfileop.vue b/src/views/tasks/machinereturnfileop.vue
index c066d5e..fb9dc90 100644
--- a/src/views/tasks/machinereturnfileop.vue
+++ b/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>
@@ -10,12 +10,12 @@
@search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
@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="exportExcel">瀵煎嚭鍒癊XCEL</el-button>
+ <el-button type="primary" :disabled="this.selectedList.length==0" plain @click="exportWebSite">瀵煎嚭鍥炰紶娑夊瘑缃�</el-button>
+ <!--<el-button type="primary" plain @click="reassign">鎸傝浇杞﹀簥绋嬪簭搴�</el-button>-->
+ <el-button type="primary" :disabled="this.selectedList.length==0" plain @click="exportExcel">瀵煎嚭鍒癊XCEL</el-button>
</template>
<template #menu="scope">
- <el-button type="primary" text size="default" v-if="permission.flow_model_update"
+ <el-button type="primary" text size="default"
@click.stop="handleAction(scope.row, scope.index)">瀹℃壒
</el-button>
</template>
@@ -62,48 +62,64 @@
menu: false,
dialogClickModal: false,
column: [
+
+ {
+ label: '鏂囦欢鍚嶇О',
+ prop: 'name'
+ },
{
+ label: '鍥炰紶鏈哄簥',
+ prop: 'machineCode',
+ },
+ {
+ 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: 'fileCreateTime',
+ type: 'datetime',
+ format: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ },
+ {
label: '纭鏃堕棿',
- prop: 'confirmTime',
+ prop: 'createTime',
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
search: true,
searchRange: true,
searchSpan: 8,
- hide: true,
+ hide: false,
},
-
- {
- label: '绋嬪簭缂栧彿',
- prop: 'code',
- },
- {
- label: '鍥炰紶鏈哄簥',
- prop: 'machineCode',
- },
-
- {
- label: '鏂囦欢鍚嶇О',
- prop: 'name'
- },
- {
- label: '鏂囦欢鍥哄寲鐘舵��',
- prop: 'isCured',
- formatter: (val, value, label) => {
- return `${val==0?'鏈浐鍖�':"宸插浐鍖�"}`;
- },
- },
- {
- label: '鏂囦欢鍒拌揪鏃堕棿',
- prop: 'arrivedTime',
+ {
+ label: '瀵煎嚭鏃堕棿',
+ prop: 'exportTime',
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
}
],
- selectedList: [],
- }
+ },
+ selectedList: [],
}
},
methods: {
@@ -122,12 +138,12 @@
}).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(','),
}
).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();
});
});
@@ -144,9 +160,9 @@
}).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`);
+ downloadXls(res.data, `鏈哄簥鍥炰紶绋嬪簭鍒楄〃${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
NProgress.done();
});
});
@@ -156,8 +172,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 +193,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);
--
Gitblit v1.9.3