From a9f005e2af294c47d7cd1e4b6ed401bf65f5b080 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 04 三月 2025 16:44:09 +0800 Subject: [PATCH] art: 所有设备 台账 二保工单 根据设备id查询二保工单,并过滤掉已完成和已取消的二保工单 --- src/views/eam/MalfunctionRepair.vue | 92 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 79 insertions(+), 13 deletions(-) diff --git a/src/views/eam/MalfunctionRepair.vue b/src/views/eam/MalfunctionRepair.vue index d2077f6..fa28a84 100644 --- a/src/views/eam/MalfunctionRepair.vue +++ b/src/views/eam/MalfunctionRepair.vue @@ -88,12 +88,17 @@ :sm="6" > <a-form-item label="浣跨敤閮ㄩ棬"> - <a-tree-select + <!-- <a-tree-select style="width: 100%" :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" :tree-data="treeData" placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬" tree-default-expand-all + v-model="queryParam.useId" + /> --> + <j-dict-select-tag + dictCode="sys_depart,depart_name,id" + placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬" v-model="queryParam.useId" /> </a-form-item> @@ -142,10 +147,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 +239,30 @@ @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" @@ -411,7 +440,13 @@ { title: '鍗曟嵁鍙�', align: "center", - dataIndex: 'num' + dataIndex: 'num', + width: 150 + }, + { + title: '缁熶竴缂栧彿', + align: "center", + dataIndex: 'equipmentNum' }, { title: '鐘舵��', @@ -426,7 +461,7 @@ if (text == '1') { return "琚姩鎶ヤ慨"; } else if (text == '2') { - return "涓诲姩鎶ヤ慨"; + return "杞﹂棿鎶ヤ慨"; } else if (text == '3') { return "涓诲姩缁翠慨"; } @@ -450,11 +485,7 @@ dataIndex: 'specificEquipment', scopedSlots: { customRender: 'specificEquipment' } }, - { - title: '缁熶竴缂栧彿', - align: "center", - dataIndex: 'equipmentNum' - }, + { title: '璁惧鍚嶇О', align: "center", @@ -507,7 +538,7 @@ width: 200 }, { - title: '鏄惁鍋滄満寰呬慨', + title: '鏄惁鍋滄満', align: "center", dataIndex: 'isStopName', }, @@ -534,6 +565,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 +586,8 @@ fixed: "right", width: 100, scopedSlots: { customRender: 'action' } - } + }, + ], url: { list: "/eam/equipmentReportRepair/getReportRepairList", @@ -730,7 +776,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 + } + }) + }, + //鐐瑰嚮璺宠浆鍒拌川閲忛殣鎮i〉 + handleQualityHiddenDanger(record) { + this.$router.push({ + path: '/eam/QuanlityConfirmList', + query: { + id: record.quanlityId, + num: record.num + } + }) + }, } } </script> -- Gitblit v1.9.3