From a374ea5c8db77636b5c0dcffbe7c6d39e59c0d35 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Fri, 14 Jun 2019 08:15:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseSituationSearch.js | 24 ++ src/utils/request.js | 2 +- .../CreateInquirySheet/index.vue | 10 + .../CreatePurchaseContract/index.vue | 20 +- .../PurchaseSituationSearch/Export2Excel.js | 224 ++++++++++++++++++ .../PurchaseSituationSearch/index.vue | 93 +++++++- 6 files changed, 364 insertions(+), 9 deletions(-) create mode 100644 src/views/PurchasingCenter/PurchaseSituationSearch/Export2Excel.js diff --git a/src/api/PurchasingCenter/PurchaseSituationSearch.js b/src/api/PurchasingCenter/PurchaseSituationSearch.js index b650c6eb..b2fcf305 100644 --- a/src/api/PurchasingCenter/PurchaseSituationSearch.js +++ b/src/api/PurchasingCenter/PurchaseSituationSearch.js @@ -49,3 +49,27 @@ export function searchTable2(...params) { } }) } +// 查询表1标准件和外购件无分页 +export function searchTable1Export(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购部采购_查询物料_分配后_加供应商', + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[4]}` + } + }) +} +// 查询表1基本件无分页 +export function searchTable2Export(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商', + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}` + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index 39e0294c..93173359 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -22,7 +22,7 @@ export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231 const service = axios.create({ - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://127.0.0.1:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index 53104492..f15de6d6 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -92,6 +92,11 @@ {{ scope.row.机床图号 }} + + + + + +