From e1097d9e7c8470e6c8037a628da3b36d6577d8e3 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 04 三月 2025 11:01:06 +0800
Subject: [PATCH] art: 所有设备 台账 补充列表字段

---
 src/views/eam/EquipmentListOfAll.vue |  415 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 261 insertions(+), 154 deletions(-)

diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue
index a434b3e..93d4613 100644
--- a/src/views/eam/EquipmentListOfAll.vue
+++ b/src/views/eam/EquipmentListOfAll.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card
     :bordered="false"
-    title="鎵�鏈夎澶�"
+    title=""
   >
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">
@@ -13,35 +13,42 @@
           :gutter="24"
           style="margin-bottom: 1%;"
         >
-          <a-col :span="24">
+          <a-col :xl='6'
+                :lg='7'
+                :md='8'
+                :sm='24'>
             <a-form-item
               label="缁熶竴缂栧彿缇�"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
             >
               <a-textarea
-                placeholder="璇疯緭鍏ユ墍鏈夌粺涓�缂栫爜,椤荤敤绌烘牸闅斿紑,鍚﹀垯鍙兘鏌ヨ鍑洪敊璇俊鎭�"
+                placeholder="璇疯緭鍏ユ墍鏈夌粺涓�缂栫爜,姣忎釜缁熶竴缂栫爜鍗犵敤涓�琛�,鍚﹀垯鏌ヨ淇℃伅鍙兘浼氬嚭閿�"
                 v-model="queryParam.nums"
                 :auto-size="{ minRows: 2, maxRows:2 }"
               ></a-textarea>
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
+          <a-col :xl='6'
+                 :lg='7'
+                 :md='8'
+                 :sm='24'>
             <a-form-item
               label="璁惧鎵�灞炲垎绫�"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
             >
               <j-dict-select-tag
-                dictCode="mom_eam_equipment_category,name,id"
+                dictCode="mom_eam_equipment_category,name,id,del_flag!='1'"
                 placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
                 v-model="queryParam.equipmentCategoryId"
               />
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :xl='6'
+                 :lg='7'
+                 :md='8'
+                 :sm='24'>
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -53,7 +60,10 @@
               ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :xl='6'
+                 :lg='7'
+                 :md='8'
+                 :sm='24'>
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -65,7 +75,10 @@
               ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :xl='6'
+                 :lg='7'
+                 :md='8'
+                 :sm='24'>
             <a-form-item
               label="鍨嬪彿"
               :labelCol="labelCol"
@@ -77,9 +90,11 @@
               ></a-input>
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
+
+          <a-col :xl='6'
+                 :lg='7'
+                 :md='8'
+                 :sm='24'>
             <a-form-item
               label="宸ュ尯"
               :labelCol="labelCol"
@@ -89,7 +104,7 @@
                 allow-clear
                 placeholder="璇烽�夋嫨宸ュ尯"
                 :triggerChange="true"
-                dictCode="mom_base_area,name,id,del_flag!='1'"
+                dictCode="mom_base_area,name,id,del_flag!='1' and type = '2'"
                 v-model="queryParam.factoryModelId"
               />
             </a-form-item>
@@ -109,7 +124,10 @@
               />
             </a-form-item>
           </a-col> -->
-          <a-col :span="6">
+          <a-col :xl='6'
+                 :lg='7'
+                 :md='8'
+                 :sm='24'>
             <a-form-item
               label="缁存姢閮ㄩ棬"
               :labelCol="labelCol"
@@ -130,7 +148,10 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :xl='6'
+                 :lg='7'
+                 :md='8'
+                 :sm='24'>
             <a-form-item
               label="浣跨敤閮ㄩ棬"
               :labelCol="labelCol"
@@ -151,7 +172,10 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :xl='6'
+                 :lg='7'
+                 :md='8'
+                 :sm='24'>
             <a-form-item
               label="鏄惁鐢熶骇绾胯澶�"
               :labelCol="labelCol"
@@ -166,9 +190,10 @@
               />
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
+          <a-col :xl='6'
+                 :lg='7'
+                 :md='8'
+                 :sm='24'>
             <a-form-item
               label="ABC鏍囪瘑"
               :labelCol="labelCol"
@@ -183,7 +208,10 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :xl='6'
+                 :lg='7'
+                 :md='8'
+                 :sm='24'>
             <a-form-item
               label="鎶�鏈姸鎬�"
               :labelCol="labelCol"
@@ -198,7 +226,10 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :xl='6'
+                 :lg='7'
+                 :md='8'
+                 :sm='24'>
             <a-form-item
               label="璁惧鐘舵��"
               :labelCol="labelCol"
@@ -213,7 +244,10 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :xl='6'
+                 :lg='7'
+                 :md='8'
+                 :sm='24'>
             <a-form-item
               label="鍏抽敭璁惧鏍囪瘑"
               :labelCol="labelCol"
@@ -228,9 +262,10 @@
               />
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
+          <a-col :xl='6'
+                 :lg='7'
+                 :md='8'
+                 :sm='24'>
             <a-form-model-item
               label="璐ㄤ繚寮�濮嬫棩鏈�"
               :labelCol="labelCol"
@@ -244,7 +279,10 @@
               ></j-date>
             </a-form-model-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :xl='6'
+                 :lg='7'
+                 :md='8'
+                 :sm='24'>
             <a-form-model-item
               label="璐ㄤ繚缁撴潫鏃ユ湡"
               :labelCol="labelCol"
@@ -259,7 +297,10 @@
             </a-form-model-item>
           </a-col>
           <!-- 鎸夌淮淇彮缁勬绱� -->
-          <a-col :span="6">
+          <a-col :xl='6'
+                 :lg='7'
+                 :md='8'
+                 :sm='24'>
             <a-form-item
               label="缁翠慨鐝粍"
               :labelCol="labelCol"
@@ -756,16 +797,61 @@
             return parseInt(index) + 1
           },
           width: 50,
+          fixed: 'left',
         },
         {
-          title: '璁惧绫诲瀷',
+          title: '缁熶竴缂栫爜',
+          align: "center",
+          dataIndex: 'num',
+          scopedSlots: { customRender: 'num' },
+          fixed: 'left',
+        },
+        {
+          title: '璁惧鍚嶇О',
+          align: "center",
+          dataIndex: 'name',
+          scopedSlots: { customRender: 'name' },
+          fixed: 'left',
+        },
+        {
+          title: '浣跨敤閮ㄩ棬',
+          align: "center",
+          dataIndex: 'useId_dictText',
+        },
+        {
+          title: '涓績',
+          align: "center",
+          dataIndex: 'workCenterId_dictText',
+        },
+        {
+          title: '宸ュ尯',
+          align: "center",
+          dataIndex: 'factoryModelId_dictText',
+        },
+        {
+          title: '宸ユ',
+          align: "center",
+          dataIndex: 'areaId_dictText',
+        },
+        {
+          title: '缁存姢閮ㄩ棬',
+          align: "center",
+          dataIndex: 'manageId_dictText',
+        },
+        {
+          title: '缁翠慨鐝粍',
+          align: "center",
+          dataIndex: 'teamId_dictText',
+        },
+        {
+          title: '璁惧鎵�灞炲垎绫�',
           align: "center",
           dataIndex: 'equipmentCategoryId_dictText',
         },
         {
-          title: '鏄惁鐢熶骇绾胯澶�',
+          title: 'ABC鏍囪瘑',
           align: "center",
-          dataIndex: 'isLineEquip_dictText',
+          dataIndex: 'equipmentImportanceId',
         },
         {
           title: '鍏抽敭璁惧鏍囪瘑',
@@ -773,16 +859,110 @@
           dataIndex: 'specificEquipment_dictText',
         },
         {
-          title: '缁熶竴缂栫爜',
+          title: '瀹夊叏閰嶇疆',
           align: "center",
-          dataIndex: 'num',
-          scopedSlots: { customRender: 'num' },
+          dataIndex: 'securityConfiguration',
         },
         {
-          title: '璁惧鍚嶇О',
+          title: '鍐峰嵈绯荤粺',
           align: "center",
-          dataIndex: 'name',
-          scopedSlots: { customRender: 'name' },
+          dataIndex: 'coolingSystem',
+        },
+        {
+          title: '鐏伀鍣�',
+          align: "center",
+          dataIndex: 'fireExtinguisher',
+        },
+        {
+          title: '鐏伀鍣ㄦ湁鏁堟湡',
+          align: "center",
+          dataIndex: 'fireExtinguisherValidityPeriod',
+        },
+        {
+          title: '鎿嶄綔绯荤粺',
+          align: "center",
+          dataIndex: 'operatingSystem',
+        },
+        {
+          title: '绯荤粺',
+          align: "center",
+          dataIndex: 'system',
+        },
+        {
+          title: '璁惧绔彛',
+          align: "center",
+          dataIndex: 'port',
+        },
+        {
+          title: '鍧愭爣鏁伴噺',
+          align: "center",
+          dataIndex: 'coordinateNum',
+        },
+        {
+          title: '璁惧鐘舵��',
+          align: "center",
+          dataIndex: 'equipmentStatus_dictText',
+        },
+        {
+          title: '鎶�鏈姸鎬�',
+          align: "center",
+          dataIndex: 'technologyStatus_dictText',
+          scopedSlots: { customRender: 'technologyStatus' },
+        },
+        {
+          title: '閲嶉噺',
+          align: "center",
+          dataIndex: 'equipmentUda3',
+        },
+        {
+          title: '閲嶉噺璁¢噺鍗曚綅',
+          align: "center",
+          dataIndex: 'equipmentUda4_dictText',
+        },
+        {
+          title: '鍔熻兘浣嶇疆',
+          align: "center",
+          dataIndex: 'equipmentUda5',
+        },
+        {
+          title: '瀹夎浣嶇疆',
+          align: "center",
+          dataIndex: 'equipmentUda2',
+        },
+        {
+          title: '鍑哄巶鏃ユ湡',
+          align: "center",
+          dataIndex: 'leaveFactoryDate',
+        },
+        {
+          title: '绔嬮」鍗″彿',
+          align: "center",
+          dataIndex: 'projectApprovalNo',
+        },
+        {
+          title: '璧勯噾鏉ユ簮',
+          align: "center",
+          dataIndex: 'fundSource',
+        },
+        {
+          title: '楠屾敹鏃ユ湡',
+          align: "center",
+          dataIndex: 'acceptanceCheckDate',
+        },
+        {
+          title: '鍑哄巶缂栧彿',
+          align: "center",
+          dataIndex: 'factoryNo',
+        },
+        {
+          title: '璧勪骇鍒堕�犲晢',
+          align: "center",
+          dataIndex: 'constructorId_dictText',
+        },
+        {
+          title: '璧勪骇鐨勬潵婧愬浗瀹�',
+          align: "center",
+          dataIndex: 'sourceCountry',
         },
         {
           title: '鍨嬪彿',
@@ -790,7 +970,7 @@
           dataIndex: 'model',
         },
         {
-          title: '瑙勬牸',
+          title: '璁惧瑙勬牸',
           align: "center",
           dataIndex: 'specification',
         },
@@ -800,31 +980,49 @@
           dataIndex: 'gpo',
         },
         {
-          title: '浣跨敤閮ㄩ棬',
+          title: '鍒涘缓浜�',
           align: "center",
-          dataIndex: 'useId_dictText',
+          dataIndex: 'createBy'
         },
-        // {
-        //   title: '缁存姢閮ㄩ棬',
-        //   align: "center",
-        //   dataIndex: 'manageId_dictText',
-        // },
-        // {
-        //   title: '缁翠慨鐝粍',
-        //   align: "center",
-        //   dataIndex: 'teamId_dictText',
-        // },
         {
-          title: 'ABC鏍囪瘑',
+          title: '鍒涘缓鏃堕棿',
           align: "center",
-          dataIndex: 'equipmentImportanceId',
+          dataIndex: 'createTime',
         },
-
         {
-          title: '鎶�鏈姸鎬�',
+          title: '鏇存柊浜�',
           align: "center",
-          dataIndex: 'technologyStatus_dictText',
-          scopedSlots: { customRender: 'technologyStatus' },
+          dataIndex: 'updateBy'
+        },
+        {
+          title: '鏇存柊鏃堕棿',
+          align: "center",
+          dataIndex: 'updateTime',
+        },
+        {
+          title: '璐ㄤ繚寮�濮嬫棩鏈�',
+          align: "center",
+          dataIndex: 'warrantyStart'
+        },
+        {
+          title: '璐ㄤ繚缁撴潫鏃ユ湡',
+          align: "center",
+          dataIndex: 'warrantyEnd',
+        },
+        {
+          title: '璧勪骇鐘舵��',
+          align: "center",
+          dataIndex: 'propertyStatus_dictText',
+        },
+        {
+          title: '涓変繚鏃ユ湡',
+          align: "center",
+          dataIndex: 'thirdMaintenanceTime',
+        },
+        {
+          title: '鎶�鏈壌瀹氭棩鏈�',
+          align: "center",
+          dataIndex: 'technologyStatusQualificationTime',
         },
         {
           title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
@@ -837,6 +1035,11 @@
           dataIndex: 'nextTechnologyStatusQualificationTime',
         },
         {
+          title: '鏄惁鐢熶骇绾胯澶�',
+          align: "center",
+          dataIndex: 'isLineEquip_dictText',
+        },
+        {
           title: '鐢熶骇绾跨紪鍙�',
           align: "center",
           dataIndex: 'lineId_dictText',
@@ -846,103 +1049,6 @@
           align: "center",
           dataIndex: 'isMeta_dictText',
         },
-        // {
-        //   title: '瀹夊叏閰嶇疆',
-        //   align: "center",
-        //   dataIndex: 'securityConfiguration',
-        // },
-        // {
-        //   title: '鍐峰嵈绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'coolingSystem',
-        // },
-        // {
-        //   title: '鐏伀鍣�',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisher',
-        // },
-
-
-        // {
-        //   title: '鎿嶄綔绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'operatingSystem',
-        // },
-        // {
-        //   title: '绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'system',
-        // },
-        // {
-        //   title: '璁惧绔彛',
-        //   align: "center",
-        //   dataIndex: 'port',
-        // },
-        // {
-        //   title: '鍧愭爣鏁伴噺',
-        //   align: "center",
-        //   dataIndex: 'coordinateNum',
-        // },
-        // {
-        //   title: '璁惧鐘舵��',
-        //   align: "center",
-        //   dataIndex: 'equipmentStatus_dictText',
-        // },
-        // {
-        //   title: '閲嶉噺',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda3',
-        // },
-        // {
-        //   title: '閲嶉噺璁¢噺鍗曚綅',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda4_dictText',
-        // },
-        // {
-        //   title: '鍔熻兘浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda5',
-        // },
-        // {
-        //   title: '瀹夎浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda2',
-        // },
-        // {
-        //   title: '鍑哄巶鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'leaveFactoryDate',
-        // },
-        // {
-        //   title: '绔嬮」鍗″彿',
-        //   align: "center",
-        //   dataIndex: 'projectApprovalNo',
-        // },
-        // {
-        //   title: '璧勯噾鏉ユ簮',
-        //   align: "center",
-        //   dataIndex: 'fundSource',
-        // },
-        // {
-        //   title: '楠屾敹鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'acceptanceCheckDate',
-        // },
-        // {
-        //   title: '鍑哄巶缂栧彿',
-        //   align: "center",
-        //   dataIndex: 'factoryNo',
-        // },
-        // {
-        //   title: '璧勪骇鍒堕�犲晢',
-        //   align: "center",
-        //   dataIndex: 'constructorId_dictText',
-        // },
-        // {
-        //   title: '璧勪骇鐨勬潵婧愬浗瀹�',
-        //   align: "center",
-        //   dataIndex: 'sourceCountry',
-        // }, 
         {
           title: '宸ヨ壓鍙傛暟绠$悊',
           align: "center",
@@ -982,7 +1088,7 @@
         },
       ],
       url: {
-        list: "/eam/equipment/getEquipmentList",
+        list: "/eam/equipment/getEquipmentTZList",
         delete: "/eam/equipment/delete",
         deleteBatch: "/eam/equipment/deleteBatch",
         active: "/eam/equipment/active",
@@ -1194,6 +1300,7 @@
     },
 
     handleDownload() {
+      debugger;
       var params = {}//鏌ヨ鏉′欢
       params.type = "equipment"
       params.pageNo = 1

--
Gitblit v1.9.3