diff --git a/src/views/plan/workbench/orderInventoryCom/bottomMiddle.vue b/src/views/plan/workbench/orderInventoryCom/bottomMiddle.vue index bb69729..556ad51 100644 --- a/src/views/plan/workbench/orderInventoryCom/bottomMiddle.vue +++ b/src/views/plan/workbench/orderInventoryCom/bottomMiddle.vue @@ -86,6 +86,7 @@ export default { "ContrastOrderResponse-SalesOrder", "ContrastOrderResponse-ContractDeliveryDate", "ContrastOrderResponse-DemandWeek", + "ContrastOrderResponse-ExpectedWeek", "ContrastOrderResponse-OrderId", "ContrastOrderResponse-Article", "ContrastOrderResponse-Desc", @@ -110,7 +111,7 @@ export default { methods: { // 合并单元格 objectSpanMethod({ row, column, rowIndex, columnIndex }) { - if (columnIndex < 10) { + if (columnIndex < this.headers.length) { const _row = this.mergeArray[rowIndex] const _col = _row > 0 ? 1 : 0; return {