From 3852097234f7700c4c16bf1a22f990a5333aa608 Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 3 Jun 2024 14:57:13 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20add=E4=B8=8B=E8=BE=BE=E8=AE=A1?= =?UTF-8?q?=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 17 +- src/views/login.vue | 4 +- src/views/mes/base/baseDeviceLedger/index.vue | 2 +- src/views/mes/prod/prodBomInfo/childIndex.vue | 1 + src/views/mes/prod/prodBomInfo/index.vue | 7 + src/views/mes/prod/prodOrderInfo/index.vue | 197 ++++++++--- .../mes/prod/prodOrderInfo/releasePlan.vue | 331 ++++++++++++++++++ 7 files changed, 501 insertions(+), 58 deletions(-) create mode 100644 src/views/mes/prod/prodOrderInfo/releasePlan.vue diff --git a/src/router/index.js b/src/router/index.js index 4043ff6..5cdad45 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -226,7 +226,22 @@ export const dynamicRoutes = [ meta: { title: '修改生成配置', activeMenu: '/tool/gen' } } ] - } + }, + { + path: '/mes/release-order', + component: Layout, + hidden: true, + permissions: ['mes/prod:prodOrderInfo:edit'], + children: [ + { + path: 'index/:objId(\\d+)', + component: () => import('@/views/mes/prod/prodOrderInfo/releasePlan'), + name: 'releaseOrder', + meta: { title: '订单下达', activeMenu: '/mes/releasePlan' } + } + ] + }, + ] // 防止连续点击多次路由报错 diff --git a/src/views/login.vue b/src/views/login.vue index 85132a9..6a65780 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -1,7 +1,7 @@ diff --git a/src/views/mes/base/baseDeviceLedger/index.vue b/src/views/mes/base/baseDeviceLedger/index.vue index 5309d14..40f477f 100644 --- a/src/views/mes/base/baseDeviceLedger/index.vue +++ b/src/views/mes/base/baseDeviceLedger/index.vue @@ -152,7 +152,7 @@ {{ parseTime(scope.row.enableDate, '{y}-{m}-{d}') }} - + - + @@ -344,6 +351,56 @@ 取 消 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -355,6 +412,7 @@ import { addProdOrderInfo, updateProdOrderInfo } from '@/api/mes/prod/prodOrderInfo' +import router from "@//router"; export default { name: 'ProdOrderInfo', @@ -379,6 +437,8 @@ export default { title: '', // 是否显示弹出层 open: false, + // 是否显示下达计划弹出层 + // releaseOpen: false, // 更新时间时间范围 daterangeBeginDate: [], // 查询参数 @@ -469,9 +529,38 @@ export default { this.loading = false }) }, + /** 下达计划 */ + handleReleasePlan(row) { + // if (row.isRelease === 0) { + // this.$modal.msgWarning('该ERP订单已下达计划!') + // return + // } + // this.reset() + // const objId = row.objId + // getProdOrderInfo(objId).then(response => { + // this.form = response.data + // this.releaseOpen = true + // this.title = 'ERP订单下达计划' + // }) + const objId = row.objId; + const orderCode = row.orderCode; + const params = {queryParams: this.queryParams}; + this.$tab.closeOpenPage(router.currentRoute); + this.$tab.openPage("订单[" + orderCode + "]下达", '/mes/release-order/index/' + objId, params); + }, + /** 下达计划提交 */ + submitReleaseForm() { + + // addProdOrderInfo(this.form).then(response => { + // this.$modal.msgSuccess('下达计划成功') + // this.open = false + // this.getList() + // }) + }, // 取消按钮 cancel() { this.open = false + this.releaseOpen = false this.reset() }, // 表单重置 diff --git a/src/views/mes/prod/prodOrderInfo/releasePlan.vue b/src/views/mes/prod/prodOrderInfo/releasePlan.vue new file mode 100644 index 0000000..34af303 --- /dev/null +++ b/src/views/mes/prod/prodOrderInfo/releasePlan.vue @@ -0,0 +1,331 @@ + + +