diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js
index 70aeca6..a25651a 100644
--- a/src/api/mes/reportWork.js
+++ b/src/api/mes/reportWork.js
@@ -59,3 +59,11 @@ export function getProductionList(query) {
params: query
});
}
+//成品产量报表
+export function getDailyReport(query) {
+ return request({
+ url: '/mes/reportWork/getDailyReport',
+ method: 'get',
+ params: query
+ });
+}
diff --git a/src/api/technology/routeprodproduct.js b/src/api/technology/routeprodproduct.js
index 82dff97..d3dc763 100644
--- a/src/api/technology/routeprodproduct.js
+++ b/src/api/technology/routeprodproduct.js
@@ -43,7 +43,7 @@ export function delProduct(recordId) {
});
}
-// 查询工艺线体关联列表
+// 查询工艺产品关联列表
export function getListProduct(query) {
return request({
url: '/technology/pro/routeprodproduct/getList',
@@ -51,3 +51,12 @@ export function getListProduct(query) {
params: query
});
}
+
+// 查询工艺已经关联的产品列表
+export function getRightList(query) {
+ return request({
+ url: '/technology/pro/routeprodproduct/getRightList',
+ method: 'get',
+ params: query
+ });
+}
diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue
index db2d600..3853498 100644
--- a/src/views/plan/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -692,6 +692,20 @@ export default {
changeRoute(routeCode) {
getProEquipment(routeCode).then(response => {
this.eRouteOptions = response.data
+ //默认全选
+ let selectAll = [];
+ this.eRouteOptions.forEach(it => {
+ var children = it.children;
+ if(children != null){
+ children.forEach(it2=>{
+ let arr = []
+ arr.push(it.value)
+ arr.push(it2.value)
+ selectAll.push(arr)
+ })
+ }
+ })
+ this.splitForm.prodLineCodeArray = selectAll
})
},
// 选择线体改变
@@ -1189,7 +1203,9 @@ export default {
},
/** 拆分表单重置 */
resetBatch() {
+ this.eRouteOptions= [],
this.splitForm = {
+ prodLineCodeArray: [],
id: null,
prodLineCode: [],
splitNum: null,
diff --git a/src/views/technology/proroute/routeprodproduct.vue b/src/views/technology/proroute/routeprodproduct.vue
index 8feb154..2124d65 100644
--- a/src/views/technology/proroute/routeprodproduct.vue
+++ b/src/views/technology/proroute/routeprodproduct.vue
@@ -1,11 +1,83 @@
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+