From 16913ea709f434cfebe71fd0c66b0a6931398f3e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 13 十二月 2023 08:56:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 01e02df..76fc6c0 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -77,17 +77,6 @@
:width="item.width"
align="center">
</el-table-column>
- <!-- 鍙傜収鏁版嵁-->
-<!-- <el-table-column v-for="(item,index) in referArray"-->
-<!-- v-if="item.referConfig && Object.keys(item.referConfig).length > 0 && !item.hidden"-->
-<!-- :key="index"-->
-<!-- :label="item.title" :show-overflow-tooltip="true"-->
-<!-- :sortable="item.sortable" :width="item.width" align="center"-->
-<!-- :prop="item.prop">-->
-<!-- <template slot-scope="scope">-->
-<!-- <span>{{ scope.row[item.showField] }}</span>-->
-<!-- </template>-->
-<!-- </el-table-column>-->
</el-table>
</div>
</el-row>
@@ -356,15 +345,7 @@
},
// 涓绘暟鎹寜閽�
masterVrBtnList: [],
- fileOptions: {
- ownbizOid: "0",
- ownbizBtm: "0",
- fileDocClassify: '!=processAuditSuggest',
- fileDocClassifyName: '',
- hasDownload: true,
- hasUpload: true,
- height: 110
- },
+ fileOptions:{},
result: '',
elapsedTime: '',
};
@@ -416,6 +397,15 @@
this.tableData = newval;
this.searchResults = newval
this.doLayout();
+ this.fileOptions= {
+ ownbizOid: "0",
+ ownbizBtm: "0",
+ fileDocClassify: '!=processAuditSuggest',
+ fileDocClassifyName: '',
+ hasDownload: true,
+ hasUpload: true,
+ height: 'auto'
+ }
},
},
tableHeadFindData: {
@@ -1101,7 +1091,7 @@
<style lang="scss" scoped>
//鍥哄畾鍒楅珮搴�
/deep/ .el-table__fixed {
- height: calc(100vh - 370px) !important;
+ height: calc(100vh - 365px) !important;
}
// 婊氬姩鏉℃牱寮忎慨鏀�
@@ -1139,7 +1129,7 @@
.top {
overflow-y: scroll;
- min-height: 55%;
+ min-height: 40%;
}
.bottom {
--
Gitblit v1.9.3