diff --git a/src/views/modules/shopOrder/productionReport/searchSfdcRollsReport.vue b/src/views/modules/shopOrder/productionReport/searchSfdcRollsReport.vue index 23e5fcf..e37ae62 100644 --- a/src/views/modules/shopOrder/productionReport/searchSfdcRollsReport.vue +++ b/src/views/modules/shopOrder/productionReport/searchSfdcRollsReport.vue @@ -99,8 +99,28 @@ - + + + + + + + + + + + + + + + + + + + + +
@@ -501,6 +521,8 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js'; this.searchData.operatorID = this.searchData.operatorID.toUpperCase() this.searchData.sResourceID = this.searchData.sResourceID.toUpperCase() this.searchData.workCenterNo = this.searchData.workCenterNo.toUpperCase() + this.searchData.productionResourceID = this.searchData.productionResourceID.toUpperCase() + this.searchData.consumptionResourceID = this.searchData.consumptionResourceID.toUpperCase() } } }, @@ -595,7 +617,10 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js'; consumeItemNo: '', rollNo: '', rollType: '', - createdby: '' + createdby: '', + productionResourceID: '', + consumptionResourceID: '', + finalStatus: '' }, dataList:[], dataListLoading: false, @@ -925,6 +950,24 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js'; fixed: '', columnWidth: 100 }, + { + userId: this.$store.state.user.name, + functionId: 104003007, + serialNumber: '104003007TableSfdcRollsProductionResourceID', + tableId: "104003007Table", + tableName: "订单产出标签报表", + columnProp: "productionResourceID", + headerAlign: "center", + align: "left", + columnLabel: "生产机台", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, { userId: this.$store.state.user.name, functionId: 104003007, @@ -1015,6 +1058,24 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js'; fixed: '', columnWidth: 100 }, + { + userId: this.$store.state.user.name, + functionId: 104003007, + serialNumber: '104003007TableSfdcRollsConsumptionResourceID', + tableId: "104003007Table", + tableName: "订单产出标签报表", + columnProp: "consumptionResourceID", + headerAlign: "center", + align: "left", + columnLabel: "消耗机台", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, { userId: this.$store.state.user.name, functionId: 104003007,