From 076533b2fbb75c373f5e7cd0a8b868187de00792 Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Tue, 23 Apr 2024 11:23:33 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eam/basic/fixedAssets/fixedAssets.data.ts | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/views/eam/basic/fixedAssets/fixedAssets.data.ts b/src/views/eam/basic/fixedAssets/fixedAssets.data.ts index 59191ff..fe6876c 100644 --- a/src/views/eam/basic/fixedAssets/fixedAssets.data.ts +++ b/src/views/eam/basic/fixedAssets/fixedAssets.data.ts @@ -73,16 +73,16 @@ export const FixedAssets = useCrudSchemas(reactive([ isSearch: true, }, { - label: '会计单位', - field: 'accountingUnit', + label: '规格型号', + field: 'specifications', sort: 'custom', table: { width: '150', }, }, { - label: '规格型号', - field: 'specifications', + label: '会计单位', + field: 'accountingUnit', sort: 'custom', table: { width: '150', @@ -147,6 +147,17 @@ export const FixedAssets = useCrudSchemas(reactive([ } } }, + { + label: '管理部门', + field: 'manageDept', + sort: 'custom', + isForm: false, + dictType: DICT_TYPE.SPECIAL_DEPT_ROLE, + dictClass: 'string', + table: { + width: '150', + }, + }, { label: '出厂日期', field: 'productionDate', From d6e77988df3d12b1f840daedf786772c90ca4f25 Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Tue, 23 Apr 2024 11:30:10 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=A3=80=E4=BF=AE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=A3=80=E4=BF=AE=E5=86=85=E5=AE=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deviceinspectionjob/deviceInspectionMain.data.ts | 12 ++++++++++++ .../moldinspectionjob/moldInspectionMain.data.ts | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/views/eam/device/deviceinspectionjob/deviceInspectionMain.data.ts b/src/views/eam/device/deviceinspectionjob/deviceInspectionMain.data.ts index 996c319..a526dcf 100644 --- a/src/views/eam/device/deviceinspectionjob/deviceInspectionMain.data.ts +++ b/src/views/eam/device/deviceinspectionjob/deviceInspectionMain.data.ts @@ -417,6 +417,18 @@ export const DeviceInspectionDetail = useCrudSchemas(reactive([ isForm: false, isTableForm: false, }, + { + label: '检修内容', + field: 'name', + sort: 'custom', + isSearch: true, + form: { + component: 'Input', + componentProps: { + type:'textarea' + } + }, + }, { label: '责任人', field: 'chargePeoples', diff --git a/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts b/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts index 0fa0432..c540491 100644 --- a/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts +++ b/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts @@ -407,6 +407,18 @@ export const MoldInspectionDetail = useCrudSchemas(reactive([ isForm: false, isTableForm: false, }, + { + label: '内容', + field: 'name', + sort: 'custom', + isSearch: true, + form: { + component: 'Input', + componentProps: { + type:'textarea' + } + }, + }, { label: '责任人', field: 'chargePeoples', From dc75ed8c68f13ea7bb231d5b2b7c94f3790bfce8 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Sun, 28 Apr 2024 13:14:08 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/eam/device/deviceAccounts/index.vue | 9 +++++---- src/views/eam/device/deviceInternalAudit/index.vue | 10 +++++----- src/views/eam/device/deviceMaintainPlan/index.vue | 6 +++--- src/views/eam/device/deviceRepair/index.vue | 8 ++++---- .../device/deviceSpotInspectionRecordMain/index.vue | 4 +++- src/views/eam/device/deviceinspectionjob/index.vue | 12 ++++++++---- src/views/eam/device/devicemaintainjob/index.vue | 11 ++++++++--- src/views/eam/device/devicemaintenancejob/index.vue | 12 ++++++++++-- src/views/eam/device/problemSolving/index.vue | 8 +++++--- 9 files changed, 51 insertions(+), 29 deletions(-) diff --git a/src/views/eam/device/deviceAccounts/index.vue b/src/views/eam/device/deviceAccounts/index.vue index b5d2230..4e973b5 100644 --- a/src/views/eam/device/deviceAccounts/index.vue +++ b/src/views/eam/device/deviceAccounts/index.vue @@ -80,6 +80,7 @@ DeviceMaintenanceDetail } from '../devicemaintenancejob/deviceMaintenanceMain.data' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' + import {hasPermi} from "@/directives/permission/hasPermi"; defineOptions({ name: 'DeviceAccounts' }) @@ -126,10 +127,10 @@ // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 + defaultButtons.defaultAddBtn({hasPermi:'eam:device-accounts:create'}), // 新增 defaultButtons.selectQrCodeBatchBtn(null), //批量生成二维码 - // defaultButtons.defaultImportBtn(null), // 导入 - // defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.defaultImportBtn({hasPermi:'eam:device-accounts:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'eam:device-accounts:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 @@ -170,7 +171,7 @@ // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListEditBtn({hasPermi:'eam:device-accounts:update'}), // 编辑 // defaultButtons.mainListDeleteBtn(null), // 删除 defaultButtons.selectQrCodeBtn(null), //二维码 defaultButtons.selectItemBtn(null) //备件 diff --git a/src/views/eam/device/deviceInternalAudit/index.vue b/src/views/eam/device/deviceInternalAudit/index.vue index aee747f..64f9355 100644 --- a/src/views/eam/device/deviceInternalAudit/index.vue +++ b/src/views/eam/device/deviceInternalAudit/index.vue @@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'eam:deviceInternalAudit:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'eam:deviceInternalAudit:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'eam:device-Internal-Audit:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'eam:device-Internal-Audit:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'eam:device-Internal-Audit:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -133,8 +133,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn(null), // 编辑 - defaultButtons.mainListDeleteBtn(null), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'eam:device-Internal-Audit:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'eam:device-Internal-Audit:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/device/deviceMaintainPlan/index.vue b/src/views/eam/device/deviceMaintainPlan/index.vue index a5b9edf..08d916e 100644 --- a/src/views/eam/device/deviceMaintainPlan/index.vue +++ b/src/views/eam/device/deviceMaintainPlan/index.vue @@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'eam:deviceMaintainPlan:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'eam:deviceMaintainPlan:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'eam:deviceMaintainPlan:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'eam:device-Maintain-Plan:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'eam:device-Maintain-Plan:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'eam:device-Maintain-Plan:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 diff --git a/src/views/eam/device/deviceRepair/index.vue b/src/views/eam/device/deviceRepair/index.vue index f23218c..475a3f3 100644 --- a/src/views/eam/device/deviceRepair/index.vue +++ b/src/views/eam/device/deviceRepair/index.vue @@ -115,9 +115,9 @@ const HeadButttondata = [ // defaultButtons.defaultAddBtn({hasPermi:'eam:deviceRepair:create'}), // 新增 // defaultButtons.defaultImportBtn({hasPermi:'eam:deviceRepair:import'}), // 导入 // defaultButtons.defaultExportBtn({ hasPermi: 'eam:deviceRepair:export' }), // 导出 - defaultButtons.defaultAddBtn(null), // 新增 - // defaultButtons.defaultImportBtn(null), // 导入 - // defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'eam:device-repair-request:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'eam:device-repair-request:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'eam:device-repair-request:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -153,7 +153,7 @@ const butttondata = (row) => { // defaultButtons.mainListEditBtn({hasPermi:'eam:deviceRepair:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({ hasPermi: 'eam:deviceRepair:delete' }), // 删除 - defaultButtons.backoutBtn({ hide: !(row.result == 'PENDING' && row.declarer == userStore.getUser.id )}), // 撤销 + defaultButtons.backoutBtn({hasPermi:'eam:device-repair-request:rejected', hide: !(row.result == 'PENDING' && row.declarer == userStore.getUser.id )}), // 撤销 ] } diff --git a/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue b/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue index 03575ed..160ee2f 100644 --- a/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue +++ b/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue @@ -218,6 +218,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ // defaultButtons.defaultAddBtn(null), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'eam:device-spot-inspection-record-main:import'}), + defaultButtons.defaultExportBtn({hasPermi:'eam:device-spot-inspection-record-main:export'}), defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 @@ -261,7 +263,7 @@ const isShowMainButton = (row, val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.approveBtn({ hide: !(row.status == 'COMPLETED' && judgeIfDeviceRole())}), // 审批 + defaultButtons.approveBtn({ hasPermi:'eam:device-spot-inspection-record-main:approve', hide: !(row.status == 'COMPLETED')}), // 审批 ] } const onChange = (field, cur, item) => { diff --git a/src/views/eam/device/deviceinspectionjob/index.vue b/src/views/eam/device/deviceinspectionjob/index.vue index 6aed69e..58856c4 100644 --- a/src/views/eam/device/deviceinspectionjob/index.vue +++ b/src/views/eam/device/deviceinspectionjob/index.vue @@ -194,7 +194,9 @@ const judgeHasAddFunc = () => { // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({ hide: !(judgeHasAddFunc()) }), // 新增 + 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.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -237,12 +239,14 @@ const butttondata = (row) => { // defaultButtons.mainListEditBtn({hasPermi:'eam:deviceInspectionMain:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'eam:deviceInspectionMain:delete'}), // 删除 // defaultButtons.mainListEditBtn({ hide: !(row.status != 'COMPLETED' && row.status != 'VERIFIED' && row.status != 'REJECTED' && isReceiver(row.maintenance))}), // 编辑 - defaultButtons.mainInspectionOrderBtn({ hide: !(row.status == 'PECEIVED' && (userStore.getUser.id == row.maintenance)) }), //检修 - defaultButtons.finishOrderBtn({ hide: !(row.status == 'PECEIVED' && (userStore.getUser.id == row.maintenance)) }), //完成 + defaultButtons.mainInspectionOrderBtn({hasPermi:'eam:device-inspection-job-main:inspection', hide: !(row.status == 'PECEIVED' && (userStore.getUser.id == row.maintenance)) }), //检修 + defaultButtons.finishOrderBtn({ hasPermi:'eam:device-inspection-job-main:orderClickFinish', hide: !(row.status == 'PECEIVED' && (userStore.getUser.id == row.maintenance)) }), //完成 defaultButtons.verifyOrderBtn({ - hide: !(row.status == 'COMPLETED' && judgeIsTheClassEngineer(row)) + hasPermi:'eam:device-inspection-job-main:orderClickVerify', + hide: !(row.status == 'COMPLETED' ) }), // 验证 defaultButtons.orderPrintBtn({ + hasPermi:'eam:device-inspection-job-main:print', hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id) || !((row.status == 'COMPLETED' || row.status == 'PECEIVED') && judgeIsTheClassEngineer(row)) }) // 打印 ] diff --git a/src/views/eam/device/devicemaintainjob/index.vue b/src/views/eam/device/devicemaintainjob/index.vue index e43f807..81df738 100644 --- a/src/views/eam/device/devicemaintainjob/index.vue +++ b/src/views/eam/device/devicemaintainjob/index.vue @@ -221,6 +221,8 @@ const { getList, setSearchParams } = tableMethods const HeadButttondata = [ // defaultButtons.defaultAddBtn({ // }), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'eam:device-maintain-job-main:import'}), + defaultButtons.defaultExportBtn({hasPermi:'eam:device-maintain-job-main:export'}), defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 @@ -260,20 +262,23 @@ const butttondata = (row) => { return [ // defaultButtons.mainListEditBtn(null), // 编辑 defaultButtons.acceptOrderBtn({ - hide: !( - row.status == 'PENDING' && judgeIsTheClass(row) - ) + hasPermi:'eam:device-maintain-job-main:orderClick', + hide: !(row.status == 'PENDING') }), // 接单 defaultButtons.maintainBtn({ + hasPermi:'eam:device-maintain-job-main:maintain', hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id) }),// 保养 defaultButtons.finishOrderBtn({ + hasPermi:'eam:device-maintain-job-main:orderClickFinish', hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id) }), // 完成 defaultButtons.verifyOrderBtn({ + hasPermi:'eam:device-maintain-job-main:orderClickVerify', hide: !(row.status == 'COMPLETED' && judgeIsTheClassEngineer(row)) }), // 验证 defaultButtons.orderPrintBtn({ + hasPermi:'eam:device-maintain-job-main:print', hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id) || !((row.status == 'COMPLETED' || row.status == 'PECEIVED') && judgeIsTheClassEngineer(row)) }) // 打印 diff --git a/src/views/eam/device/devicemaintenancejob/index.vue b/src/views/eam/device/devicemaintenancejob/index.vue index aea78c2..04259eb 100644 --- a/src/views/eam/device/devicemaintenancejob/index.vue +++ b/src/views/eam/device/devicemaintenancejob/index.vue @@ -439,7 +439,9 @@ const judgeIsTheClassWorker = (row) => { // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({ hide: !(judgeHasAddFunc()) }), // 新增 + defaultButtons.defaultAddBtn({ hasPermi:'eam:device-maintenance-job-main:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'eam:device-maintenance-job-main:import'}), + defaultButtons.defaultExportBtn({hasPermi:'eam:device-maintenance-job-main:export'}), defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 @@ -486,27 +488,33 @@ const isShowMainButton = (row, val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({ hide: !(row.status != 'COMPLETED' && row.status != 'VERIFIED' && row.status != 'REJECTED' && row.status != 'APPLYPASS' && isReceiver(row.maintenance) )}), // 编辑 + defaultButtons.mainListEditBtn({hasPermi:'eam:device-maintenance-job-main:update', hide: !(row.status != 'COMPLETED' && row.status != 'VERIFIED' && row.status != 'REJECTED' && row.status != 'APPLYPASS' && isReceiver(row.maintenance) )}), // 编辑 defaultButtons.acceptOrderBtn({ + hasPermi:'eam:device-maintenance-job-main:orderClick', hide: !( row.status == 'PENDING' && judgeIsTheClass(row) && judgeIsTheFactory(row) ) }), // 接单 defaultButtons.turnOrderBtn({ + hasPermi:'eam:device-maintenance-job-main:turnTo', hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id && !row.hasDetails ) }), // 转办 defaultButtons.repairBtn({ + hasPermi:'eam:device-maintenance-job-main:repair', hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id) }), // 维修 defaultButtons.verifyOrderBtn({ + hasPermi:'eam:device-maintenance-job-main:orderClickVerify', hide: !( judgeIsTheClassEngineerAndApply(row,'VERIFY') && judgeIsTheFactory(row) ) }), // 验证 defaultButtons.finishOrderBtn({ + hasPermi:'eam:device-maintenance-job-main:orderClickFinish', hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id && row.hasDetails) }), // 完成 defaultButtons.confirmOrderBtn({ + hasPermi:'eam:device-maintenance-job-main:orderClickConfirm', hide: !( judgeIsTheClassEngineerAndApply(row,'CONFIRM') ) diff --git a/src/views/eam/device/problemSolving/index.vue b/src/views/eam/device/problemSolving/index.vue index dae632f..a1423fa 100644 --- a/src/views/eam/device/problemSolving/index.vue +++ b/src/views/eam/device/problemSolving/index.vue @@ -108,7 +108,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null) // 新增 + defaultButtons.defaultAddBtn({hasPermi:'eam:problem-solving:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'eam:problem-solving:import'}), + defaultButtons.defaultExportBtn({hasPermi:'eam:problem-solving:export'}) // { // label: '自定义扩展按钮', // name: 'zdy', @@ -143,8 +145,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn(null), // 编辑 - defaultButtons.mainListDeleteBtn(null) // 删除 + defaultButtons.mainListEditBtn({hasPermi:'eam:problem-solving:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'eam:problem-solving:delete'}) // 删除 ] // 列表-操作按钮事件 From 9c70b5cfbfd77cebe68901d933d40df470a078b9 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 29 Apr 2024 10:25:40 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/device/deviceInspectionMain/index.ts | 6 +++--- src/api/eam/device/deviceMaintenanceMain/index.ts | 6 +++--- src/api/eam/device/deviceRepair/index.ts | 4 ++-- src/api/eam/mold/moldRepair/index.ts | 4 ++-- src/views/eam/device/deviceRepair/index.vue | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/api/eam/device/deviceInspectionMain/index.ts b/src/api/eam/device/deviceInspectionMain/index.ts index 084fee0..2330bb9 100644 --- a/src/api/eam/device/deviceInspectionMain/index.ts +++ b/src/api/eam/device/deviceInspectionMain/index.ts @@ -60,7 +60,7 @@ export const importTemplate = () => { // 检修完成 export const finishInspection = (id: number) => { - return request.get({ url: `/eam/device-inspection-job-main/onClick?id=` + id }) + return request.get({ url: `/eam/device-inspection-job-main/orderClickFinish?id=` + id }) } @@ -72,5 +72,5 @@ export const getDeviceInspectionMainNoPage = async (params) => { //验证 export const verifyOrder = async (id: number,verifyContent: string) => { - return await request.get({ url: `/eam/device-inspection-job-main/onVerify?id=`+id+`&verifyContent=` + verifyContent }) -} \ No newline at end of file + return await request.get({ url: `/eam/device-inspection-job-main/orderClickVerify?id=`+id+`&verifyContent=` + verifyContent }) +} diff --git a/src/api/eam/device/deviceMaintenanceMain/index.ts b/src/api/eam/device/deviceMaintenanceMain/index.ts index cbf5469..8684350 100644 --- a/src/api/eam/device/deviceMaintenanceMain/index.ts +++ b/src/api/eam/device/deviceMaintenanceMain/index.ts @@ -76,19 +76,19 @@ export const getDeviceMainTempList = async (type: String) => { // 完成维修工单 export const finishOrder = async (params) => { - return await request.get({ url: `/eam/device-maintenance-job-main/orderClick`, params}) + return await request.get({ url: `/eam/device-maintenance-job-main/orderClickFinish`, params}) } // 校验维修工单 export const verifyOrder = async (params) => { - return await request.get({ url: `/eam/device-maintenance-job-main/orderClick`, params}) + return await request.get({ url: `/eam/device-maintenance-job-main/orderClickVerify`, params}) } // 确认维修工单 export const confirmOrder = async (params) => { - return await request.get({ url: `/eam/device-maintenance-job-main/orderClick`, params}) + return await request.get({ url: `/eam/device-maintenance-job-main/orderClickConfirm`, params}) } diff --git a/src/api/eam/device/deviceRepair/index.ts b/src/api/eam/device/deviceRepair/index.ts index 149e64b..1751735 100644 --- a/src/api/eam/device/deviceRepair/index.ts +++ b/src/api/eam/device/deviceRepair/index.ts @@ -57,8 +57,8 @@ export const importTemplate = () => { } // 撤销申请 -export const rejected = (id: Number) => { - return request.delete({ url: '/eam/device-repair-request/rejected?id=' + id }) +export const cancel = (id: Number) => { + return request.delete({ url: '/eam/device-repair-request/cancel?id=' + id }) } diff --git a/src/api/eam/mold/moldRepair/index.ts b/src/api/eam/mold/moldRepair/index.ts index ee85c1d..e97a7d3 100644 --- a/src/api/eam/mold/moldRepair/index.ts +++ b/src/api/eam/mold/moldRepair/index.ts @@ -58,5 +58,5 @@ export const importTemplate = () => { // 撤销申请 export const rejected = (id: Number) => { - return request.delete({ url: '/eam/device-repair-request/rejected?id=' + id }) -} \ No newline at end of file + return request.delete({ url: '/eam/device-repair-request/cancel?id=' + id }) +} diff --git a/src/views/eam/device/deviceRepair/index.vue b/src/views/eam/device/deviceRepair/index.vue index 475a3f3..0ab12ff 100644 --- a/src/views/eam/device/deviceRepair/index.vue +++ b/src/views/eam/device/deviceRepair/index.vue @@ -153,7 +153,7 @@ const butttondata = (row) => { // defaultButtons.mainListEditBtn({hasPermi:'eam:deviceRepair:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({ hasPermi: 'eam:deviceRepair:delete' }), // 删除 - defaultButtons.backoutBtn({hasPermi:'eam:device-repair-request:rejected', hide: !(row.result == 'PENDING' && row.declarer == userStore.getUser.id )}), // 撤销 + defaultButtons.backoutBtn({hasPermi:'eam:device-repair-request:cancel', hide: !(row.result == 'PENDING' && row.declarer == userStore.getUser.id )}), // 撤销 ] } @@ -292,7 +292,7 @@ function handleBackout(row) { if (row.result != 'PENDING') { message.error('该报修单正在处理中，不能撤销！') } - DeviceRepairApi.rejected(row.id).then(res => { + DeviceRepairApi.cancel(row.id).then(res => { console.log("撤销成功！") getList() // 刷新当前列表 }) From f36f65f624bb3d66b5197a6b2342f360199f088c Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 29 Apr 2024 14:20:26 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=A8=A1=E5=85=B7=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/eam/mold/moldAccounts/index.vue | 8 ++++---- src/views/eam/mold/moldMaintainPlan/index.vue | 6 +++--- src/views/eam/mold/moldRepair/index.vue | 11 ++++------- .../eam/mold/moldSpotInspectionRecordMain/index.vue | 4 +++- src/views/eam/mold/moldinspectionjob/index.vue | 10 +++++++--- src/views/eam/mold/moldmaintainjob/index.vue | 8 +++++++- src/views/eam/mold/moldmaintenancejob/index.vue | 12 ++++++++++-- 7 files changed, 38 insertions(+), 21 deletions(-) diff --git a/src/views/eam/mold/moldAccounts/index.vue b/src/views/eam/mold/moldAccounts/index.vue index 094a56e..3d166b2 100644 --- a/src/views/eam/mold/moldAccounts/index.vue +++ b/src/views/eam/mold/moldAccounts/index.vue @@ -176,10 +176,10 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 + defaultButtons.defaultAddBtn({hasPermi:'eam:mold-accounts:create'}), // 新增 defaultButtons.selectQrCodeBatchBtn(null), //批量生成二维码 - // defaultButtons.defaultImportBtn(null), // 导入 - // defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.defaultImportBtn({hasPermi:'eam:mold-accounts:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'eam:mold-accounts:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 @@ -220,7 +220,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListEditBtn({hasPermi:'eam:mold-accounts:update'}), // 编辑 // defaultButtons.mainListDeleteBtn(null), // 删除 defaultButtons.selectQrCodeBtn(null), //二维码 // defaultButtons.selectItemBtn(null) //备件 diff --git a/src/views/eam/mold/moldMaintainPlan/index.vue b/src/views/eam/mold/moldMaintainPlan/index.vue index a716eb2..478c5bd 100644 --- a/src/views/eam/mold/moldMaintainPlan/index.vue +++ b/src/views/eam/mold/moldMaintainPlan/index.vue @@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'eam:moldMaintainPlan:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'eam:moldMaintainPlan:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'eam:moldMaintainPlan:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'eam:mold-maintain-plan:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'eam:mold-maintain-plan:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'eam:mold-maintain-plan: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 43ee9c5..bb6396f 100644 --- a/src/views/eam/mold/moldRepair/index.vue +++ b/src/views/eam/mold/moldRepair/index.vue @@ -103,12 +103,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - // defaultButtons.defaultAddBtn({hasPermi:'eam:moldRepair:create'}), // 新增 - // defaultButtons.defaultImportBtn({hasPermi:'eam:moldRepair:import'}), // 导入 - // defaultButtons.defaultExportBtn({ hasPermi: 'eam:moldRepair:export' }), // 导出 - defaultButtons.defaultAddBtn(null), // 新增 - // defaultButtons.defaultImportBtn(null), // 导入 - // defaultButtons.defaultExportBtn(null), // 导出 + 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.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -143,7 +140,7 @@ const butttondata = (row) => { return [ // defaultButtons.mainListEditBtn({hasPermi:'eam:moldRepair:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({ hasPermi: 'eam:moldRepair:delete' }), // 删除 - defaultButtons.backoutBtn({ hide: row.result != 'PENDING' }), // 撤销 + defaultButtons.backoutBtn({ hasPermi:'eam:mold-repair-request:cancel', hide: row.result != 'PENDING' }), // 撤销 ] } diff --git a/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue b/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue index 460cf1f..ebdb7f3 100644 --- a/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue +++ b/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue @@ -217,6 +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.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 @@ -260,7 +262,7 @@ const isShowMainButton = (row, val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.approveBtn({ hide: !(row.status == 'COMPLETED' && judgeIfMoldRole())}), // 审批 + defaultButtons.approveBtn({ hasPermi:'eam:mold-spot-inspection-record-main:approve', hide: !(row.status == 'COMPLETED' && judgeIfMoldRole())}), // 审批 ] } const onChange = (field, cur, item) => { diff --git a/src/views/eam/mold/moldinspectionjob/index.vue b/src/views/eam/mold/moldinspectionjob/index.vue index ae40292..f65ff75 100644 --- a/src/views/eam/mold/moldinspectionjob/index.vue +++ b/src/views/eam/mold/moldinspectionjob/index.vue @@ -206,7 +206,9 @@ const judgeHasAddFunc = () => { // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({ hide: !(judgeHasAddFunc())}), // 新增 + 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.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -245,12 +247,14 @@ const butttondata = (row) => { // defaultButtons.mainListEditBtn({hasPermi:'eam:moldInspectionMain:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'eam:moldInspectionMain:delete'}), // 删除 // defaultButtons.mainListEditBtn({ hide: !(row.status != 'COMPLETED' && row.status != 'VERIFIED' && row.status != 'REJECTED' && isReceiver(row.maintenance))}), // 编辑 - defaultButtons.mainInspectionOrderBtn({ hide: !(row.status == 'PECEIVED' && (userStore.getUser.id == row.maintenance)) }), //检修 - defaultButtons.finishOrderBtn({ hide: !(row.status == 'PECEIVED' && (userStore.getUser.id == row.maintenance)) }), //完成 + defaultButtons.mainInspectionOrderBtn({ hasPermi:'eam:mold-inspection-job-main:inspection', hide: !(row.status == 'PECEIVED' && (userStore.getUser.id == row.maintenance)) }), //检修 + defaultButtons.finishOrderBtn({ hasPermi:'eam:mold-inspection-job-main:orderClickFinish', hide: !(row.status == 'PECEIVED' && (userStore.getUser.id == row.maintenance)) }), //完成 defaultButtons.verifyOrderBtn({ + hasPermi:'eam:mold-inspection-job-main:orderClickVerify', hide: !(row.status == 'COMPLETED' && judgeIsTheClassEngineer(row)) }), // 验证 defaultButtons.orderPrintBtn({ + hasPermi:'eam:mold-inspection-job-main:print', hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id) || !((row.status == 'COMPLETED' || row.status == 'PECEIVED') && judgeIsTheClassEngineer(row)) }) // 打印 ] diff --git a/src/views/eam/mold/moldmaintainjob/index.vue b/src/views/eam/mold/moldmaintainjob/index.vue index 2bef166..5a612b4 100644 --- a/src/views/eam/mold/moldmaintainjob/index.vue +++ b/src/views/eam/mold/moldmaintainjob/index.vue @@ -222,6 +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.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 @@ -261,21 +263,25 @@ const butttondata = (row) => { return [ // defaultButtons.mainListEditBtn(null), // 编辑 defaultButtons.acceptOrderBtn({ - + hasPermi:'eam:mold-maintain-job-main:orderClick', hide: !( row.status == 'PENDING' && judgeIsTheClass(row) ) }), // 接单 defaultButtons.maintainBtn({ + hasPermi:'eam:mold-maintain-job-main:maintain', hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id) }),// 保养 defaultButtons.finishOrderBtn({ + hasPermi:'eam:mold-maintain-job-main:orderClickFinish', hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id) }), // 完成 defaultButtons.verifyOrderBtn({ + hasPermi:'eam:mold-maintain-job-main:orderClickVerify', hide: !(row.status == 'COMPLETED' && judgeIsTheClassEngineer(row)) }), // 验证 defaultButtons.orderPrintBtn({ + hasPermi:'eam:mold-maintain-job-main:print', hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id) || !((row.status == 'COMPLETED' || row.status == 'PECEIVED') && judgeIsTheClassEngineer(row)) }) // 打印 ] diff --git a/src/views/eam/mold/moldmaintenancejob/index.vue b/src/views/eam/mold/moldmaintenancejob/index.vue index 8e50844..8955b3d 100644 --- a/src/views/eam/mold/moldmaintenancejob/index.vue +++ b/src/views/eam/mold/moldmaintenancejob/index.vue @@ -391,7 +391,9 @@ const judgeIsTheClassWorker = (row) => { // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({ hide: !(judgeHasAddFunc())}), // 新增 + 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.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 @@ -443,27 +445,33 @@ const isShowMainButton = (row, val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({ hide: !(row.status != 'COMPLETED' && row.status != 'VERIFIED' && row.status != 'REJECTED' && row.status != 'APPLYPASS' && isReceiver(row.maintenance) )}), // 编辑 + defaultButtons.mainListEditBtn({hasPermi:'eam:mold-maintenance-job-main:update', hide: !(row.status != 'COMPLETED' && row.status != 'VERIFIED' && row.status != 'REJECTED' && row.status != 'APPLYPASS' && isReceiver(row.maintenance) )}), // 编辑 defaultButtons.acceptOrderBtn({ + hasPermi:'eam:mold-maintenance-job-main:orderClick', hide: !( row.status == 'PENDING' && judgeIsTheClass(row) && judgeIsTheFactory(row) ) }), // 接单 defaultButtons.turnOrderBtn({ + hasPermi:'eam:mold-maintenance-job-main:turnTo', hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id && !row.hasDetails) }), // 转办 defaultButtons.repairBtn({ + hasPermi:'eam:mold-maintenance-job-main:repair', hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id) }), // 维修 defaultButtons.verifyOrderBtn({ + hasPermi:'eam:mold-maintenance-job-main:orderClickVerify', hide: !( judgeIsTheClassEngineerAndApply(row,'VERIFY') && judgeIsTheFactory(row) ) }), // 验证 defaultButtons.finishOrderBtn({ + hasPermi:'eam:mold-maintenance-job-main:orderClickFinish', hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id && row.hasDetails) }), // 完成 defaultButtons.confirmOrderBtn({ + hasPermi:'eam:mold-maintenance-job-main:orderClickConfirm', hide: !( judgeIsTheClassEngineerAndApply(row,'CONFIRM') ) From 563e25db7cc7e37277328711cf999eadaa1e7901 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 29 Apr 2024 14:43:52 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/mold/moldMaintenanceMain/index.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api/eam/mold/moldMaintenanceMain/index.ts b/src/api/eam/mold/moldMaintenanceMain/index.ts index 783a57f..63e52c7 100644 --- a/src/api/eam/mold/moldMaintenanceMain/index.ts +++ b/src/api/eam/mold/moldMaintenanceMain/index.ts @@ -76,17 +76,17 @@ export const getMoldMainTempList = async (type: String) => { // 完成维修工单 export const finishOrder = async (params) => { - return await request.get({ url: `/eam/device-maintenance-job-main/orderClick`, params}) + return await request.get({ url: `/eam/device-maintenance-job-main/orderClickFinish`, params}) } // 申请人确认工单 export const confirmOrder = async (params) => { - return await request.get({ url: `/eam/device-maintenance-job-main/orderClick`, params}) + return await request.get({ url: `/eam/device-maintenance-job-main/orderClickConfirm`, params}) } // 校验维修工单 export const verifyOrder = async (params) => { - return await request.get({ url: `/eam/device-maintenance-job-main/orderClick`, params}) -} \ No newline at end of file + return await request.get({ url: `/eam/device-maintenance-job-main/orderClickVerify`, params}) +} From d84f95b128a640581253e712622cbb63d858d8cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Mon, 29 Apr 2024 15:39:56 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/eam/basic/basciYearEquipment/index.vue | 6 +++--- src/views/eam/basic/basicMonthEquipment/index.vue | 4 ++-- src/views/eam/basic/deviceMaintenance/index.vue | 8 ++++---- src/views/eam/basic/inspection/index.vue | 8 ++++---- src/views/eam/basic/item/index.vue | 10 +++++----- src/views/eam/basic/location/index.vue | 8 ++++---- src/views/eam/basic/locationArea/index.vue | 8 ++++---- src/views/eam/basic/moldInspection/index.vue | 8 ++++---- src/views/eam/basic/moldMaintenance/index.vue | 8 ++++---- src/views/eam/basic/supplier/index.vue | 8 ++++---- src/views/eam/item/applicationRecord/index.vue | 2 +- src/views/eam/item/countRecord/index.vue | 2 +- src/views/eam/item/countadjustPlan/index.vue | 2 +- src/views/eam/item/countadjustWork/index.vue | 4 ++-- src/views/eam/item/itemAccounts/index.vue | 12 ++++++------ src/views/eam/item/itemApplyMain/index.vue | 4 ++-- src/views/eam/item/itemInLocation/index.vue | 11 +++++------ src/views/eam/item/itemMaintenance/index.vue | 9 ++++----- src/views/eam/item/itemOrderMain/index.vue | 4 ++-- src/views/eam/item/itemOutLocation/index.vue | 9 ++++----- src/views/eam/item/replaceItemDes/index.vue | 6 +++--- src/views/eam/item/transaction/index.vue | 8 ++++---- 22 files changed, 73 insertions(+), 76 deletions(-) diff --git a/src/views/eam/basic/basciYearEquipment/index.vue b/src/views/eam/basic/basciYearEquipment/index.vue index 3d5009b..e11e831 100644 --- a/src/views/eam/basic/basciYearEquipment/index.vue +++ b/src/views/eam/basic/basciYearEquipment/index.vue @@ -112,7 +112,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 + defaultButtons.defaultAddBtn({hasPermi:'basic:BasciYearEquipment:create'}), // 新增 // defaultButtons.defaultImportBtn(null), // 导入 //defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 @@ -152,8 +152,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn(null), // 编辑 - defaultButtons.mainListDeleteBtn(null) // 删除 + defaultButtons.mainListEditBtn({hasPermi:'basic:BasciYearEquipment:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'basic:BasciYearEquipment:delete'}) // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/basic/basicMonthEquipment/index.vue b/src/views/eam/basic/basicMonthEquipment/index.vue index c7deb1d..20ca336 100644 --- a/src/views/eam/basic/basicMonthEquipment/index.vue +++ b/src/views/eam/basic/basicMonthEquipment/index.vue @@ -98,7 +98,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ //defaultButtons.defaultAddBtn(null), // 新增 - defaultButtons.defaultImportBtn(null), // 导入 + defaultButtons.defaultImportBtn({hasPermi:'basic:BasciYearEquipment:export'}), // 导入 // defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 // defaultButtons.defaultFilterBtn(null), // 筛选 @@ -132,7 +132,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ //defaultButtons.mainListEditBtn(null), // 编辑 - defaultButtons.mainListDeleteBtn(null), // 删除 + defaultButtons.mainListDeleteBtn({hasPermi:'basic:BasciYearEquipment:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/basic/deviceMaintenance/index.vue b/src/views/eam/basic/deviceMaintenance/index.vue index 4582ff7..2fd8896 100644 --- a/src/views/eam/basic/deviceMaintenance/index.vue +++ b/src/views/eam/basic/deviceMaintenance/index.vue @@ -160,8 +160,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 - defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'basic:deviceMaintenance:create'}), // 新增 + defaultButtons.defaultExportBtn({hasPermi:'basic:deviceMaintenance:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -191,8 +191,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn(null), // 编辑 - defaultButtons.mainListDeleteBtn(null), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'basic:deviceMaintenance:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'basic:deviceMaintenance:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/basic/inspection/index.vue b/src/views/eam/basic/inspection/index.vue index 5a9a669..d01c72e 100644 --- a/src/views/eam/basic/inspection/index.vue +++ b/src/views/eam/basic/inspection/index.vue @@ -133,8 +133,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 - defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'basic:inspection:create'}), // 新增 + defaultButtons.defaultExportBtn({hasPermi:'basic:inspection:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -164,8 +164,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn(null), // 编辑 - defaultButtons.mainListDeleteBtn(null), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'basic:inspection:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'basic:inspection:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/basic/item/index.vue b/src/views/eam/basic/item/index.vue index 2ffaf68..c43a779 100644 --- a/src/views/eam/basic/item/index.vue +++ b/src/views/eam/basic/item/index.vue @@ -83,8 +83,8 @@ // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 - defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'basic:locationArea:create'}), // 新增 + defaultButtons.defaultExportBtn({hasPermi:'basic:locationArea:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -106,9 +106,9 @@ // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn(null), // 编辑 - defaultButtons.chooseDeviceBtn(null),//备件 - defaultButtons.mainListDeleteBtn(null), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'basic:locationArea:update'}), // 编辑 + defaultButtons.chooseDeviceBtn({hasPermi:'basic:locationArea:choose'}),//备件 + defaultButtons.mainListDeleteBtn({hasPermi:'basic:locationArea:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/basic/location/index.vue b/src/views/eam/basic/location/index.vue index 74180a6..df9c4b3 100644 --- a/src/views/eam/basic/location/index.vue +++ b/src/views/eam/basic/location/index.vue @@ -88,8 +88,8 @@ // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 - defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'basic:location:create'}), // 新增 + defaultButtons.defaultExportBtn({hasPermi:'basic:location:update'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -119,8 +119,8 @@ // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn(null), // 编辑 - defaultButtons.mainListDeleteBtn(null), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'basic:location:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'basic:location:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/basic/locationArea/index.vue b/src/views/eam/basic/locationArea/index.vue index 5dc03e0..9a2c763 100644 --- a/src/views/eam/basic/locationArea/index.vue +++ b/src/views/eam/basic/locationArea/index.vue @@ -79,8 +79,8 @@ // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 - defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'basic:locationArea:query'}), // 新增 + defaultButtons.defaultExportBtn({hasPermi:'basic:locationArea:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -110,8 +110,8 @@ // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn(null), // 编辑 - defaultButtons.mainListDeleteBtn(null), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'basic:locationArea:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'basic:locationArea:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/basic/moldInspection/index.vue b/src/views/eam/basic/moldInspection/index.vue index c56563b..2caca7a 100644 --- a/src/views/eam/basic/moldInspection/index.vue +++ b/src/views/eam/basic/moldInspection/index.vue @@ -96,8 +96,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 - defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'basic:MoldInspection:create'}), // 新增 + defaultButtons.defaultExportBtn({hasPermi:'basic:MoldInspection:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -127,8 +127,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn(null), // 编辑 - defaultButtons.mainListDeleteBtn(null), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'basic:MoldInspection:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'basic:MoldInspection:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/basic/moldMaintenance/index.vue b/src/views/eam/basic/moldMaintenance/index.vue index 39ac48a..aa1da49 100644 --- a/src/views/eam/basic/moldMaintenance/index.vue +++ b/src/views/eam/basic/moldMaintenance/index.vue @@ -156,8 +156,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 - defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'basic:moldMaintenance:create'}), // 新增 + defaultButtons.defaultExportBtn({hasPermi:'basic:moldMaintenance:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -187,8 +187,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn(null), // 编辑 - defaultButtons.mainListDeleteBtn(null), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'basic:moldMaintenance:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'basic:moldMaintenance:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/basic/supplier/index.vue b/src/views/eam/basic/supplier/index.vue index d8940c4..84e0e8c 100644 --- a/src/views/eam/basic/supplier/index.vue +++ b/src/views/eam/basic/supplier/index.vue @@ -80,8 +80,8 @@ // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 - defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'basic:supplier:create'}), // 新增 + defaultButtons.defaultExportBtn({hasPermi:'basic:supplier:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -111,8 +111,8 @@ // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn(null), // 编辑 - defaultButtons.mainListDeleteBtn(null), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'basic:supplier:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'basic:supplier:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/item/applicationRecord/index.vue b/src/views/eam/item/applicationRecord/index.vue index ff045e2..7e81e1a 100644 --- a/src/views/eam/item/applicationRecord/index.vue +++ b/src/views/eam/item/applicationRecord/index.vue @@ -173,7 +173,7 @@ // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.approveBtn({ hide: isShowMainButton(row, ['0']) }), // 审批 + defaultButtons.approveBtn({ hide: isShowMainButton(row, ['0']) ,hasPermi:'item:itemApplyMain:approve'}), // 审批 // defaultButtons.mainListEditBtn(null), // 编辑 // defaultButtons.mainListDeleteBtn(null), // 删除 ] diff --git a/src/views/eam/item/countRecord/index.vue b/src/views/eam/item/countRecord/index.vue index 0f2a13e..ace2e98 100644 --- a/src/views/eam/item/countRecord/index.vue +++ b/src/views/eam/item/countRecord/index.vue @@ -162,7 +162,7 @@ // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainAdjust({ hide: isShowMainButton(row, ['CANGENERATE']) }),// 盘点调整 + defaultButtons.mainAdjust({ hide: isShowMainButton(row, ['CANGENERATE']),hasPermi:'item:countRecord:adjust' }),// 盘点调整 ] } diff --git a/src/views/eam/item/countadjustPlan/index.vue b/src/views/eam/item/countadjustPlan/index.vue index ab4f794..9d1237d 100644 --- a/src/views/eam/item/countadjustPlan/index.vue +++ b/src/views/eam/item/countadjustPlan/index.vue @@ -99,7 +99,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 + defaultButtons.defaultAddBtn({hasPermi:'item:countadjustPlan:create'}), // 新增 // defaultButtons.defaultImportBtn(null), // 导入 // defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 diff --git a/src/views/eam/item/countadjustWork/index.vue b/src/views/eam/item/countadjustWork/index.vue index 3e8b981..4604c88 100644 --- a/src/views/eam/item/countadjustWork/index.vue +++ b/src/views/eam/item/countadjustWork/index.vue @@ -156,8 +156,8 @@ // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainExport(null),// 导出 - defaultButtons.mainAdjustImport(null),// 导入 + defaultButtons.mainExport({hasPermi:'item:countadjustWork:export'}),// 导出 + defaultButtons.mainAdjustImport({hasPermi:'item:countadjustWork:import'}),// 导入 ] } diff --git a/src/views/eam/item/itemAccounts/index.vue b/src/views/eam/item/itemAccounts/index.vue index 08196d2..617a2a6 100644 --- a/src/views/eam/item/itemAccounts/index.vue +++ b/src/views/eam/item/itemAccounts/index.vue @@ -85,9 +85,9 @@ // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({ hasPermi: 'eam:itemAccounts:create' }), // 新增 - defaultButtons.defaultImportBtn({ hasPermi: 'eam:itemAccounts:import' }), // 导入 - defaultButtons.defaultExportBtn({ hasPermi: 'eam:itemAccounts:export' }), // 导出 + defaultButtons.defaultAddBtn({ hasPermi: 'item:itemAccounts:create' }), // 新增 + defaultButtons.defaultImportBtn({ hasPermi: 'item:itemAccounts:import' }), // 导入 + defaultButtons.defaultExportBtn({ hasPermi: 'item:itemAccounts:export' }), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -119,9 +119,9 @@ // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({ hasPermi: 'eam:itemAccounts:update' }), // 编辑 - defaultButtons.replaceLocation(null), //更换库位 - defaultButtons.mainListDeleteBtn({ hasPermi: 'eam:itemAccounts:delete' }), // 删除 + defaultButtons.mainListEditBtn({ hasPermi: 'item:itemAccounts:update' }), // 编辑 + defaultButtons.replaceLocation({ hasPermi: 'item:itemAccounts:replaceLocation' }), //更换库位 + defaultButtons.mainListDeleteBtn({ hasPermi: 'item:itemAccounts:delete' }), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/item/itemApplyMain/index.vue b/src/views/eam/item/itemApplyMain/index.vue index 7b8aed1..e28ae16 100644 --- a/src/views/eam/item/itemApplyMain/index.vue +++ b/src/views/eam/item/itemApplyMain/index.vue @@ -143,7 +143,7 @@ // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 + defaultButtons.defaultAddBtn({hasPermi:'item:itemApplyMain:create'}), // 新增 // defaultButtons.defaultImportBtn(null), // 导入 // defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 @@ -185,7 +185,7 @@ // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.backoutBtn({ hide: isShowMainButton(row, ['0']) }), // 撤回 + defaultButtons.backoutBtn({ hide: isShowMainButton(row, ['0']) ,hasPermi:'item:itemApplyMain:backout'}), // 撤回 // defaultButtons.mainListEditBtn(null), // 编辑 // defaultButtons.mainListDeleteBtn(null), // 删除 ] diff --git a/src/views/eam/item/itemInLocation/index.vue b/src/views/eam/item/itemInLocation/index.vue index 82f1e88..5b1b7ca 100644 --- a/src/views/eam/item/itemInLocation/index.vue +++ b/src/views/eam/item/itemInLocation/index.vue @@ -81,9 +81,8 @@ // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({ hasPermi: 'eam:itemInLocation:create' }), // 新增 - defaultButtons.defaultImportBtn({ hasPermi: 'eam:itemInLocation:import' }), // 导入 - defaultButtons.defaultExportBtn({ hasPermi: 'eam:itemInLocation:export' }), // 导出 + defaultButtons.defaultAddBtn({ hasPermi: 'item:itemInLocation:create' }), // 新增 + defaultButtons.defaultExportBtn({ hasPermi: 'item:itemInLocation:export' }), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -115,8 +114,8 @@ // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({ hasPermi: 'eam:itemInLocation:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({ hasPermi: 'eam:itemInLocation:delete' }), // 删除 + defaultButtons.mainListEditBtn({ hasPermi: 'item:itemInLocation:update' }), // 编辑 + defaultButtons.mainListDeleteBtn({ hasPermi: 'item:itemInLocation:delete' }), // 删除 ] // 列表-操作按钮事件 @@ -222,4 +221,4 @@ getList() importTemplateData.templateUrl = await ItemInLocationApi.importTemplate() }) - \ No newline at end of file + diff --git a/src/views/eam/item/itemMaintenance/index.vue b/src/views/eam/item/itemMaintenance/index.vue index 2fde18f..9118985 100644 --- a/src/views/eam/item/itemMaintenance/index.vue +++ b/src/views/eam/item/itemMaintenance/index.vue @@ -99,9 +99,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'eam:itemMaintenance:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'eam:itemMaintenance:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'eam:itemMaintenance:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'item:itemMaintenance:create'}), // 新增 + defaultButtons.defaultExportBtn({hasPermi:'item:itemMaintenance:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -133,8 +132,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'eam:itemMaintenance:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'eam:itemMaintenance:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'item:itemMaintenance:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'item:itemMaintenance:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/item/itemOrderMain/index.vue b/src/views/eam/item/itemOrderMain/index.vue index f49e7b6..6702bb0 100644 --- a/src/views/eam/item/itemOrderMain/index.vue +++ b/src/views/eam/item/itemOrderMain/index.vue @@ -116,7 +116,7 @@ // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 + defaultButtons.defaultAddBtn({hasPermi:'item:itemApplyMain:create'}), // 新增 // defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 @@ -159,7 +159,7 @@ // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']) }), // 完成 + defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']),hasPermi:'item:itemApplyMain:create' }), // 完成 // defaultButtons.mainListEditBtn(null), // 编辑 // defaultButtons.mainListDeleteBtn(null), // 删除 ] diff --git a/src/views/eam/item/itemOutLocation/index.vue b/src/views/eam/item/itemOutLocation/index.vue index 3a1f30a..2d56d2d 100644 --- a/src/views/eam/item/itemOutLocation/index.vue +++ b/src/views/eam/item/itemOutLocation/index.vue @@ -99,9 +99,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'eam:itemOutLocation:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'eam:itemOutLocation:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'eam:itemOutLocation:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'item:itemOutLocation:create'}), // 新增 + defaultButtons.defaultExportBtn({hasPermi:'item:itemOutLocation:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -133,8 +132,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'eam:itemOutLocation:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'eam:itemOutLocation:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'item:itemOutLocation:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'item:itemOutLocation:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/item/replaceItemDes/index.vue b/src/views/eam/item/replaceItemDes/index.vue index 480867f..90d2203 100644 --- a/src/views/eam/item/replaceItemDes/index.vue +++ b/src/views/eam/item/replaceItemDes/index.vue @@ -79,7 +79,7 @@ // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 + defaultButtons.defaultAddBtn({hasPermi:'item:replaceItemDes:create'}), // 新增 // { // label: '自定义扩展按钮', // name: 'zdy', @@ -108,8 +108,8 @@ // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn(null), // 编辑 - defaultButtons.mainListDeleteBtn(null), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'item:replaceItemDes:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'item:replaceItemDes:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/item/transaction/index.vue b/src/views/eam/item/transaction/index.vue index 875dc25..d87e485 100644 --- a/src/views/eam/item/transaction/index.vue +++ b/src/views/eam/item/transaction/index.vue @@ -97,9 +97,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'eam::create'}), // 新增 + defaultButtons.defaultAddBtn({hasPermi:'item:transaction:create'}), // 新增 defaultButtons.defaultImportBtn({hasPermi:'eam::import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'eam::export'}), // 导出 + defaultButtons.defaultExportBtn({hasPermi:'item:transaction:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -131,8 +131,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'eam::update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'eam::delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'item:transaction:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'item:transaction:delete'}), // 删除 ] // 列表-操作按钮事件 From 69cdc05c518aefc52881680f6f54a8095cb03623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Mon, 29 Apr 2024 17:15:57 +0800 Subject: [PATCH 8/9] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/eam/basic/basicMonthEquipment/index.vue | 4 ++-- src/views/eam/basic/inspection/index.vue | 8 ++++---- src/views/eam/basic/item/index.vue | 10 +++++----- src/views/eam/basic/locationArea/index.vue | 2 +- src/views/eam/basic/moldInspection/index.vue | 8 ++++---- src/views/eam/basic/moldMaintenance/index.vue | 8 ++++---- src/views/eam/item/itemLocationReplace/index.vue | 10 +++++----- src/views/eam/item/itemOrderMain/index.vue | 4 ++-- src/views/eam/item/transaction/index.vue | 2 +- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/views/eam/basic/basicMonthEquipment/index.vue b/src/views/eam/basic/basicMonthEquipment/index.vue index 20ca336..dbb71e5 100644 --- a/src/views/eam/basic/basicMonthEquipment/index.vue +++ b/src/views/eam/basic/basicMonthEquipment/index.vue @@ -98,7 +98,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ //defaultButtons.defaultAddBtn(null), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'basic:BasciYearEquipment:export'}), // 导入 + defaultButtons.defaultImportBtn({hasPermi:'basic:BasicMonthEquipment:export'}), // 导入 // defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 // defaultButtons.defaultFilterBtn(null), // 筛选 @@ -132,7 +132,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ //defaultButtons.mainListEditBtn(null), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'basic:BasciYearEquipment:delete'}), // 删除 + defaultButtons.mainListDeleteBtn({hasPermi:'basic:BasicMonthEquipment:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/basic/inspection/index.vue b/src/views/eam/basic/inspection/index.vue index d01c72e..d69f35f 100644 --- a/src/views/eam/basic/inspection/index.vue +++ b/src/views/eam/basic/inspection/index.vue @@ -133,8 +133,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'basic:inspection:create'}), // 新增 - defaultButtons.defaultExportBtn({hasPermi:'basic:inspection:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'basic:deviceMaintenance:create'}), // 新增 + defaultButtons.defaultExportBtn({hasPermi:'basic:deviceMaintenance:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -164,8 +164,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'basic:inspection:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'basic:inspection:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'basic:deviceMaintenance:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'basic:deviceMaintenance:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/basic/item/index.vue b/src/views/eam/basic/item/index.vue index c43a779..d5b29eb 100644 --- a/src/views/eam/basic/item/index.vue +++ b/src/views/eam/basic/item/index.vue @@ -83,8 +83,8 @@ // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'basic:locationArea:create'}), // 新增 - defaultButtons.defaultExportBtn({hasPermi:'basic:locationArea:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'basic:item:create'}), // 新增 + defaultButtons.defaultExportBtn({hasPermi:'basic:item:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -106,9 +106,9 @@ // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'basic:locationArea:update'}), // 编辑 - defaultButtons.chooseDeviceBtn({hasPermi:'basic:locationArea:choose'}),//备件 - defaultButtons.mainListDeleteBtn({hasPermi:'basic:locationArea:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'basic:item:update'}), // 编辑 + defaultButtons.chooseDeviceBtn({hasPermi:'basic:item:choose'}),//备件 + defaultButtons.mainListDeleteBtn({hasPermi:'basic:item:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/basic/locationArea/index.vue b/src/views/eam/basic/locationArea/index.vue index 9a2c763..021e5e9 100644 --- a/src/views/eam/basic/locationArea/index.vue +++ b/src/views/eam/basic/locationArea/index.vue @@ -79,7 +79,7 @@ // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'basic:locationArea:query'}), // 新增 + defaultButtons.defaultAddBtn({hasPermi:'basic:locationArea:create'}), // 新增 defaultButtons.defaultExportBtn({hasPermi:'basic:locationArea:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 diff --git a/src/views/eam/basic/moldInspection/index.vue b/src/views/eam/basic/moldInspection/index.vue index 2caca7a..148db3f 100644 --- a/src/views/eam/basic/moldInspection/index.vue +++ b/src/views/eam/basic/moldInspection/index.vue @@ -96,8 +96,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'basic:MoldInspection:create'}), // 新增 - defaultButtons.defaultExportBtn({hasPermi:'basic:MoldInspection:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'basic:deviceMaintenance:create'}), // 新增 + defaultButtons.defaultExportBtn({hasPermi:'basic:deviceMaintenance:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -127,8 +127,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'basic:MoldInspection:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'basic:MoldInspection:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'basic:deviceMaintenance:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'basic:deviceMaintenance:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/basic/moldMaintenance/index.vue b/src/views/eam/basic/moldMaintenance/index.vue index aa1da49..5aec4a6 100644 --- a/src/views/eam/basic/moldMaintenance/index.vue +++ b/src/views/eam/basic/moldMaintenance/index.vue @@ -156,8 +156,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'basic:moldMaintenance:create'}), // 新增 - defaultButtons.defaultExportBtn({hasPermi:'basic:moldMaintenance:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'basic:deviceMaintenance:create'}), // 新增 + defaultButtons.defaultExportBtn({hasPermi:'basic:deviceMaintenance:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -187,8 +187,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'basic:moldMaintenance:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'basic:moldMaintenance:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'basic:deviceMaintenance:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'basic:deviceMaintenance:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/item/itemLocationReplace/index.vue b/src/views/eam/item/itemLocationReplace/index.vue index 4497063..3037843 100644 --- a/src/views/eam/item/itemLocationReplace/index.vue +++ b/src/views/eam/item/itemLocationReplace/index.vue @@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'eam:itemLocationReplace:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'eam:itemLocationReplace:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'eam:itemLocationReplace:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'item:itemLocationReplace:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'item:itemLocationReplace:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'item:itemLocationReplace:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -133,8 +133,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'eam:itemLocationReplace:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'eam:itemLocationReplace:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'item:itemLocationReplace:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'item:itemLocationReplace:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/item/itemOrderMain/index.vue b/src/views/eam/item/itemOrderMain/index.vue index 6702bb0..ed3d5db 100644 --- a/src/views/eam/item/itemOrderMain/index.vue +++ b/src/views/eam/item/itemOrderMain/index.vue @@ -116,7 +116,7 @@ // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'item:itemApplyMain:create'}), // 新增 + defaultButtons.defaultAddBtn({hasPermi:'item:itemOrderMain:create'}), // 新增 // defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 @@ -159,7 +159,7 @@ // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']),hasPermi:'item:itemApplyMain:create' }), // 完成 + defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']),hasPermi:'item:itemOrderMain:create' }), // 完成 // defaultButtons.mainListEditBtn(null), // 编辑 // defaultButtons.mainListDeleteBtn(null), // 删除 ] diff --git a/src/views/eam/item/transaction/index.vue b/src/views/eam/item/transaction/index.vue index d87e485..27e45cc 100644 --- a/src/views/eam/item/transaction/index.vue +++ b/src/views/eam/item/transaction/index.vue @@ -98,7 +98,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'item:transaction:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'eam::import'}), // 导入 + defaultButtons.defaultImportBtn({hasPermi:'item:transaction:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'item:transaction:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 From 72f656a8524c1c5b70c06e2eb94d7d92f49e6d3b Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 29 Apr 2024 17:34:04 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eam/mold/moldInspectionDetail/index.ts | 18 ++++++------ src/api/eam/mold/moldInspectionMain/index.ts | 22 +++++++-------- .../eam/mold/moldMaintainOrderDetail/index.ts | 18 ++++++------ .../eam/mold/moldMaintainOrderMain/index.ts | 22 +++++++-------- src/api/eam/mold/moldMaintainPlan/index.ts | 18 ++++++------ .../eam/mold/moldMaintenanceDetail/index.ts | 10 +++---- src/api/eam/mold/moldMaintenanceMain/index.ts | 28 +++++++++---------- src/api/eam/mold/moldRepair/index.ts | 18 ++++++------ .../moldSpotInspectionRecordMain/index.ts | 18 ++++++------ 9 files changed, 86 insertions(+), 86 deletions(-) diff --git a/src/api/eam/mold/moldInspectionDetail/index.ts b/src/api/eam/mold/moldInspectionDetail/index.ts index 71081c3..bdf92e7 100644 --- a/src/api/eam/mold/moldInspectionDetail/index.ts +++ b/src/api/eam/mold/moldInspectionDetail/index.ts @@ -23,38 +23,38 @@ export const getMoldInspectionDetailPage = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/eam/device-inspection-job-detail/senior', data }) + return await request.post({ url: '/eam/mold-inspection-job-detail/senior', data }) } else { - return await request.get({ url: `/eam/device-inspection-job-detail/page`, params }) + return await request.get({ url: `/eam/mold-inspection-job-detail/page`, params }) } } // 查询检修工单子详情 export const getMoldInspectionDetail = async (id: number) => { - return await request.get({ url: `/eam/device-inspection-job-detail/get?id=` + id }) + return await request.get({ url: `/eam/mold-inspection-job-detail/get?id=` + id }) } // 新增检修工单子 export const createMoldInspectionDetail = async (data: MoldInspectionDetailVO) => { - return await request.post({ url: `/eam/device-inspection-job-detail/create`, data }) + return await request.post({ url: `/eam/mold-inspection-job-detail/create`, data }) } // 修改检修工单子 export const updateMoldInspectionDetail = async (data: MoldInspectionDetailVO) => { - return await request.put({ url: `/eam/device-inspection-job-detail/update`, data }) + return await request.put({ url: `/eam/mold-inspection-job-detail/update`, data }) } // 删除检修工单子 export const deleteMoldInspectionDetail = async (id: number) => { - return await request.delete({ url: `/eam/device-inspection-job-detail/delete?id=` + id }) + return await request.delete({ url: `/eam/mold-inspection-job-detail/delete?id=` + id }) } // 导出检修工单子 Excel export const exportMoldInspectionDetail = async (params) => { - return await request.download({ url: `/eam/device-inspection-job-detail/export-excel`, params }) + return await request.download({ url: `/eam/mold-inspection-job-detail/export-excel`, params }) } // 下载用户导入模板 export const importTemplate = () => { - return request.download({ url: '/eam/device-inspection-job-detail/get-import-template' }) -} \ No newline at end of file + return request.download({ url: '/eam/mold-inspection-job-detail/get-import-template' }) +} diff --git a/src/api/eam/mold/moldInspectionMain/index.ts b/src/api/eam/mold/moldInspectionMain/index.ts index 6ddb2f8..10190c7 100644 --- a/src/api/eam/mold/moldInspectionMain/index.ts +++ b/src/api/eam/mold/moldInspectionMain/index.ts @@ -21,50 +21,50 @@ export const getMoldInspectionMainPage = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/eam/device-inspection-job-main/senior', data }) + return await request.post({ url: '/eam/mold-inspection-job-main/senior', data }) } else { - return await request.get({ url: `/eam/device-inspection-job-main/page`, params }) + return await request.get({ url: `/eam/mold-inspection-job-main/page`, params }) } } // 查询检修工单主详情 export const getMoldInspectionMain = async (id: number) => { - return await request.get({ url: `/eam/device-inspection-job-main/get?id=` + id }) + return await request.get({ url: `/eam/mold-inspection-job-main/get?id=` + id }) } // 新增检修工单主 export const createMoldInspectionMain = async (data: MoldInspectionMainVO) => { - return await request.post({ url: `/eam/device-inspection-job-main/createPC`, data }) + return await request.post({ url: `/eam/mold-inspection-job-main/createPC`, data }) } // 修改检修工单主 export const updateMoldInspectionMain = async (data: MoldInspectionMainVO) => { - return await request.put({ url: `/eam/device-inspection-job-main/update`, data }) + return await request.put({ url: `/eam/mold-inspection-job-main/update`, data }) } // 删除检修工单主 export const deleteMoldInspectionMain = async (id: number) => { - return await request.delete({ url: `/eam/device-inspection-job-main/delete?id=` + id }) + return await request.delete({ url: `/eam/mold-inspection-job-main/delete?id=` + id }) } // 导出检修工单主 Excel export const exportMoldInspectionMain = async (params) => { - return await request.download({ url: `/eam/device-inspection-job-main/export-excel`, params }) + return await request.download({ url: `/eam/mold-inspection-job-main/export-excel`, params }) } // 下载用户导入模板 export const importTemplate = () => { - return request.download({ url: '/eam/device-inspection-job-main/get-import-template' }) + return request.download({ url: '/eam/mold-inspection-job-main/get-import-template' }) } // 查询检修工单主列表 export const getMoldInspectionMainNoPage = async (params) => { - return await request.get({ url: `/eam/device-inspection-job-main/noPage`, params }) + return await request.get({ url: `/eam/mold-inspection-job-main/noPage`, params }) } //验证 export const verifyOrder = async (id: number,verifyContent: string) => { - return await request.get({ url: `/eam/device-inspection-job-main/onVerify?id=`+id+`&verifyContent=` + verifyContent }) -} \ No newline at end of file + return await request.get({ url: `/eam/mold-inspection-job-main/onVerify?id=`+id+`&verifyContent=` + verifyContent }) +} diff --git a/src/api/eam/mold/moldMaintainOrderDetail/index.ts b/src/api/eam/mold/moldMaintainOrderDetail/index.ts index 491a4c1..109d62f 100644 --- a/src/api/eam/mold/moldMaintainOrderDetail/index.ts +++ b/src/api/eam/mold/moldMaintainOrderDetail/index.ts @@ -23,38 +23,38 @@ export const getMoldMaintainOrderDetailPage = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/eam/device-maintain-job-detail/senior', data }) + return await request.post({ url: '/eam/mold-maintain-job-detail/senior', data }) } else { - return await request.get({ url: `/eam/device-maintain-job-detail/page`, params }) + return await request.get({ url: `/eam/mold-maintain-job-detail/page`, params }) } } // 查询保养工单子详情 export const getMoldMaintainOrderDetail = async (id: number) => { - return await request.get({ url: `/eam/device-maintain-job-detail/get?id=` + id }) + return await request.get({ url: `/eam/mold-maintain-job-detail/get?id=` + id }) } // 新增保养工单子 export const createMoldMaintainOrderDetail = async (data: MoldMaintainOrderDetailVO) => { - return await request.post({ url: `/eam/device-maintain-job-detail/create`, data }) + return await request.post({ url: `/eam/mold-maintain-job-detail/create`, data }) } // 修改保养工单子 export const updateMoldMaintainOrderDetail = async (data: MoldMaintainOrderDetailVO) => { - return await request.put({ url: `/eam/device-maintain-job-detail/update`, data }) + return await request.put({ url: `/eam/mold-maintain-job-detail/update`, data }) } // 删除保养工单子 export const deleteMoldMaintainOrderDetail = async (id: number) => { - return await request.delete({ url: `/eam/device-maintain-job-detail/delete?id=` + id }) + return await request.delete({ url: `/eam/mold-maintain-job-detail/delete?id=` + id }) } // 导出保养工单子 Excel export const exportMoldMaintainOrderDetail = async (params) => { - return await request.download({ url: `/eam/device-maintain-job-detail/export-excel`, params }) + return await request.download({ url: `/eam/mold-maintain-job-detail/export-excel`, params }) } // 下载用户导入模板 export const importTemplate = () => { - return request.download({ url: '/eam/device-maintain-job-detail/get-import-template' }) -} \ No newline at end of file + return request.download({ url: '/eam/mold-maintain-job-detail/get-import-template' }) +} diff --git a/src/api/eam/mold/moldMaintainOrderMain/index.ts b/src/api/eam/mold/moldMaintainOrderMain/index.ts index e6bbf10..e5b8864 100644 --- a/src/api/eam/mold/moldMaintainOrderMain/index.ts +++ b/src/api/eam/mold/moldMaintainOrderMain/index.ts @@ -24,56 +24,56 @@ export const getMoldMaintainOrderMainPage = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/eam/device-maintain-job-main/senior', data }) + return await request.post({ url: '/eam/mold-maintain-job-main/senior', data }) } else { params.type = 'MOLD' - return await request.get({ url: `/eam/device-maintain-job-main/page`, params }) + return await request.get({ url: `/eam/mold-maintain-job-main/page`, params }) } } // 查询保养工单主详情 export const getMoldMaintainOrderMain = async (id: number) => { - return await request.get({ url: `/eam/device-maintain-job-main/get?id=` + id }) + return await request.get({ url: `/eam/mold-maintain-job-main/get?id=` + id }) } // 新增保养工单主 export const createMoldMaintainOrderMain = async (data: MoldMaintainOrderMainVO) => { - return await request.post({ url: `/eam/device-maintain-job-main/create`, data }) + return await request.post({ url: `/eam/mold-maintain-job-main/create`, data }) } // 修改保养工单主 export const updateMoldMaintainOrderMain = async (data: MoldMaintainOrderMainVO) => { - return await request.put({ url: `/eam/device-maintain-job-main/update`, data }) + return await request.put({ url: `/eam/mold-maintain-job-main/update`, data }) } // 删除保养工单主 export const deleteMoldMaintainOrderMain = async (id: number) => { - return await request.delete({ url: `/eam/device-maintain-job-main/delete?id=` + id }) + return await request.delete({ url: `/eam/mold-maintain-job-main/delete?id=` + id }) } // 导出保养工单主 Excel export const exportMoldMaintainOrderMain = async (params) => { - return await request.download({ url: `/eam/device-maintain-job-main/export-excel`, params }) + return await request.download({ url: `/eam/mold-maintain-job-main/export-excel`, params }) } // 下载用户导入模板 export const importTemplate = () => { - return request.download({ url: '/eam/device-maintain-job-main/get-import-template' }) + return request.download({ url: '/eam/mold-maintain-job-main/get-import-template' }) } // 保养接单 export const orderClick = (id: number) => { - return request.get({ url: '/eam/device-maintain-job-main/orderClick?id=' + id }) + return request.get({ url: '/eam/mold-maintain-job-main/orderClick?id=' + id }) } // 保养完成 export const orderClickFinish = (id: number) => { - return request.get({ url: '/eam/device-maintain-job-main/orderClickFinish?id=' + id }) + return request.get({ url: '/eam/mold-maintain-job-main/orderClickFinish?id=' + id }) } // 验证 export const orderClickApprove = (id: number,status: string,verifyContent: string) => { - return request.get({ url: '/eam/device-maintain-job-main/orderClickVerify?id=' + id + '&status=' + status + '&verifyContent=' + verifyContent }) + return request.get({ url: '/eam/mold-maintain-job-main/orderClickVerify?id=' + id + '&status=' + status + '&verifyContent=' + verifyContent }) } diff --git a/src/api/eam/mold/moldMaintainPlan/index.ts b/src/api/eam/mold/moldMaintainPlan/index.ts index cd2196e..b35edfc 100644 --- a/src/api/eam/mold/moldMaintainPlan/index.ts +++ b/src/api/eam/mold/moldMaintainPlan/index.ts @@ -18,38 +18,38 @@ export const getMoldMaintainPlanPage = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/eam/device-maintain-plan/senior', data }) + return await request.post({ url: '/eam/mold-maintain-plan/senior', data }) } else { - return await request.get({ url: `/eam/device-maintain-plan/page`, params }) + return await request.get({ url: `/eam/mold-maintain-plan/page`, params }) } } // 查询保养计划详情 export const getMoldMaintainPlan = async (id: number) => { - return await request.get({ url: `/eam/device-maintain-plan/get?id=` + id }) + return await request.get({ url: `/eam/mold-maintain-plan/get?id=` + id }) } // 新增保养计划 export const createMoldMaintainPlan = async (data: MoldMaintainPlanVO) => { - return await request.post({ url: `/eam/device-maintain-plan/create`, data }) + return await request.post({ url: `/eam/mold-maintain-plan/create`, data }) } // 修改保养计划 export const updateMoldMaintainPlan = async (data: MoldMaintainPlanVO) => { - return await request.put({ url: `/eam/device-maintain-plan/update`, data }) + return await request.put({ url: `/eam/mold-maintain-plan/update`, data }) } // 删除保养计划 export const deleteMoldMaintainPlan = async (id: number) => { - return await request.delete({ url: `/eam/device-maintain-plan/delete?id=` + id }) + return await request.delete({ url: `/eam/mold-maintain-plan/delete?id=` + id }) } // 导出保养计划 Excel export const exportMoldMaintainPlan = async (params) => { - return await request.download({ url: `/eam/device-maintain-plan/export-excel`, params }) + return await request.download({ url: `/eam/mold-maintain-plan/export-excel`, params }) } // 下载用户导入模板 export const importTemplate = () => { - return request.download({ url: '/eam/device-maintain-plan/get-import-template' }) -} \ No newline at end of file + return request.download({ url: '/eam/mold-maintain-plan/get-import-template' }) +} diff --git a/src/api/eam/mold/moldMaintenanceDetail/index.ts b/src/api/eam/mold/moldMaintenanceDetail/index.ts index 600617f..cc35288 100644 --- a/src/api/eam/mold/moldMaintenanceDetail/index.ts +++ b/src/api/eam/mold/moldMaintenanceDetail/index.ts @@ -14,28 +14,28 @@ export const getMoldMaintenanceDetailPage = async (params) => {     const data = {...params}     return await request.post({ url: '/wms/purchasereceipt-request-detail/senior', data })   } else { -    return await request.get({ url: `/eam/device-maintenance-job-detail/page`, params }) +    return await request.get({ url: `/eam/mold-maintenance-job-detail/page`, params })   } } // 查询维修工单子详情 export const getPurchasereceiptRequestDetail = async (id) => { -  return await request.get({ url: `/eam/device-maintenance-job-detail/selectListByNumber?id=` + id }) +  return await request.get({ url: `/eam/mold-maintenance-job-detail/selectListByNumber?id=` + id }) } // 新增维修工单子 export const createMoldMaintenanceDetail = async (data: MoldMaintenanceDetailVO) => { -  return await request.post({ url: `/eam/device-maintenance-job-detail/create`, data }) +  return await request.post({ url: `/eam/mold-maintenance-job-detail/create`, data }) } // 修改维修工单子 export const updateMoldMaintenanceDetail = async (data: MoldMaintenanceDetailVO) => { -  return await request.put({ url: `/eam/device-maintenance-job-detail/update`, data }) +  return await request.put({ url: `/eam/mold-maintenance-job-detail/update`, data }) } // 删除维修工单子 export const deleteMoldMaintenanceDetail = async (id: number) => { -  return await request.delete({ url: `/eam/device-maintenance-job-detail/delete?id=` + id }) +  return await request.delete({ url: `/eam/mold-maintenance-job-detail/delete?id=` + id }) } diff --git a/src/api/eam/mold/moldMaintenanceMain/index.ts b/src/api/eam/mold/moldMaintenanceMain/index.ts index 63e52c7..9adbda2 100644 --- a/src/api/eam/mold/moldMaintenanceMain/index.ts +++ b/src/api/eam/mold/moldMaintenanceMain/index.ts @@ -22,71 +22,71 @@ export const getMoldMaintenanceMainPage = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/eam/device-maintenance-job-main/senior', data }) + return await request.post({ url: '/eam/mold-maintenance-job-main/senior', data }) } else { - return await request.get({ url: `/eam/device-maintenance-job-main/page`, params }) + return await request.get({ url: `/eam/mold-maintenance-job-main/page`, params }) } } // 查询维修工单主详情 export const getMoldMaintenanceMain = async (id: number) => { - return await request.get({ url: `/eam/device-maintenance-job-main/get?id=` + id }) + return await request.get({ url: `/eam/mold-maintenance-job-main/get?id=` + id }) } // 新增维修工单主 export const createMoldMaintenanceMain = async (data: MoldMaintenanceMainVO) => { - return await request.post({ url: `/eam/device-maintenance-job-main/createPC`, data }) + return await request.post({ url: `/eam/mold-maintenance-job-main/createPC`, data }) } // 修改维修工单主 export const updateMoldMaintenanceMain = async (data: MoldMaintenanceMainVO) => { - return await request.put({ url: `/eam/device-maintenance-job-main/update`, data }) + return await request.put({ url: `/eam/mold-maintenance-job-main/update`, data }) } // 删除维修工单主 export const deleteMoldMaintenanceMain = async (id: number) => { - return await request.delete({ url: `/eam/device-maintenance-job-main/delete?id=` + id }) + return await request.delete({ url: `/eam/mold-maintenance-job-main/delete?id=` + id }) } // 导出维修工单主 Excel export const exportMoldMaintenanceMain = async (params) => { - return await request.download({ url: `/eam/device-maintenance-job-main/export-excel`, params }) + return await request.download({ url: `/eam/mold-maintenance-job-main/export-excel`, params }) } // 下载用户导入模板 export const importTemplate = () => { - return request.download({ url: '/eam/device-maintenance-job-main/get-import-template' }) + return request.download({ url: '/eam/mold-maintenance-job-main/get-import-template' }) } // 修改维修工单主 export const orderStepChange = async (data: MoldMaintenanceMainVO) => { - return await request.get({ url: `/eam/device-maintenance-job-main/orderClick?number=`+data.number+`&status=`+data.status+`&id=`+data.id+`&requestNumber=`+data.requestNumber }) + return await request.get({ url: `/eam/mold-maintenance-job-main/orderClick?number=`+data.number+`&status=`+data.status+`&id=`+data.id+`&requestNumber=`+data.requestNumber }) } // 修改维修工单主 export const orderTurnTo = async (data: MoldMaintenanceMainVO) => { - return await request.get({ url: `/eam/device-maintenance-job-main/turnTo?deviceNumber=`+data.deviceNumber +`&id=`+data.id + `&receiverType=`+ data.type +`&receiverUserId=` + data.maintenance }) + return await request.get({ url: `/eam/mold-maintenance-job-main/turnTo?deviceNumber=`+data.deviceNumber +`&id=`+data.id + `&receiverType=`+ data.type +`&receiverUserId=` + data.maintenance }) } // 查询维修工单主列表不分页 export const getMoldMainTempList = async (type: String) => { - return await request.get({ url: `/eam/device-maintenance-job-main/getList?type=` + type }) + return await request.get({ url: `/eam/mold-maintenance-job-main/getList?type=` + type }) } // 完成维修工单 export const finishOrder = async (params) => { - return await request.get({ url: `/eam/device-maintenance-job-main/orderClickFinish`, params}) + return await request.get({ url: `/eam/mold-maintenance-job-main/orderClickFinish`, params}) } // 申请人确认工单 export const confirmOrder = async (params) => { - return await request.get({ url: `/eam/device-maintenance-job-main/orderClickConfirm`, params}) + return await request.get({ url: `/eam/mold-maintenance-job-main/orderClickConfirm`, params}) } // 校验维修工单 export const verifyOrder = async (params) => { - return await request.get({ url: `/eam/device-maintenance-job-main/orderClickVerify`, params}) + return await request.get({ url: `/eam/mold-maintenance-job-main/orderClickVerify`, params}) } diff --git a/src/api/eam/mold/moldRepair/index.ts b/src/api/eam/mold/moldRepair/index.ts index e97a7d3..028f2b4 100644 --- a/src/api/eam/mold/moldRepair/index.ts +++ b/src/api/eam/mold/moldRepair/index.ts @@ -20,43 +20,43 @@ export const getMoldRepairPage = async (params) => { if (params.isSearch) { delete params.isSearch const data = { ...params } - return await request.post({ url: '/eam/device-repair-request/senior', data }) + return await request.post({ url: '/eam/mold-repair-request/senior', data }) } else { - return await request.get({ url: `/eam/device-repair-request/page`, params }) + return await request.get({ url: `/eam/mold-repair-request/page`, params }) } } // 查询报修申请详情 export const getMoldRepair = async (id: number) => { - return await request.get({ url: `/eam/device-repair-request/get?id=` + id }) + return await request.get({ url: `/eam/mold-repair-request/get?id=` + id }) } // 新增报修申请 export const createMoldRepair = async (data: MoldRepairVO) => { - return await request.post({ url: `/eam/device-repair-request/create`, data }) + return await request.post({ url: `/eam/mold-repair-request/create`, data }) } // 修改报修申请 export const updateMoldRepair = async (data: MoldRepairVO) => { - return await request.put({ url: `/eam/device-repair-request/update`, data }) + return await request.put({ url: `/eam/mold-repair-request/update`, data }) } // 删除报修申请 export const deleteMoldRepair = async (id: number) => { - return await request.delete({ url: `/eam/device-repair-request/delete?id=` + id }) + return await request.delete({ url: `/eam/mold-repair-request/delete?id=` + id }) } // 导出报修申请 Excel export const exportMoldRepair = async (params) => { - return await request.download({ url: `/eam/device-repair-request/export-excel`, params }) + return await request.download({ url: `/eam/mold-repair-request/export-excel`, params }) } // 下载用户导入模板 export const importTemplate = () => { - return request.download({ url: '/eam/device-repair-request/get-import-template' }) + return request.download({ url: '/eam/mold-repair-request/get-import-template' }) } // 撤销申请 export const rejected = (id: Number) => { - return request.delete({ url: '/eam/device-repair-request/cancel?id=' + id }) + return request.delete({ url: '/eam/mold-repair-request/cancel?id=' + id }) } diff --git a/src/api/eam/mold/moldSpotInspectionRecordMain/index.ts b/src/api/eam/mold/moldSpotInspectionRecordMain/index.ts index 580b20d..8f448dc 100644 --- a/src/api/eam/mold/moldSpotInspectionRecordMain/index.ts +++ b/src/api/eam/mold/moldSpotInspectionRecordMain/index.ts @@ -20,38 +20,38 @@ export const getDeviceSpotInspectionRecordMainPage = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/eam/device-spot-inspection-record-main/senior', data }) + return await request.post({ url: '/eam/mold-spot-inspection-record-main/senior', data }) } else { - return await request.get({ url: `/eam/device-spot-inspection-record-main/page`, params }) + return await request.get({ url: `/eam/mold-spot-inspection-record-main/page`, params }) } } // 查询检修工单主详情 export const getDeviceSpotInspectionRecordMain = async (id: number) => { - return await request.get({ url: `/eam/device-spot-inspection-record-main/get?id=` + id }) + return await request.get({ url: `/eam/mold-spot-inspection-record-main/get?id=` + id }) } // 新增检修工单主 export const createDeviceSpotInspectionRecordMain = async (data: DeviceSpotInspectionRecordMainVO) => { - return await request.post({ url: `/eam/device-spot-inspection-record-main/create`, data }) + return await request.post({ url: `/eam/mold-spot-inspection-record-main/create`, data }) } // 修改检修工单主 export const updateDeviceSpotInspectionRecordMain = async (data: DeviceSpotInspectionRecordMainVO) => { - return await request.put({ url: `/eam/device-spot-inspection-record-main/update`, data }) + return await request.put({ url: `/eam/mold-spot-inspection-record-main/update`, data }) } // 删除检修工单主 export const deleteDeviceSpotInspectionRecordMain = async (id: number) => { - return await request.delete({ url: `/eam/device-spot-inspection-record-main/delete?id=` + id }) + return await request.delete({ url: `/eam/mold-spot-inspection-record-main/delete?id=` + id }) } // 导出检修工单主 Excel export const exportDeviceSpotInspectionRecordMain = async (params) => { - return await request.download({ url: `/eam/device-spot-inspection-record-main/export-excel`, params }) + return await request.download({ url: `/eam/mold-spot-inspection-record-main/export-excel`, params }) } // 下载用户导入模板 export const importTemplate = () => { - return request.download({ url: '/eam/device-spot-inspection-record-main/get-import-template' }) -} \ No newline at end of file + return request.download({ url: '/eam/mold-spot-inspection-record-main/get-import-template' }) +}