From 87087912d4fa21b974d8e0db1f7e2e10203a59ae Mon Sep 17 00:00:00 2001 From: lixin Date: Thu, 3 Jan 2019 18:40:19 +0800 Subject: [PATCH 1/2] bugrepaire --- src/views/Inventory/ExchangePart/index.vue | 2 +- src/views/Inventory/InventoryManagement/index.vue | 2 +- src/views/Inventory/OfflinePartOut/index.vue | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/Inventory/ExchangePart/index.vue b/src/views/Inventory/ExchangePart/index.vue index d42ffbbc..ca27a4bd 100644 --- a/src/views/Inventory/ExchangePart/index.vue +++ b/src/views/Inventory/ExchangePart/index.vue @@ -474,7 +474,7 @@ export default { addListDetailinfor(form) { this.$refs[form].validate((valid) => { if (valid) { - addExchangepart(this.form.ExchangeNumber, this.tableData1[0].采购合同明细流水号, this.tableData2[0].采购合同明细流水号, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.tableData1[0].项目流水号, this.tableData2[0].项目流水号, this.tableData1[0].机床流水号, this.tableData2[0].机床流水号, this.tableData1[0].分组流水号, this.tableData2[0].分组流水号, this.tableData1[0].货位流水号, this.tableData2[0].货位流水号, this.form.ExchangeNumberx, this.picikingPeople, this.form.ExchangeNote, this.PickingListNumber).then(response => { + addExchangepart(this.form.ExchangeNumber, this.tableData1[0].采购合同明细流水号, this.tableData2[0].采购合同明细流水号, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.tableData1[0].项目流水号, this.tableData2[0].项目流水号, this.tableData1[0].机床流水号, this.tableData2[0].机床流水号, this.tableData1[0].组件流水号, this.tableData2[0].组件流水号, this.tableData1[0].货位流水号, this.tableData2[0].货位流水号, this.form.ExchangeNumberx, this.picikingPeople, this.form.ExchangeNote, this.PickingListNumber).then(response => { if (response.data[0].result === '1') { this.$message.success('增加成功') } else { this.$message.error('增加失败') } diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue index a1fad173..1f6d153a 100644 --- a/src/views/Inventory/InventoryManagement/index.vue +++ b/src/views/Inventory/InventoryManagement/index.vue @@ -215,7 +215,7 @@ - + - + From 5493ed68e278e97e0070c5bd41e5d54a74358cd8 Mon Sep 17 00:00:00 2001 From: lixin Date: Thu, 3 Jan 2019 18:56:17 +0800 Subject: [PATCH 2/2] lx --- src/utils/request.js | 4 ++-- src/views/Inventory/PartOut/index.vue | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 629d2d97..183b8f60 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -18,8 +18,8 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, - // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.1.199:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, + // baseURL: `http://192.168.1.199:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 diff --git a/src/views/Inventory/PartOut/index.vue b/src/views/Inventory/PartOut/index.vue index f7fb9a76..d1f4e05d 100644 --- a/src/views/Inventory/PartOut/index.vue +++ b/src/views/Inventory/PartOut/index.vue @@ -178,7 +178,7 @@ @@ -289,9 +289,10 @@ export default { // 查询交换单 searchExchange() { ExchangeOut(this.pickingListNumberx).then(response => { + console.log(response.data, 2233455) const data = response.data for (let i = 0; i < data.length; i++) { - data[i].审批通过 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false + data[i].审批通过 === 0 ? data[i].是否禁用 = true : data[i].是否禁用 = false } this.tableDataExchange = data })