From 1c87b4362af00a1a09c3d822392ba27bdb16ce2f Mon Sep 17 00:00:00 2001 From: xuxiaoming Date: Thu, 30 Dec 2021 10:30:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=BB=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=8F=91=E5=B8=83=E5=BC=B9=E5=87=BA=E7=AA=97?= =?UTF-8?q?=E5=8F=A3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/api.js | 6 ++--- src/server/request.js | 1 + .../alternativeResources/index.vue | 1 - .../artStockResource/addOrEdit.vue | 3 +-- .../artStockResource/index.vue | 1 - .../inventoryLevels/index.vue | 1 - .../mainResources/index.vue | 1 - .../plan/workbench/homePage/formal/index.vue | 1 - src/views/plan/workbench/homePage/index.vue | 1 - .../demandPlanning/articleDemand/index.vue | 3 +-- .../demandPlanning/articleDemand/public.vue | 22 ++++++++----------- .../articleDemand/publicDetail.vue | 10 +++++++-- .../demandPlanning/index.vue | 1 - .../resourceContent/evaluation/index.vue | 2 -- 14 files changed, 23 insertions(+), 31 deletions(-) diff --git a/src/server/api.js b/src/server/api.js index c617957..09db90e 100644 --- a/src/server/api.js +++ b/src/server/api.js @@ -56,21 +56,21 @@ export const getStanderOne = (params) => }); export const uploadExcel = (param, customerId, versionId) => - service.request({ + upService.request({ url: "/admin/ap/custdemandverhead/importfile?customerId=" + customerId + "&versionId=" + versionId, method: "post", headers: { "Content-Type": "multipart/form-data" }, data: param, }); export const readexcel = (param, script) => - service.request({ + upService.request({ url: "/admin/base/script/readexcel?script=" + script, method: "post", headers: { "Content-Type": "multipart/form-data" }, data: param, }); export const bulkimportfile = (data) => - service.request({ + upService.request({ url: "/admin/ap/custdemandverhead/bulkimportfile", method: "post", headers: { "Content-Type": "multipart/form-data" }, diff --git a/src/server/request.js b/src/server/request.js index 579c60d..48e4077 100644 --- a/src/server/request.js +++ b/src/server/request.js @@ -2,6 +2,7 @@ import axios from "axios"; import { ElMessage } from "element-plus"; let switchValue = true; const baseURL = process.env.VUE_APP_BASE_URL || "http://101.201.121.115:9003/"; +// const baseURL = process.env.VUE_APP_BASE_URL || "http://192.168.0.98:9003/"; const service = axios.create({ baseURL, timeout: 1000 * 60 * 2, // request timeout diff --git a/src/views/factoryModel/materialResourceMaintenance/alternativeResources/index.vue b/src/views/factoryModel/materialResourceMaintenance/alternativeResources/index.vue index be44485..2e49333 100644 --- a/src/views/factoryModel/materialResourceMaintenance/alternativeResources/index.vue +++ b/src/views/factoryModel/materialResourceMaintenance/alternativeResources/index.vue @@ -174,7 +174,6 @@ export default { // 物料列表 getArticleList(){ getArticleList().then(({data=[]})=>{ - console.log('%cindex.vue line:151 data', 'color: #007acc;', data); this.articleList=data; }) }, diff --git a/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue b/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue index 899d741..e9a1947 100644 --- a/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue +++ b/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue @@ -506,8 +506,7 @@ this.edit(); } } else { - console.log("error submit!!"); - console.log('%caddOrEdit.vue line:587 valid', 'color: #007acc;', valid); + console.log("error submit!!");; return false; } }); diff --git a/src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue b/src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue index eafd6de..e277c84 100644 --- a/src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue +++ b/src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue @@ -226,7 +226,6 @@ export default { }, // 删除 handleDelete(item) { - console.log('%cindex.vue line:186 item', 'color: #007acc;', item); this.delHanle(deleteHanle(item["AP_ArticleStockLevel-ArtId"])); }, diff --git a/src/views/factoryModel/materialResourceMaintenance/inventoryLevels/index.vue b/src/views/factoryModel/materialResourceMaintenance/inventoryLevels/index.vue index 9f94000..fcf5336 100644 --- a/src/views/factoryModel/materialResourceMaintenance/inventoryLevels/index.vue +++ b/src/views/factoryModel/materialResourceMaintenance/inventoryLevels/index.vue @@ -189,7 +189,6 @@ export default { }, // 删除 handleDelete(item) { - console.log('%cindex.vue line:186 item', 'color: #007acc;', item); this.delHanle(deleteHanle(item["AP_ArticleStockLevel-ArtId"])); }, diff --git a/src/views/factoryModel/materialResourceMaintenance/mainResources/index.vue b/src/views/factoryModel/materialResourceMaintenance/mainResources/index.vue index 4a4d57f..d928f8a 100644 --- a/src/views/factoryModel/materialResourceMaintenance/mainResources/index.vue +++ b/src/views/factoryModel/materialResourceMaintenance/mainResources/index.vue @@ -172,7 +172,6 @@ export default { // 物料列表 getArticleList(){ getArticleList({arttypeid:"FINISHED"}).then(({data=[]})=>{ - console.log('%cindex.vue line:151 data', 'color: #007acc;', data); this.articleList=data; }) }, diff --git a/src/views/plan/workbench/homePage/formal/index.vue b/src/views/plan/workbench/homePage/formal/index.vue index 9b932b9..19a611e 100644 --- a/src/views/plan/workbench/homePage/formal/index.vue +++ b/src/views/plan/workbench/homePage/formal/index.vue @@ -49,7 +49,6 @@ export default { }) }, calculateTableHeight(data) { - console.log('%cindex.vue line:53 calculateTableHeight formal', 'color: #007acc;', data); this.$emit("calculateTableHeight",data) } }, diff --git a/src/views/plan/workbench/homePage/index.vue b/src/views/plan/workbench/homePage/index.vue index eb6fd54..b47d380 100644 --- a/src/views/plan/workbench/homePage/index.vue +++ b/src/views/plan/workbench/homePage/index.vue @@ -46,7 +46,6 @@ export default { this.tableHeight = height }, calculateFormalTableHeight(height){ - console.log('%cindex.vue line:49 calculateFormalTableHeight', 'color: #007acc;', height); this.formalTableHeight = height } }, diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue index 5653dd4..1756e46 100644 --- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue +++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue @@ -309,7 +309,7 @@ publishedVersion().then(({ data = "" }) => { this.promptMessage = data }).catch(() => { - this.$message({ type: "error", message: "获取消息失败" }); + this.$message({ type: "error", message: "获取发布版本失败" }); }); }, handleQuery() { @@ -453,7 +453,6 @@ delete item.key; delete item.Label; }); - console.log('%cindex.vue line:435 editMapList', 'color: #007acc;', editMapList); return JSON.stringify(editMapList); }, // 保存数据 diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/public.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/public.vue index b548baf..35159cf 100644 --- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/public.vue +++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/public.vue @@ -61,6 +61,7 @@ v-if="showPublicDetail" :showPublicDetail="showPublicDetail" :versionNr="versionNr" + @closeDialog="closePublicDetailDialog" /> @@ -120,21 +121,16 @@ }); }, lookDetailHandler(versionNr) { + console.log('%cpublic.vue line:123 this.showPublicDetail 1', 'color: #007acc;', this.showPublicDetail); this.showPublicDetail = true + console.log('%cpublic.vue line:123 this.showPublicDetail 2', 'color: #007acc;', this.showPublicDetail); this.versionNr = versionNr - // planOrderQuery({ - // versionnr: versionNr, - // pageNumber: 1, - // pageSize: 50 - // }).then(({ data = [] }) => { - // this.loading = false - // this.detailData = data - // this.showPublicDetail = true - - // }).catch((e) => { - // this.$message({ type: "error", message: "重新发布信息失败" }); - // this.loading = false - // }); + + }, + closePublicDetailDialog(){ + console.log('%cpublic.vue line:123 closePublicDetailDialog this.showPublicDetail 1', 'color: #007acc;', this.showPublicDetail); + this.showPublicDetail = false + console.log('%cpublic.vue line:123 closePublicDetailDialog this.showPublicDetail 2', 'color: #007acc;', this.showPublicDetail); }, publishIdentify() { this.loading = true diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/publicDetail.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/publicDetail.vue index 49e5b3e..b918934 100644 --- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/publicDetail.vue +++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/publicDetail.vue @@ -2,7 +2,8 @@ + :before-close="closeDialog" + > { this.SET_articleDemandLoading(false); }); diff --git a/src/views/productionPlanning/customerForecastDemandReview/resourceContent/evaluation/index.vue b/src/views/productionPlanning/customerForecastDemandReview/resourceContent/evaluation/index.vue index 9e7226e..660ffc2 100644 --- a/src/views/productionPlanning/customerForecastDemandReview/resourceContent/evaluation/index.vue +++ b/src/views/productionPlanning/customerForecastDemandReview/resourceContent/evaluation/index.vue @@ -51,7 +51,6 @@ }; }, - computed: { ...mapState("customerForecastDemandReview", [ 'evaluationLoadPercent', @@ -73,7 +72,6 @@ } load++ this.loadPercent = parseInt(load / temp * 100) - console.log('%cindex.vue line:161 this.loadPercent', 'color: #007acc;', this.loadPercent); }, 100) }, endLoading(){