diff --git a/src/views/modules/yieldReport/com_process_inspection.vue b/src/views/modules/yieldReport/com_process_inspection.vue index 4b4ebdf..7f17761 100644 --- a/src/views/modules/yieldReport/com_process_inspection.vue +++ b/src/views/modules/yieldReport/com_process_inspection.vue @@ -347,6 +347,10 @@ export default { orderNo: { type: String, default: '' + }, + resourceId: { + type: String, + default: '' } }, data() { @@ -856,6 +860,10 @@ export default { if (this.orderNo) { this.searchData.orderNo = this.orderNo } + // 设置机台ID参数 + if (this.resourceId) { + this.searchData.resourceId = this.resourceId + } this.getDataList() this.getSiteAndBuByUserName2() this.getUmList() diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index bb2603d..202d996 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -727,8 +727,8 @@ - - + + @@ -4631,7 +4631,8 @@ export default { const params = { site: this.scheduleData.site, //buNo: this.scheduleData.buNo, - orderNo: this.scheduleData.orderNo + orderNo: this.scheduleData.orderNo, + resourceId: this.scheduleData.resourceId }; checkProcessInspectionPendingCount(params).then(({data}) => {