From 26ed21e36e400c56aae4e7dd5ab182414726cafb Mon Sep 17 00:00:00 2001 From: Rui_Li <877258667@qq.com> Date: Thu, 21 Apr 2022 13:23:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=88=87=E7=BB=93=E6=9D=9F=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/yieldReport/com_finish_roll.js | 5 + .../com_separate_roll_with_split.vue | 46 +- .../com_split_order_finish_roll.vue | 956 ++++++++++++++++++ .../yieldReport/com_split_order_report.vue | 7 +- 4 files changed, 993 insertions(+), 21 deletions(-) create mode 100644 src/views/modules/yieldReport/com_split_order_finish_roll.vue diff --git a/src/api/yieldReport/com_finish_roll.js b/src/api/yieldReport/com_finish_roll.js index 0be7424..d80d020 100644 --- a/src/api/yieldReport/com_finish_roll.js +++ b/src/api/yieldReport/com_finish_roll.js @@ -44,5 +44,10 @@ export const getSORoutingPreviousOperationItemNo = data => createAPI('schedule/g // 换包装结束卷校验 export const checkRepackFinishRollWithNoFqc = data => createAPI(`schedule/checkRepackFinishRollWithNoFqc`,'POST',data) + // 换包装结束卷 export const repackFinishRollWithNoFqc = data => createAPI(`schedule/repackFinishRollWithNoFqc`,'POST',data) + +// 分切订单获取报工数量的请求 +export const getSplitOrderCurrentRollReportedQty = data => createAPI('schedule/getSplitOrderCurrentRollReportedQty','POST',data) + diff --git a/src/views/modules/yieldReport/com_separate_roll_with_split.vue b/src/views/modules/yieldReport/com_separate_roll_with_split.vue index e4b95ed..1d69b57 100644 --- a/src/views/modules/yieldReport/com_separate_roll_with_split.vue +++ b/src/views/modules/yieldReport/com_separate_roll_with_split.vue @@ -188,7 +188,7 @@ export default { headerAlign: "center", align: "center", columnLabel: "行号", - columnWidth: '', + columnWidth: 80, columnHidden: false, columnImage: false, columnSortable: false, @@ -206,7 +206,7 @@ export default { headerAlign: "center", align: "center", columnLabel: "物料编码", - columnWidth: '', + columnWidth: 100, columnHidden: false, columnImage: false, columnSortable: false, @@ -242,7 +242,7 @@ export default { headerAlign: "center", align: "center", columnLabel: "数量", - columnWidth: '', + columnWidth: 80, columnHidden: false, columnImage: false, columnSortable: false, @@ -409,19 +409,21 @@ export default { /*初始化页面参数*/ init (scheduleData, operatorData) { //设置参数 - this.pageData.partNo = '' - this.pageData.partDesc = '' - this.pageData.orderNo = scheduleData.orderNo - this.pageData.itemNo = scheduleData.itemNo - this.pageData.seqNo = scheduleData.seqNo - this.pageData.rollNo = scheduleData.rollNo - this.pageData.operatorId = operatorData.operatorId - this.pageData.customerId = '无' - this.pageData.customerName = '' - this.pageData.fgPartNo = '无' - this.pageData.fgPartDesc = '' - this.pageData.supplierId = '*' - this.pageData.supplierName = '' + this.pageData.partNo = ''; + this.pageData.partDesc = ''; + this.pageData.orderNo = scheduleData.orderNo; + this.pageData.itemNo = scheduleData.itemNo; + this.pageData.seqNo = scheduleData.seqNo; + this.pageData.rollNo = scheduleData.rollNo; + this.pageData.operatorId = operatorData.operatorId; + this.pageData.customerId = '无'; + this.pageData.customerName = ''; + this.pageData.fgPartNo = '无'; + this.pageData.fgPartDesc = ''; + this.pageData.supplierId = '*'; + this.pageData.supplierName = ''; + this.pageData.rollNums = 1; + this.pageData.rollQty = 0; //清空列表 this.sfdcMaterialList = [] //初始化操作员对象 @@ -561,8 +563,17 @@ export default { this.$message.success(data.msg) //刷新报工的页面 this.$emit('refreshPageData') + //清空参数 + this.pageData.customerId = '无'; + this.pageData.customerName = ''; + this.pageData.fgPartNo = '无'; + this.pageData.fgPartDesc = ''; + this.pageData.supplierId = '*'; + this.pageData.supplierName = ''; + this.pageData.rollNums = 1; + this.pageData.rollQty = 0; //关闭当前的页面 - this.closeDialog() + //this.closeDialog() } }) }, @@ -573,6 +584,7 @@ export default { if(row){ this.pageData.partNo = row.partNo; this.pageData.partDesc = row.partDesc; + this.pageData.itemNo = row.bomItemNo; //触发刷新当前页面参数的操作 this.refreshPageData(); } diff --git a/src/views/modules/yieldReport/com_split_order_finish_roll.vue b/src/views/modules/yieldReport/com_split_order_finish_roll.vue new file mode 100644 index 0000000..92cf8e7 --- /dev/null +++ b/src/views/modules/yieldReport/com_split_order_finish_roll.vue @@ -0,0 +1,956 @@ + + + + + diff --git a/src/views/modules/yieldReport/com_split_order_report.vue b/src/views/modules/yieldReport/com_split_order_report.vue index 6ab1ebf..aba0ed5 100644 --- a/src/views/modules/yieldReport/com_split_order_report.vue +++ b/src/views/modules/yieldReport/com_split_order_report.vue @@ -608,7 +608,7 @@ import { import comSwitchOperator from "./com_switch_operator";/*切换操作员*/ import comSwitchRoll from "./com_split_order_switch_roll";/*切换卷操作*/ import comSeparateRollWithSplit from "./com_separate_roll_with_split";/*创建分卷的组件*/ -import comFinishRoll from "./com_finish_roll";/*结束卷数的组件*/ +import comFinishRoll from "./com_split_order_finish_roll";/*结束卷数的组件*/ import comFinishPartRoll from "./com_finish_part_roll";//产量报告的组件 import comMergeRoll from "./com_merge_roll";/*合并卷的组件*/ import comStartTuning from "./com_start_tuning";/*开始调机组件*/ @@ -2791,9 +2791,8 @@ export default { sums[index] = '下机卷总数：'; return; } - if (index == 14) { - let list = data.filter(item => item.virtualRollFlag != 'Y' && item.rollType != '删除卷') - const values = list.map(item => Number(item[column.property])); + if (index === 2) { + const values = data.map(item => Number(item[column.property])); let sum = 0 if (!values.every(value => isNaN(value))) { sum = values.reduce((prev, curr) => {