From 9e24028919caa58bd61418710263f0eb7fbeba8a Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Fri, 28 Jun 2024 15:52:00 +0800 Subject: [PATCH] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20=E7=82=B9?= =?UTF-8?q?=E6=A3=80=E5=B7=A1=E6=A3=80=E4=BF=9D=E5=85=BB=20=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E4=BD=9C=E5=BA=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eam/equipmentInspectionMain/index.vue | 26 ++++++++++++++++++- .../eam/equipmentMaintenanceMain/index.vue | 25 +++++++++++++++++- .../eam/equipmentSpotCheckMain/index.vue | 25 +++++++++++++++++- src/views/eam/planInspection/index.vue | 2 +- src/views/eam/planSpotCheck/index.vue | 2 +- 5 files changed, 75 insertions(+), 5 deletions(-) diff --git a/src/views/eam/equipmentInspectionMain/index.vue b/src/views/eam/equipmentInspectionMain/index.vue index ddf2c7985..8148ea401 100644 --- a/src/views/eam/equipmentInspectionMain/index.vue +++ b/src/views/eam/equipmentInspectionMain/index.vue @@ -94,6 +94,7 @@ import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts import * as EquipmentItemApi from "@/api/eam/equipmentAccounts"; import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data"; import * as ToolItemApi from "@/api/eam/toolAccounts"; +import * as EquipmentSpotCheckMainApi from "@/api/eam/equipmentSpotCheckMain"; defineOptions({ name: 'EquipmentInspectionMain' }) @@ -189,9 +190,10 @@ const isShowEditStatusButton = (row) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hide: isShowEditStatusButton(row),hasPermi:'eam:equipmentInspectionMain:update'}), // 编辑 + defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentInspectionMain:update'}), // 编辑 defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentInspectionMain:update'}), // 接单 defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentInspectionMain:update'}), // 执行 + defaultButtons.mainListCancelBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentInspectionMain:update'}), //作废 defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentInspectionMain:update'}), // 完成巡检 defaultButtons.mainListValidateBtn({hide: isShowStatusButton(row,['6']),hasPermi:'eam:equipmentInspectionMain:update'}), // 验证 //defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:equipmentInspectionMain:update'}), @@ -213,6 +215,8 @@ const buttonTableClick = async (val, row) => { handleFinish(row) } else if (val == 'validate') { // 验证 handleValidate(row) + } else if (val == 'cancel') { // 作废 + handleCancel(row.id) } } @@ -392,6 +396,26 @@ const handleValidate = async (row) => { } +/** 作废按钮操作 */ +const handleCancel = async (id: number) => { + try { + // 二次确认 + await message.delConfirm('是否作废所选中任务？'); + const params = ref({ + id: '', + status:'', + }) + params.value.id = id + params.value.status = '8' + // 发起 + await EquipmentInspectionMainApi.updateEquipmentInspectionOrder(params.value) + message.success(t('执行成功')) + // 刷新列表 + await getList() + } catch {} +} + + const detailBasicFormOnChange = (field, item) => { //未完成 if(field == 'result' && item == '1'){ diff --git a/src/views/eam/equipmentMaintenanceMain/index.vue b/src/views/eam/equipmentMaintenanceMain/index.vue index 07d7bb31c..08c0f18ec 100644 --- a/src/views/eam/equipmentMaintenanceMain/index.vue +++ b/src/views/eam/equipmentMaintenanceMain/index.vue @@ -104,6 +104,7 @@ import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts import * as EquipmentItemApi from "@/api/eam/equipmentAccounts"; import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data"; import * as ToolItemApi from "@/api/eam/toolAccounts"; +import * as EquipmentInspectionMainApi from "@/api/eam/equipmentInspectionMain"; defineOptions({ name: 'EquipmentMaintenanceMain' }) @@ -197,9 +198,10 @@ const isShowEditStatusButton = (row) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hide: isShowEditStatusButton(row),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 编辑 + defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 编辑 defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 接单 defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 执行 + defaultButtons.mainListCancelBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentMaintenanceMain:update'}), //作废 defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 完成保养 defaultButtons.mainListValidateBtn({hide: isShowStatusButton(row,['6']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 验证 defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:equipmentMaintenanceMain:update'}), @@ -221,6 +223,8 @@ const buttonTableClick = async (val, row) => { handleFinish(row) } else if (val == 'validate') { // 验证 handleValidate(row) + } else if (val == 'cancel') { // 作废 + handleCancel(row.id) } } @@ -391,6 +395,25 @@ const handleValidate = async (row) => { } +/** 作废按钮操作 */ +const handleCancel = async (id: number) => { + try { + // 二次确认 + await message.delConfirm('是否作废所选中任务？'); + const params = ref({ + id: '', + status:'', + }) + params.value.id = id + params.value.status = '8' + // 发起 + await EquipmentMaintenanceMainApi.updateMaintenanceOrder(params.value) + message.success(t('执行成功')) + // 刷新列表 + await getList() + } catch {} +} + /** 启用 */ const handleEnable = async (id: number) => { try { diff --git a/src/views/eam/equipmentSpotCheckMain/index.vue b/src/views/eam/equipmentSpotCheckMain/index.vue index 3b076c62b..3c3026348 100644 --- a/src/views/eam/equipmentSpotCheckMain/index.vue +++ b/src/views/eam/equipmentSpotCheckMain/index.vue @@ -93,6 +93,7 @@ import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts import * as EquipmentItemApi from "@/api/eam/equipmentAccounts"; import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data"; import * as ToolItemApi from "@/api/eam/toolAccounts"; +import * as EquipmentRepairJobMainApi from "@/api/eam/equipmentRepairJobMain"; defineOptions({ name: 'EquipmentSpotCheckMain' }) @@ -187,9 +188,10 @@ const isShowEditStatusButton = (row) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hide: isShowEditStatusButton(row),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 编辑 + defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 编辑 defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 接单 defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 执行 + defaultButtons.mainListCancelBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentSpotCheckMain:update'}), //作废 defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 完成点检 defaultButtons.mainListValidateBtn({hide: isShowStatusButton(row,['6']),hasPermi:'eam:equipmentSpotCheckMain:update'}), // 验证 //defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:equipmentSpotCheckMain:update'}), @@ -211,6 +213,8 @@ const buttonTableClick = async (val, row) => { handleFinish(row) } else if (val == 'validate') { // 验证 handleValidate(row) + } else if (val == 'cancel') { // 作废 + handleCancel(row.id) } } @@ -389,6 +393,25 @@ const handleValidate = async (row) => { } +/** 作废按钮操作 */ +const handleCancel = async (id: number) => { + try { + // 二次确认 + await message.delConfirm('是否作废所选中任务？'); + const params = ref({ + id: '', + status:'', + }) + params.value.id = id + params.value.status = '8' + // 发起 + await EquipmentSpotCheckMainApi.updateEquipmentSpotCheckOrder(params.value) + message.success(t('执行成功')) + // 刷新列表 + await getList() + } catch {} +} + const detailBasicFormOnChange = (field, item) => { //异常 diff --git a/src/views/eam/planInspection/index.vue b/src/views/eam/planInspection/index.vue index 1eef0e612..237c839f1 100644 --- a/src/views/eam/planInspection/index.vue +++ b/src/views/eam/planInspection/index.vue @@ -159,7 +159,7 @@ const isShowStatusButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi:'eam:planInspection:update'}), // 编辑 + defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['0']),hasPermi:'eam:planInspection:update'}), // 编辑 defaultButtons.mainListAuditingBtn({hide: isShowStatusButton(row,['0']),hasPermi:'eam:planInspection:update'}), // 审核 defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:planInspection:update'}), // 完成 defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:planInspection:update'}), diff --git a/src/views/eam/planSpotCheck/index.vue b/src/views/eam/planSpotCheck/index.vue index 9dae3f7bd..af5403b82 100644 --- a/src/views/eam/planSpotCheck/index.vue +++ b/src/views/eam/planSpotCheck/index.vue @@ -160,7 +160,7 @@ const isShowStatusButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi:'eam:planSpotCheck:update'}), // 编辑 + defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['0']),hasPermi:'eam:planSpotCheck:update'}), // 编辑 defaultButtons.mainListAuditingBtn({hide: isShowStatusButton(row,['0']),hasPermi:'eam:planSpotCheck:update'}), // 审核 defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:planSpotCheck:update'}), // 完成 defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:planSpotCheck:update'}),