From cafa9ae77da5ae18db0336a353a79a639b7cc299 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 17 八月 2025 10:32:46 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/flowmgr/programexport.vue | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 103 insertions(+), 11 deletions(-)
diff --git a/src/views/flowmgr/programexport.vue b/src/views/flowmgr/programexport.vue
index 0a20af5..3a60048 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 14:55:07
+ * @LastEditors: gaoshp
+ * @LastEditTime: 2025-08-17 10:17:27
* @FilePath: /mdmweb/src/views/flowmgr/programexport.vue
-->
<template>
@@ -23,7 +23,7 @@
</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> -->
@@ -88,17 +88,27 @@
prop: 'title',
},
{
- label: '鍥惧彿',
+ label: '闆剁粍浠跺彿',
prop: 'drawingNo',
},
{
- label: '鍥惧彿鐗堟',
- prop: 'drawingNoEdition',
+ label: '宸ュ簭鍙�',
+ prop: 'processNo',
+ },
+
+ {
+ label: '宸ュ簭鐗堟',
+ prop: 'processEdition',
},
{
label: '宸ュ簭鍚嶇О',
prop: 'processName',
},
+ {
+ label: '鍥惧彿鐗堟',
+ prop: 'drawingNoEdition',
+ },
+
{
label: '绋嬪簭鍚嶇О',
prop: 'name',
@@ -120,13 +130,85 @@
searchSpan: 8,
},
],
+ },
+ optionCompleted: {
+ addBtn: false,
+ editBtn: false,
+ delBtn: false,
+ viewBtn: true,
+ columnBtn: false,
+ tip: false,
+ // simplePage: true,
+ searchShow: 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',
+ },
+ {
+ label: '闆剁粍浠跺彿',
+ prop: 'drawingNo',
+ },
+ {
+ label: '宸ュ簭鍙�',
+ prop: 'processNo',
+ },
+ {
+ label: '宸ュ簭鐗堟',
+ prop: 'processEdition',
+ },
+ {
+ label: '宸ュ簭鍚嶇О',
+ prop: 'processName',
+ },
+ {
+ label: '鍥惧彿鐗堟',
+ prop: 'drawingNoEdition',
+ },
+
+ {
+ label: '绋嬪簭鍚嶇О',
+ prop: 'name',
+ search: true,
+ },
+ {
+ label: '閫氳繃鏃堕棿',
+ prop: 'createTime',
+ sortable: true,
+ },
+ {
+ 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,
+ },
+ ],
}
};
},
methods: {
tabsClick(tab,event) {
- console.log(this.activeName,'activeName')
- console.log(tab,event);
this.onLoad(this.page, this.query);
},
selectionChange(list) {
@@ -211,10 +293,20 @@
{},
{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]
+ //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