From b79e888e558ce3a57c305b90d6575599cbe27a3f Mon Sep 17 00:00:00 2001 From: xuxiaoming Date: Wed, 29 Dec 2021 10:08:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E8=B5=84=E6=BA=90=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artStockResource.js | 7 +- .../artStockResource/index.vue | 27 +++++- .../artStockResource/upload.vue | 93 +++++++++++++++++++ .../customerInquiry/index.vue | 8 +- 4 files changed, 125 insertions(+), 10 deletions(-) create mode 100644 src/views/factoryModel/materialResourceMaintenance/artStockResource/upload.vue diff --git a/src/server/factoryModel/materialResourceMaintenance/artStockResource.js b/src/server/factoryModel/materialResourceMaintenance/artStockResource.js index 9aa73a5..e1825dd 100644 --- a/src/server/factoryModel/materialResourceMaintenance/artStockResource.js +++ b/src/server/factoryModel/materialResourceMaintenance/artStockResource.js @@ -1,7 +1,8 @@ import { post, put, - get + get, + upload } from "../../api"; // 工厂列表 export const getPlantList = (params) => get('/admin/base/plant/selectlist', params); @@ -22,4 +23,6 @@ export const getDetails = (ResourceId) => get(`/admin/ap/artstockresource/select // 列表 export const queryTableData = (params) =>get('/admin/ap/artstockresource/query', params); // 删除 -export const deleteHanle = (params) => '/admin/ap/artstockresource/deleteone/'+ params; \ No newline at end of file +export const deleteHanle = (params) => '/admin/ap/artstockresource/deleteone/'+ params; + +export const importArtResource = (params) => upload("/admin/base/article/importartresource", params) \ No newline at end of file diff --git a/src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue b/src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue index 46bf76f..eafd6de 100644 --- a/src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue +++ b/src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue @@ -46,6 +46,12 @@ + 导入 + {{ mappingText(maxCoverPeriodTypeArray, scope.row["AP_ArticleStockLevel-MaxCoverPeriodType"], 'Stdef-StdefTyp', 'Stdef-Bez') }} - {{ + {{ mappingText(completeStatusList, scope.row["AP_ArticleStockLevel-CompleteStatus"], 'Stdef-StdefTyp', 'Stdef-Bez') }} {{ scope.row[item] }} @@ -130,22 +136,30 @@ :articleList="articleList" @setIsAddOrEdit="setIsAddOrEdit" /> + + + \ No newline at end of file diff --git a/src/views/productionPlanning/customerInquiry/index.vue b/src/views/productionPlanning/customerInquiry/index.vue index f55fe86..e64b62b 100644 --- a/src/views/productionPlanning/customerInquiry/index.vue +++ b/src/views/productionPlanning/customerInquiry/index.vue @@ -13,7 +13,7 @@ 批量导入 @@ -105,7 +105,7 @@ @setIsAdd="setIsAdd" @pushData="pushData" /> @@ -126,7 +126,7 @@ export default { tableHeight:0, loading: false, isAdd: false, - importDialogVisable: false, + importDialogVisible: false, deliveryTrialDisable:false, isShowDialog: '', detailHeaders: [], @@ -167,7 +167,7 @@ export default { completeCallBack(dataList) { this.tableData = dataList - this.importDialogVisable = false + this.importDialogVisible = false }, // 工厂列表 getCustomerList(){