diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js
index deb6cb7..a002262 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 a7126dc..b4b5f2b 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 7a4d35d..5aaa098 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -1,14 +1,6 @@
-
-
-
-
-
-
-
搜索
重置
@@ -89,7 +71,7 @@
v-hasPermi="['mes:reportWork:add']"
>新增
-
+
+
+ 报工详情
+
+
+ 报工损耗
报工SAP
-
- 物料损耗
-
+
-
-
- {{scope.row.reportCode}}
+
+
+ {{scope.row.workorderCode}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 否
- 是
-
-
-
-
-
-
-
-
-
-
-
-
- 工单物料消耗明细
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 否
+ 是
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mes/reportWork/reportWorkConsume.vue b/src/views/mes/reportWork/reportWorkConsume.vue
index 498d0ad..4aa54e6 100644
--- a/src/views/mes/reportWork/reportWorkConsume.vue
+++ b/src/views/mes/reportWork/reportWorkConsume.vue
@@ -1,137 +1,32 @@
-
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 修改
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确 定
+