From 2226e5abb7cefff4c15288f1943f6ada1aff443e Mon Sep 17 00:00:00 2001
From: xuxiaoming <xiaoming.xu@le-it.com.cn>
Date: Thu, 20 Jan 2022 14:50:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=BB=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=9C=A8=E9=80=94=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demandPlanning/articleDemand/index.vue                 | 2 +-
 .../customerForecastDemandReview/demandPlanning/index.vue  | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue
index 29bfe30..42c615f 100644
--- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue
+++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue
@@ -128,7 +128,7 @@
                 :disabled="item.charAt(item.length - 1) == '*'"
                 size="mini"></el-input>
             <span v-else-if="scope.row[item] ==  '预测需求' || scope.row[item] ==  '订单需求' || scope.row[item] ==  '独立需求'">{{ scope.row[item] }}  <div class="add_icon"></div> </span>
-            <span v-else-if="scope.row[item] ==  '在制量' || scope.row[item] ==  '期初库存' ">{{ scope.row[item] }}  <div class="subtract_icon"></div> </span>
+            <span v-else-if="scope.row[item] ==  '在制量' || scope.row[item] ==  '期初库存'   || scope.row[item] ==  '在途量' ">{{ scope.row[item] }}  <div class="subtract_icon"></div> </span>
             <span v-else>{{ scope.row[item] }}</span>
           </template>
         </el-table-column>
diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue
index 268f5ec..f2af56b 100644
--- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue
+++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue
@@ -58,7 +58,8 @@
           "AP_ArticleDemand-TargetInventory": "目标库存",
           "AP_ArticleDemand-MinInventory": "最低库存",
           "AP_ArticleDemand-NetDemandQty": "净生产量",
-          "AP_ArticleDemand-EndingInventory": "期末库存"
+          "AP_ArticleDemand-EndingInventory": "期末库存",
+          "AP_ArticleDemand-ZaituQty":"在途量"
         }
       };
     },
@@ -165,8 +166,8 @@
         data["SortKeys"].splice(this.keyStartIndex, 0, "Label");
         data["Item"].forEach((item, index) => {
           item.key = item["AP_ArticleDemand-ArtId"];
-          item.Label = this.labelList[item["AP_ArticleDemand-Label"]];
-          if (index % 10 == 0) {
+          item.Label = this.labelList[item["AP_ArticleDemand-Label"]]??item["AP_ArticleDemand-Label"];
+          if (index % 11 == 0) {
             item.show = true;
           } else {
             item.show = false;