From de42c8e66e2303b46741fa66dc72f4b4183f8084 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 28 七月 2023 12:00:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/file/main.vue | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/file/main.vue b/Source/UBCS-WEB/src/components/file/main.vue
index 44f196f..abf9230 100644
--- a/Source/UBCS-WEB/src/components/file/main.vue
+++ b/Source/UBCS-WEB/src/components/file/main.vue
@@ -7,7 +7,6 @@
:before-open="beforeOpen"
:permission="permissionList"
v-model="form"
- :height="options.height || 200"
ref="crud"
@row-del="rowDel"
@search-change="searchChange"
@@ -66,6 +65,7 @@
import {mapGetters} from "vuex";
import {dateFormat} from "@/util/date";
import {validatenull} from "@/util/validate";
+import func from "@/util/func";
export default {
props: ["options","visible","ownbizOid"],
@@ -88,10 +88,10 @@
hasDel:validatenull(this.options.hasDel) ? true :this.options.hasDel,
hasDownload:validatenull(this.options.hasDownload) ? true :this.options.hasDownload,
option: {
- height:(this.options.tableHeight?this.options.tableHeight:'auto'),
+ height:(this.options.tableHeight?this.options.tableHeight:'200'),
calcHeight: 30,
tip: false,
- searchShow: true,
+ searchShow: false,
searchMenuSpan: 6,
border: true,
index: true,
@@ -381,16 +381,24 @@
let data=new FormData();
if(row && row.oid){
data.append('fileOids',row.oid)
- download(data)
+ this.downloadFile(data);
}else{
if (this.selectionList.length === 0) {
- this.$message.warning("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");x
+ this.$message.warning("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
return;
}
data.append('fileOids',this.oids)
- download(data);
+ this.downloadFile(data);
}
},
+ downloadFile(data){
+ download(data).then(res=>{
+ // console.log(res);
+ if(res){
+ func.downloadFileByBlob(res);
+ }
+ });
+ },
rowDel(row) {
this.$confirm("纭畾灏嗛�夋嫨鏂囦欢鍒犻櫎?", {
confirmButtonText: "纭畾",
--
Gitblit v1.9.3