From d0402787dc67be2fffb681a38c965683ddcb3c51 Mon Sep 17 00:00:00 2001 From: Rui_Li <877258667@qq.com> Date: Fri, 28 Jan 2022 15:45:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=B4=BE=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yieldReport/com_finish_schedule.vue | 1244 +++++++++++++++++ .../yieldReport/com_produce_report_normal.vue | 3 - .../modules/yieldReport/produce_order.vue | 29 +- 3 files changed, 1269 insertions(+), 7 deletions(-) create mode 100644 src/views/modules/yieldReport/com_finish_schedule.vue diff --git a/src/views/modules/yieldReport/com_finish_schedule.vue b/src/views/modules/yieldReport/com_finish_schedule.vue new file mode 100644 index 0000000..c14e26f --- /dev/null +++ b/src/views/modules/yieldReport/com_finish_schedule.vue @@ -0,0 +1,1244 @@ + + + + + diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index 31a7815..16190d1 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -2809,7 +2809,6 @@ export default { } //设置查询的数据 this.searchData = JSON.parse(JSON.stringify(this.scheduleData)); - console.log(123) }); }, @@ -2877,7 +2876,6 @@ export default { //刷新页签的table数据 async refreshCurrentTabTable() { - console.log(456) //设置查询的数据 this.searchData = JSON.parse(JSON.stringify(this.scheduleData)); //判断是否按照当前卷来查询 @@ -2918,7 +2916,6 @@ export default { //刷新页面的数据 async refreshPageData() { await getScheduleDataBySeqNo(this.scheduleData.seqNo).then(({data}) => { - console.log(12) this.scheduleData.seqNo = data.row.seqNo; this.scheduleData.orderNo = data.row.orderNo; this.scheduleData.itemNo = data.row.itemNo; diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue index 5c1c43d..f4f1af0 100644 --- a/src/views/modules/yieldReport/produce_order.vue +++ b/src/views/modules/yieldReport/produce_order.vue @@ -8,7 +8,7 @@ 列表 - 关闭 + 结单 + + + + + @@ -127,10 +133,11 @@ import { getProduceScheduleList, } from '@/api/yieldReport/produce_order.js'; + /*引入组件*/ import comSwitchOperator from "./com_switch_operator";/*切换操作员*/ import comProduceReportNormal from "./com_produce_report_normal";/* 报工的组件*/ -import comFinishRoll from "./com_finish_roll";/*结束卷的组件*/ +import comFinishSchedule from "./com_finish_schedule";/*结束派工的组件*/ export default { data() { @@ -138,7 +145,7 @@ export default { height: 800, showOperatorFlag: false, showReportFlag: false, - showFinishFlag:false, + showFinishScheduleFlag:false, searchData: { site: this.$store.state.user.site, resourceId: '', @@ -946,7 +953,7 @@ export default { components: { comSwitchOperator,/*切换用户的组件*/ comProduceReportNormal,/*报工页面的组件*/ - comFinishRoll,/*结束卷的组件*/ + comFinishSchedule,/*结束派工单的组件*/ }, mounted() { this.$nextTick(() => { @@ -1017,6 +1024,20 @@ export default { }); }, + //打开结束派工单的modal + showFinishScheduleModal() { + //首先判断是否选择好派工单 + if (JSON.stringify(this.currentRow) == '{}') { + this.$message.error('请先选择派工单!'); + return false; + } + //打开操作员切换功能 + this.showFinishScheduleFlag = true; + this.$nextTick(() => { + this.$refs.comFinishSchedule.init(this.currentRow, this.operatorData); + }); + }, + //保存操作员的信息 saveOperatorData() { //查询操作员信息