From 722610cdf5aa026510d5f336561b0ce09f619747 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 07 七月 2025 20:16:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/maintenance/EamInspectionOrderList.vue | 33 +++++++++++----------------------
1 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/src/views/eam/maintenance/EamInspectionOrderList.vue b/src/views/eam/maintenance/EamInspectionOrderList.vue
index c67e2f4..6490a89 100644
--- a/src/views/eam/maintenance/EamInspectionOrderList.vue
+++ b/src/views/eam/maintenance/EamInspectionOrderList.vue
@@ -107,12 +107,6 @@
</template>
<a v-else @click="handleDetail(record)">璇︽儏</a>
-
- <template v-if="record.inspectionStatus === 'COMPLETE'">
- <a-divider type="vertical"/>
-
- <a @click="handlePrint(record)">鎵撳嵃</a>
- </template>
</span>
</a-table>
</div>
@@ -164,11 +158,6 @@
}
},
{
- title: '宸ュ崟鍙�',
- align: 'center',
- dataIndex: 'orderNum'
- },
- {
title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentCode'
@@ -177,6 +166,16 @@
title: '璁惧鍚嶇О',
align: 'center',
dataIndex: 'equipmentName'
+ },
+ {
+ title: '璁惧鍨嬪彿',
+ align: 'center',
+ dataIndex: 'equipmentModel'
+ },
+ {
+ title: '宸ュ崟鍙�',
+ align: 'center',
+ dataIndex: 'orderNum'
},
{
title: '瑙勮寖鍚嶇О',
@@ -282,12 +281,8 @@
this.$refs.modalFormXq.getBasicInformation({ ...record, dataId: record.id })
},
handleInspection(id) {
- if (!this.url.receiveInspectionOrder) {
- this.$message.error('璇疯缃畊rl.receiveInspectionOrder!')
- return
- }
var that = this
- getAction(that.url.receiveInspectionOrder, { id: id }).then((res) => {
+ getAction(that.url.receiveInspectionOrder, { id }).then((res) => {
if (res.success) {
that.$notification.success({
message: '娑堟伅',
@@ -390,7 +385,6 @@
that.loadData()
that.onClearSelected()
} else {
- // that.$message.warning(res.message);
that.$notification.warning({
message: '娑堟伅',
description: res.message
@@ -407,11 +401,6 @@
this.queryParam.inspectionDateBegin = dateString[0]
this.queryParam.inspectionDateEnd = dateString[1]
},
-
- handlePrint(record) {
- let href = `${window._CONFIG['domianURL']}/jmreport/view/1094871242505912320?id=` + record.id + `&equipmentId=` + record.equipmentId + `&inspectionDate=` + record.inspectionDate //缃戠珯閾炬帴
- window.open(href, '_blank')
- }
}
}
</script>
--
Gitblit v1.9.3