From c4379ec6f6b634db8ce1c90d53902d224b44a604 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 12 十二月 2023 14:40:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 36 +++++++++++++-----------------------
1 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 01e02df..a30dac6 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>
@@ -342,7 +331,7 @@
datetime: "datetime",
},
tableData: [],
- tableHeight: 'calc(100vh - 350px)',
+ tableHeight: 'calc(100vh - 300px)',
DataVisible: false,
tableHeadData: [],
items: {},
@@ -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: {
@@ -523,7 +513,7 @@
this.tableHeight = 'calc(100vh - 630px)';
this.$refs.dataTable.doLayout()
} else {
- this.tableHeight = 'calc(100vh - 350px)';
+ this.tableHeight = 'calc(100vh - 310px)';
this.$refs.dataTable.doLayout()
}
},
@@ -1139,7 +1129,7 @@
.top {
overflow-y: scroll;
- min-height: 55%;
+ min-height: 40%;
}
.bottom {
--
Gitblit v1.10.0