From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/modules/equipmentTransfer/EquipmentTransferOutDetail.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/eam/modules/equipmentTransfer/EquipmentTransferOutDetail.vue b/src/views/eam/modules/equipmentTransfer/EquipmentTransferOutDetail.vue
index 87de269..a0112fc 100644
--- a/src/views/eam/modules/equipmentTransfer/EquipmentTransferOutDetail.vue
+++ b/src/views/eam/modules/equipmentTransfer/EquipmentTransferOutDetail.vue
@@ -19,7 +19,7 @@
size='middle'
bordered
rowKey='id'
- :scroll='{x:true}'
+ :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"
:columns='columns'
:dataSource='dataSource'
:pagination='ipagination'
@@ -68,6 +68,7 @@
// disableMixinCreated: true,
// originTargetKeys: [],
// 琛ㄥご
+ disableMixinCreated: true,
columns: [
{
title: '#',
@@ -80,7 +81,7 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum'
},
--
Gitblit v1.9.3