From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/MalfunctionRepair.vue | 112 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 88 insertions(+), 24 deletions(-)
diff --git a/src/views/eam/MalfunctionRepair.vue b/src/views/eam/MalfunctionRepair.vue
index 8bab567..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"
@@ -178,12 +178,10 @@
</a-form-item>
</a-col>
<a-col
- :md="6"
+ :md="6"
:sm="6"
>
- <a-form-item
- label="鏄惁鍏抽敭璁惧"
- >
+ <a-form-item label="鏄惁鍏抽敭璁惧">
<j-dict-select-tag
allow-clear
placeholder="璇烽�夋嫨鏄惁鍏抽敭璁惧"
@@ -225,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"
@@ -236,13 +234,41 @@
@change="handleTableChange"
:customRow="clickThenSelect"
>
- <span
+ <!-- 鐐瑰嚮鍒楄烦杞埌浜嬫晠鐧昏椤� -->
+ <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"
>
- <a-icon type="check" style="color: chartreuse;" v-if="text==='0'" />
- <a-icon type="close" v-else style="color:red;"/>
- </span>
+ <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"
@@ -413,7 +439,7 @@
dataIndex: 'statusName',
},
{
- title: '绫诲瀷',
+ title: '鎶ヤ慨绫诲瀷',
align: "center",
dataIndex: 'type',
customRender: (text) => {
@@ -421,6 +447,8 @@
return "琚姩鎶ヤ慨";
} else if (text == '2') {
return "涓诲姩鎶ヤ慨";
+ } else if (text == '3') {
+ return "涓诲姩缁翠慨";
}
},
},
@@ -457,11 +485,11 @@
align: "center",
dataIndex: 'equipmentModel',
},
- {
- title: '瑙勬牸',
- align: "center",
- dataIndex: 'equipmentSpecification',
- },
+ // {
+ // title: '瑙勬牸',
+ // align: "center",
+ // dataIndex: 'equipmentSpecification',
+ // },
{
title: '浣跨敤閮ㄩ棬',
align: "center",
@@ -495,10 +523,11 @@
{
title: '鏁呴殰鏃堕棿',
align: "center",
- dataIndex: 'faultTime'
+ dataIndex: 'faultTime',
+ width: 200
},
{
- title: '鏄惁鍋滄満寰呬慨',
+ title: '鏄惁鍋滄満',
align: "center",
dataIndex: 'isStopName',
},
@@ -525,14 +554,29 @@
align: "center",
dataIndex: 'remark'
},
+ //璐ㄩ噺闅愭偅纭杩涘害
+ {
+ title: '璐ㄩ噺闅愭偅',
+ align: "center",
+ dataIndex: 'isConfirm1',
+ scopedSlots: { customRender: 'qualityHiddenDangerProgress' }
+ },
+ //浜嬫晠鐧昏纭杩涘害
+ {
+ title: '浜嬫晠鐧昏',
+ align: "center",
+ dataIndex: 'isConfirm2',
+ scopedSlots: { customRender: 'accidentRegistrationProgress' }
+ },
{
title: '鎿嶄綔',
dataIndex: 'action',
align: "center",
fixed: "right",
- width: 200,
+ width: 100,
scopedSlots: { customRender: 'action' }
- }
+ },
+
],
url: {
list: "/eam/equipmentReportRepair/getReportRepairList",
@@ -546,8 +590,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 + "鏉�"
},
@@ -721,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