From 2cffeb30840020af3654f74ea700ec94dc82024c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 28 六月 2023 13:19:46 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue   |    3 +++
 Source/UBCS-WEB/src/api/resource/file.js                    |    5 +++--
 Source/UBCS-WEB/src/components/file/main.vue                |    9 +++++----
 Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue |    3 +++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS-WEB/src/api/resource/file.js b/Source/UBCS-WEB/src/api/resource/file.js
index 46c711a..b544412 100644
--- a/Source/UBCS-WEB/src/api/resource/file.js
+++ b/Source/UBCS-WEB/src/api/resource/file.js
@@ -12,7 +12,7 @@
   })
 }
 
-export const remove = (fileOids,oids) => {
+export const remove = (oids) => {
   return request({
     url: '/api/ubcs-resource/fileController/deleteFile',
     method: 'delete',
@@ -39,7 +39,8 @@
 export const download = (fileOids) => {
   return request({
     url: '/api/ubcs-resource/fileController/downloadFilesByOids',
-    method: 'get',
+    method: 'post',
+    headers:{'Content-Type':'application/x-www-form-urlencoded'},
     params: {
       fileOids
     }
diff --git a/Source/UBCS-WEB/src/components/file/main.vue b/Source/UBCS-WEB/src/components/file/main.vue
index 9e5a099..370eea5 100644
--- a/Source/UBCS-WEB/src/components/file/main.vue
+++ b/Source/UBCS-WEB/src/components/file/main.vue
@@ -188,6 +188,7 @@
           prop: 'attachFile',
           type: 'upload',
           dragFile: true,
+          showFileList:false,
           accept: this.options.uploadAccept || 'file',
           loadText: '鏂囦欢涓婁紶涓紝璇风◢绛�',
           span: 24,
@@ -364,13 +365,13 @@
     handleDownload(row) {
       //window.open(`${row.link}`);
       if(row && row.oid){
-        download(row.oid)
+        download({fileOids:row.oid})
       }else{
         if (this.selectionList.length === 0) {
           this.$message.warning("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
           return;
         }
-        download(this.oids);
+        download({fileOids:this.oids});
       }
     },
     rowDel(row) {
@@ -380,7 +381,7 @@
         type: "warning"
       })
         .then(() => {
-          return remove(row.oid,row.oid);
+          return remove([row.oid]);
         })
         .then(() => {
           this.onLoad(this.page);
@@ -401,7 +402,7 @@
         type: "warning"
       })
         .then(() => {
-          return remove(this.oids,this.oids);
+          return remove(this.oids.split(','));
         })
         .then(() => {
           this.onLoad(this.page);
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index c27c046..bac7f47 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -280,6 +280,9 @@
           this.page.total=res.data.total
           this.loading = false;
           this.selectionClear();
+        }).catch(error=>{
+          this.$message.error(error);
+          this.loading = false;
         });
       }
 
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index 31782b5..0b8fa27 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -338,6 +338,9 @@
           this.page.total=res.data.total
           this.loading = false;
           this.selectionClear();
+        }).catch(error=>{
+          this.$message.error(error);
+          this.loading = false;
         });
       }
 

--
Gitblit v1.9.3