From b56533dbda737f7a835cf9d6a4e7e76080fc2346 Mon Sep 17 00:00:00 2001
From: "DESKTOP-JT599KC\\Luan Shanshan" <xinyao.wang@le-it.com.cn>
Date: Thu, 20 Jan 2022 15:41:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E6=96=99=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/workbench/orderInventoryCom/bottomMiddle.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 {