diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue index 42ceaed89..25d4c3990 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue @@ -161,7 +161,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({hasPermi:'wms:deliver-job-main:export'}), // 导出 + defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue index 9621df6bb..e687b739a 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue @@ -120,7 +120,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({hasPermi:'wms:deliver-record-main:export'}), // 导出 + defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue index 65ad32e20..78cbad88b 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue @@ -249,9 +249,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:deliver-plan-main:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:deliver-plan-main:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:deliver-plan-main:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:`wms:${routeName.value}:create` }), // 新增 + defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import` }), // 导入 + defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export` }), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -303,14 +303,14 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:deliver-plan-main:open'}), // 打开 - defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:deliver-plan-main:close'}), // 关闭 - defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:deliver-plan-main:submit'}), // 提交审批 - defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:deliver-plan-main:reject'}), // 驳回 - defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:deliver-plan-main:agree'}), // 审批通过 - defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:deliver-plan-main:publish'}), // 发布 - defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:deliver-plan-main:resetting'}), // 重置 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:deliver-plan-main:update'}), // 编辑 + defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:`wms:${routeName.value}:open`}), // 打开 + defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:`wms:${routeName.value}:close`}), // 关闭 + defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:submit`}), // 提交审批 + defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:reject`}), // 驳回 + defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:agree`}), // 审批通过 + defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['3']),hasPermi:`wms:${routeName.value}:publish`}), // 发布 + defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:`wms:${routeName.value}:resetting`}), // 重置 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:update`}), // 编辑 ] } diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue index 0e52f7c66..b57594389 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -292,9 +292,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:container-main-request:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:container-main-request:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:container-main-request:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:`wms:${routeName.value}:create`}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import`}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -346,14 +346,14 @@ const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['ma return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4','6']),hasPermi:'wms:container-main-request:close'}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:container-main-request:reAdd'}), //重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:submit'}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:refused'}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:agree'}), // 审批通过 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:container-main-request:handle'}), // 处理 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:update'}), // 编辑 - // defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-main-request:delete'}), // 删除 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4','6']),hasPermi:`wms:${routeName.value}:close`}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:`wms:${routeName.value}:reAdd`}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:submit`}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:refused`}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:agree`}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:`wms:${routeName.value}:handle`}), // 处理 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:update`}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:`wms:${routeName.value}:delete`}), // 删除 ] } diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue index c6c7e41c5..c3411002f 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue @@ -142,8 +142,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - // defaultButtons.defaultAddBtn({hasPermi:'wms:container-record-detail:create'}), // 新增 - defaultButtons.defaultExportBtn({hasPermi:'wms:container-record-detail:export'}), // 导出 + // defaultButtons.defaultAddBtn({hasPermi:`wms:{routeName.value}:create`}), // 新增 + defaultButtons.defaultExportBtn({hasPermi:`wms:{routeName.value}:export`}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -184,8 +184,8 @@ const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['ma return [] } return [ - // defaultButtons.mainListEditBtn({hasPermi:'wms:container-record-main:update'}), // 编辑 - // defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-record-main:delete'}), // 删除 + // defaultButtons.mainListEditBtn({hasPermi:`wms:{routeName.value}:update`}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:`wms:{routeName.value}:delete`}), // 删除 ] } diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue index f13238f80..7458d4eac 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -115,6 +115,7 @@ const { tableObject, tableMethods } = useTable({ /** * */ + if ( routeName.value == 'InitialContainerManageRequest') { tableObject.params = { type:'INITIAL', @@ -245,9 +246,9 @@ const isShowMainButton = (row,val) => { // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:container-main-request:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:container-main-request:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:container-main-request:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'wms:initial-container-main-request:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'wms:initial-container-main-request:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'wms:initial-container-main-request:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -290,14 +291,14 @@ const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['ma return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4','6']),hasPermi:'wms:container-main-request:close'}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:container-main-request:reAdd'}), //重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:submit'}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:refused'}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:agree'}), // 审批通过 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:container-main-request:handle'}), // 处理 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:update'}), // 编辑 - // defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-main-request:delete'}), // 删除 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4','6']),hasPermi:'wms:initial-container-main-request:close'}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:initial-container-main-request:reAdd'}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:initial-container-main-request:submit'}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:initial-container-main-request:refused'}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:initial-container-main-request:agree'}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:initial-container-main-request:handle'}), // 处理 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:initial-container-main-request:update'}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:'wms:initial-container-main-request:delete'}), // 删除 ] } diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue index 3be8fb002..48289d112 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue @@ -96,6 +96,8 @@ import Detail from '@/components/Detail/src/Detail.vue' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' const { loadStart, loadDone } = usePageLoading() +// 器具报废申请 +// 仅有器具报废申请在使用的 defineOptions({ name: 'ScrapContainerManageRequest' }) const message = useMessage() // 消息弹窗 @@ -267,9 +269,9 @@ const isShowMainButton = (row,val) => { // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:container-main-request:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:container-main-request:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:container-main-request:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'wms:scrap-container-main-request:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'wms:scrap-container-main-request:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'wms:scrap-container-main-request:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -312,14 +314,14 @@ const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['ma return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4','6']),hasPermi:'wms:container-main-request:close'}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:container-main-request:reAdd'}), //重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:submit'}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:refused'}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:agree'}), // 审批通过 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:container-main-request:handle'}), // 处理 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:update'}), // 编辑 - // defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-main-request:delete'}), // 删除 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4','6']),hasPermi:'wms:scrap-container-main-request:close'}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:scrap-container-main-request:reAdd'}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:scrap-container-main-request:submit'}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:scrap-container-main-request:refused'}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:scrap-container-main-request:agree'}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:scrap-container-main-request:handle'}), // 处理 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:scrap-container-main-request:update'}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:'wms:scrap-container-main-request:delete'}), // 删除 ] } diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue index 767925dd8..3f44d4305 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue @@ -95,48 +95,6 @@ const { tableObject, tableMethods } = useTable({ getListApi: InventorychangeRecordDetailApi.getInventorychangeRecordDetailPage // 分页接口 }) - -// 判断 路由名称 进行条件过滤 -/** - * OktoholdRecordMain 合格转隔离 - */ - if ( routeName.value == 'OktoholdReqordMain') { - tableObject.params = { - fromInventoryStatus: 'OK', - toInventoryStatus:'HOLD' - } - fromInventoryStatus.value = 'OK' - toInventoryStatus.value = "HOLD" -} else if ( routeName.value == 'HoldtookRecordMain') { - tableObject.params = { - fromInventoryStatus: 'HOLD', - toInventoryStatus:'OK' - } - fromInventoryStatus.value = 'HOLD' - toInventoryStatus.value = "OK" -} else if ( routeName.value == 'HoldtoscrapRecordMain') { - tableObject.params = { - fromInventoryStatus: 'HOLD', - toInventoryStatus:'SCRAP' - } - fromInventoryStatus.value = 'HOLD' - toInventoryStatus.value = "SCRAP" -} else if ( routeName.value == 'OktoscrapRecordMain') { - tableObject.params = { - fromInventoryStatus: 'OK', - toInventoryStatus:'SCRAP' - } - fromInventoryStatus.value = 'OK' - toInventoryStatus.value = "SCRAP" -} else if ( routeName.value == 'ScraptoholdRecordMain') { - tableObject.params = { - fromInventoryStatus: 'SCRAP', - toInventoryStatus:'HOLD' - } - fromInventoryStatus.value = 'SCRAP' - toInventoryStatus.value = "HOLD" -} - // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods