From f8188da5c9022239ce8d7de5a004120eb92a231a Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 14 七月 2023 15:33:28 +0800
Subject: [PATCH] 附件列表联动
---
Source/UBCS-WEB/src/components/file/main.vue | 3 -
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 68 ++++++++++++++++++++-------------
2 files changed, 42 insertions(+), 29 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 1f91490..1c5e011 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -2,7 +2,7 @@
<basic-container>
<div class="main">
<div class="top">
- <div class="testbox" style="height: 720px">
+ <div class="testbox" style="">
<div>
<!-- <el-button plain size="small" type="primary" @click="addvisible = true">澧炲姞
</el-button>
@@ -27,7 +27,7 @@
style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input> -->
</div>
- <el-row style=" width: 100%;margin-bottom: 20px">
+ <el-row style="width: 100%;margin-bottom: 20px">
<div>
<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)">{{
@@ -37,8 +37,8 @@
<el-input v-model="WupinFindValue" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
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" style=""
- @cell-click="handleCellClick" @row-click="handleRowClick" @selection="handleSelection" @selection-change="handleSelectionChange" @sort-change="sortChange">
+ <el-table v-if="tableData.length != 0" v-loading="isLoading" :data="tableData" :height="tableHeight" style="min-height: 300px" ref="dataTable"
+ @cell-click="handleCellClick" @row-click="handleRowClick" @select="handleSelection" @select-all="handleSelectionAll" @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>
@@ -81,7 +81,7 @@
</BatchImport>
</div>
<div class="bottom">
- <el-collapse v-model="visibleNames" @change=""handleCollapse>
+ <el-collapse v-model="visibleNames" @change="handleCollapse">
<el-collapse-item title="闄勪欢鍒楄〃" name="1">
<fileInHtml :options="fileOptions"></fileInHtml>
</el-collapse-item>
@@ -197,6 +197,7 @@
datetime: "datetime",
},
tableData: [],
+ tableHeight:'calc(100vh - 330px)',
DataVisible: false,
tableHeadData: [],
items: {},
@@ -290,6 +291,16 @@
}
},
methods: {
+ //灞曞紑闄勪欢
+ handleCollapse(activeNames) {
+ if (activeNames.length > 0) {
+ this.tableHeight = 'calc(100vh - 630px)';
+ this.$refs.dataTable.doLayout()
+ } else {
+ this.tableHeight = 'calc(100vh - 330px)';
+ this.$refs.dataTable.doLayout()
+ }
+ },
// 鍙戝竷
setHandler() {
if (this.selectRow.length <= 0) {
@@ -361,10 +372,10 @@
this.editShow = column.property;
this.rowOid = row.oid;
},
- handleRowClick(row,column){
- this.fileOptions.ownbizOid= row.oid;
- this.fileOptions.ownbizBtm=row.btmname;
- this.$refs.crud.toggleRowSelection(row);
+ handleRowClick(row, column) {
+ this.fileOptions.ownbizOid = row.oid;
+ this.fileOptions.ownbizBtm = row.btmname;
+ this.$refs.dataTable.toggleRowSelection(row);
},
//鍒犻櫎
enumDeleteRow(row) {
@@ -460,9 +471,16 @@
});
},
//閫夋嫨
- handleSelection(list,row) {
- this.fileOptions.ownbizOid= row.oid;
- this.fileOptions.ownbizBtm=row.btmname;
+ handleSelection(list, row) {
+ debugger;
+ this.fileOptions.ownbizOid = row.oid;
+ this.fileOptions.ownbizBtm = row.btmname;
+
+ },
+ //閫夋嫨鍏ㄩ儴
+ handleSelectionAll() {
+ this.fileOptions.ownbizOid = '0';
+ this.fileOptions.ownbizBtm = '0';
},
//缂栬緫
@@ -520,7 +538,7 @@
AddSumbit(val) {
this.addvisible = false;
console.log(val)
- addSaveCode(val).then(res=>{
+ addSaveCode(val).then(res => {
console.log(res)
this.$nextTick(() => {
this.onLoad()
@@ -530,26 +548,19 @@
EditSumbit(val) {
this.editvisible = false;
console.log(val)
- editSaveCode(val).then(res=>{
- console.log(res)
- this.$nextTick(() => {
- this.onLoad()
- })
+ editSaveCode(val).then(res => {
+ console.log(res)
+ this.$nextTick(() => {
+ this.onLoad()
+ })
})
},
openBatchImport(type) {
this.batchImportData.visible = true
this.batchImportData.type = type
this.batchImportData.codeClassifyOid = this.codeClassifyOid
- },
- handleCollapse(activeNames){
- if(activeNames.length>0){
-
- }else{
-
- }
}
- },
+ }
};
</script>
@@ -581,7 +592,10 @@
.bottom {
margin-top: 20px;
- max-height: 43%;
overflow-y: scroll;
}
+
+.el-collapse-item__content{
+ padding-bottom: 0;
+}
</style>
diff --git a/Source/UBCS-WEB/src/components/file/main.vue b/Source/UBCS-WEB/src/components/file/main.vue
index 9866551..2391abf 100644
--- a/Source/UBCS-WEB/src/components/file/main.vue
+++ b/Source/UBCS-WEB/src/components/file/main.vue
@@ -7,7 +7,6 @@
:before-open="beforeOpen"
:permission="permissionList"
v-model="form"
- :height="options.height || 300"
ref="crud"
@row-del="rowDel"
@search-change="searchChange"
@@ -88,7 +87,7 @@
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: false,
--
Gitblit v1.9.3