From 7bcc72a7fce7c0636b91b2d156e3d4962efb76a7 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 28 八月 2025 09:59:49 +0800
Subject: [PATCH] 界面优化
---
src/views/flowmgr/programexport.vue | 161 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 148 insertions(+), 13 deletions(-)
diff --git a/src/views/flowmgr/programexport.vue b/src/views/flowmgr/programexport.vue
index 489da39..df6c95c 100644
--- a/src/views/flowmgr/programexport.vue
+++ b/src/views/flowmgr/programexport.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2025-06-20 20:48:17
- * @LastEditors: 鏉庡枂(寮�鍙戠粍) lzhe@yxqiche.com
- * @LastEditTime: 2025-08-11 16:34:15
+ * @LastEditors: gaoshp
+ * @LastEditTime: 2025-08-17 10:17:27
* @FilePath: /mdmweb/src/views/flowmgr/programexport.vue
-->
<template>
@@ -13,7 +13,7 @@
<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">瀵煎嚭</el-button>
+ <el-button type="primary" :disabled="this.selection.length==0" plain @click="exportExcel">瀵煎嚭</el-button>
</template>
<template #menu="scope">
<!-- <el-button type="primary" text size="default"
@@ -23,12 +23,12 @@
</avue-crud>
</el-tab-pane>
<el-tab-pane label="宸插姙" name="completed">
- <avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud" @current-change="currentChange"
+ <avue-crud :option="optionCompleted" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud" @current-change="currentChange"
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" @search-change="searchChange" @search-reset="searchReset" @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">瀵煎嚭</el-button>
+ <el-button type="primary" :disabled="this.selection.length==0" plain @click="exportExcel">瀵煎嚭</el-button>
</template>
<template #menu="scope">
<!-- <el-button type="primary" text size="default"
@@ -73,6 +73,7 @@
// simplePage: true,
searchShow: true,
searchMenuSpan: 6,
+ searchEnter:true,
dialogWidth: '60%',
// tree: true,
border: true,
@@ -86,23 +87,39 @@
{
label: '娴佺▼鏍囬',
prop: 'title',
+ with: 250
},
{
- label: '鍥惧彿',
+ label: '闆剁粍浠跺彿',
prop: 'drawingNo',
},
{
- label: '鍥惧彿鐗堟',
- prop: 'drawingNoEdition',
+ label: '宸ュ簭鍙�',
+ prop: 'processNo',
+ with: 75
+ },
+
+ {
+ label: '宸ュ簭鐗堟',
+ prop: 'processEdition',
+ with: 85
},
{
label: '宸ュ簭鍚嶇О',
prop: 'processName',
+ with: 85
},
{
- label: '绋嬪簭鍚嶇О',
+ label: '鍥惧彿鐗堟',
+ prop: 'drawingNoEdition',
+ with: 85
+ },
+
+ {
+ label: '绋嬪簭鍖呭悕',
prop: 'name',
search: true,
+ with: 100
},
{
label: '閫氳繃鏃堕棿',
@@ -118,6 +135,91 @@
valueFormat: 'YYYY-MM-DD HH:mm:ss',
searchRange: true,
searchSpan: 8,
+ },
+ ],
+ },
+ optionCompleted: {
+ addBtn: false,
+ editBtn: false,
+ delBtn: false,
+ viewBtn: true,
+ columnBtn: false,
+ tip: false,
+ // simplePage: true,
+ searchShow: true,
+ searchEnter:true,
+ searchMenuSpan: 6,
+ dialogWidth: '60%',
+ // tree: true,
+ border: true,
+ index: true,
+ selection: true,
+ // viewBtn: true,
+ menuWidth: 200,
+ menu: false,
+ dialogClickModal: false,
+ column: [
+ {
+ label: '娴佺▼鏍囬',
+ prop: 'title',
+ with: 200
+ },
+ {
+ label: '闆剁粍浠跺彿',
+ prop: 'drawingNo',
+ },
+ {
+ label: '宸ュ簭鍙�',
+ prop: 'processNo',
+ width: 70
+ },
+ {
+ label: '宸ュ簭鐗堟',
+ prop: 'processEdition',
+ width: 85
+ },
+ {
+ label: '宸ュ簭鍚嶇О',
+ prop: 'processName',
+ width: 85
+ },
+ {
+ label: '鍥惧彿鐗堟',
+ prop: 'drawingNoEdition',
+ width: 85
+ },
+
+ {
+ label: '绋嬪簭鍖呭悕',
+ prop: 'name',
+ search: true,
+ },
+ {
+ label: '閫氳繃鏃堕棿',
+ prop: 'createTime',
+ sortable: true,
+ },
+ {
+ label: '瀵煎嚭浜�',
+ prop: 'exporter',
+ width: 70
+ },
+ {
+ label: '宸插姙鏃堕棿',
+ prop: 'updateTime',
+ sortable: true,
+ },
+ {
+ label: '閫氳繃鏃堕棿',
+ prop: 'passTime',
+ search: true,
+ hide: true,
+ type: 'datetime',
+ format: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ searchRange: true,
+ searchSpan: 8,
+ sortable: true,
},
],
}
@@ -192,13 +294,36 @@
this.loading = false;
});
},
+ findDuplicates(arr) {
+ const seen = new Set();
+ const duplicates = new Set();
+
+ arr.forEach(item => {
+ if (seen.has(item)) {
+ duplicates.add(item);
+ } else {
+ seen.add(item);
+ }
+ });
+
+ return Array.from(duplicates);
+ },
exportExcel() {
this.$confirm('鏄惁瀵煎嚭?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning',
}).then(() => {
- console.log(this.selection)
+ //console.log(this.selection)
+ let selectArray = [];
+ for(var i=0;i<this.selection.length;i++){
+ selectArray.push(this.selection[i].name+"-"+this.selection[i].processEdition)
+ }
+ let dupData = this.findDuplicates(selectArray);
+ if(dupData.length > 0){
+ this.$message.error('涓嶈兘鍦ㄤ竴娆″鍑轰腑閫夋嫨涓�涓▼搴忕殑涓嶅悓鐗堟湰:['+dupData.join()+"]");
+ return;
+ }
if(this.selection == null || this.selection.length == 0){
this.$message.error('璇疯嚦灏戦�夋嫨涓�鏉″鍑�');
return;
@@ -209,9 +334,19 @@
{},
{ids: this.selection.map(item => item.id)},
).then(res => {
- let name = res.headers['content-disposition'].split('filename=')[1]
- console.log(res.headers['content-disposition'].split('filename=')[1]);
- downloadFile(res.data, `${name}`);
+ console.log('status='+res.status)
+ if(res.status == 200){
+ //console.log(res.data);
+
+ let name = res.headers['content-disposition'].split('filename=')[1]
+ name = decodeURI(name)
+ //console.log(res.headers['content-disposition'].split('filename=')[1]);
+ downloadFile(res.data, `${name}`);
+
+ }else{
+ this.$message.error('瀵煎嚭閿欒');
+ console.log(res);
+ }
NProgress.done();
this.onLoad(this.page, this.query);
});
--
Gitblit v1.9.3