From df478c8f96fe06c8838436543d069c77f2570a77 Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Thu, 9 May 2024 11:24:03 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/eam/device/deviceAccounts/index.vue | 4 ++-- .../eam/device/deviceinspectionjob/index.vue | 4 ++-- .../eam/device/devicemaintenancejob/index.vue | 4 ++++ src/views/eam/mold/moldAccounts/index.vue | 4 ++-- src/views/eam/mold/moldRepair/index.vue | 4 ++-- .../moldSpotInspectionRecordMain/index.vue | 4 ++-- .../eam/mold/moldinspectionjob/index.vue | 4 ++-- src/views/eam/mold/moldmaintainjob/index.vue | 4 ++-- .../eam/mold/moldmaintenancejob/index.vue | 23 +++++++++---------- 9 files changed, 29 insertions(+), 26 deletions(-) diff --git a/src/views/eam/device/deviceAccounts/index.vue b/src/views/eam/device/deviceAccounts/index.vue index 4e973b5..4dd5854 100644 --- a/src/views/eam/device/deviceAccounts/index.vue +++ b/src/views/eam/device/deviceAccounts/index.vue @@ -129,8 +129,8 @@ const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'eam:device-accounts:create'}), // 新增 defaultButtons.selectQrCodeBatchBtn(null), //批量生成二维码 - defaultButtons.defaultImportBtn({hasPermi:'eam:device-accounts:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'eam:device-accounts:export'}), // 导出 + // defaultButtons.defaultImportBtn({hasPermi:'eam:device-accounts:import'}), // 导入 + // defaultButtons.defaultExportBtn({hasPermi:'eam:device-accounts:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 diff --git a/src/views/eam/device/deviceinspectionjob/index.vue b/src/views/eam/device/deviceinspectionjob/index.vue index 58856c4..1dcd565 100644 --- a/src/views/eam/device/deviceinspectionjob/index.vue +++ b/src/views/eam/device/deviceinspectionjob/index.vue @@ -195,8 +195,8 @@ const judgeHasAddFunc = () => { // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultAddBtn({ hasPermi:'eam:device-inspection-job-main:create'}), // 新增 - defaultButtons.defaultImportBtn({ hasPermi:'eam:device-inspection-job-main:import'}), // 导入 - defaultButtons.defaultExportBtn({ hasPermi:'eam:device-inspection-job-main:export'}), // 导出 + // defaultButtons.defaultImportBtn({ hasPermi:'eam:device-inspection-job-main:import'}), // 导入 + // defaultButtons.defaultExportBtn({ hasPermi:'eam:device-inspection-job-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 diff --git a/src/views/eam/device/devicemaintenancejob/index.vue b/src/views/eam/device/devicemaintenancejob/index.vue index cc41ca6..f89a7e6 100644 --- a/src/views/eam/device/devicemaintenancejob/index.vue +++ b/src/views/eam/device/devicemaintenancejob/index.vue @@ -372,6 +372,10 @@ const judgeIsTheClassEngineerAndApply = (row,type) => { } }else if(row.status === 'APPLYPASS' && type == 'VERIFY'){ return true + }else if(row.requestNumber == null || row.requestNumber == ''){ + if(row.status === 'COMPLETED' && type == 'VERIFY'){ + return true + } } // 如果不是COMPLETED或APPLYPASS状态，或者COMPLETED状态下条件不满足，则默认返回false return false; diff --git a/src/views/eam/mold/moldAccounts/index.vue b/src/views/eam/mold/moldAccounts/index.vue index 3d166b2..633dc55 100644 --- a/src/views/eam/mold/moldAccounts/index.vue +++ b/src/views/eam/mold/moldAccounts/index.vue @@ -178,8 +178,8 @@ const { getList, setSearchParams } = tableMethods const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'eam:mold-accounts:create'}), // 新增 defaultButtons.selectQrCodeBatchBtn(null), //批量生成二维码 - defaultButtons.defaultImportBtn({hasPermi:'eam:mold-accounts:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'eam:mold-accounts:export'}), // 导出 + // defaultButtons.defaultImportBtn({hasPermi:'eam:mold-accounts:import'}), // 导入 + // defaultButtons.defaultExportBtn({hasPermi:'eam:mold-accounts:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 diff --git a/src/views/eam/mold/moldRepair/index.vue b/src/views/eam/mold/moldRepair/index.vue index bb6396f..67b7f88 100644 --- a/src/views/eam/mold/moldRepair/index.vue +++ b/src/views/eam/mold/moldRepair/index.vue @@ -104,8 +104,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'eam:mold-repair-request:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'eam:mold-repair-request:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'eam:mold-repair-request:export'}), // 导出 + // defaultButtons.defaultImportBtn({hasPermi:'eam:mold-repair-request:import'}), // 导入 + // defaultButtons.defaultExportBtn({hasPermi:'eam:mold-repair-request:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 diff --git a/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue b/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue index 1784027..b485ad3 100644 --- a/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue +++ b/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue @@ -217,8 +217,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ // defaultButtons.defaultAddBtn(null), // 新增 - defaultButtons.defaultImportBtn({ hasPermi:'eam:mold-spot-inspection-record-main:import'}), - defaultButtons.defaultExportBtn({ hasPermi:'eam:mold-spot-inspection-record-main:export'}), + // defaultButtons.defaultImportBtn({ hasPermi:'eam:mold-spot-inspection-record-main:import'}), + // defaultButtons.defaultExportBtn({ hasPermi:'eam:mold-spot-inspection-record-main:export'}), defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 diff --git a/src/views/eam/mold/moldinspectionjob/index.vue b/src/views/eam/mold/moldinspectionjob/index.vue index 883c47d..6f86379 100644 --- a/src/views/eam/mold/moldinspectionjob/index.vue +++ b/src/views/eam/mold/moldinspectionjob/index.vue @@ -207,8 +207,8 @@ const judgeHasAddFunc = () => { // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultAddBtn({ hasPermi:'eam:mold-inspection-job-main:create'}), // 新增 - defaultButtons.defaultImportBtn({ hasPermi:'eam:mold-inspection-job-main:import'}), - defaultButtons.defaultExportBtn({ hasPermi:'eam:mold-inspection-job-main:export'}), + // defaultButtons.defaultImportBtn({ hasPermi:'eam:mold-inspection-job-main:import'}), + // defaultButtons.defaultExportBtn({ hasPermi:'eam:mold-inspection-job-main:export'}), defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 diff --git a/src/views/eam/mold/moldmaintainjob/index.vue b/src/views/eam/mold/moldmaintainjob/index.vue index 1d4f5e7..e709bce 100644 --- a/src/views/eam/mold/moldmaintainjob/index.vue +++ b/src/views/eam/mold/moldmaintainjob/index.vue @@ -222,8 +222,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ // defaultButtons.defaultAddBtn(null), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'eam:mold-maintain-job-main:import'}), - defaultButtons.defaultExportBtn({hasPermi:'eam:mold-maintain-job-main:export'}), + // defaultButtons.defaultImportBtn({hasPermi:'eam:mold-maintain-job-main:import'}), + // defaultButtons.defaultExportBtn({hasPermi:'eam:mold-maintain-job-main:export'}), defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 diff --git a/src/views/eam/mold/moldmaintenancejob/index.vue b/src/views/eam/mold/moldmaintenancejob/index.vue index b67985e..c5f5820 100644 --- a/src/views/eam/mold/moldmaintenancejob/index.vue +++ b/src/views/eam/mold/moldmaintenancejob/index.vue @@ -357,10 +357,6 @@ const judgeIsTheClass = (row) => { } } -const judgeIsTheFactory = (row) => { - return userStore.userSelfInfo.deptId == row.factoryAreaNumber -} - const judgeIsTheClassEngineer = (row) => { const rolesOk = userStore.roles.find(item => { if (row.type == 'MOLD') { @@ -392,8 +388,8 @@ const judgeIsTheClassWorker = (row) => { // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultAddBtn({ hasPermi:'eam:mold-maintenance-job-main:create'}), // 新增 - defaultButtons.defaultImportBtn({ hasPermi:'eam:mold-maintenance-job-main:import'}), - defaultButtons.defaultExportBtn({ hasPermi:'eam:mold-maintenance-job-main:export'}), + // defaultButtons.defaultImportBtn({ hasPermi:'eam:mold-maintenance-job-main:import'}), + // defaultButtons.defaultExportBtn({ hasPermi:'eam:mold-maintenance-job-main:export'}), defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 @@ -449,7 +445,7 @@ const butttondata = (row) => { defaultButtons.acceptOrderBtn({ hasPermi:'eam:mold-maintenance-job-main:orderClick', hide: !( - row.status == 'PENDING' && judgeIsTheFactory(row) + row.status == 'PENDING' ) }), // 接单 defaultButtons.turnOrderBtn({ @@ -463,7 +459,7 @@ const butttondata = (row) => { defaultButtons.verifyOrderBtn({ hasPermi:'eam:mold-maintenance-job-main:orderClickVerify', hide: !( - judgeIsTheClassEngineerAndApply(row,'VERIFY') && judgeIsTheFactory(row) + judgeIsTheClassEngineerAndApply(row,'VERIFY') ) }), // 验证 defaultButtons.finishOrderBtn({ @@ -1163,21 +1159,24 @@ const validateRow = (row) => { return true; }; - - const judgeIsTheClassEngineerAndApply = (row,type) => { // 根据不同的状态进行判断 - if (row.status === 'COMPLETED') { + if (row.status === 'COMPLETED' && type == 'CONFIRM') { // COMPLETED状态下，需要额外判断requestNumber和declarer if(row.requestNumber != null && row.requestNumber !== '' && row.declarer === userStore.getUser.id){ return true }else{ return false } + }else if(row.status === 'APPLYPASS' && type == 'VERIFY'){ + return true + }else if(row.requestNumber == null || row.requestNumber == ''){ + if(row.status === 'COMPLETED' && type == 'VERIFY'){ + return true + } } // 如果不是COMPLETED或APPLYPASS状态，或者COMPLETED状态下条件不满足，则默认返回false return false; - } /** 初始化 **/