From 45132f503fdfca7ecc717a27b02bee60b785c16f Mon Sep 17 00:00:00 2001 From: “linengliang” <vanSuperEnergy@163.com> Date: 星期五, 15 九月 2023 11:50:50 +0800 Subject: [PATCH] 预测性维护计划修改 --- src/views/eam/common/MaintenanceStandardWorkInstruction.vue | 1 + src/views/eam/modules/predictiveWorkOrder/WorkInstruction.vue | 13 +++++++++++-- src/views/eam/PredictiveWorkPlanList.vue | 5 ++++- src/views/eam/common/RepairOrderDetailList.vue | 2 +- src/views/eam/modules/predictiveWorkPlan/PredictiveSpareParts.vue | 1 + src/views/eam/modules/predictiveWorkPlan/PredictiveWarn.vue | 1 + src/views/eam/common/MaintenanceStandardPlanningMaterial.vue | 1 + src/views/eam/common/JSelectMaintenanceStandardSafetyRequirementModal.vue | 1 + src/views/eam/common/MaintenanceStandardSafetyRequirement.vue | 1 + src/views/eam/modules/predictiveWorkOrder/DetailList.vue | 2 +- src/views/eam/modules/predictiveWorkPlan/PredictiveParameters.vue | 1 + 11 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/views/eam/PredictiveWorkPlanList.vue b/src/views/eam/PredictiveWorkPlanList.vue index 0a96f78..86c48d7 100644 --- a/src/views/eam/PredictiveWorkPlanList.vue +++ b/src/views/eam/PredictiveWorkPlanList.vue @@ -419,7 +419,10 @@ this.selectionRows = selectionRows this.planId = this.selectedRowKeys[0] this.equipmentId = selectionRows[0].equipment_id - this.isAdd = true + this.isAdd = selectionRows[0].status=='1'; + this.isDel = selectionRows[0].status=='1'; + this.isEdit = selectionRows[0].status=='1'; + }, onChange(e) { diff --git a/src/views/eam/common/JSelectMaintenanceStandardSafetyRequirementModal.vue b/src/views/eam/common/JSelectMaintenanceStandardSafetyRequirementModal.vue index ffd40fb..cde61ec 100644 --- a/src/views/eam/common/JSelectMaintenanceStandardSafetyRequirementModal.vue +++ b/src/views/eam/common/JSelectMaintenanceStandardSafetyRequirementModal.vue @@ -189,6 +189,7 @@ showModals(oldSelectRows) { this.oldSelectRows = oldSelectRows + this.selectionRows = []; this.visible = true this.loadData(1) }, diff --git a/src/views/eam/common/MaintenanceStandardPlanningMaterial.vue b/src/views/eam/common/MaintenanceStandardPlanningMaterial.vue index a6cc244..6e25493 100644 --- a/src/views/eam/common/MaintenanceStandardPlanningMaterial.vue +++ b/src/views/eam/common/MaintenanceStandardPlanningMaterial.vue @@ -41,6 +41,7 @@ <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)" + v-if="maintenanceStandardId !='' && isAdd " > <a>鍒犻櫎</a> </a-popconfirm> diff --git a/src/views/eam/common/MaintenanceStandardSafetyRequirement.vue b/src/views/eam/common/MaintenanceStandardSafetyRequirement.vue index fac3031..5fcb402 100644 --- a/src/views/eam/common/MaintenanceStandardSafetyRequirement.vue +++ b/src/views/eam/common/MaintenanceStandardSafetyRequirement.vue @@ -41,6 +41,7 @@ <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)" + v-if="maintenanceStandardId !='' && isAdd " > <a>鍒犻櫎</a> </a-popconfirm> diff --git a/src/views/eam/common/MaintenanceStandardWorkInstruction.vue b/src/views/eam/common/MaintenanceStandardWorkInstruction.vue index 4cd78ec..a68ade0 100644 --- a/src/views/eam/common/MaintenanceStandardWorkInstruction.vue +++ b/src/views/eam/common/MaintenanceStandardWorkInstruction.vue @@ -94,6 +94,7 @@ <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)" + v-if="maintenanceStandardId !='' && isAdd " > <a>鍒犻櫎</a> </a-popconfirm> diff --git a/src/views/eam/common/RepairOrderDetailList.vue b/src/views/eam/common/RepairOrderDetailList.vue index cad8690..8b77ce9 100644 --- a/src/views/eam/common/RepairOrderDetailList.vue +++ b/src/views/eam/common/RepairOrderDetailList.vue @@ -191,7 +191,7 @@ } ], url: { - list: "/eam/repairOrder/pageRepairOrderDetailByMainId", + list: "/eam/repairOrder/listRepairOrderDetailByMainId", delete: "/eam/repairOrder/deleteRepairOrderDetail", deleteBatch: "/eam/repairOrder/deleteBatchRepairOrderDetail", exportXlsUrl: "/eam/repairOrder/exportRepairOrderDetail", diff --git a/src/views/eam/modules/predictiveWorkOrder/DetailList.vue b/src/views/eam/modules/predictiveWorkOrder/DetailList.vue index c0434bf..cb7e1e3 100644 --- a/src/views/eam/modules/predictiveWorkOrder/DetailList.vue +++ b/src/views/eam/modules/predictiveWorkOrder/DetailList.vue @@ -183,7 +183,7 @@ }, ], url: { - list: "/eam/repairOrder/pageRepairOrderDetailByMainId", + list: "/eam/repairOrder/listRepairOrderDetailByMainId", delete: "/eam/repairOrder/deleteRepairOrderDetail", deleteBatch: "/eam/repairOrder/deleteBatchRepairOrderDetail", exportXlsUrl: "/eam/repairOrder/exportRepairOrderDetail", diff --git a/src/views/eam/modules/predictiveWorkOrder/WorkInstruction.vue b/src/views/eam/modules/predictiveWorkOrder/WorkInstruction.vue index 7a5889c..1df280d 100644 --- a/src/views/eam/modules/predictiveWorkOrder/WorkInstruction.vue +++ b/src/views/eam/modules/predictiveWorkOrder/WorkInstruction.vue @@ -90,13 +90,13 @@ @click="handleDownload(record)" >涓嬭浇</a> - <a-divider type="vertical" /> + <!-- <a-divider type="vertical" /> <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)" > <a>鍒犻櫎</a> - </a-popconfirm> + </a-popconfirm> --> </span> </a-table> @@ -204,6 +204,15 @@ scopedSlots: { customRender: 'size' }, width:200 }, + { + title: '鎿嶄綔', + align: 'center', + dataIndex: 'action', + scopedSlots: { + customRender: 'action' + }, + width:200 + } ], url: { list: "/eam/maintenanceStandardWorkInstruction/getMaintenanceStandardWorkInstructionList", diff --git a/src/views/eam/modules/predictiveWorkPlan/PredictiveParameters.vue b/src/views/eam/modules/predictiveWorkPlan/PredictiveParameters.vue index e42f96e..5d13a99 100644 --- a/src/views/eam/modules/predictiveWorkPlan/PredictiveParameters.vue +++ b/src/views/eam/modules/predictiveWorkPlan/PredictiveParameters.vue @@ -40,6 +40,7 @@ <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)" + v-if="planId != '' && isDel" > <a>鍒犻櫎</a> </a-popconfirm> diff --git a/src/views/eam/modules/predictiveWorkPlan/PredictiveSpareParts.vue b/src/views/eam/modules/predictiveWorkPlan/PredictiveSpareParts.vue index 7728307..6e9d121 100644 --- a/src/views/eam/modules/predictiveWorkPlan/PredictiveSpareParts.vue +++ b/src/views/eam/modules/predictiveWorkPlan/PredictiveSpareParts.vue @@ -41,6 +41,7 @@ <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)" + v-if="planId != '' && isAdd " > <a>鍒犻櫎</a> </a-popconfirm> diff --git a/src/views/eam/modules/predictiveWorkPlan/PredictiveWarn.vue b/src/views/eam/modules/predictiveWorkPlan/PredictiveWarn.vue index 7f4c05c..4dd80d0 100644 --- a/src/views/eam/modules/predictiveWorkPlan/PredictiveWarn.vue +++ b/src/views/eam/modules/predictiveWorkPlan/PredictiveWarn.vue @@ -40,6 +40,7 @@ <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)" + v-if="planId != '' && isAdd " > <a>鍒犻櫎</a> </a-popconfirm> -- Gitblit v1.9.3