From 4cc4badd55cf0e6e113a60b257e6491e027828ef Mon Sep 17 00:00:00 2001 From: bryan sun Date: Fri, 27 Dec 2019 14:19:21 +0800 Subject: [PATCH 1/3] 1 --- src/utils/request.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 2cb92ad8..7b85968f 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,16 +17,16 @@ 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.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.1.231:8411/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 export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` -export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` +export const MESDownloadFile = `http://192.168.0.104:8079/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.104:8079/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service From 4f7803d1967b2867de072c9059db6295028a6951 Mon Sep 17 00:00:00 2001 From: liushuai Date: Sat, 4 Jan 2020 11:47:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingCenter/MaterialManagement.js | 11 ++++++++ src/utils/request.js | 2 +- .../MaterialManagement/index.vue | 25 ++++++++++++------- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/api/PurchasingCenter/MaterialManagement.js b/src/api/PurchasingCenter/MaterialManagement.js index 707bce5a..d3cc0eab 100644 --- a/src/api/PurchasingCenter/MaterialManagement.js +++ b/src/api/PurchasingCenter/MaterialManagement.js @@ -41,6 +41,17 @@ export function initDepartmentName() { } }) } +export function yanzheng(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_供货商验证_查询数据', + param: '供货商=' + num + } + }) +} export function initMaterialCategory(check, DepartmentValue) { return request({ url: '', diff --git a/src/utils/request.js b/src/utils/request.js index 2cb92ad8..fc41e22d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -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.110:8002/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/PurchasingCenter/MaterialManagement/index.vue b/src/views/PurchasingCenter/MaterialManagement/index.vue index d63d071f..b3e3ee37 100644 --- a/src/views/PurchasingCenter/MaterialManagement/index.vue +++ b/src/views/PurchasingCenter/MaterialManagement/index.vue @@ -566,7 +566,8 @@ import { getMaterial, searchmateria5, Dahui, - Tongguo + Tongguo, + yanzheng } from '@/api/PurchasingCenter/MaterialManagement' import { mapGetters } from 'vuex' @@ -755,14 +756,20 @@ export default { AddGonghuoshang(formName) { this.$refs[formName].validate((valid) => { if (valid) { - AddGonghuoshang(this.form3.供货商名称).then(response => { - if (response.data[0].result === '1') { - this.$message.success('添加成功') - this.dialogFormVisible3 = false - this.getGonghuoshang() + yanzheng(this.form3.供货商名称).then(response => { + if (response.data[0].Column1 === 0) { + AddGonghuoshang(this.form3.供货商名称).then(response => { + if (response.data[0].result === '1') { + this.$message.success('添加成功') + this.dialogFormVisible3 = false + this.getGonghuoshang() + } else { + this.dialogFormVisible3 = false + this.$message.error('添加失败') + } + }) } else { - this.dialogFormVisible3 = false - this.$message.error('添加失败') + this.$message.error('该供货商已存在') } }) } @@ -852,7 +859,7 @@ export default { this.form.物料型号 = row.物料型号 this.form.计量单位流水号 = row.计量单位流水号 this.form.物料来源流水号 = row.物料来源流水号 - this.form.GonghuoshangValue = parseInt(row.供货商流水号) + parseInt(row.供货商流水号) === 721 ? this.form.GonghuoshangValue = 1 : this.form.GonghuoshangValue = parseInt(row.供货商流水号) this.getSelect(initMaterialCategory, ['物料类别', '物料类别流水号'], 'MaterialCategory1') this.getSelect(initMaterialVariety, ['物料品种', '物料品种流水号'], 'MaterialVariety1', row.物料类别流水号) }, From 208753b1a45f187b9f4f2e89c5ad88c927a5c729 Mon Sep 17 00:00:00 2001 From: bryan sun Date: Sun, 5 Jan 2020 10:56:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=90=A5=E9=94=80=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 7b85968f..fc41e22d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,16 +17,16 @@ 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.104:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.0.104:8079/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.1.231:8411/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 export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` -export const MESDownloadFile = `http://192.168.0.104:8079/submit/MESDownloadFile.ashx` +export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.0.104:8079/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service