From 1056fae380cb28ffc610d8f1de461bf9f5aec559 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 08 九月 2023 15:55:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/file/main.vue |   81 +++++++++++++++++++++++++++-------------
 1 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/file/main.vue b/Source/UBCS-WEB/src/components/file/main.vue
index cfbd438..8444c92 100644
--- a/Source/UBCS-WEB/src/components/file/main.vue
+++ b/Source/UBCS-WEB/src/components/file/main.vue
@@ -1,21 +1,22 @@
 <template>
   <basic-container>
     <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :before-open="beforeOpen"
-               :permission="permissionList"
-               v-model="form"
-               ref="crud"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
+      :table-loading="loading"
+      :data="data"
+      :page.sync="page"
+      :before-open="beforeOpen"
+      :permission="permissionList"
+      v-model="form"
+      ref="crud"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @row-click="selectedRowClick"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad">
       <template slot="menuLeft">
         <el-button v-if="hasUpload" type="primary"
                    size="small"
@@ -63,17 +64,18 @@
 <script>
 import {getList, getFile,upload,update, remove,download} from "@/api/resource/file";
 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:'400'),
         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='';
@@ -367,15 +381,23 @@
       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.downloadFileByBlobHandler(res);
+        }
+      });
     },
     rowDel(row) {
       this.$confirm("纭畾灏嗛�夋嫨鏂囦欢鍒犻櫎?", {
@@ -436,6 +458,13 @@
     },
     selectionChange(list) {
       this.selectionList = list;
+      this.$refs.crud.setCurrentRow(this.selectionList[list.length-1]);
+    },
+    selectedRowClick(row){
+      this.selectionList = row;
+      this.$refs.crud.toggleSelection();
+      this.$refs.crud.setCurrentRow(row);
+      this.$refs.crud.toggleRowSelection(row); //閫変腑褰撳墠琛�
     },
     selectionClear() {
       this.selectionList = [];
@@ -448,7 +477,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