From cce74ee5c1b6bb7068a167b08e976d1c8bde90d4 Mon Sep 17 00:00:00 2001 From: rui_li <877258667@qq.com> Date: Tue, 22 Mar 2022 18:11:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E5=8F=B3=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/common/com_part_stock.js | 4 + .../common/com_batch_work_calendar.vue | 918 ++++++++++++++++++ src/views/modules/common/com_part_stock.vue | 295 ++++++ src/views/modules/schedule/order_schedule.vue | 158 ++- .../modules/schedule/order_schedule_fqc.vue | 16 + 5 files changed, 1369 insertions(+), 22 deletions(-) create mode 100644 src/api/common/com_part_stock.js create mode 100644 src/views/modules/common/com_batch_work_calendar.vue create mode 100644 src/views/modules/common/com_part_stock.vue diff --git a/src/api/common/com_part_stock.js b/src/api/common/com_part_stock.js new file mode 100644 index 0000000..6c64464 --- /dev/null +++ b/src/api/common/com_part_stock.js @@ -0,0 +1,4 @@ +import { createAPI } from '@/utils/httpRequest.js' + +// 获取当前工单的物料库存数据 +export const getOrderPartStockedQty = data => createAPI('scheduling/getOrderPartStockedQty', 'POST', data) diff --git a/src/views/modules/common/com_batch_work_calendar.vue b/src/views/modules/common/com_batch_work_calendar.vue new file mode 100644 index 0000000..a1a07e8 --- /dev/null +++ b/src/views/modules/common/com_batch_work_calendar.vue @@ -0,0 +1,918 @@ + + + + + diff --git a/src/views/modules/common/com_part_stock.vue b/src/views/modules/common/com_part_stock.vue new file mode 100644 index 0000000..fdca8bd --- /dev/null +++ b/src/views/modules/common/com_part_stock.vue @@ -0,0 +1,295 @@ + + + + + diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue index 3bd31ca..f4beb13 100644 --- a/src/views/modules/schedule/order_schedule.vue +++ b/src/views/modules/schedule/order_schedule.vue @@ -167,19 +167,25 @@ - + 主菜单 - 生产订单 - 工作日历 - 分批排产 - 重新排产 + 生产订单 + 工作日历 + 批量维护工作日历 + 分批排产 + 重新排产 + 查看物料库存 - - + + + 明细菜单 + + + 生产订单 + 工作日历 + 批量维护工作日历 + 分批排产 + 重新排产 + 查看物料库存 + + - - - + + + + + @@ -278,6 +305,8 @@ import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/ import comSplitSchedule from '@/views/modules/schedule/com_split_schedule';/*分批排产的modal*/ import comWorkCalendarOut from "../common/com_work_calendar_out";/*工作日历外组件*/ + import comBatchWorkCalendar from "../common/com_batch_work_calendar";/*批量维护工作日历外组件*/ + import comPartStock from "../common/com_part_stock";/*展示物料库存的组件*/ import { getResourceRestList, getShopOrderList, @@ -297,8 +326,9 @@ export default { height: 200, tagNo: '', showWorkCalendarOut: false, - showScheduleMenu: false, + showBatchWorkCalendar: false, showSplitScheduleFlag: false, + showPartStockFlag: false, scheduleIndex: -1, modelFlag: false, modelInputFlag: true, @@ -314,9 +344,9 @@ export default { resourceId: '', workCenterNo: '', enterTime1: '', - enterTime2: new Date(), + enterTime2: this.dayjs(new Date()).format('YYYY-MM-DD'), needTime1: '', - needTime2: new Date(), + needTime2: this.dayjs(new Date()).format('YYYY-MM-DD'), scheduleDate: this.dayjs(new Date()).format('YYYY-MM-DD'), scheduleTime: '08:30', specifiedTime: 'N', @@ -1728,9 +1758,18 @@ export default { primaryMenuButton: { shopOrderFlag: true, workCalendarOutFlag: true, - closedButton: true, - pauseButton: true, - openReverseButton: true + batchWorkCalendarFlag: true, + splitScheduleFlag: true, + reScheduleOrderFlag: true, + partStockFlag: true, + }, + detailMenuButton: { + shopOrderFlag: true, + workCalendarOutFlag: true, + batchWorkCalendarFlag: true, + splitScheduleFlag: true, + reScheduleOrderFlag: true, + partStockFlag: true, } } }, @@ -1740,6 +1779,8 @@ export default { Chooselist,/*列表的组件*/ comSplitSchedule,/* 分批排产的组件 */ comWorkCalendarOut,/*工作日历外组件*/ + comBatchWorkCalendar,/*批量维护工作日历外组件*/ + comPartStock,/*展示物料库存的组件*/ }, mounted() { @@ -1821,7 +1862,7 @@ export default { }, /*区分不同的菜单 调用不同的方法 调用不同的方法*/ - handleCommand(menuName){ + OrderHandleCommand(menuName){ //区分是哪一个方法调用 if('生产工单' === menuName){ //判断是否选择好了工单 @@ -1846,18 +1887,63 @@ export default { 'calendarDesc': this.pageData.calendarDesc, 'scheduledDate': this.pageData.scheduleDate}; //打开组件 需要的数据 展示需要的数据 this.$nextTick(() => { - debugger; this.showWorkCalendarOut = true; this.$refs.comWorkCalendarOut.init(tempData); }) + }else if('批量维护工作日历' === menuName){ + //判断是否选择好了工单 + if(this.currentRoutingRow == null || this.currentRoutingRow == {}){ + //重置按钮 + this.primaryMenuButton.workCalendarOutFlag = true; + //返回错误 + this.$message.error('请选择工单!'); + return false; + } + let tempData = {'site': this.pageData.site, 'calendarId': this.pageData.calendarId, + 'calendarDesc': this.pageData.calendarDesc, 'scheduledDate': this.pageData.scheduleDate}; + //打开组件 需要的数据 展示需要的数据 + this.$nextTick(() => { + this.showBatchWorkCalendar = true; + this.$refs.comBatchWorkCalendar.init(tempData); + }) }else if('分批排产' === menuName){ + //判断是否选择好了工单 + if(this.currentRoutingRow == null || this.currentRoutingRow == {}){ + //重置按钮 + this.primaryMenuButton.workCalendarOutFlag = true; + //返回错误 + this.$message.error('请选择工单!'); + return false; + } this.openSplitScheduleModal(); }else if('重新排产' === menuName){ + //判断是否选择好了工单 + if(this.currentRoutingRow == null || this.currentRoutingRow == {}){ + //重置按钮 + this.primaryMenuButton.workCalendarOutFlag = true; + //返回错误 + this.$message.error('请选择工单!'); + return false; + } //调用提示的方法 this.warnReScheduleConfirm(); + }else if('查看物料库存' === menuName){ + //判断是否选择好了工单 + if(this.currentRoutingRow == null || this.currentRoutingRow == {}){ + //重置按钮 + this.primaryMenuButton.partStockFlag = true; + //返回错误 + this.$message.error('请选择工单!'); + return false; + } + let tempData = {'site': this.pageData.site, 'orderNo': this.currentRoutingRow.orderNo}; + //打开组件 需要的数据 展示需要的数据 + this.$nextTick(() => { + this.showPartStockFlag = true; + this.$refs.comPartStock.init(tempData); + }) } - }, /*打开分批排产*/ @@ -2172,9 +2258,37 @@ export default { if(this.currentRoutingRow == null || this.currentRoutingRow == {}){ this.primaryMenuButton.shopOrderFlag = true; this.primaryMenuButton.workCalendarOutFlag = true; + this.primaryMenuButton.batchWorkCalendarFlag = true; + this.primaryMenuButton.splitScheduleFlag = true; + this.primaryMenuButton.reScheduleOrderFlag = true; + this.primaryMenuButton.partStockFlag = true; }else{ this.primaryMenuButton.shopOrderFlag = false; this.primaryMenuButton.workCalendarOutFlag = false; + this.primaryMenuButton.batchWorkCalendarFlag = false; + this.primaryMenuButton.splitScheduleFlag = false; + this.primaryMenuButton.reScheduleOrderFlag = false; + this.primaryMenuButton.partStockFlag = false; + } + }, + + /*控制明细菜单是否显示*/ + controlDetailMenuBun(){ + //没有选择行 所有的按钮都是灰色 + if(this.currentSchedlingRow == null || this.currentSchedlingRow == {}){ + this.detailMenuButton.shopOrderFlag = true; + this.detailMenuButton.workCalendarOutFlag = true; + this.detailMenuButton.batchWorkCalendarFlag = true; + this.detailMenuButton.splitScheduleFlag = true; + this.detailMenuButton.reScheduleOrderFlag = true; + this.detailMenuButton.partStockFlag = true; + }else{ + this.detailMenuButton.shopOrderFlag = false; + this.detailMenuButton.workCalendarOutFlag = false; + this.detailMenuButton.batchWorkCalendarFlag = false; + this.detailMenuButton.splitScheduleFlag = false; + this.detailMenuButton.reScheduleOrderFlag = false; + this.detailMenuButton.partStockFlag = false; } }, @@ -2287,7 +2401,7 @@ div.customer-el-card-blue { /*设置间距*/ .el-dropdown-menu /deep/ li.customer-li{ font-size: 12px; - height: 20px; + line-height: 16px; padding: 4px 8px; } diff --git a/src/views/modules/schedule/order_schedule_fqc.vue b/src/views/modules/schedule/order_schedule_fqc.vue index 8dbafc0..faedd1b 100644 --- a/src/views/modules/schedule/order_schedule_fqc.vue +++ b/src/views/modules/schedule/order_schedule_fqc.vue @@ -318,10 +318,24 @@ + + + + + + + + +