@@ -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
|
||||
})
|
||||
}
|
||||
|
||||
@@ -66,12 +66,6 @@ export default {
|
||||
selectProduct: 'Select Product'
|
||||
},
|
||||
menu: {
|
||||
|
||||
//收货单据新增
|
||||
InboundManagement: 'InboundManagement',
|
||||
ReceivingDocumentsAdd:"ReceivingDocumentsAdd",
|
||||
ReceiptDocumentManagement:"ReceiptDocumentManagement",
|
||||
ManagementOfInboundDocuments:"ManagementOfInboundDocuments",
|
||||
InboundTaskManagement:"InboundTaskManagement",
|
||||
InboundManagement: 'InboundManagement'
|
||||
},
|
||||
}
|
||||
|
||||
@@ -63,13 +63,5 @@ export default {
|
||||
totalAmount: '总金额',
|
||||
submit: '提交',
|
||||
selectProduct: '选择物料'
|
||||
},
|
||||
menu: {
|
||||
InboundManagement:"入库管理",
|
||||
//收货单据新增
|
||||
ReceivingDocumentsAdd: '收货单据新增',
|
||||
ReceiptDocumentManagement:"收货单据管理",
|
||||
ManagementOfInboundDocuments:"入库单据管理",
|
||||
InboundTaskManagement:"入库作业管理",
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -214,7 +214,6 @@
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled=single
|
||||
@click="handleCompletedManually({type: 'invalid'})"
|
||||
v-hasPermi="['job:mydoJob:CompletedManually']"
|
||||
>手动作废</el-button>
|
||||
@@ -225,7 +224,6 @@
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled=single
|
||||
@click="handleCompletedManually({type: 'completed'})"
|
||||
v-hasPermi="['job:mydoJob:CompletedManually']"
|
||||
>手动完成</el-button>
|
||||
@@ -354,15 +352,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
listMydoJob,
|
||||
getMydoJob,
|
||||
delMydoJob,
|
||||
addMydoJob,
|
||||
updateMydoJob,
|
||||
manualCompleted,
|
||||
manualInvalidation,
|
||||
} from "@/api/job/mydoJob"
|
||||
import { listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob } from "@/api/job/mydoJob"
|
||||
import { listMydoJobDetail } from "@/api/job/mydoJobDetail"
|
||||
|
||||
export default {
|
||||
@@ -535,13 +525,8 @@ export default {
|
||||
}
|
||||
if (row.type === 'invalid'){
|
||||
//手动作废
|
||||
manualInvalidation(data)
|
||||
}else if (row.type === 'completed'){
|
||||
var data = {
|
||||
jobId: jobIds
|
||||
}
|
||||
//手动完成
|
||||
manualCompleted(data)
|
||||
}
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
|
||||
@@ -120,7 +120,7 @@
|
||||
icon="el-icon-delete"
|
||||
@click="handleDeleteProduct(scope.$index)"
|
||||
>{{ $t('receiveStockinAdd.delete') }}</el-button>
|
||||
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -193,7 +193,6 @@ import {addStockin} from "@/api/receive/stockin";
|
||||
import {listBasProduct} from "@/api/bas/BasProduct";
|
||||
import {listBasSupplier} from "@/api/bas/BasSupplier";
|
||||
import { getToken } from "@/utils/auth"
|
||||
import {listWarehouse} from "";
|
||||
|
||||
|
||||
export default {
|
||||
|
||||
Reference in New Issue
Block a user