From 096fe84a273b5a71100419a36cca9ce1067bb8f3 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Sat, 2 Dec 2023 00:23:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/reportWork.js | 31 +- src/api/mes/reportWorkConsume.js | 26 + src/views/mes/reportWork/index.vue | 859 ++++++++++++------ .../mes/reportWork/reportWorkConsume.vue | 311 ++----- src/views/mes/reportWork/selectWorkOrder.vue | 9 +- 5 files changed, 707 insertions(+), 529 deletions(-) diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js index deb6cb79..a0022621 100644 --- a/src/api/mes/reportWork.js +++ b/src/api/mes/reportWork.js @@ -135,9 +135,9 @@ export function getMesListEquip(query) { }); } //报工按钮 -export function reportSap(reportCode) { +export function reportSap(workorderCode) { const data = { - reportCode + workorderCode } return request({ url: '/mes/reportWork/reportSap', @@ -174,3 +174,30 @@ export function getBatchList(workorderCode) { data: data }); } + +// 查询报工详细列表 +export function getReportList(query) { + return request({ + url: '/mes/reportWork/getReportList', + method: 'get', + params: query + }); +} +// 提交报工详细列表 +export function submitReportPS(data) { + return request({ + url: '/mes/reportWork/submitReportPS', + method: 'post', + data: data + }); +} + +// 查询物料管理列表 +export function getPrepareList(query) { + return request({ + url: '/mes/reportWork/getPrepareList', + method: 'get', + params: query + }); +} + diff --git a/src/api/mes/reportWorkConsume.js b/src/api/mes/reportWorkConsume.js index a7126dc7..b4b5f2bb 100644 --- a/src/api/mes/reportWorkConsume.js +++ b/src/api/mes/reportWorkConsume.js @@ -51,3 +51,29 @@ export function delReportWorkConsume(recordId) { method: 'delete' }); } + +// 查询报工物料损耗详细列表 +export function getConsumeList(query) { + return request({ + url: '/mes/reportWorkConsume/getConsumeList', + method: 'get', + params: query + }); +} +// 提交报工物料损耗详细列表 +export function submitConsumePS(data) { + return request({ + url: '/mes/reportWorkConsume/submitConsumePS', + method: 'post', + data: data + }); +} + +/**提交报工信息**/ +export function submitReportInfo(data) { + return request({ + url: '/mes/reportWorkConsume/submitReportInfo', + method: 'post', + data: data + }); +} diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index 7a4d35da..5aaa098a 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -1,14 +1,6 @@