From 46003c8e286ae48d7e3aa100b5258dd6d5763101 Mon Sep 17 00:00:00 2001
From: houjie <714924425@qq.com>
Date: 星期六, 19 八月 2023 16:01:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/views/eam/modules/equipmentScrap/EquipmentScrapDetailList.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/eam/modules/equipmentScrap/EquipmentScrapDetailList.vue b/src/views/eam/modules/equipmentScrap/EquipmentScrapDetailList.vue
index 261baa3..417e423 100644
--- a/src/views/eam/modules/equipmentScrap/EquipmentScrapDetailList.vue
+++ b/src/views/eam/modules/equipmentScrap/EquipmentScrapDetailList.vue
@@ -69,7 +69,7 @@
size="middle"
bordered
rowKey="id"
- :scroll="{x:true}"
+ :scroll="{ x: 'calc(1500px + 50%)', y: 900 }"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
--
Gitblit v1.9.3