From ce5dce2d7f6eefbbe863d99e8adfa5d4ed5e229a Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 05 九月 2023 13:10:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/file/main.vue |   43 ++++++++++++++++++++++++++++++++++---------
 1 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/file/main.vue b/Source/UBCS-WEB/src/components/file/main.vue
index 370eea5..251148c 100644
--- a/Source/UBCS-WEB/src/components/file/main.vue
+++ b/Source/UBCS-WEB/src/components/file/main.vue
@@ -65,15 +65,17 @@
 import {mapGetters} from "vuex";
 import {dateFormat} from "@/util/date";
 import {validatenull} from "@/util/validate";
+import func from "@/util/func";
 
 export default {
-  props: ["options","visible"],
+  props: ["options","visible","ownbizOid"],
   data() {
     return {
       form: {},
       query: {},
       params:{},
       loading: false,
+      hasPage:this.options.hasPage||false,
       page: {
         pageSize: 10,
         currentPage: 1,
@@ -86,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,
@@ -232,6 +234,12 @@
   mounted() {
 
   },
+  watch:{
+    ownbizOid(val){
+      this.setParams()
+      this.refreshChange()
+    }
+  },
   methods: {
     setFormItem(){
       /*this.options.formItems=[{
@@ -312,9 +320,9 @@
     setParams() {
       var queryMap = {
         currentButtonKey: 'VIEW',
-        ownbizOid:this.options.ownbizOid || "share",
-        ownBtmName:this.options.ownbizBtm || "share",
-        fileDocClassify: this.options.fileDocClassify|| "ADMIN_SHARE",
+        ownbizOid: this.options.ownbizOid || "share",
+        ownBtmName: this.options.ownbizBtm || "share",
+        fileDocClassify: this.options.fileDocClassify || "ADMIN_SHARE",
         fileDocClassifyName: this.options.fileDocClassifyName || "绠＄悊鍛樺叡浜枃浠�"
       };
       if (this.options.where) {
@@ -330,6 +338,12 @@
       }
       this.page.pageSize = this.options.pageObject.limit;
       this.page.currentPage = this.options.pageObject.page;
+
+      this.attachOption.column[1].data.ownbizOid = this.options.ownbizOid || "share";
+      this.attachOption.column[1].data.ownBtmName = this.options.ownbizBtm || "share";
+      this.attachOption.column[1].data.fileDocClassify = this.options.fileDocClassify || "ADMIN_SHARE";
+      this.attachOption.column[1].data.fileDocClassifyName = this.options.fileDocClassifyName || "绠＄悊鍛樺叡浜枃浠�"
+
     },
     handleUpload() {
       this.attachOption.column[1].data.fileOid='';
@@ -364,15 +378,26 @@
     },
     handleDownload(row) {
       //window.open(`${row.link}`);
+      let data=new FormData();
       if(row && row.oid){
-        download({fileOids:row.oid})
+        data.append('fileOids',row.oid)
+        this.downloadFile(data);
       }else{
         if (this.selectionList.length === 0) {
           this.$message.warning("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
           return;
         }
-        download({fileOids:this.oids});
+        data.append('fileOids',this.oids)
+        this.downloadFile(data);
       }
+    },
+    downloadFile(data){
+      download(data).then(res=>{
+        // console.log(res);
+        if(res){
+          func.downloadFileByBlobHandler(res);
+        }
+      });
     },
     rowDel(row) {
       this.$confirm("纭畾灏嗛�夋嫨鏂囦欢鍒犻櫎?", {
@@ -445,7 +470,7 @@
       this.page.pageSize = pageSize;
     },
     refreshChange() {
-      this.onLoad(this.page, this.query);
+      this.onLoad(this.page);
     },
     onLoad(page, params={}) {
       this.loading = true;

--
Gitblit v1.9.3