From f612136d7797315b0264e2d95bac4fbba8dc4099 Mon Sep 17 00:00:00 2001
From: xuxiaoming <xiaoming.xu@le-it.com.cn>
Date: Tue, 1 Nov 2022 09:27:27 +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=AD=97=E6=AE=B5=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demandPlanning/articleDemand/index.vue    | 31 +++++++++----------
 .../demandPlanning/index.vue                  |  1 +
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue
index c2064dd..c2d3f8e 100644
--- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue
+++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue
@@ -188,23 +188,20 @@
   </div>
 </template>
 <script>
-  import AddOrEdit from "./addOrEdit";
-  import Public from "./public";
-  import Char from "./char";
-  import { mapActions, mapMutations, mapState } from "vuex";
-   import { baseURL } from "@/server/request"
   import {
-    getArtIdList,
-    publishedVersion,
-    refreshData,
-    reloadData,
-    saveDemand,
-    searchResource,
-    exportData,
-    publishIdentifyAll
-  } from "@/server/productionPlanning/customerForecastDemandReview";
-  import { syncData } from "@/server/productionPlanning/productInventory";
-  import { getColumnName } from "@/utils/allField.js";
+exportData, getArtIdList,
+publishedVersion, publishIdentifyAll, refreshData,
+reloadData,
+saveDemand,
+searchResource
+} from "@/server/productionPlanning/customerForecastDemandReview";
+import { syncData } from "@/server/productionPlanning/productInventory";
+import { baseURL } from "@/server/request";
+import { getColumnName } from "@/utils/allField.js";
+import { mapActions, mapMutations, mapState } from "vuex";
+import AddOrEdit from "./addOrEdit";
+import Char from "./char";
+import Public from "./public";
 
   export default {
     components: {
@@ -252,7 +249,7 @@
         editKeyList: [],
         pagination:{ 
           pageNumber: 1,
-          pageSize: 26,  // 因为每13条为一组 这里的数字应该是 13 的整数倍  .../index.vue  171行 的整数倍 
+          pageSize: 26,  // 因为每13条为一组 这里的数字应该是 13 的整数倍  .../index.vue  171行 的整数倍    在51行 加字段翻译
           total: 0,
           pageSizes:[13, 26, 39, 65]
         }
diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue
index 7ee76c1..cc35aaf 100644
--- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue
+++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue
@@ -51,6 +51,7 @@
         labelList: {
           "AP_ArticleDemand-ForecastDemandQty": "预测需求",
           "AP_ArticleDemand-OrderQty": "订单需求",
+          "AP_ArticleDemand-NetDemand": "净需求",
           "AP_ArticleDemand-OutSourcingQty": "外购需求",
           "AP_ArticleDemand-IndependentDemandQty": "独立需求",
           "AP_ArticleDemand-WipQty": "在制量",