From 44d89f2faf9498c0b982613bef7294f83c854e88 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 31 一月 2024 17:50:04 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop

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

diff --git a/src/views/eam/MalfunctionRepair.vue b/src/views/eam/MalfunctionRepair.vue
index e1cd998..d2077f6 100644
--- a/src/views/eam/MalfunctionRepair.vue
+++ b/src/views/eam/MalfunctionRepair.vue
@@ -177,6 +177,20 @@
               ></a-input>
             </a-form-item>
           </a-col>
+          <a-col
+            :md="6"
+            :sm="6"
+          >
+            <a-form-item label="鏄惁鍏抽敭璁惧">
+              <j-dict-select-tag
+                allow-clear
+                placeholder="璇烽�夋嫨鏄惁鍏抽敭璁惧"
+                :triggerChange="true"
+                dictCode="specific_equipment"
+                v-model="queryParam.specificEquipment"
+              />
+            </a-form-item>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -209,7 +223,7 @@
       <a-table
         ref="table"
         size="middle"
-        :scroll="{ x: 'calc(1900px + 50%)', y: 900 }"
+        :scroll="{ x: 'calc(1500px + 50%)', y: 900 }"
         bordered
         rowKey="id"
         :columns="columns"
@@ -220,6 +234,21 @@
         @change="handleTableChange"
         :customRow="clickThenSelect"
       >
+        <span
+          slot="specificEquipment"
+          slot-scope="text"
+        >
+          <a-icon
+            type="check"
+            style="color: chartreuse;"
+            v-if="text==='0'"
+          />
+          <a-icon
+            type="close"
+            v-else
+            style="color:red;"
+          />
+        </span>
         <span
           slot="action"
           slot-scope="text, record"
@@ -390,7 +419,7 @@
           dataIndex: 'statusName',
         },
         {
-          title: '绫诲瀷',
+          title: '鎶ヤ慨绫诲瀷',
           align: "center",
           dataIndex: 'type',
           customRender: (text) => {
@@ -398,6 +427,8 @@
               return "琚姩鎶ヤ慨";
             } else if (text == '2') {
               return "涓诲姩鎶ヤ慨";
+            } else if (text == '3') {
+              return "涓诲姩缁翠慨";
             }
           },
         },
@@ -414,6 +445,12 @@
           },
         },
         {
+          title: '鍏抽敭璁惧',
+          align: "center",
+          dataIndex: 'specificEquipment',
+          scopedSlots: { customRender: 'specificEquipment' }
+        },
+        {
           title: '缁熶竴缂栧彿',
           align: "center",
           dataIndex: 'equipmentNum'
@@ -428,11 +465,11 @@
           align: "center",
           dataIndex: 'equipmentModel',
         },
-        {
-          title: '瑙勬牸',
-          align: "center",
-          dataIndex: 'equipmentSpecification',
-        },
+        // {
+        //   title: '瑙勬牸',
+        //   align: "center",
+        //   dataIndex: 'equipmentSpecification',
+        // },
         {
           title: '浣跨敤閮ㄩ棬',
           align: "center",
@@ -466,7 +503,8 @@
         {
           title: '鏁呴殰鏃堕棿',
           align: "center",
-          dataIndex: 'faultTime'
+          dataIndex: 'faultTime',
+          width: 200
         },
         {
           title: '鏄惁鍋滄満寰呬慨',
@@ -501,7 +539,7 @@
           dataIndex: 'action',
           align: "center",
           fixed: "right",
-          width: 200,
+          width: 100,
           scopedSlots: { customRender: 'action' }
         }
       ],
@@ -517,8 +555,8 @@
       /* 鍒嗛〉鍙傛暟 */
       ipagination: {
         current: 1,
-        pageSize: 5,
-        pageSizeOptions: ['5', '10', '50'],
+        pageSize: 20,
+        pageSizeOptions: ['5', '10', '20', '50'],
         showTotal: (total, range) => {
           return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
         },

--
Gitblit v1.9.3