From d6babd4700146961fdec918c051a898f05ed56e2 Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期日, 19 四月 2026 16:32:39 +0800
Subject: [PATCH] Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan into dev
---
Code/WMS/WIDESEA_WMSClient/src/components/basic/ViewGrid/ViewGrid.vue | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSClient/src/components/basic/ViewGrid/ViewGrid.vue b/Code/WMS/WIDESEA_WMSClient/src/components/basic/ViewGrid/ViewGrid.vue
index e4bbcd3..02a7a75 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/components/basic/ViewGrid/ViewGrid.vue
+++ b/Code/WMS/WIDESEA_WMSClient/src/components/basic/ViewGrid/ViewGrid.vue
@@ -244,7 +244,6 @@
<el-button
v-else
:type="btn.type"
- size="small"
:color="btn.color"
:dark="false"
:class="btn.class"
@@ -259,7 +258,6 @@
<el-button
type="default"
style="padding: 0px 10px"
- size="small"
:plain="true"
v-if="showCustom"
@click="showCustomModel"
@@ -458,6 +456,7 @@
<vol-table
ref="table"
:single="single"
+ :expand="tableExpand"
:rowKey="rowKey"
:loadTreeChildren="loadTreeTableChildren"
@loadBefore="loadTableBefore"
--
Gitblit v1.9.3