From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱

---
 src/views/eam/modules/equipmentChange/EquipmentChangeDetail.vue |   58 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/views/eam/modules/equipmentChange/EquipmentChangeDetail.vue b/src/views/eam/modules/equipmentChange/EquipmentChangeDetail.vue
index 56c3c75..9af5081 100644
--- a/src/views/eam/modules/equipmentChange/EquipmentChangeDetail.vue
+++ b/src/views/eam/modules/equipmentChange/EquipmentChangeDetail.vue
@@ -19,7 +19,7 @@
         size='middle'
         bordered
         rowKey='id'
-        :scroll='{x:true}'
+        :scroll="{ x: 'calc(1500px + 40%)', y: 900 }"
         :columns='columns'
         :dataSource='dataSource'
         :pagination='ipagination'
@@ -68,6 +68,7 @@
       // disableMixinCreated: true,
       // originTargetKeys: [],
       // 琛ㄥご
+      disableMixinCreated: true,
       columns: [
         {
           title: '#',
@@ -81,88 +82,87 @@
         },
         {
 
-          title: '璁惧缂栫爜',
+          title: '缁熶竴缂栫爜',
           align: 'center',
-          width: 100,
-          dataIndex: 'equipmentNum'
+          dataIndex: 'equipmentNum',
+          width: 170,
         },
         {
           title: '璁惧鍚嶇О',
           align: 'center',
-          width: 150,
-          dataIndex: 'equipmentName'
+          dataIndex: 'equipmentName',
+          width: 170,
 
         },
         {
           title: '鍨嬪彿',
           align: 'center',
-          width: 100,
-          dataIndex: 'specification'
+          dataIndex: 'specification',
+          width: 170,
 
         },
         {
           title: '瑙勬牸',
-          width: 100,
           align: 'center',
-          dataIndex: 'model'
-
+          dataIndex: 'model',
+          width: 170,
         },
         {
           title: '鍙樺姩绫诲瀷',
           align: 'center',
-          width: 100,
+          width: 170,
           dataIndex: 'changeTypeName'
 
         },
         {
           title: '鍙樺姩鍘熷洜',
           align: 'center',
-          width: 100,
+          width: 170,
           dataIndex: 'changeReason'
 
         },
         {
           title: '鍙樺姩鍓嶇鐞嗛儴闂�',
           align: 'center',
-          width: 150,
+          width: 170,
           dataIndex: 'beforeDepartName'
         },
         {
           title: '鍙樺姩鍚庣鐞嗛儴闂�',
           align: 'center',
-          width: 150,
+          width: 170,
           dataIndex: 'afterDepartName'
         },
         {
           title: '鍙樺姩鍓嶇鐞嗕汉',
           align: 'center',
-          width: 150,
+          width: 170,
           dataIndex: 'beforeManagerName'
         },
         {
           title: '鍙樺姩鍚庣鐞嗕汉',
           align: 'center',
-          width: 150,
+          width: 170,
           dataIndex: 'afterManagerName'
         },
         {
           title: '鍙樺姩鍓嶄娇鐢ㄩ儴闂�',
           align: 'center',
-          width: 150,
+          width: 170,
           dataIndex: 'beforeUsageDepartName'
 
         },
         {
           title: '鍙樺姩鍚庝娇鐢ㄩ儴闂�',
           align: 'center',
-          width: 150,
+          width: 170,
           dataIndex: 'afterUsageDepartName'
 
         },
         {
           title: '鍙樺姩鍓嶈矗浠荤彮缁�',
           align: 'center',
-          width: 150,
+          width: 170,
           dataIndex: 'beforeTeamId'
 
         },
@@ -170,62 +170,62 @@
         {
           title: '鍙樺姩鍚庤矗浠荤彮缁�',
           align: 'center',
-          width: 150,
+          width: 170,
           dataIndex: 'afterTeamId'
 
         },
         {
           title: '鍙樺姩鍓嶈矗浠讳汉',
           align: 'center',
-          width: 150,
+          width: 170,
           dataIndex: 'beforeFunctionaryName'
 
         },
         {
           title: '鍙樺姩鍚庤矗浠讳汉',
           align: 'center',
-          width: 150,
+          width: 170,
           dataIndex: 'afterFunctionaryName'
 
         },
         {
           title: '鍙樺姩鍓嶄綅缃�',
           align: 'center',
-          width: 150,
+          width: 170,
           dataIndex: 'beforeLocation'
 
         },
         {
           title: '鍙樺姩鍚庝綅缃�',
           align: 'center',
-          width: 150,
+          width: 170,
           dataIndex: 'afterLocation'
 
         },
         {
           title: '鍙樺姩鍓嶈澶囩姸鎬�',
           align: 'center',
-          width: 150,
+          width: 170,
           dataIndex: 'beforeEquipmentStatus'
 
         },
         {
           title: '鍙樺姩鍚庤澶囩姸鎬�',
           align: 'center',
-          width: 150,
+          width: 170,
           dataIndex: 'afterEquipmentStatusName'
 
         },
         {
           title: '鍙樺姩鍓嶆妧鏈姸鎬�',
           align: 'center',
-          width: 150,
+          width: 170,
           dataIndex: 'beforeTechnologyStatus'
 
         },  {
           title: '鍙樺姩鍚庢妧鏈姸鎬�',
           align: 'center',
-          width: 150,
+          width: 170,
           dataIndex: 'afterTechnologyStatusName'
 
         }

--
Gitblit v1.9.3