From 9be2e2f91332ed341406acf9739d8912dddbf6fe Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 22 七月 2025 20:43:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/maintenance/EamInspectionOrderList.vue | 91 +++++++++++++++++++++++++++++----------------
1 files changed, 59 insertions(+), 32 deletions(-)
diff --git a/src/views/eam/maintenance/EamInspectionOrderList.vue b/src/views/eam/maintenance/EamInspectionOrderList.vue
index 4068d89..9f36e36 100644
--- a/src/views/eam/maintenance/EamInspectionOrderList.vue
+++ b/src/views/eam/maintenance/EamInspectionOrderList.vue
@@ -71,21 +71,21 @@
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<template v-if=" record.inspectionStatus === 'WAIT_INSPECTION'">
- <a v-has="'eeam:inspection:edit'" @click="handleEdit(record)">缂栬緫</a>
+ <a @click="handleEdit(record)">缂栬緫</a>
- <a-divider v-has="'eeam:inspection:edit'" type="vertical"/>
+ <a-divider type="vertical"/>
- <a-popconfirm v-has="'eam:inspection:collect'" title="纭畾棰嗗彇鍚�?" @confirm="() => handleInspection(record.id)">
+ <a-popconfirm title="纭畾棰嗗彇鍚�?" @confirm="() => handleInspection(record.id)">
<a>棰嗗彇</a>
</a-popconfirm>
- <a-divider v-has="'eam:inspection:collect'" type="vertical"/>
+ <a-divider type="vertical"/>
<a-dropdown>
<a class="ant-dropdown-link">鏇村 <a-icon type="down"/></a>
<a-menu slot="overlay">
<a-menu-item>
- <a-popconfirm v-has="'eam:inspection:abolish'" title="纭畾浣滃簾鍚�?" @confirm="() => handleAbolish(record.id)">
+ <a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handleAbolish(record.id)">
<a>浣滃簾</a>
</a-popconfirm>
</a-menu-item>
@@ -96,7 +96,14 @@
</a-dropdown>
</template>
- <a v-else @click="handleDetail(record)">璇︽儏</a>
+ <template v-else>
+ <template v-if="record.inspectionStatus=='COMPLETE'">
+ <a @click="handlePrint(record)">棰勮</a>
+ <a-divider type="vertical"/>
+ </template>
+
+ <a @click="handleDetail(record)">璇︽儏</a>
+ </template>
</span>
</a-table>
</div>
@@ -142,22 +149,26 @@
align: 'center',
customRender: function(t, r, index) {
return parseInt(index) + 1
- }
+ },
+ fixed: 'left'
},
{
title: '缁熶竴缂栫爜',
align: 'center',
- dataIndex: 'equipmentCode'
+ dataIndex: 'equipmentCode',
+ fixed: 'left'
},
{
title: '璁惧鍚嶇О',
align: 'center',
- dataIndex: 'equipmentName'
+ dataIndex: 'equipmentName',
+ fixed: 'left'
},
{
title: '璁惧鍨嬪彿',
align: 'center',
- dataIndex: 'equipmentModel'
+ dataIndex: 'equipmentModel',
+ fixed: 'left'
},
{
title: '宸ュ崟鍙�',
@@ -175,7 +186,8 @@
dataIndex: 'inspectionDate',
customRender: function(text) {
return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
- }
+ },
+ width: 150
},
{
title: '鐐规杩囨湡鏃ユ湡',
@@ -183,7 +195,8 @@
dataIndex: 'expirationTime',
customRender: function(text) {
return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
- }
+ },
+ width: 150
},
{
title: '鍒涘缓鏂瑰紡',
@@ -203,7 +216,8 @@
{
title: '鐐规鏃堕棿',
align: 'center',
- dataIndex: 'operateTime'
+ dataIndex: 'operateTime',
+ width: 150
},
{
title: '缁翠慨宸�',
@@ -213,12 +227,14 @@
{
title: '纭鏃堕棿',
align: 'center',
- dataIndex: 'confirmTime'
+ dataIndex: 'confirmTime',
+ width: 150
},
{
title: 'HF缂栫爜',
align: 'center',
- dataIndex: 'hfCode'
+ dataIndex: 'hfCode',
+ width: 250
}
],
url: {
@@ -243,7 +259,8 @@
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
- scopedSlots: { customRender: 'action' }
+ scopedSlots: { customRender: 'action' },
+ fixed: 'right'
}
this.columns = [...this.columns, operationColumn]
this.loadData(1)
@@ -260,8 +277,7 @@
this.$refs.modalFormXq.visible = true
this.$refs.modalFormXq.title = '璇︽儏'
this.$refs.modalFormXq.disableSubmit = true
- this.$refs.modalFormXq.getAllApproveData(record)
- this.$refs.modalFormXq.getBasicInformation({ ...record, dataId: record.id })
+ this.$refs.modalFormXq.handleDetail(record)
},
handleInspection(id) {
@@ -287,21 +303,25 @@
handleAbolish(id) {
var that = this
- getAction(that.url.cancelInspectionOrder, { id: id }).then((res) => {
- if (res.success) {
- that.$notification.success({
- message: '娑堟伅',
- description: res.message
- })
- that.loadData()
- } else {
- that.$notification.warning({
- message: '娑堟伅',
- description: res.message
- })
- }
- })
+ this.loading = true
+ getAction(that.url.cancelInspectionOrder, { id })
+ .then((res) => {
+ if (res.success) {
+ that.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.loadData()
+ } else {
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ this.loading = false
+ }
+ })
},
+
batchZf(type) {
var ids = ''
for (var a = 0; a < this.selectedRowKeys.length; a++) {
@@ -334,6 +354,7 @@
}
})
},
+
batchLq(type) {
var ids = ''
for (var a = 0; a < this.selectedRowKeys.length; a++) {
@@ -367,6 +388,12 @@
}
})
},
+
+ handlePrint(record) {
+ let href = `${window._CONFIG['domianURL']}/jmreport/view/1105664887569121280?equipmentCode=` + record.equipmentCode
+ window.open(href, '_blank')
+ },
+
onInspectionDateChange: function(value, dateString) {
this.queryParam.inspectionDateBegin = dateString[0]
this.queryParam.inspectionDateEnd = dateString[1]
--
Gitblit v1.9.3