From ed1d897aab1eee2b52a858c04e81c6f6f64f9f45 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sat, 5 Jan 2019 11:33:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 4 +--- .../PartWorkCraftSelect_rdlc/index.vue | 13 +++++++------ .../ManufacturingCenter/ProcessingStatus/index.vue | 1 + .../ProcessingStatusEdit/index.vue | 1 + .../ProductionCapacityBalance/index.vue | 1 + .../Outsourcing/InterBudgetaryBudgets/index.vue | 1 + .../OutsourcingPaymentPlanManagement/index.vue | 1 + src/views/Outsourcing/PreorderAssociation/index.vue | 1 + 8 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 491b6cb5..69fb2138 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -19,9 +19,7 @@ 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://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.212: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/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue index 9112c622..f4b54e5f 100644 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue @@ -701,7 +701,13 @@ export default { } } - + diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue index 9574c768..80dc229d 100644 --- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue @@ -373,6 +373,7 @@ export default { }, created() { this.fetchData() + this.getTableData() }, methods: { // 查询供应商名称 diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue index 1981fda5..6a326aa4 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue @@ -437,6 +437,7 @@ export default { created() { this.fetchData() this.fetchData3() + this.getTableData() }, methods: { handleCurrentChange2(row) { // 获取当前行人员信息 diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue index 84e4b9e3..cad79f87 100644 --- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue +++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue @@ -729,6 +729,7 @@ export default { created() { this.fetchData() this.Selection1() + this.getTable() }, methods: { // TABLE每行颜色 diff --git a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue index 5595bd25..099172ed 100644 --- a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue +++ b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue @@ -205,6 +205,7 @@ export default { }, created() { this.fetchData() + this.searchPartNum() }, methods: { radioChange() { diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue index 9a2be09f..40a0e54a 100644 --- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue +++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue @@ -423,6 +423,7 @@ export default { }, created() { this.fetchData() + this.searchTable() }, methods: { getSummaries(param) { diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue index 03764682..baeb5eb9 100644 --- a/src/views/Outsourcing/PreorderAssociation/index.vue +++ b/src/views/Outsourcing/PreorderAssociation/index.vue @@ -166,6 +166,7 @@ export default { }, created() { this.fetchData() + this.searchTable() }, methods: { fetchData() { From 90c459364b05033cfda4258f348fc3ffc369418f Mon Sep 17 00:00:00 2001 From: lixin Date: Sat, 5 Jan 2019 18:56:09 +0800 Subject: [PATCH 2/4] lx --- src/api/Inventory/ExchangePart.js | 6 +++--- src/api/Inventory/InboundCard.js | 2 +- src/utils/request.js | 2 +- src/views/Inventory/DirectPart/index.vue | 2 +- src/views/Inventory/ExchangePart/index.vue | 7 ++++--- src/views/Inventory/OfflinePartOut/index.vue | 5 +++++ src/views/Inventory/OfflinePurchase/index.vue | 6 ------ src/views/Inventory/PickingList/index.vue | 10 +++++----- src/views/Inventory/SubstitutePart/index.vue | 13 ++++--------- 9 files changed, 24 insertions(+), 29 deletions(-) diff --git a/src/api/Inventory/ExchangePart.js b/src/api/Inventory/ExchangePart.js index 9565acdb..ba5d4098 100644 --- a/src/api/Inventory/ExchangePart.js +++ b/src/api/Inventory/ExchangePart.js @@ -96,15 +96,15 @@ export function dropExchangeList(PickingListNumberx) { } }) } -// 删除交换单 -export function editExchangeList(data1, data2, data3, data4) { +// 交换单修改 +export function editExchangeList(data1, data2, data3, data4, data5) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_交换件_交换单修改', - param: '交换单流水号=' + data1 + '&交换单编号=' + data2 + '&交换数量=' + data3 + '&备注=' + data4 + param: '交换单流水号=' + data1 + '&交换单编号=' + data2 + '&交换数量=' + data3 + '&领料单流水号=' + data4 + '&备注=' + data5 } }) } diff --git a/src/api/Inventory/InboundCard.js b/src/api/Inventory/InboundCard.js index 6bd7ba98..616a0857 100644 --- a/src/api/Inventory/InboundCard.js +++ b/src/api/Inventory/InboundCard.js @@ -142,7 +142,7 @@ export function addInboundCardDetail(data1, data2, data3, data4, data5, data6, d }) } -// 入库单明细查询 +// 入库单明细删除 export function deleteInboundCardDetail(data1) { return request({ url: '', diff --git a/src/utils/request.js b/src/utils/request.js index 491b6cb5..1f855b84 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -20,8 +20,8 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, + // baseURL: `http://192.168.1.212: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/DirectPart/index.vue b/src/views/Inventory/DirectPart/index.vue index 4a91ec3c..b2a12d23 100644 --- a/src/views/Inventory/DirectPart/index.vue +++ b/src/views/Inventory/DirectPart/index.vue @@ -367,7 +367,7 @@ export default { this.dialogFormVisible1 = true this.directPartNumber = row.直达件流水号 this.form.DirectNumber = row.到货数量 - this.PeopleValue = parseInt(row.领用人员流水号) + this.form.getPeople = parseInt(row.领用人员流水号) this.form.DirectNote = row.备注 }, // 修改直达件 diff --git a/src/views/Inventory/ExchangePart/index.vue b/src/views/Inventory/ExchangePart/index.vue index ca27a4bd..c7d97afa 100644 --- a/src/views/Inventory/ExchangePart/index.vue +++ b/src/views/Inventory/ExchangePart/index.vue @@ -250,7 +250,7 @@ - + 取消 确 定 - 确定 + 确定 @@ -553,12 +553,13 @@ export default { this.exchangeListNumber = row.交换单流水号 this.form.ExchangeNumber = row.交换单编号 this.form.ExchangeNumberx = row.交换数量 + this.PickingListNumber = parseInt(row.领料单流水号) this.form.ExchangeNote = row.备注 this.title = '编辑' this.dialogFormVisible = true }, submitEdit() { - this.editTable(editExchangeList, [this.exchangeListNumber, this.form.ExchangeNumber, this.form.ExchangeNumberx, this.form.ExchangeNote], 'form', function() { this.getExchangeTable(); this.dialogFormVisible = false }) + this.editTable(editExchangeList, [this.exchangeListNumber, this.form.ExchangeNumber, this.form.ExchangeNumberx, this.PickingListNumber, this.form.ExchangeNote], 'form', function() { this.getExchangeTable(); this.dialogFormVisible = false }) } } } diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue index 0ba61882..5cb89e64 100644 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ b/src/views/Inventory/OfflinePartOut/index.vue @@ -141,6 +141,11 @@ {{ scope.row.出库时间 }} + + + diff --git a/src/views/Inventory/OfflinePurchase/index.vue b/src/views/Inventory/OfflinePurchase/index.vue index b6cf9afc..e1d78972 100644 --- a/src/views/Inventory/OfflinePurchase/index.vue +++ b/src/views/Inventory/OfflinePurchase/index.vue @@ -133,12 +133,6 @@ - - - - - -