diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js
index 663e012..408fe5a 100644
--- a/src/api/mes/reportWork.js
+++ b/src/api/mes/reportWork.js
@@ -195,7 +195,7 @@ export function getBatchList(workorderCode) {
});
}
-// 查询报工详细列表
+// 查询报工详细列表废弃改为--->2.0查询各级报工详细列表
export function getReportList(query) {
return request({
url: '/mes/reportWork/getReportList',
@@ -204,6 +204,15 @@ export function getReportList(query) {
});
}
+// 2.0查询各级报工详细列表
+export function getAllLevelReportList(query) {
+ return request({
+ url: '/mes/reportWork/getAllLevelReportList',
+ method: 'get',
+ params: query
+ });
+}
+
// 查询报工详细列表
export function getCKList(data) {
return request({
diff --git a/src/api/plan/workorder.js b/src/api/plan/workorder.js
index 58e99fd..0c9508d 100644
--- a/src/api/plan/workorder.js
+++ b/src/api/plan/workorder.js
@@ -33,7 +33,7 @@ export function getWorkBatchList(data){
})
}
-// 通过子工单查询订单信息和工单信息
+// 通母工单查询订单信息和工单信息
export function getOrderAndWork(data) {
return request({
url: '/plan/pro/workorder/getOrderAndWorkInfo',
@@ -51,6 +51,23 @@ export function listWorkorder(query) {
});
}
+// 查询生产工单列表--顶级母
+export function listWorkorderLevel0(query) {
+ return request({
+ url: '/plan/pro/workorder/listLevel0',
+ method: 'get',
+ params: query
+ });
+}
+// 查询生产工单列表--下一级
+export function getNextLevelWorkOrderList(parentOrder) {
+ return request({
+ url: '/plan/pro/workorder/getNextLevelWorkOrderList/' + parentOrder,
+ method: 'get'
+ });
+}
+
+
// 查询生产工单详细
export function getWorkorder(workorderId) {
return request({
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 7a26bfd..9b0e541 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -94,6 +94,7 @@
v-hasPermi="['mes:reportWork:remove']"
>删除
+ -->
报工详情
- -->
+ >报工信息维护
+
取 消
-
+
-
-
-
+
+
@@ -491,35 +497,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-