From 0ba0ee4623288f7f9134a9f1a8609fd387dd0bbd Mon Sep 17 00:00:00 2001 From: rui_li <877258667@qq.com> Date: Thu, 16 Dec 2021 16:02:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/yieldReport/produce_report_normal.js | 3 + src/assets/scss/global.scss | 1 - .../modules/yieldReport/com_finish_roll.vue | 77 +++++++++--------- .../modules/yieldReport/com_merge_roll.vue | 4 +- .../modules/yieldReport/com_produce_down.vue | 2 +- .../yieldReport/com_produce_report_normal.vue | 78 ++++++++++--------- .../modules/yieldReport/com_separate_roll.vue | 6 +- .../modules/yieldReport/com_start_produce.vue | 2 +- .../modules/yieldReport/com_start_tuning.vue | 2 +- .../modules/yieldReport/produce_order.vue | 19 +++-- 10 files changed, 104 insertions(+), 90 deletions(-) diff --git a/src/api/yieldReport/produce_report_normal.js b/src/api/yieldReport/produce_report_normal.js index 2c3416e..547e087 100644 --- a/src/api/yieldReport/produce_report_normal.js +++ b/src/api/yieldReport/produce_report_normal.js @@ -34,6 +34,9 @@ export const getSfdcRollByCon = data => createAPI('schedule/getSfdcRollByCon', ' export const refreshWorkPlatformButtons = data => createAPI('schedule/refreshWorkPlatformButtons', 'POST', data) +// 获取当前页面的按钮 +export const checkProduceButton = data => createAPI('schedule/checkProduceButton', 'POST', data) + diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index 8ff1f50..db271ab 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -241,7 +241,6 @@ input.el-input__inner{ /* 时间框选择样式 */ .customer-css span.el-input__prefix{ - top: -3px; left: 1px; } /* 时间HH:MM的样式*/ diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue index 8cf3f8b..c39a0d4 100644 --- a/src/views/modules/yieldReport/com_finish_roll.vue +++ b/src/views/modules/yieldReport/com_finish_roll.vue @@ -38,19 +38,19 @@
卷数量统计 - 是否报告产量 - + - + - + - +
@@ -73,47 +73,47 @@ - +
卷生产时间统计 - + - + - + - + - + - + - + - + - + - + - + - + @@ -121,55 +121,55 @@
+ style="margin-left: 325px; margin-top: -165px; width: 575px;"> 产量报告 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -181,7 +181,7 @@
主材料 - @@ -40,7 +40,7 @@ - + 确 定 关闭 diff --git a/src/views/modules/yieldReport/com_produce_down.vue b/src/views/modules/yieldReport/com_produce_down.vue index d7d7d42..78e8b77 100644 --- a/src/views/modules/yieldReport/com_produce_down.vue +++ b/src/views/modules/yieldReport/com_produce_down.vue @@ -17,7 +17,7 @@ - + 切换用户 - + 开始调机 - + 开始生产 @@ -311,7 +311,7 @@
不良 - + 报告不良 @@ -322,12 +322,12 @@
扫描 - + 刀模板 - + 材料 @@ -432,6 +432,7 @@ import { getSfdcDefectByCon, getSfdcRollByCon, refreshWorkPlatformButtons, + checkProduceButton, } from "@/api/yieldReport/produce_report_normal.js"; /*引入组件*/ import comSwitchOperator from "./com_switch_operator";/*切换操作员*/ @@ -2615,6 +2616,7 @@ export default { userName: this.$store.state.user.name, seqNo: '', orderNo: '', + itemNo: 0, partNo: '', workCenterDesc: '', resourceDesc: '', @@ -2679,6 +2681,7 @@ export default { getScheduleDataBySeqNo(this.scheduleData.seqNo).then(({data}) => { this.scheduleData.seqNo = data.row.seqNo; this.scheduleData.orderNo = data.row.orderNo; + this.scheduleData.itemNo = data.row.itemNo; this.scheduleData.partNo = data.row.partNo; this.scheduleData.partDesc = data.row.partDesc; this.scheduleData.planStartTime = data.row.planStartTime; @@ -2803,6 +2806,7 @@ export default { getScheduleDataBySeqNo(this.scheduleData.seqNo).then(({data}) => { this.scheduleData.seqNo= data.row.seqNo; this.scheduleData.orderNo= data.row.orderNo; + this.scheduleData.itemNo = data.row.itemNo; this.scheduleData.partNo= data.row.partNo; this.scheduleData.partDesc= data.row.partDesc; this.scheduleData.planStartTime= data.row.planStartTime; @@ -2835,58 +2839,58 @@ export default { //刷新当前页面的菜单 refreshPageButtons(){ - refreshWorkPlatformButtons(this.searchData).then(({data}) => { - if(data.resultMap.createNewRollFlag = 'Y'){ - this.buttonTags.createNewRollFlag = true; - }else{ + /*refreshWorkPlatformButtons(this.scheduleData).then(({data}) => { + if(data.resultMap.createNewRollFlag == 'Y'){ this.buttonTags.createNewRollFlag = false; - } - if(data.resultMap.switchRollFlag = 'Y'){ - this.buttonTags.switchRollFlag = true; }else{ - this.buttonTags.switchRollFlag = false; + this.buttonTags.createNewRollFlag = true; } - if(data.resultMap.separateRollFlag = 'Y'){ - this.buttonTags.separateRollFlag = true; + if(data.resultMap.switchRollFlag == 'Y'){ + this.buttonTags.switchRollFlag = false; }else{ - this.buttonTags.separateRollFlag = false; + this.buttonTags.switchRollFlag = true; } - if(data.resultMap.finishRollFlag = 'Y'){ - this.buttonTags.finishRollFlag = true; + if(data.resultMap.separateRollFlag == 'Y'){ + this.buttonTags.separateRollFlag = false; }else{ - this.buttonTags.finishRollFlag = false; + this.buttonTags.separateRollFlag = true; } - if(data.resultMap.tuningFlag = 'Y'){ - this.buttonTags.tuningFlag = true; + if(data.resultMap.finishRollFlag == 'Y'){ + this.buttonTags.finishRollFlag = false; }else{ - this.buttonTags.tuningFlag = false; + this.buttonTags.finishRollFlag = true; } - if(data.resultMap.produceFlag = 'Y'){ - this.buttonTags.produceFlag = true; + if(data.resultMap.tuningFlag == 'Y'){ + this.buttonTags.tuningFlag = false; }else{ - this.buttonTags.produceFlag = false; + this.buttonTags.tuningFlag = true; } - if(data.resultMap.defectFlag = 'Y'){ - this.buttonTags.defectFlag = true; + if(data.resultMap.produceFlag == 'Y'){ + this.buttonTags.produceFlag = false; }else{ - this.buttonTags.defectFlag = false; + this.buttonTags.produceFlag = true; } - if(data.resultMap.toolFlag = 'Y'){ - this.buttonTags.toolFlag = true; + if(data.resultMap.defectFlag == 'Y'){ + this.buttonTags.defectFlag = false; }else{ - this.buttonTags.toolFlag = false; + this.buttonTags.defectFlag = true; } - if(data.resultMap.materialFlag = 'Y'){ - this.buttonTags.materialFlag = true; + if(data.resultMap.toolFlag == 'Y'){ + this.buttonTags.toolFlag = false; }else{ - this.buttonTags.materialFlag = false; + this.buttonTags.toolFlag = true; } - if(data.resultMap.downTimeFlag = 'Y'){ - this.buttonTags.downTimeFlag = true; + if(data.resultMap.materialFlag == 'Y'){ + this.buttonTags.materialFlag = false; }else{ + this.buttonTags.materialFlag = true; + } + if(data.resultMap.downTimeFlag == 'Y'){ this.buttonTags.downTimeFlag = false; + }else{ + this.buttonTags.downTimeFlag = true; } - }); + });*/ }, //设置参数 diff --git a/src/views/modules/yieldReport/com_separate_roll.vue b/src/views/modules/yieldReport/com_separate_roll.vue index eda48b3..0b7373e 100644 --- a/src/views/modules/yieldReport/com_separate_roll.vue +++ b/src/views/modules/yieldReport/com_separate_roll.vue @@ -16,7 +16,7 @@ - + - + - + diff --git a/src/views/modules/yieldReport/com_start_produce.vue b/src/views/modules/yieldReport/com_start_produce.vue index 11fc6c9..f54c546 100644 --- a/src/views/modules/yieldReport/com_start_produce.vue +++ b/src/views/modules/yieldReport/com_start_produce.vue @@ -16,7 +16,7 @@ - + - + - 显示已结束派工单 + 显示已结束派工单 @@ -149,7 +149,8 @@ export default { planStartTime2: this.dayjs(new Date()).format('YYYY-MM-DD'), closedFlag: 'N', status: 1, - username: this.$store.state.user.name + username: this.$store.state.user.name, + searchFlag: false }, currentRow: {}, operatorData: { @@ -957,7 +958,10 @@ export default { /*查询派工单*/ getProduceScheduleList() { + //开始真的查询; + this.searchData.searchFlag = true; getProduceScheduleList(this.searchData).then(({data}) => { + //设置查询数据 this.produceScheduleList = data.rows; }) }, @@ -1050,9 +1054,14 @@ export default { } }, created() { - //查询工单的数据 - this.getProduceScheduleList(); + //不查询 + getProduceScheduleList(this.searchData).then(({data}) => { + //设置查询数据 + this.searchData.searchFlag = false; + this.produceScheduleList = data.rows; + }); } + }