From 8be1b149327239d4fb9587e72bc8f438013f9838 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 12 七月 2023 20:26:17 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue |   74 ++++++++++++++++++++++++++----------
 1 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index be3ea00..a7b9b6f 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -27,7 +27,7 @@
       </div>
       <el-row style="height: 700px; width: 100%">
         <div>
-          <el-button v-for="(item, index) in masterVrBtnList" :key="index" plain size="small" type="primary"
+          <el-button v-for="(item, index) in masterVrBtnList" :key="index" plain size="small" type="primary" v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)"
                      @click="handelBtnClick(item)">{{
               item.name
             }}
@@ -92,7 +92,8 @@
     integrationTransfer,
     SetPersonnel,
     ResembleQueryDialog,
-    BatchImport
+    BatchImport,
+    // fileInHtml
   },
   name: "Crud.vue",
   props: {
@@ -148,9 +149,11 @@
         type: "PUBLIC",
         template: "",
         vars: {
-          codeClassifyOid: ""
+          codeClassifyOid: "",
+          templateOid:""
         }
       },
+      visibleNames:[],
       visibleFlow: false,
       transferData: [],
       transferProps: {
@@ -193,7 +196,15 @@
         codeClassifyOid: ''
       },
       // 涓绘暟鎹寜閽�
-      masterVrBtnList: []
+      masterVrBtnList: [],
+      fileOptions:{
+        ownbizOid:"1",
+        ownbizBtm:"1",
+        fileDocClassify:'!=processAuditSuggest',
+        fileDocClassifyName:'',
+        hasDownload:true,
+        hasUpload:true
+      }
     };
   },
   computed: {},
@@ -213,8 +224,7 @@
     codeClassifyOid: {
       handler(newval, oldval) {
         this.codeClassifyOid = newval;
-        this.parameter.vars.codeClassifyOid = newval;
-        console.log('瀛�',newval)
+        this.parameter.vars.codeClassifyOid = newval
       },
       deep: true,
     },
@@ -251,6 +261,8 @@
     templateOid: {
       handler(newval, oldval) {
         this.parameter.code = newval;
+        this.fileOptions.ownbizOid="1";
+        this.parameter.vars.templateOid = newval
       },
       deep: true,
     },
@@ -334,6 +346,10 @@
       this.editShow = column.property;
       this.rowOid = row.oid;
     },
+    handleRowClick(row,column){
+      this.fileOptions.ownbizOid= row.oid;
+      this.fileOptions.ownbizBtm=row.btmname;
+    },
     //鍒犻櫎
     enumDeleteRow(row) {
       this.tableData.splice(row, 1);
@@ -352,8 +368,7 @@
     CrudHeaderRend() {
       if (this.codeClassifyOid != "") {
         MasterTable({
-          codeClassifyOid: this.codeClassifyOid,
-          functionId: 5,
+          codeClassifyOid: this.codeClassifyOid
         }).then((res) => {
           this.options = res.data.tableDefineVO.seniorQueryColumns;
           this.List = res.data.tableDefineVO.cols[0];
@@ -421,19 +436,18 @@
       });
     },
     //澶氶��
-    handleSelectionChange(row) {
-      console.log(row)
-      if (this.row) {
-        this.rowOid = row[0].oid;
-      } else {
-        this.rowOid = "";
-      }
-      this.selectRow = row;
+    handleSelectionChange(list) {
+      this.selectRow = list;
       this.parameter.ids = [];
-      row.forEach((item) => {
+      list.forEach((item) => {
         this.parameter.ids.push(item.oid);
       });
-      console.log('  this.parameter.ids', this.parameter.ids)
+    },
+    //閫夋嫨
+    handleSelection(list,row) {
+      this.fileOptions.ownbizOid= row.oid;
+      this.fileOptions.ownbizBtm=row.btmname;
+
     },
     //缂栬緫
     editHandler() {
@@ -504,9 +518,9 @@
       })
     },
     openBatchImport(type) {
-      this.batchImportData.visible = true;
-      this.batchImportData.type = type;
-      this.batchImportData.codeClassifyOid = this.codeClassifyOid;
+      this.batchImportData.visible = true
+      this.batchImportData.type = type
+      this.batchImportData.codeClassifyOid = this.codeClassifyOid
     }
   },
 };
@@ -517,6 +531,7 @@
   .el-table--scrollable-x .el-table__body-wrapper {
     overflow: auto !important;
   }
+
   .el-table__fixed-right-patch {
     background-color: #f5f7fa !important;
   }
@@ -525,4 +540,21 @@
 /deep/ .el-button {
   margin: 0 10px 10px 0;
 }
+
+.main {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - 150px);
+  min-height: 400px;
+}
+.top {
+  overflow-y: scroll;
+  min-height: 55%;
+}
+
+.bottom {
+  margin-top: 20px;
+  max-height: 43%;
+  overflow-y: scroll;
+}
 </style>

--
Gitblit v1.9.3