From 59eb5746394c73b4eb7396fe695d0cdb1f0c071e Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 25 十月 2023 17:04:27 +0800
Subject: [PATCH] 已经处理的问题

---
 src/views/eam/MalfunctionRepair.vue |   92 +++++++++++++++-------------------------------
 1 files changed, 30 insertions(+), 62 deletions(-)

diff --git a/src/views/eam/MalfunctionRepair.vue b/src/views/eam/MalfunctionRepair.vue
index b855dd3..5227684 100644
--- a/src/views/eam/MalfunctionRepair.vue
+++ b/src/views/eam/MalfunctionRepair.vue
@@ -79,52 +79,6 @@
         @change="handleTableChange"
         :customRow="clickThenSelect"
       >
-        <!-- :rowSelection="rowSelection" -->
-        <!-- :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" -->
-
-        <!-- <template
-          slot="htmlSlot"
-          slot-scope="text"
-        >
-          <div v-html="text"></div>
-        </template>
-        <template
-          slot="imgSlot"
-          slot-scope="text,record"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犲浘鐗�</span>
-          <img
-            v-else
-            :src="getImgView(text)"
-            :preview="record.id"
-            height="25px"
-            alt=""
-            style="max-width:80px;font-size: 12px;font-style: italic;"
-          />
-        </template>
-        <template
-          slot="fileSlot"
-          slot-scope="text"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犳枃浠�</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)"
-          >
-            涓嬭浇
-          </a-button>
-        </template> -->
-
         <span
           slot="action"
           slot-scope="text, record"
@@ -187,6 +141,9 @@
             </a-menu>
           </a-dropdown>
         </span>
+        <span slot="faultDescription" slot-scope="text">
+            <j-ellipsis :value="text" :length="10" />
+        </span>
 
       </a-table>
     </div>
@@ -203,7 +160,7 @@
           class="table-operator"
           style="margin-top: 0px"
         >
-          <FaultDescriptionList ref="FaultDescriptionList" />
+          <FaultDescriptionList ref="FaultDescriptionList"   @ok="modalFormOk"/>
         </div>
 
       </a-tab-pane>
@@ -230,6 +187,7 @@
 import MalfunctionRepairModal from './modules/malfunctionRepair/MalfunctionRepaireModal'
 import FaultDescriptionList from './modules/malfunctionRepair/FaultDescriptionList'
 import ApprovelModal from './modules/malfunctionRepair/ApprovelModal'
+import JEllipsis from '@/components/jeecg/JEllipsis'
 
 export default {
   name: 'MalfunctionRepairList',
@@ -237,7 +195,8 @@
   components: {
     MalfunctionRepairModal,
     FaultDescriptionList,
-    ApprovelModal
+    ApprovelModal,
+    JEllipsis 
   },
   data() {
     return {
@@ -291,21 +250,30 @@
           align: "center",
           dataIndex: 'departName',
         },
-        {
-          title: '绱ф�ョ▼搴�',
-          align: "center",
-          dataIndex: 'urgencyName',
-        },
+        // {
+        //   title: '绱ф�ョ▼搴�',
+        //   align: "center",
+        //   dataIndex: 'urgencyName',
+        // },
         {
           title: '鏁呴殰鎻忚堪',
           align: "center",
-          dataIndex: 'faultDescription'
+          dataIndex: 'faultDescription',
+          scopedSlots: { 
+            customRender: 'faultDescription' 
+          }
+
         },
         // {
         //   title: '鏁呴殰鎷嶇収',
         //   align: "center",
         //   dataIndex: 'photo',
         //   scopedSlots: { customRender: 'imgSlot' }
+        // },
+        // {
+        //   title: '鏁呴殰鍘熷洜',
+        //   align: "center",
+        //   dataIndex: 'faultReason'
         // },
         {
           title: '鏁呴殰鏃堕棿',
@@ -332,14 +300,14 @@
           align: "center",
           dataIndex: 'remark'
         },
-        {
-          title: '鎿嶄綔',
-          dataIndex: 'action',
-          align: "center",
-          fixed: "right",
-          width: 200,
-          scopedSlots: { customRender: 'action' }
-        }
+        // {
+        //   title: '鎿嶄綔',
+        //   dataIndex: 'action',
+        //   align: "center",
+        //   fixed: "right",
+        //   width: 200,
+        //   scopedSlots: { customRender: 'action' }
+        // }
       ],
       url: {
         list: "/eam/equipmentReportRepair/getReportRepairList",

--
Gitblit v1.9.3