From edfc3cb483058ba3d92315ed591dcb8a9eb6e11f Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 10 四月 2025 15:13:21 +0800
Subject: [PATCH] 修改点检
---
src/views/eam/maintenance/EamInspectionOrderList.vue | 26 ++++++++++++++++++++++++--
src/views/eam/maintenance/modules/EamInspectionOrderModal.vue | 7 +++++--
2 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/views/eam/maintenance/EamInspectionOrderList.vue b/src/views/eam/maintenance/EamInspectionOrderList.vue
index 11083ce..a7000e3 100644
--- a/src/views/eam/maintenance/EamInspectionOrderList.vue
+++ b/src/views/eam/maintenance/EamInspectionOrderList.vue
@@ -112,7 +112,7 @@
<a @click="handleDetail(record)">璇︽儏</a>
</a-menu-item>
<a-menu-item v-if="record.inspectionStatus === '1'" >
- <a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handleDelete(record.id)">
+ <a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handleOrReceive(record.id)">
<a>浣滃簾</a>
</a-popconfirm>
</a-menu-item>
@@ -237,7 +237,7 @@
],
url: {
list: "/eam/eamInspectionOrder/list",
- delete: "/eam/eamInspectionOrder/cancelInspectionOrder",
+ cancelInspectionOrder: "/eam/eamInspectionOrder/cancelInspectionOrder",
deleteBatch: "/eam/eamInspectionOrder/deleteBatch",
exportXlsUrl: "/eam/eamInspectionOrder/exportXls",
importExcelUrl: "eam/eamInspectionOrder/importExcel",
@@ -304,6 +304,28 @@
}
});
},
+ handleOrReceive(id){
+ if (!this.url.cancelInspectionOrder) {
+ this.$message.error("璇疯缃畊rl.cancelInspectionOrder!")
+ return
+ }
+ 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.$message.warning(res.message);
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ });
+ }
+ });
+ },
batchZf(type){
if (this.selectedRowKeys.length <= 0) {
this.$notification.warning({
diff --git a/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue b/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue
index 67e0612..4c49a93 100644
--- a/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue
+++ b/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue
@@ -155,6 +155,7 @@
},
maintenanceCategory: 'POINT_INSPECTION',
standardId:"",
+ standardType:false,
detail: {
loading: false,
dataSource: [],
@@ -201,11 +202,13 @@
this.detail.dataSource = [];
this.visible = true
this.editable = false
+ this.standardType=false;
},
edit(record) {
console.log(record)
this.model = Object.assign({}, record)
this.standardId=record.standardId
+ this.standardType=true;
this.visible = true
this.editable = true
this.detail.dataSource = []
@@ -271,7 +274,7 @@
this.model.standardName = selectObj.standardName
this.model.maintenancePeriod=selectObj.maintenancePeriod
this.model.standardCode=selectObj.standardCode
- if (this.standardId===undefined || this.standardId==="") {
+ if (!this.standardType) {
this.standardId=selectObj.id
this.loadDetail(selectObj.id)
}
@@ -293,7 +296,7 @@
getAction(this.url.detail, { standardId: standardId }).then(res => {
if (res.success) {
this.detail.dataSource = [...res.result]
- this.standardId=undefined;
+ this.standardType=false;
}
})
}
--
Gitblit v1.9.3