From c368e14219564527610cc2761efc6aef95732290 Mon Sep 17 00:00:00 2001 From: bryan sun Date: Mon, 23 Dec 2019 08:32:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseSituationSearch.js | 2 +- src/utils/request.js | 6 +- src/views/Assembly/QualityBasicData/index.vue | 74 +++++++++---------- 3 files changed, 40 insertions(+), 42 deletions(-) diff --git a/src/api/PurchasingCenter/PurchaseSituationSearch.js b/src/api/PurchasingCenter/PurchaseSituationSearch.js index acf2f13b..85e6001b 100644 --- a/src/api/PurchasingCenter/PurchaseSituationSearch.js +++ b/src/api/PurchasingCenter/PurchaseSituationSearch.js @@ -43,7 +43,7 @@ export function searchTable2(...params) { method: 'post', data: { type: '1', - name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商', + name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_新', param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[6]}&零件名称=${params[7]}&零件规格_check=${params[8]}&零件规格=${params[9]}&零件图号_check=${params[10]}&零件图号=${params[11]}`, Pagination: params[4] + '&' + params[5] } diff --git a/src/utils/request.js b/src/utils/request.js index f07767cc..059fb22e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,8 +17,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` -export const url = `http://192.168.0.101:8074/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.0.101:8074/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.0.104:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.0.104:8079/submit/downloadFile.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 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 @@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.0.101:8074/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.104:8079/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/Assembly/QualityBasicData/index.vue b/src/views/Assembly/QualityBasicData/index.vue index dd57da6a..128da7f9 100644 --- a/src/views/Assembly/QualityBasicData/index.vue +++ b/src/views/Assembly/QualityBasicData/index.vue @@ -1,7 +1,7 @@