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/equipmentScrap/EquipmentScrapDetailList.vue |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/eam/modules/equipmentScrap/EquipmentScrapDetailList.vue b/src/views/eam/modules/equipmentScrap/EquipmentScrapDetailList.vue
index 261baa3..c004bc9 100644
--- a/src/views/eam/modules/equipmentScrap/EquipmentScrapDetailList.vue
+++ b/src/views/eam/modules/equipmentScrap/EquipmentScrapDetailList.vue
@@ -10,8 +10,8 @@
 <!--&lt;!&ndash;              </a-form-item>&ndash;&gt;-->
 <!--&lt;!&ndash;              </a-col>&ndash;&gt;-->
 <!--              <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
-<!--              <a-form-item label="璁惧缂栫爜">-->
-<!--                <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮�" v-model="queryParam.equipmentNum"></a-input>-->
+<!--              <a-form-item label="缁熶竴缂栫爜">-->
+<!--                <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜" v-model="queryParam.equipmentNum"></a-input>-->
 <!--              </a-form-item>-->
 <!--              </a-col>-->
 <!--          <template v-if="toggleSearchStatus">-->
@@ -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"
@@ -168,7 +168,7 @@
           //   dataIndex: 'equipmentId_dictText',
           // },
           {
-            title:'璁惧缂栫爜',
+            title:'缁熶竴缂栫爜',
             align:"center",
             dataIndex: 'equipmentNum'
           },

--
Gitblit v1.9.3