From f303499ea96dc9402f470d9c64aadd5945a7b638 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 03 六月 2024 11:17:28 +0800
Subject: [PATCH] OEE报表页面表格列属性ellipsis开启后内容若超出盒子宽度则出现与表头错位现象，而无法实现ellipsis开启后内容超出单元格则省略功能，现采取增加列宽度方式且关闭ellipsis属性功能方法解决问题

---
 src/views/eam/MalfunctionRepair.vue |   65 ++++++++++++++++++++++++++++++--
 1 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/src/views/eam/MalfunctionRepair.vue b/src/views/eam/MalfunctionRepair.vue
index d2077f6..ebd2bbc 100644
--- a/src/views/eam/MalfunctionRepair.vue
+++ b/src/views/eam/MalfunctionRepair.vue
@@ -142,10 +142,10 @@
             :md="6"
             :sm="6"
           >
-            <a-form-item label="鏄惁鍋滄満缁翠慨">
+            <a-form-item label="鏄惁鍋滄満">
               <j-dict-select-tag
                 allow-clear
-                placeholder="璇烽�夋嫨鏄惁鍋滄満缁翠慨"
+                placeholder="璇烽�夋嫨鏄惁鍋滄満"
                 :triggerChange="true"
                 dictCode="is_stop"
                 v-model="queryParam.isStop"
@@ -234,6 +234,26 @@
         @change="handleTableChange"
         :customRow="clickThenSelect"
       >
+      <!-- 鐐瑰嚮鍒楄烦杞埌浜嬫晠鐧昏椤� -->
+        <template
+          slot="accidentRegistrationProgress"
+          slot-scope="text, record">
+          <a
+            v-if="text!==''&&text!==null"
+            @click="handleAccidentRegistration(record)">
+            {{text=='yes'? '宸茬‘璁�':'鏈‘璁�'}}
+          </a>
+        </template>
+        <!-- 鐐瑰嚮鍒楄烦杞埌璐ㄩ噺闅愭偅椤� -->
+        <template
+          slot="qualityHiddenDangerProgress"
+          slot-scope="text, record">
+          <a
+            v-if="text!==''&&text!==null"
+            @click="handleQualityHiddenDanger(record)">
+            {{text=='yes'? '宸茬‘璁�':'鏈‘璁�'}}
+          </a>
+        </template>
         <span
           slot="specificEquipment"
           slot-scope="text"
@@ -507,7 +527,7 @@
           width: 200
         },
         {
-          title: '鏄惁鍋滄満寰呬慨',
+          title: '鏄惁鍋滄満',
           align: "center",
           dataIndex: 'isStopName',
         },
@@ -534,6 +554,20 @@
           align: "center",
           dataIndex: 'remark'
         },
+         //璐ㄩ噺闅愭偅纭杩涘害
+         {
+          title: '璐ㄩ噺闅愭偅',
+          align: "center",
+          dataIndex: 'isConfirm1',
+          scopedSlots: { customRender: 'qualityHiddenDangerProgress' }
+        },
+        //浜嬫晠鐧昏纭杩涘害
+        {
+          title: '浜嬫晠鐧昏',
+          align: "center",
+          dataIndex: 'isConfirm2',
+          scopedSlots: { customRender: 'accidentRegistrationProgress' }
+        },
         {
           title: '鎿嶄綔',
           dataIndex: 'action',
@@ -541,7 +575,8 @@
           fixed: "right",
           width: 100,
           scopedSlots: { customRender: 'action' }
-        }
+        },
+       
       ],
       url: {
         list: "/eam/equipmentReportRepair/getReportRepairList",
@@ -730,7 +765,27 @@
     handleAccept(record) {
       this.$refs.acceptModel.title = "楠屾敹"
       this.$refs.acceptModel.edit(record)
-    }
+    },
+    //鐐瑰嚮璺宠浆鍒颁簨鏁呯櫥璁伴〉
+    handleAccidentRegistration(record) {
+      this.$router.push({
+        path: '/eam/FaultInfoList',
+        query: {
+          id: record.faultInfoId,
+          num: record.num
+        }
+      })
+    },
+    //鐐瑰嚮璺宠浆鍒拌川閲忛殣鎮ｉ〉
+    handleQualityHiddenDanger(record) {
+      this.$router.push({
+        path: '/eam/QuanlityConfirmList',
+        query: {
+          id: record.quanlityId,
+          num: record.num
+        }
+      })
+    },
   }
 }
 </script>

--
Gitblit v1.9.3