Merge pull request '主生产计划在途量改成采购量' (#189) from xuxiaoming into develop

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

src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue

@@ -133,7 +133,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] ==  '在途量' || 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] ==  '委外量'  ">{{ 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

@@ -59,7 +59,7 @@
           "AP_ArticleDemand-MinInventory": "最低库存",
           "AP_ArticleDemand-NetDemandQty": "净生产量",
           "AP_ArticleDemand-EndingInventory": "期末库存",
-          "AP_ArticleDemand-ZaituQty":"在途量",
+          "AP_ArticleDemand-ZaituQty":"采购量",
           "AP_ArticleDemand-WeiwaiQty":"委外量"
         }
       };

src/views/productionPlanning/emergencyOrder/index.vue

@@ -84,7 +84,7 @@
             <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] ==  '在途量' || scope.row[item] ==  '委外量' ">{{ scope.row[item] }}
+            <span v-else-if="scope.row[item] ==  '在制量' || 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>
@@ -157,7 +157,7 @@
           "AP_ArticleDemandEmergency-MinInventory": "最低库存",
           "AP_ArticleDemandEmergency-NetDemandQty": "净生产量",
           "AP_ArticleDemandEmergency-EndingInventory": "期末库存",
-          "AP_ArticleDemandEmergency-ZaituQty":"在途量",
+          "AP_ArticleDemandEmergency-ZaituQty":"采购量",
           "AP_ArticleDemandEmergency-WeiwaiQty":"委外量"
         }
       };