diff --git a/ruoyi-ui/src/api/job/mydoJob.js b/ruoyi-ui/src/api/job/mydoJob.js index 39a4006..962a6e0 100644 --- a/ruoyi-ui/src/api/job/mydoJob.js +++ b/ruoyi-ui/src/api/job/mydoJob.js @@ -42,19 +42,3 @@ export function delMydoJob(jobId) { method: 'delete' }) } -// 手动完成 -export function manualCompleted(data) { - return request({ - url: '/job/mydoJob/manualCompleted', - method: 'post', - data: data - }) -} -//手动作废 -export function manualInvalidation(data) { - return request({ - url: '/job/mydoJob/manualInvalidation', - method: 'post', - data: data - }) -} diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index 7b28737..4ebc50a 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -66,12 +66,6 @@ export default { selectProduct: 'Select Product' }, menu: { - - //收货单据新增 - InboundManagement: 'InboundManagement', - ReceivingDocumentsAdd:"ReceivingDocumentsAdd", - ReceiptDocumentManagement:"ReceiptDocumentManagement", - ManagementOfInboundDocuments:"ManagementOfInboundDocuments", - InboundTaskManagement:"InboundTaskManagement", + InboundManagement: 'InboundManagement' }, } diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 7dada00..d6e1d12 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -63,13 +63,5 @@ export default { totalAmount: '总金额', submit: '提交', selectProduct: '选择物料' - }, - menu: { - InboundManagement:"入库管理", - //收货单据新增 - ReceivingDocumentsAdd: '收货单据新增', - ReceiptDocumentManagement:"收货单据管理", - ManagementOfInboundDocuments:"入库单据管理", - InboundTaskManagement:"入库作业管理", - }, + } } diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js index b78a8d9..b549ef0 100644 --- a/ruoyi-ui/src/store/modules/permission.js +++ b/ruoyi-ui/src/store/modules/permission.js @@ -4,7 +4,6 @@ import { getRouters } from '@/api/menu' import Layout from '@/layout/index' import ParentView from '@/components/ParentView' import InnerLink from '@/layout/components/InnerLink' -import i18n from "@/lang"; const permission = { state: { @@ -47,8 +46,6 @@ const permission = { commit('SET_DEFAULT_ROUTES', sidebarRoutes) commit('SET_TOPBAR_ROUTES', sidebarRoutes) resolve(rewriteRoutes) - - }) }) } @@ -72,10 +69,6 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) { } else { route.component = loadView(route.component) } - // 在 route.component 处理后添加 - if (route.meta && route.meta.title) { - route.meta.title = i18n.t(route.meta.title) - } } if (route.children != null && route.children && route.children.length) { route.children = filterAsyncRouter(route.children, route, type) diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue index 0a258d3..0669100 100644 --- a/ruoyi-ui/src/views/in/job/index.vue +++ b/ruoyi-ui/src/views/in/job/index.vue @@ -214,7 +214,6 @@ plain icon="el-icon-edit" size="mini" - :disabled=single @click="handleCompletedManually({type: 'invalid'})" v-hasPermi="['job:mydoJob:CompletedManually']" >手动作废 @@ -225,7 +224,6 @@ plain icon="el-icon-edit" size="mini" - :disabled=single @click="handleCompletedManually({type: 'completed'})" v-hasPermi="['job:mydoJob:CompletedManually']" >手动完成 @@ -354,15 +352,7 @@