From a8557c74bba5f4f7ff9b2f3c9d84db5d24bb43cd Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 05 十二月 2024 10:33:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue b/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
index 1ac2bed..16babc4 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
@@ -253,7 +253,8 @@
</script>
<template>
- <div>
+ <div style="width: 100%;height: 100%">
+ <div class="head">
<el-row>
<el-col :span="8">
<el-cascader
@@ -265,10 +266,12 @@
/>
</el-col>
</el-row>
+ </div>
+ <div class="main-table">
<vxe-grid
style="width: 40vw;"
class="mytable-scrollbar"
- max-height="500px"
+ height="100%"
ref="xGrid"
v-bind="gridOptions"
v-on="gridEvents"
@@ -296,6 +299,7 @@
</vxe-grid>
+ </div>
<el-dialog
v-model="dialogTableVisible"
destroy-on-close
@@ -306,5 +310,13 @@
</template>
<style scoped>
+.head{
+ width: 100%;
+ height: 35px;
+}
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0