From ad4c2e59b99cb238c5a1a79b750704536a420ee9 Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期一, 07 七月 2025 17:53:43 +0800
Subject: [PATCH] 1
---
src/views/tasks/machinereturnfileop.vue | 70 ++++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 18 deletions(-)
diff --git a/src/views/tasks/machinereturnfileop.vue b/src/views/tasks/machinereturnfileop.vue
index 4dadcf5..f69e562 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-06-20 09:03:42
+ * @LastEditTime: 2025-06-20 20:58:07
* @FilePath: /mdmweb/src/views/tasks/machinereturnfileop.vue
-->
<template>
@@ -10,9 +10,9 @@
@search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
<template #menu-left>
- <el-button type="primary" plain @click="reassign">瀵煎嚭鍥炰紶娑夊瘑缃�</el-button>
+ <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">瀵煎嚭鍒癊XCEL</el-button>
+ <el-button type="primary" plain @click="exportExcel">瀵煎嚭鍒癊XCEL</el-button>
</template>
<template #menu="scope">
<el-button type="primary" text size="default" v-if="permission.flow_model_update"
@@ -25,6 +25,11 @@
<script>
import { getList } from '@/api/tasks/machinereturnfileop.js';
+import { exportBlob } from '@/api/common';
+import { getToken } from '@/utils/auth';
+import NProgress from 'nprogress';
+import { downloadXls } from '@/utils/util';
+import 'nprogress/nprogress.css';
export default {
name: 'MachineReturnFileOp',
data() {
@@ -54,11 +59,12 @@
selection: true,
// viewBtn: true,
menuWidth: 100,
+ menu: false,
dialogClickModal: false,
column: [
{
label: '纭鏃堕棿',
- prop: '',
+ prop: 'confirmTime',
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -70,11 +76,11 @@
{
label: '绋嬪簭缂栧彿',
- prop: 'processDefinitionName',
+ prop: 'programName',
},
{
label: '鍥炰紶鏈哄簥',
- prop: 'processDefinitionName',
+ prop: 'machineCode',
},
{
@@ -86,34 +92,61 @@
},
{
label: '鏂囦欢鍥哄寲鐘舵��',
- prop: 'startUserName',
+ prop: 'machineCode',
},
{
label: '鏂囦欢鍒拌揪鏃堕棿',
- prop: 'processCreateTime',
+ prop: 'arrivedTime',
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
{
label: '鏂囦欢鏁版嵁搴撶紪鍙�',
- prop: 'createTime',
+ prop: '',
},
],
}
}
},
methods: {
- reassign() {
-
+ exportWebSite() {
+ this.$confirm('鏄惁瀵煎嚭?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }).then(() => {
+ NProgress.start();
+ exportBlob(
+ `/blade-mdm/machineback/filehandle/export-to-inner?${this.website.tokenHeader}=${getToken()}`
+ ).then(res => {
+ downloadXls(res.data, `瀵煎嚭鍥炰紶娑夊瘑缃�${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
+ NProgress.done();
+ });
+ });
+ },
+ exportExcel() {
+ this.$confirm('鏄惁瀵煎嚭?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }).then(() => {
+ NProgress.start();
+ 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`);
+ NProgress.done();
+ });
+ });
},
searchChange(params, done) {
let data = {}
this.query = params;
this.page.currentPage = 1;
console.log('searchChange', params);
- params.createTimeBegin = params?.processCreateTime?.[0] || '';
- params.createTimeEnd = params?.processCreateTime?.[1] || '';
+ params.confirmTimeBegin = params?.confirmTime?.[0] || '';
+ params.confirmTimeEnd = params?.confirmTime?.[1] || '';
console.log(params);
// data = {
// createTimeBegin: dayjs(params.createTimeBegin).isValid() ? dayjs(params.createTimeBegin).format('YYYY-MM-DD') : '',
@@ -121,10 +154,10 @@
// keyword: params.keyword || ''
// }
data = {
- createTimeBegin: params.createTimeBegin,
- createTimeEnd: params.createTimeEnd,
- keyword: params.keyword || ''
+ confirmTimeBegin: params.confirmTimeBegin,
+ confirmTimeEnd: params.confirmTimeEnd,
}
+ this.query = data
this.onLoad(this.page, data);
done();
},
@@ -153,13 +186,14 @@
/** * 椤甸潰鍔犺浇鏃惰幏鍙栨暟鎹�
*/
onLoad(page, params = {}) {
+ console.log('onLoad', page, params);
const query = {
...this.query,
// category: params.category ? flowCategory(params.category) : null,
mode: this.mode,
};
try {
- delete query.processCreateTime; // 鍒犻櫎涓嶅繀瑕佺殑鏌ヨ鏉′欢
+ delete query.confirmTime; // 鍒犻櫎涓嶅繀瑕佺殑鏌ヨ鏉′欢
} catch (error) {
console.error('鏃ユ湡鏍煎紡鍖栭敊璇�', error);
}
@@ -170,7 +204,7 @@
this.page.total = data.total;
this.data = data.records;
this.loading = false;
- },() => {
+ }, () => {
this.data = [];
this.loading = false;
}).catch(err => {
--
Gitblit v1.9.3