From ce70bd97c7f2577f0978b39b9da1ccdd8d5b768f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 九月 2025 22:50:14 +0800
Subject: [PATCH] 机床增加设备编号
---
src/views/tasks/machinereturnfileop.vue | 151 ++++++++++++++++++++++++++++++++------------------
1 files changed, 96 insertions(+), 55 deletions(-)
diff --git a/src/views/tasks/machinereturnfileop.vue b/src/views/tasks/machinereturnfileop.vue
index f69e562..3af182e 100644
--- a/src/views/tasks/machinereturnfileop.vue
+++ b/src/views/tasks/machinereturnfileop.vue
@@ -1,21 +1,21 @@
<!--
* @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"
+ <avue-crud :option="option" :search="query" :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="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>
@@ -40,7 +40,7 @@
total: 0,
},
form: {},
- query: {},
+ query: {status:1},
loading: true,
data: [],
option: {
@@ -62,55 +62,92 @@
menu: false,
dialogClickModal: false,
column: [
+
+ {
+ label: '鏂囦欢鍚嶇О',
+ prop: 'name',
+ search:true,
+ },
{
+ label: '瀵煎嚭鐘舵��',
+ prop: 'status',
+ search:true,
+ type:'select',
+ dicData:[
+ {
+ label: '鏈鍑�',
+ value:1
+ },
+ {
+ label: '宸插鍑�',
+ value:2
+ }
+ ]
+ },
+ {
+ 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: 'programName',
- },
- {
- label: '鍥炰紶鏈哄簥',
- prop: 'machineCode',
- },
-
- {
- label: '鏂囦欢鍚嶇О',
- prop: '',
- formatter: (val, value, label) => {
- return `${val?.variables?.machineCode}`;
- },
- },
- {
- label: '鏂囦欢鍥哄寲鐘舵��',
- prop: 'machineCode',
- },
- {
- label: '鏂囦欢鍒拌揪鏃堕棿',
- prop: 'arrivedTime',
+ {
+ label: '瀵煎嚭鏃堕棿',
+ prop: 'exportTime',
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
- },
- {
- label: '鏂囦欢鏁版嵁搴撶紪鍙�',
- prop: '',
- },
+ }
],
- }
+ },
+ selectedList: [],
}
},
methods: {
+ selectionChange (list) {
+ this.selectedList = list;
+ },
exportWebSite() {
+ if (this.selectedList.length === 0) {
+ this.$message.warning('璇峰厛閫夋嫨闇�瑕佸鍑虹殑鏁版嵁');
+ return;
+ }
this.$confirm('鏄惁瀵煎嚭?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -118,14 +155,22 @@
}).then(() => {
NProgress.start();
exportBlob(
- `/blade-mdm/machineback/filehandle/export-to-inner?${this.website.tokenHeader}=${getToken()}`
+ `/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`);
+ this.onLoad(this.page, {});
NProgress.done();
});
});
},
exportExcel() {
+ if (this.selectedList.length === 0) {
+ this.$message.warning('璇峰厛閫夋嫨闇�瑕佸鍑虹殑鏁版嵁');
+ return;
+ }
this.$confirm('鏄惁瀵煎嚭?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -133,9 +178,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();
});
});
@@ -145,17 +190,14 @@
this.query = params;
this.page.currentPage = 1;
console.log('searchChange', params);
- 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') : '',
- // createTimeEnd: dayjs(params.createTimeEnd).isValid() ? dayjs(params.createTimeEnd).format('YYYY-MM-DD') : '',
- // keyword: params.keyword || ''
- // }
+ params.confirmTimeBegin = params?.determineTime?.[0] || '';
+ params.confirmTimeEnd = params?.determineTime?.[1] || '';
+
data = {
confirmTimeBegin: params.confirmTimeBegin,
confirmTimeEnd: params.confirmTimeEnd,
+ name: params.name,
+ status: this.query.status,
}
this.query = data
this.onLoad(this.page, data);
@@ -166,8 +208,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);
@@ -189,7 +231,6 @@
console.log('onLoad', page, params);
const query = {
...this.query,
- // category: params.category ? flowCategory(params.category) : null,
mode: this.mode,
};
try {
--
Gitblit v1.9.3