From a36c39e79960664f8f14b92383861642405f7215 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 24 八月 2025 14:26:41 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/tasks/machinereturnfileop.vue | 79 ++++++++++++++++++++++++---------------
1 files changed, 49 insertions(+), 30 deletions(-)
diff --git a/src/views/tasks/machinereturnfileop.vue b/src/views/tasks/machinereturnfileop.vue
index 5daf5d9..4b23d70 100644
--- a/src/views/tasks/machinereturnfileop.vue
+++ b/src/views/tasks/machinereturnfileop.vue
@@ -1,17 +1,17 @@
<!--
* @Date: 2025-06-18 09:17:09
* @LastEditors: gaoshp
- * @LastEditTime: 2025-06-20 20:58:07
+ * @LastEditTime: 2025-08-13 21:23:34
* @FilePath: /mdmweb/src/views/tasks/machinereturnfileop.vue
-->
<template>
<basic-container>
<avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud"
@search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
- @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+ @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">瀵煎嚭鍒癊XCEL</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,13 +86,39 @@
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: [],
}
}
},
methods: {
+ selectionChange (list) {
+ this.selectedList = list;
+ },
exportWebSite() {
+ if (this.selectedList.length === 0) {
+ this.$message.warning('璇峰厛閫夋嫨闇�瑕佸鍑虹殑鏁版嵁');
+ return;
+ }
this.$confirm('鏄惁瀵煎嚭?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -114,14 +126,21 @@
}).then(() => {
NProgress.start();
exportBlob(
- `/blade-mdm/machineback/filehandle/export-to-inner?${this.website.tokenHeader}=${getToken()}`
+ `/blade-mdm/machineback/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();
});
});
},
exportExcel() {
+ if (this.selectedList.length === 0) {
+ this.$message.warning('璇峰厛閫夋嫨闇�瑕佸鍑虹殑鏁版嵁');
+ return;
+ }
this.$confirm('鏄惁瀵煎嚭?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -131,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();
});
});
@@ -141,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') : '',
@@ -162,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);
--
Gitblit v1.9.3