From 70a9332c9bc76cd79a5015124008b798e1c03d60 Mon Sep 17 00:00:00 2001 From: xuxiaoming Date: Fri, 21 Jan 2022 16:46:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demandPlanning/articleDemand/index.vue | 2 +- .../customerForecastDemandReview/demandPlanning/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue index bc4ccf7..633becf 100644 --- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue +++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue @@ -216,7 +216,7 @@ editKeyList: [], pagination:{ pageNumber: 1, - pageSize: 22, + pageSize: 22, // 因为每11条为一组 这里的数字应该是 11 的整数倍 .../index.vue 170行 的整数倍 total: 0, } }; diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue index f2af56b..3e23a61 100644 --- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue +++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue @@ -167,7 +167,7 @@ data["Item"].forEach((item, index) => { item.key = item["AP_ArticleDemand-ArtId"]; item.Label = this.labelList[item["AP_ArticleDemand-Label"]]??item["AP_ArticleDemand-Label"]; - if (index % 11 == 0) { + if (index % 11 == 0) { // 每多少条为一组 item.show = true; } else { item.show = false; From 56c939d8f118cc4ef0b38e9ef1482776a6eaa20a Mon Sep 17 00:00:00 2001 From: xuxiaoming Date: Fri, 21 Jan 2022 17:12:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=8F=98=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 | 5 +++-- src/views/productionPlanning/emergencyOrder/index.vue | 7 ++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue index 633becf..7291084 100644 --- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue +++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue @@ -216,7 +216,7 @@ editKeyList: [], pagination:{ pageNumber: 1, - pageSize: 22, // 因为每11条为一组 这里的数字应该是 11 的整数倍 .../index.vue 170行 的整数倍 + pageSize: 24, // 因为每11条为一组 这里的数字应该是 11 的整数倍 .../index.vue 170行 的整数倍 total: 0, } }; diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue index 3e23a61..696508d 100644 --- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue +++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue @@ -59,7 +59,8 @@ "AP_ArticleDemand-MinInventory": "最低库存", "AP_ArticleDemand-NetDemandQty": "净生产量", "AP_ArticleDemand-EndingInventory": "期末库存", - "AP_ArticleDemand-ZaituQty":"在途量" + "AP_ArticleDemand-ZaituQty":"在途量", + "AP_ArticleDemand-WeiwaiQty":"委外量" } }; }, @@ -167,7 +168,7 @@ data["Item"].forEach((item, index) => { item.key = item["AP_ArticleDemand-ArtId"]; item.Label = this.labelList[item["AP_ArticleDemand-Label"]]??item["AP_ArticleDemand-Label"]; - if (index % 11 == 0) { // 每多少条为一组 + if (index % 12 == 0) { // 每多少条为一组 item.show = true; } else { item.show = false; diff --git a/src/views/productionPlanning/emergencyOrder/index.vue b/src/views/productionPlanning/emergencyOrder/index.vue index a6f92f1..31032eb 100644 --- a/src/views/productionPlanning/emergencyOrder/index.vue +++ b/src/views/productionPlanning/emergencyOrder/index.vue @@ -130,7 +130,7 @@ artList:[], pagination: { pageNumber: 1, - pageSize: 20, + pageSize: 24, total: 0, }, headers: [], @@ -150,7 +150,8 @@ "AP_ArticleDemandEmergency-MinInventory": "最低库存", "AP_ArticleDemandEmergency-NetDemandQty": "净生产量", "AP_ArticleDemandEmergency-EndingInventory": "期末库存", - "AP_ArticleDemandEmergency-ZaituQty":"在途量" + "AP_ArticleDemandEmergency-ZaituQty":"在途量", + "AP_ArticleDemandEmergency-WeiwaiQty":"委外量" } }; }, @@ -242,7 +243,7 @@ data["Item"].forEach((item, index) => { item.key = item["AP_ArticleDemandEmergency-ArtId"]; item.Label = this.labelList[item["AP_ArticleDemandEmergency-Label"]]; - if (index % 11 == 0) { + if (index % 12 == 0) { item.show = true; } else { item.show = false;