diff --git a/src/api/quality/income.js b/src/api/quality/income.js
index 0527800..50a717a 100644
--- a/src/api/quality/income.js
+++ b/src/api/quality/income.js
@@ -162,3 +162,11 @@ export function getWorkOrder(query) {
params: query
});
}
+// 查询入库订单列表
+export function getProductWorkOrder(query) {
+ return request({
+ url: '/quality/qcIncome/getProductWorkOrder',
+ method: 'get',
+ params: query
+ });
+ }
\ No newline at end of file
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index a396547..9dfa09c 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -643,7 +643,8 @@ export default {
attr3: null,
attr4: null,
workorderCode: null,
- parentOrder:null
+ parentOrder:null,
+ uploadStatus:"0"
},
// 表单参数
form: {
@@ -940,15 +941,16 @@ export default {
},
/** 报工详情按钮操作 */
handleReportHz(row) {
+
this.reset();
- let sr = this.selectRow[0];
+ let sr = row;
if(sr.uploadStatus =='sap报工成功'){
this.optType = 'view'
}else{
this.optType = ''
}
-
+
this.queryParams.workorderCode = sr.workorderCode;
//查询母工单报工记录列表
this.queryParams.parentOrder = '0';
@@ -964,7 +966,7 @@ export default {
this.sOrderTableList = response;
this.openReport = true;
this.titleReport = "工单报工详情";
-
+ this.queryParams.workorderCode = '';
});
},
handleEdit(index, row) {
@@ -993,7 +995,7 @@ export default {
/** 报工损耗按钮操作 */
handleConsumeHz(row) {
this.reset();
- let sr = this.selectRow[0];
+ let sr = row;
if(sr.uploadStatus =='sap报工成功'){
this.optType = 'view'
@@ -1016,6 +1018,8 @@ export default {
this.sConsumeTableList = response;
this.openConsume = true;
this.titleConsume = "工单报工物料损耗详情";
+
+ this.queryParams.workorderCode = '';
});
},
// 多选框选中数据
diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue
index 0912b3f..1f8051c 100644
--- a/src/views/plan/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -130,7 +130,7 @@
>
-
diff --git a/src/views/plan/whiteOrder/index.vue b/src/views/plan/whiteOrder/index.vue
index 26966c0..e93b670 100644
--- a/src/views/plan/whiteOrder/index.vue
+++ b/src/views/plan/whiteOrder/index.vue
@@ -121,8 +121,8 @@
>
-
-
+
+
diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index c03407c..8a270da 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -181,18 +181,18 @@
-
+
+
+
+
-
-
+
+
-
-
-
-
-
+
-
+
diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue
index 933c573..a6b9cc8 100644
--- a/src/views/quality/qcWarehousing/index.vue
+++ b/src/views/quality/qcWarehousing/index.vue
@@ -397,7 +397,7 @@
import { listWarehousing, getWarehousing, delWarehousing, addWarehousing, updateWarehousing } from "@/api/quality/warehousing";
import { getBatchList} from "@/api/quality/qcProduce";
import { getCheckTypes } from "@/api/quality/qcProduce";
-import ItemSelectWorkOrder from "./selectWorkOrder.vue";
+import ItemSelectWorkOrder from "./selectProductWorkOrder.vue";
import ItemSelectMaterial from "../qcIncome/selectMaterial.vue";
import ItemSelectLoc from "./selectLoc.vue";
import ItemSelectUser from "../qcIncome/selectUser.vue";