From a9f005e2af294c47d7cd1e4b6ed401bf65f5b080 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 04 三月 2025 16:44:09 +0800
Subject: [PATCH] art: 所有设备 台账 二保工单 根据设备id查询二保工单,并过滤掉已完成和已取消的二保工单

---
 src/views/eam/EquipmentListOfCrane.vue |   89 +++++++++++++++++++++++++++++++++-----------
 1 files changed, 67 insertions(+), 22 deletions(-)

diff --git a/src/views/eam/EquipmentListOfCrane.vue b/src/views/eam/EquipmentListOfCrane.vue
index 5b871ca..1c4d03b 100644
--- a/src/views/eam/EquipmentListOfCrane.vue
+++ b/src/views/eam/EquipmentListOfCrane.vue
@@ -82,12 +82,17 @@
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
             >
-              <a-tree-select
+              <!-- <a-tree-select
                 style="width: 100%"
                 :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                 :tree-data="treeData"
                 placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
                 tree-default-expand-all
+                v-model="queryParam.manageId"
+              /> -->
+              <j-dict-select-tag
+                dictCode="sys_depart,depart_name,id"
+                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
                 v-model="queryParam.manageId"
               />
             </a-form-item>
@@ -98,12 +103,17 @@
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
             >
-              <a-tree-select
+              <!-- <a-tree-select
                 style="width: 100%"
                 :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                 :tree-data="treeData"
                 placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
                 tree-default-expand-all
+                v-model="queryParam.useId"
+              /> -->
+              <j-dict-select-tag
+                dictCode="sys_depart,depart_name,id"
+                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
                 v-model="queryParam.useId"
               />
             </a-form-item>
@@ -314,14 +324,15 @@
         :customRow="clickThenSelect"
         @change="handleTableChange"
       >
-<!-- 鐐瑰嚮鎶�鏈姸鎬佸垪锛岃烦杞埌鎶�鏈姸鎬侀壌瀹氶〉闈� -->
-<template
+        <!-- 鐐瑰嚮鎶�鏈姸鎬佸垪锛岃烦杞埌鎶�鏈姸鎬侀壌瀹氶〉闈� -->
+        <template
           slot="technologyStatus"
           slot-scope="text,record"
-          >
+        >
           <a
             href="javascript:eam/EquipmentCalibrationOrder;"
-            @click="handleTechnologyStatus(record)">{{record.technologyStatus_dictText}}</a>
+            @click="handleTechnologyStatus(record)"
+          >{{record.technologyStatus_dictText}}</a>
         </template>
         <template
           slot="htmlSlot"
@@ -451,6 +462,26 @@
             class="error"
           >鍚�</span>
         </span>
+
+        <span
+          slot="name"
+          slot-scope="text"
+        >
+          <j-ellipsis
+            :value="text"
+            :length="8"
+          />
+        </span>
+
+        <template
+          slot="num"
+          slot-scope="text,record"
+        >
+          <a
+            href="javascript:;"
+            @click="handleDetail(record)"
+          >{{record.num}}</a>
+        </template>
 
         <span
           slot="action"
@@ -631,6 +662,7 @@
 import DailyMaintenanceList from './modules/equipmentNew/DailyMaintenanceList.vue'
 import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue'
 import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
+import JEllipsis from '@/components/jeecg/JEllipsis'
 export default {
   name: "EquipmentList",
   mixins: [JeecgListMixin, mixinDevice],
@@ -654,6 +686,7 @@
     DailyMaintenanceList,
     SecondMaintenanceList,
     ThirdMaintenanceList,
+    JEllipsis
   },
   data() {
     return {
@@ -682,14 +715,21 @@
           dataIndex: 'isLineEquip_dictText',
         },
         {
+          title: '鍏抽敭璁惧鏍囪瘑',
+          align: "center",
+          dataIndex: 'specificEquipment_dictText',
+        },
+        {
           title: '缁熶竴缂栫爜',
           align: "center",
           dataIndex: 'num',
+          scopedSlots: { customRender: 'num' },
         },
         {
           title: '璁惧鍚嶇О',
           align: "center",
           dataIndex: 'name',
+          scopedSlots: { customRender: 'name' },
         },
         {
           title: '鍨嬪彿',
@@ -706,16 +746,16 @@
           align: "center",
           dataIndex: 'gpo',
         },
-        {
-          title: '浣跨敤閮ㄩ棬',
-          align: "center",
-          dataIndex: 'useId_dictText',
-        },
-        {
-          title: '缁存姢閮ㄩ棬',
-          align: "center",
-          dataIndex: 'manageId_dictText',
-        },
+        // {
+        //   title: '浣跨敤閮ㄩ棬',
+        //   align: "center",
+        //   dataIndex: 'useId_dictText',
+        // },
+        // {
+        //   title: '缁存姢閮ㄩ棬',
+        //   align: "center",
+        //   dataIndex: 'manageId_dictText',
+        // },
         {
           title: '缁翠慨鐝粍',
           align: "center",
@@ -726,11 +766,11 @@
           align: "center",
           dataIndex: 'equipmentImportanceId',
         },
-        {
-          title: '鍏抽敭璁惧鏍囪瘑',
-          align: "center",
-          dataIndex: 'specificEquipment_dictText',
-        },
+        // {
+        //   title: '鍏抽敭璁惧鏍囪瘑',
+        //   align: "center",
+        //   dataIndex: 'specificEquipment_dictText',
+        // },
         {
           title: '鎶�鏈姸鎬�',
           align: "center",
@@ -741,6 +781,11 @@
           title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
           align: "center",
           dataIndex: 'technologyStatusVerificationType_dictText',
+        },
+        {
+          title: '涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�',
+          align: "center",
+          dataIndex: 'nextTechnologyStatusQualificationTime',
         },
         {
           title: '鐢熶骇绾跨紪鍙�',
@@ -897,7 +942,7 @@
         },
       ],
       url: {
-        list: "/eam/equipment/getEquipmentList",
+        list: "/eam/equipment/getEquipmentTZList",
         delete: "/eam/equipment/delete",
         deleteBatch: "/eam/equipment/deleteBatch",
         active: "/eam/equipment/active",

--
Gitblit v1.9.3