From 10c2ee4be4508c62b5980cc7059b1e8e95f7a3cc Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 04 七月 2023 17:22:11 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/file/main.vue |   40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/file/main.vue b/Source/UBCS-WEB/src/components/file/main.vue
index 7a9ba08..cfbd438 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,
@@ -196,7 +197,7 @@
           },
           data: {
             ownbizOid:this.options.ownbizOid || "share",
-            ownBtmname:this.options.ownbizBtm || "share",
+            ownBtmName:this.options.ownbizBtm || "share",
             fileDocClassify:this.options.fileDocClassify || "ADMIN_SHARE",
             fileDocClassifyName:this.options.fileDocClassifyName || "绠＄悊鍛樺叡浜枃浠�"
           },
@@ -311,10 +312,10 @@
     setParams() {
       var queryMap = {
         currentButtonKey: 'VIEW',
-        ownbizOid: this.options.ownbizOid,
-        ownbizBtm: this.options.ownbizBtm,
-        fileDocClassify: this.options.fileDocClassify,
-        fileDocClassifyName: this.options.fileDocClassifyName
+        ownbizOid:this.options.ownbizOid || "share",
+        ownBtmName:this.options.ownbizBtm || "share",
+        fileDocClassify: this.options.fileDocClassify|| "ADMIN_SHARE",
+        fileDocClassifyName: this.options.fileDocClassifyName || "绠＄悊鍛樺叡浜枃浠�"
       };
       if (this.options.where) {
         Object.assign(queryMap, this.options.where);
@@ -353,28 +354,27 @@
       done();
     },
     uploadAfter(res, done, loading, column) {
-      if(res.success){
-        this.attachBox = false;
-        this.$message.success('鏂囦欢涓婁紶鎴愬姛')
-      }else{
-        this.$message.error(res.msg);
-      }
+      this.attachBox = false;
+      this.$message.success('鏂囦欢涓婁紶鎴愬姛')
       this.refreshChange();
       done();
     },
     uploadError(error, column) {
-      this.$message.error('涓婁紶鏂囦欢鍑虹幇浜嗗紓甯�')
+      this.$message.error(error || '涓婁紶鏂囦欢鍑虹幇浜嗗紓甯�')
     },
     handleDownload(row) {
       //window.open(`${row.link}`);
+      let data=new FormData();
       if(row && row.oid){
-        download(row.oid)
+        data.append('fileOids',row.oid)
+        download(data)
       }else{
         if (this.selectionList.length === 0) {
-          this.$message.warning("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+          this.$message.warning("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");x
           return;
         }
-        download(this.oids);
+        data.append('fileOids',this.oids)
+        download(data);
       }
     },
     rowDel(row) {
@@ -384,7 +384,7 @@
         type: "warning"
       })
         .then(() => {
-          return remove(row.oid);
+          return remove([row.oid]);
         })
         .then(() => {
           this.onLoad(this.page);
@@ -405,7 +405,7 @@
         type: "warning"
       })
         .then(() => {
-          return remove(this.oids);
+          return remove(this.oids.split(','));
         })
         .then(() => {
           this.onLoad(this.page);
@@ -461,7 +461,7 @@
       getList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
-        if(data && data.records.length>0 && this.options.fileDocClassifyCombox){
+        if(this.options.fileDocClassifyCombox){
           this.data = data.records.map(item => {
             if(validatenull(item.fileDocClassifyName)&& !validatenull(item.fileDocClassify)){
               item.fileDocClassifyName = this.options.fileDocClassifyCombox[item.fileDocClassify] || '';
@@ -470,8 +470,10 @@
               ...item
             }
           })
+        }else{
+          this.data = data.records;
         }
-        //this.data = data.records;
+
         this.loading = false;
         this.selectionClear();
       }).catch(error=>{

--
Gitblit v1.9.3