From 333a772f146e216daa4942abc6e5399eb183fa85 Mon Sep 17 00:00:00 2001 From: xuxiaoming Date: Thu, 17 Feb 2022 18:06:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/productionPlanning.js | 6 + .../customerForecastDemandReview.js | 1 + .../demandPlanning/articleDemand/index.vue | 56 +- .../productInventory/index.vue | 2 +- .../versionHistory/index.vue | 551 ++++++++++++++++++ 5 files changed, 605 insertions(+), 11 deletions(-) create mode 100644 src/views/productionPlanning/versionHistory/index.vue diff --git a/src/router/productionPlanning.js b/src/router/productionPlanning.js index 91361c1..d2b791e 100644 --- a/src/router/productionPlanning.js +++ b/src/router/productionPlanning.js @@ -34,6 +34,12 @@ const plant = { title: "紧急插单", component: () => import("@/views/productionPlanning/emergencyOrder"), }, + { + icon: "el-icon-document", + path: "/productionPlanning/versionHistory", + title: "历史版本", + component: () => import("@/views/productionPlanning/versionHistory"), + }, ], } diff --git a/src/server/productionPlanning/customerForecastDemandReview.js b/src/server/productionPlanning/customerForecastDemandReview.js index 6d51ca8..4f62c85 100644 --- a/src/server/productionPlanning/customerForecastDemandReview.js +++ b/src/server/productionPlanning/customerForecastDemandReview.js @@ -80,3 +80,4 @@ export const planOrderQuery = (param)=> get("/admin/ap/planorder/query",param) export const republish = (data) => post("/admin/ap/planorderversion/relpublish",data) +export const publishIdentifyAll = () => get("admin/ap/planorderversion/publishidentifyall") \ No newline at end of file diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue index 51f5f4f..6ed04ae 100644 --- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue +++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue @@ -78,36 +78,54 @@ class="reset-button-style" :disabled="syncDataDisable" @click="syncData" >同步库存 +
+ + + +
+
+ 日志 +
+
+ 历史数据 +
+
-
+
-
+
-
+
- -
+
- +
{ @@ -313,6 +336,18 @@ "SET_evaluationSecondResourceLoading", "SET_articleDemandLoading", ]), + getPublishIdentifyAll(){ + publishIdentifyAll().then( ( {data = []}) => { + + this.historyList = data.publishedVersionLi + }) + }, + lookErrorHandler(versionNr){ + window.open(baseURL + "admin/common/log/read/plan/"+versionNr) + }, + lookErrorLogHandler(versionNr){ + window.open(baseURL + "admin/common/log/read/planlog/"+versionNr) + }, // 同步数据 syncData() { this.syncDataDisable = true @@ -657,7 +692,7 @@ justify-content: space-between; .search { - width: 800px; + width: 1200px; display: flex; .mps-button { @@ -698,6 +733,7 @@ background: #ccc; border-radius: 1px; border: 1px solid #ccc; + } .image_button:hover { diff --git a/src/views/productionPlanning/productInventory/index.vue b/src/views/productionPlanning/productInventory/index.vue index 8991f7c..d6e845b 100644 --- a/src/views/productionPlanning/productInventory/index.vue +++ b/src/views/productionPlanning/productInventory/index.vue @@ -21,7 +21,7 @@ @click="resetQuery">重置 同步库存 diff --git a/src/views/productionPlanning/versionHistory/index.vue b/src/views/productionPlanning/versionHistory/index.vue new file mode 100644 index 0000000..33d8016 --- /dev/null +++ b/src/views/productionPlanning/versionHistory/index.vue @@ -0,0 +1,551 @@ + + + \ No newline at end of file