From 2de735967d33dba5da5fc87191dee543b000afaf Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 18 七月 2025 20:20:18 +0800
Subject: [PATCH] 删除

---
 src/views/eam/equipment/EamEquipmentLedger.vue |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/views/eam/equipment/EamEquipmentLedger.vue b/src/views/eam/equipment/EamEquipmentLedger.vue
index 4564585..8ce27e9 100644
--- a/src/views/eam/equipment/EamEquipmentLedger.vue
+++ b/src/views/eam/equipment/EamEquipmentLedger.vue
@@ -102,7 +102,7 @@
 
         <!--浣跨敤閮ㄩ棬-->
         <template slot="factoryOrgCode" slot-scope="text,record">
-          {{[record.gsfactoryOrgCode_dictText,record.zxfactoryOrgCode_dictText,record.gqfactoryOrgCode_dictText,record.factoryOrgCode_dictText].filter(item=>item).join('/')}}
+          {{[record.zxfactoryOrgCode_dictText,record.gqfactoryOrgCode_dictText,record.factoryOrgCode_dictText].filter(item=>item).join('/')}}
         </template>
 
         <!--瀹夎浣嶇疆-->
@@ -115,8 +115,13 @@
           <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
         </template>
 
-        <!--鎿嶄綔绯荤粺-->
+        <!--鐏伀鍣�-->
         <template slot="fireExtinguisher" slot-scope="text">
+          <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
+        </template>
+
+        <!--鐪熺┖鐑鐞嗙倝-->
+        <template slot="trueHeatTreatment" slot-scope="text">
           <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
         </template>
 
@@ -170,7 +175,7 @@
     mixins: [JeecgListMixin],
     components: {
       ResumeDrawer,
-      EamEquipmentModal,
+      EamEquipmentModal
     },
     data() {
       return {
@@ -215,7 +220,6 @@
           },
           {
             title: '浣跨敤閮ㄩ棬',
-            align: 'center',
             dataIndex: 'factoryOrgCode',
             scopedSlots: { customRender: 'factoryOrgCode' }
           },
@@ -282,6 +286,12 @@
             dataIndex: 'system'
           },
           {
+            title: '鐪熺┖鐑鐞嗙倝',
+            align: 'center',
+            dataIndex: 'trueHeatTreatment',
+            scopedSlots: { customRender: 'trueHeatTreatment' }
+          },
+          {
             title: '璁惧绔彛',
             align: 'center',
             dataIndex: 'equipmentPort'
@@ -341,7 +351,7 @@
             title: '璧勪骇鍒堕�犲晢',
             align: 'center',
             dataIndex: 'manufacturingEnterprise',
-            scopedSlots: { customRender: 'manufacturingEnterprise' },
+            scopedSlots: { customRender: 'manufacturingEnterprise' }
           },
           {
             title: '璧勪骇鏉ユ簮鍥藉',

--
Gitblit v1.9.3