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/dailyMaintenanceOrder/MaintenanceStandardPlanningMaterial.vue |   84 +++++++++++++++++++++---------------------
 1 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceStandardPlanningMaterial.vue b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceStandardPlanningMaterial.vue
index e38d957..b45dbef 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceStandardPlanningMaterial.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceStandardPlanningMaterial.vue
@@ -20,11 +20,11 @@
         size="middle"
         bordered
         rowKey="id"
-        :scroll="{x:true}"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
+        :scroll="{x:true}"
         @change="handleTableChange"
       >
 
@@ -79,47 +79,47 @@
           }
         },
         {
-            title: '澶囦欢缂栧彿',
-            dataIndex: 'num',
-            align: "center",
-            width: 300,
-          },
-          {
-            title: '澶囦欢鍚嶇О',
-            dataIndex: 'name',
-            align: "center",
-            width: 300,
-          },
-          {
-            title: '澶囦欢瑙勬牸',
-            dataIndex: 'specification',
-            align: "center",
-            width: 300,
-          },
-          {
-            title: '澶囦欢鍨嬪彿',
-            dataIndex: 'model',
-            align: "center",
-            width: 300,
-          },
-          {
-            title: '鍒堕�犲晢',
-            dataIndex: 'constructorName',
-            align: "center",
-            width: 300,
-          },
-          {
-            title: '鏁伴噺',
-            dataIndex: 'quantity',
-            align: "center",
-            width: 300,
-          },
-          {
-            title: '鍗曚綅',
-            dataIndex: 'unitName',
-            align: "center",
-            width: 300,
-          },
+          title: '澶囦欢缂栧彿',
+          dataIndex: 'num',
+          align: "center",
+          // width: 300,
+        },
+        {
+          title: '澶囦欢鍚嶇О',
+          dataIndex: 'name',
+          align: "center",
+          // width: 300,
+        },
+        {
+          title: '澶囦欢瑙勬牸',
+          dataIndex: 'specification',
+          align: "center",
+          // width: 300,
+        },
+        {
+          title: '澶囦欢鍨嬪彿',
+          dataIndex: 'model',
+          align: "center",
+          // width: 300,
+        },
+        {
+          title: '鍒堕�犲晢',
+          dataIndex: 'constructorName',
+          align: "center",
+          // width: 300,
+        },
+        {
+          title: '鏁伴噺',
+          dataIndex: 'quantity',
+          align: "center",
+          // width: 300,
+        },
+        {
+          title: '鍗曚綅',
+          dataIndex: 'unitName',
+          align: "center",
+          // width: 300,
+        },
 
       ],
       url: {

--
Gitblit v1.9.3