From 1a05d62e537cc8762a4d4bcb59bf39271168eb92 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 27 十一月 2024 14:31:08 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue
index 56bf8cc..0f854da 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue
@@ -707,7 +707,7 @@
 
     <div class="main-table">
       <vxe-grid
-          max-height="100%"
+          height="100%"
           class="mytable-scrollbar"
           ref="xGrid"
           v-bind="gridOptions"

--
Gitblit v1.8.0