From 6767c1a1bebf663982727719af074b6d99075e5b Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 14 Jun 2024 09:03:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/plan/order.js | 9 ++- src/views/mes/dailyReportNew/index.vue | 4 +- src/views/mes/prepare/index.vue | 6 ++ src/views/plan/order/index.vue | 13 +++- src/views/quality/aql/index.vue | 73 ++++++++++--------- src/views/quality/incomeReport/index.vue | 27 ++++--- src/views/quality/produceReport/index.vue | 7 +- src/views/quality/productReport/index.vue | 64 ++++++++++++++-- .../quality/qcIncome/checkProjectType.vue | 39 +++++++--- src/views/quality/qcIncome/index.vue | 8 +- 10 files changed, 175 insertions(+), 75 deletions(-) diff --git a/src/api/plan/order.js b/src/api/plan/order.js index b68103e..3a639ea 100644 --- a/src/api/plan/order.js +++ b/src/api/plan/order.js @@ -147,10 +147,15 @@ export function delOrder(id) { }); } // 同步SAP订单 -export function syncSAP() { +export function syncSAP(planDateStart,planDateEnd) { + const data = { + planDateStart, + planDateEnd + } return request({ url: '/plan/order/syncSAP', - method: 'post' + method: 'post', + data: data }); } diff --git a/src/views/mes/dailyReportNew/index.vue b/src/views/mes/dailyReportNew/index.vue index 5baa065..c76183a 100644 --- a/src/views/mes/dailyReportNew/index.vue +++ b/src/views/mes/dailyReportNew/index.vue @@ -54,8 +54,8 @@ >导出 -
产量=规格*实际产量,订单完成率=实际产量/计划产量,标准工时=产量/产线标准效率,产线效率=标准工时/实际工时, - 总工时=实际用人*实际工时,
标准人均效率=实际产量/标准用人/标准工时,实际人均效率=实际产量/总工时,人均效率达成率=标准人均效率/实际人均效率
+
产量=规格*实际产量,订单完成率=实际产量/计划产量,标准工时=产量*规格/产线标准效率,产线效率=标准工时/实际工时, + 总工时=实际用人*实际工时,
标准人均效率=实际产量/标准用人/标准工时,实际人均效率=实际产量/总工时,人均效率达成率=实际人均效率/标准人均效率
diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue index 954da11..0a1d1a6 100644 --- a/src/views/mes/prepare/index.vue +++ b/src/views/mes/prepare/index.vue @@ -603,4 +603,10 @@ export default { .my-print-foot { margin-top: 20px; } +@media print { + #printFrom{ + font-family: Microsoft YaHei !important; + color: #000 !important; + } +} diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue index 0a0631d..1b2ccc4 100644 --- a/src/views/plan/order/index.vue +++ b/src/views/plan/order/index.vue @@ -1414,11 +1414,20 @@ export default { // 首-SAP同步按钮操作 handleSyncSAP() { this.loading = true; + let planDateStart =null; + let planDateEnd =null; + if (this.queryParams.planDateArray != null) { + planDateStart = moment(this.queryParams.planDateArray[0]).format('YYYYMMDD') + planDateEnd = moment(this.queryParams.planDateArray[1]).format('YYYYMMDD') + }else{ + this.$modal.msgError('请选择同步的时候范围') + return + } + let _this = this; this.$modal.confirm('是否确认SAP同步操作步骤?执行后,需要一分钟后查看同步结果').then(function () { _this.loading = false; - syncSAP() - + syncSAP(planDateStart,planDateEnd) }).then(() => { //this.getList() _this.loading = false; diff --git a/src/views/quality/aql/index.vue b/src/views/quality/aql/index.vue index 1b30a50..9612a70 100644 --- a/src/views/quality/aql/index.vue +++ b/src/views/quality/aql/index.vue @@ -113,6 +113,10 @@ >维护样本量 + +
**温馨提示:只供来料检验、成品检验抽样使用** +
+
- - - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - --> + + --> diff --git a/src/views/quality/incomeReport/index.vue b/src/views/quality/incomeReport/index.vue index 8ebcaae..62742dd 100644 --- a/src/views/quality/incomeReport/index.vue +++ b/src/views/quality/incomeReport/index.vue @@ -146,7 +146,8 @@ -

白坯检验报告

+

白坯检验报告

+

包材检验报告

@@ -235,11 +236,10 @@ - + - - +