From dc1a5a77fb195d9fdbe3dfeccaf00c45d4a67b19 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 12 七月 2023 19:08:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue |   69 ++++++++++++++++++++--------------
 1 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 238d714..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
             }}
@@ -36,7 +36,7 @@
                     size="small" style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input>
         </div>
         <el-table v-if="tableData.length != 0" v-loading="isLoading" :data="tableData" max-height="700" style=""
-                  @cell-click="handleCellClick" @row-click="handleRowClick" @selection-change="handleSelectionChange" @sort-change="sortChange">
+                  @cell-click="handleCellClick" @selection-change="handleSelectionChange" @sort-change="sortChange">
           <el-table-column fixed type="selection" width="55"></el-table-column>
           <el-table-column fixed label="搴忓彿" type="index" width="55">
           </el-table-column>
@@ -76,11 +76,6 @@
     </div>
     <BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :visible.sync="batchImportData.visible">
     </BatchImport>
-    <el-collapse v-model="visibleNames">
-      <el-collapse-item title="闄勪欢鍒楄〃" name="1">
-        <fileInHtml :options="fileOptions"></fileInHtml>
-      </el-collapse-item>
-    </el-collapse>
   </basic-container>
 </template>
 <script>
@@ -91,7 +86,6 @@
 import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
 import BatchImport from '@/components/BatchImport'
 import {validatenull} from "@/util/validate";
-import fileInHtml from "@/components/file/inHtml.vue";
 
 export default {
   components: {
@@ -99,7 +93,7 @@
     SetPersonnel,
     ResembleQueryDialog,
     BatchImport,
-    fileInHtml
+    // fileInHtml
   },
   name: "Crud.vue",
   props: {
@@ -155,11 +149,11 @@
         type: "PUBLIC",
         template: "",
         vars: {
-          codeClassifyOid: ""
+          codeClassifyOid: "",
+          templateOid:""
         }
       },
-      visibleNames:['1'],
-      visibleFile:false,
+      visibleNames:[],
       visibleFlow: false,
       transferData: [],
       transferProps: {
@@ -230,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,
     },
@@ -268,6 +261,8 @@
     templateOid: {
       handler(newval, oldval) {
         this.parameter.code = newval;
+        this.fileOptions.ownbizOid="1";
+        this.parameter.vars.templateOid = newval
       },
       deep: true,
     },
@@ -373,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];
@@ -442,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() {
@@ -525,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
     }
   },
 };
@@ -538,6 +531,7 @@
   .el-table--scrollable-x .el-table__body-wrapper {
     overflow: auto !important;
   }
+
   .el-table__fixed-right-patch {
     background-color: #f5f7fa !important;
   }
@@ -546,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