Merge pull request '添加主生产计划在途量' (#184) from xuxiaoming into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/184

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>

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;