From 9fbbbe80e6b48a3bd9544a24295971b8da9bc337 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 21 七月 2025 19:07:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue b/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
index 11a5855..930726f 100644
--- a/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
+++ b/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
@@ -62,7 +62,7 @@
           <a-col :span="model.maintenanceStatus&&model.maintenanceStatus!='WAIT_MAINTENANCE'?10:16" class="scroll-col">
             <a-tabs v-model="activeTabKey" @change="$refs.editableDetailTable.clearValidate()">
               <a-tab-pane key="1" tab="淇濆吇椤规槑缁�">
-                <j-vxe-table ref="editableDetailTable" rowSelection bordered alwaysEdit keep-source :height="300"
+                <j-vxe-table ref="editableDetailTable" rowSelection bordered alwaysEdit keep-source
                              :dataSource="detail.dataSource" :columns="detail.columns"
                              @selectRowChange="handleTableSelectRowChange">
                   <!--淇濆吇缁撴灉-->

--
Gitblit v1.9.3