设备档案优化

src/views/module_ems/tpmEquipment/TpmEquipmentList.vue

@@ -10,8 +10,18 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="设备定义ID（分类id）">
-              <j-category-select placeholder="请选择设备定义ID（分类id）" v-model="queryParam.equipdefid" pcode="id"/>
+            <a-form-item label="设备分类">
+              <!-- <j-category-select placeholder="请选择设备分类" v-model="queryParam.equipdefid" pcode="id"/> -->
+              <j-tree-select
+                ref="treeSelect"
+                placeholder="请选择设备分类"
+                v-model="queryParam.equipdefid"
+                dict="ems_tpm_equipment_define,name,id"
+                pidField="parentid"
+                pidValue="0"
+                hasChildField="has_child"
+                >
+              </j-tree-select>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
@@ -54,18 +64,18 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('设备档案')">导出</a-button>
+      <!-- <a-button type="primary" icon="download" @click="handleExportXls('设备档案')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+      </a-upload> -->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
+      </a-dropdown> -->
     </div>
 
     <!-- table区域-begin -->
@@ -170,10 +180,10 @@
             dataIndex: 'equipmentname'
           },
           {
-            title:'设备定义ID（分类id）',
+            title:'设备分类',
             align:"center",
-            dataIndex: 'equipdefid',
-            customRender: (text, record) => (text ? record['name'] : '')
+            dataIndex: 'equipdefid_dictText',
+            // customRender: (text, record) => (text ? record['name'] : '')
           },
           {
             title:'设备编号',

src/views/module_ems/tpmEquipment/modules/TpmEquipmentForm.vue

@@ -9,8 +9,18 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="设备定义ID（分类id）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipdefid">
-              <j-category-select v-model="model.equipdefid" pcode="id" placeholder="请选择设备定义ID（分类id）" back="name" @change="handleCategoryChange" />
+            <a-form-model-item label="设备分类" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipdefid">
+              <!-- <j-category-select v-model="model.equipdefid" pcode="id" placeholder="请选择设备分类" back="name" @change="handleCategoryChange" /> -->
+              <j-tree-select
+                ref="treeSelect"
+                placeholder="请选择设备分类"
+                v-model="model.equipdefid"
+                dict="ems_tpm_equipment_define,name,id"
+                pidField="parentid"
+                pidValue="0"
+                hasChildField="has_child"
+                >
+              </j-tree-select>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">