From 78bdb5114382f006fb53fd461c7b90f4f43afc39 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期二, 29 八月 2023 11:59:30 +0800
Subject: [PATCH] 设备分类

---
 src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue |   76 ++++++++++++++++++++++++++-----------
 1 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue b/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue
index 370a5a9..fe67830 100644
--- a/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue
+++ b/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue
@@ -58,15 +58,15 @@
         @click="searchReset"
         icon="reload"
       >閲嶇疆</a-button>
-      <a-button
+      <!-- <a-button
         @click="handleAdd"
         type="primary"
         icon="plus"
-      >鏂板</a-button>
+      >鏂板</a-button> -->
       <a-button
         type="primary"
         icon="download"
-        @click="handleExportXls('宸ュ巶')"
+        @click="handleExportXls('璁惧鍒嗙被鎶ヨ〃')"
       >瀵煎嚭</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-button style="margin-left: 8px">
@@ -92,7 +92,7 @@
       :loading="loading"
       :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, getCheckboxProps:getCheckboxProps}"
       @change="handleTableChange"
-      :scroll="{ x: 'calc(1200px + 50%)', y: 900 }"
+      :scroll="{ x: true, y: 900 }"
     >
 
       <!--鐘舵�佹爮涓�у睍绀�-->
@@ -134,9 +134,9 @@
             <a-icon type="down" />
           </a>
           <a-menu slot="overlay">
-            <a-menu-item>
+            <!-- <a-menu-item>
               <a @click="handleEdit(record)">缂栬緫</a>
-            </a-menu-item>
+            </a-menu-item> -->
 
             <a-menu-item v-if="record.equipmentCategoryDtlList.length==0">
               <a-popconfirm
@@ -173,10 +173,10 @@
       </span>
 
     </a-table>
-    <equipment-category-model
+    <!-- <equipment-category-model
       ref="modalForm"
       @ok="modalFormOk"
-    ></equipment-category-model>
+    ></equipment-category-model> -->
   </a-card>
 </template>
 
@@ -191,7 +191,7 @@
   name: 'EquipmentCategory2List.',
   mixins: [JeecgListMixin],
   components: {
-    EquipmentCategoryModel,
+    // EquipmentCategoryModel,
     JInput,
     JEllipsis,
   },
@@ -236,43 +236,71 @@
           dataIndex: 'parentName',
         }, */
         {
-          title: '璁惧鍒嗙被缂栫爜',
+          title: '鍒嗙被缂栫爜',
           align: "center",
           dataIndex: 'num',
+          width: 200 ,
           // scopedSlots: {
           //   customRender: 'num',
           // },
           // sorter: true,
         },
         {
-          title: '璁惧鍒嗙被鍚嶇О',
+          title: '鍒嗙被鍚嶇О',
 
           align: "center",
           dataIndex: 'name',
+          width: 200 ,
           // scopedSlots: {
           //   customRender: 'name',
           // },
           // sorter: true,
         },
         {
+          title: '鍒嗙被鏍囪瘑',
+
+          align: "center",
+          dataIndex: 'equipmentCategoryUda1_dictText',
+          // scopedSlots: {
+          //   customRender: 'name',
+          // },
+          // sorter: true,
+          width: 200 ,
+        },
+        {
+          title: '鎶�鏈姸鎬侀壌瀹氬懆鏈�',
+
+          align: "center",
+          dataIndex: 'equipmentCategoryUda2_dictText',
+          // scopedSlots: {
+          //   customRender: 'name',
+          // },
+          // sorter: true,
+          width: 200 ,
+        },
+        {
           title: '鍒涘缓浜�',
           align: "center",
           dataIndex: 'createBy',
+          width: 200 ,
         },
         {
           title: '鍒涘缓鏃堕棿',
           align: "center",
           dataIndex: 'createTime',
+          width: 200 ,
         },
         {
           title: '淇敼浜�',
           align: "center",
           dataIndex: 'updateBy',
+          width: 200 ,
         },
         {
           title: '淇敼鏃堕棿',
           align: "center",
           dataIndex: 'updateTime',
+          width: 200 ,
         },
 
         // {
@@ -285,16 +313,14 @@
         //   sorter: true,
         //   width: 100,
         // },
-        {
-          title: '鎿嶄綔',
-          align: "center",
-          dataIndex: 'action',
-          scopedSlots: {
-            customRender: 'action',
-          },
-          width: 150,
-          fixed: 'right',
-        },
+        // {
+        //   title: '鎿嶄綔',
+        //   align: "center",
+        //   dataIndex: 'action',
+        //   scopedSlots: {
+        //     customRender: 'action',
+        //   },
+        // },
       ],
       url: {
         list: "/eam/equipmentCategory/list",
@@ -424,8 +450,12 @@
     this.queryParam = {};
     this.queryParam.id = this.nodeSelected.key;
     this.loadData(1);
-  }
-
+  },
+  mounted() {
+    this.$bus.$on('loadData', (data) => {
+      this.loadData();
+    })
+  },
 
 }
 </script>

--
Gitblit v1.9.3