From dedbadd96ab7e1533572b25511fd201678c64dad Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 17 十月 2024 09:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index f7ad78e..04d6918 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -2,7 +2,7 @@
<basic-container>
<div class="main">
<div class="top">
- <div class="testbox" style="">
+ <div class="testbox">
<div>
</div>
<el-row style="width: 100%;margin-bottom: 10px">
@@ -1204,7 +1204,6 @@
this.conditionMap = {};
// 瀛樺偍鏌ヨ鏉′欢锛屼富瑕佹槸涓轰簡鐐瑰嚮椤电爜鏃跺甫涓婅繖涓潯浠�
this.conditionMap["conditionMap[" + this.keyWordFind + "]"] = '*' + this.WupinFindValue + '*';
- console.log(this.conditionMap)
TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
@@ -1226,9 +1225,12 @@
<style lang="scss" scoped>
-.el-table__fixed-body-wrapper .el-table__body {
- padding-bottom: 15px; // 婊氬姩鏉￠珮搴�
+/deep/ .el-table__fixed-body-wrapper {
+ .el-table__body {
+ padding-bottom: 15px;
+ }
}
+
//鍥哄畾鍒楅珮搴�
/deep/ .el-table__fixed {
height: calc(100vh - 365px) !important;
--
Gitblit v1.9.3