diff --git a/src/views/mes/dailyReportNew/index.vue b/src/views/mes/dailyReportNew/index.vue index bcc1ea98..8c350f0b 100644 --- a/src/views/mes/dailyReportNew/index.vue +++ b/src/views/mes/dailyReportNew/index.vue @@ -53,7 +53,17 @@ v-hasPermi="['mes:dailyReportNew:export']" >导出 - + + 白坯参考导出 + +
产量=规格*实际产量,订单完成率=实际产量/计划产量,标准工时=产量*规格/产线标准效率,产线效率=标准工时/实际工时, 总工时=实际用人*实际工时,
标准人均效率=实际产量/标准用人/标准工时,实际人均效率=实际产量/总工时,人均效率达成率=实际人均效率/标准人均效率
@@ -245,6 +255,11 @@ export default { ...this.queryParams }, `dailyReport_${new Date().getTime()}.xlsx`) }, + handleExportBP() { + this.download('mes/reportWork/getDailyReportNewBPExport', { + ...this.queryParams + }, `dailyReport_BP_${new Date().getTime()}.xlsx`) + }, getSummaries(param) { const { columns, data } = param; const sums = []; diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue index a81502b2..72d53850 100644 --- a/src/views/plan/order/index.vue +++ b/src/views/plan/order/index.vue @@ -115,14 +115,14 @@ >导出
- + @@ -519,8 +519,8 @@ - - + + @@ -530,15 +530,15 @@ - - + + - + @@ -556,7 +556,7 @@ - + @@ -1377,7 +1377,7 @@ export default { this.reset(); this.openAutoSplit = false; this.activeSplit = 0; - autoSplitOrderCancel(Object.assign({},this.autoSplitList[0])).then(response => {}); + autoSplitOrderCancel(Object.assign({},this.autoSplitList[0])).then(response => {}); }, // 判空、空串 checkNull(entity) { @@ -1508,7 +1508,7 @@ export default { getProRoutes(this.autoSplitList[0].prodCode).then(response => { this.routes = response.data; this.autoSplitform1.routeCode = response.data[0].routeCode; - + }) //var ymd = moment(this.autoSplitform1.productDate).format('YYYY-MM-DD') // 获取工单生产顺序 @@ -1562,7 +1562,7 @@ export default { }, next() { if (this.activeSplit++ > 2) this.activeSplit = 0; - //选完线体后的下一步,会进行模拟拆分 + //选完线体后的下一步,会进行模拟拆分 if(this.activeSplit == 2){ autoSplitOrder(Object.assign({},this.autoSplitList[0],this.autoSplitform1,this.autoSplitform2)).then(response => { this.workerLoading = true // 设置加载状态为true,表示正在加载 @@ -1578,15 +1578,15 @@ export default { this.workerLoading = false // 设置加载状态为false,表示加载完成 }) }) - }); + }); } }, prev(){ if (this.activeSplit-- > 2) this.activeSplit = 2; - //会进行模拟拆分的取消 + //会进行模拟拆分的取消 if(this.activeSplit == 1){ autoSplitOrderCancel(Object.assign({},this.autoSplitList[0])).then(response => { - }); + }); } }, autoSplitCommit(){ @@ -1595,7 +1595,7 @@ export default { this.getList(); this.openAutoSplit = false; this.activeSplit = 0; - }); + }); } }