From ab2265252816a593f0955699cdcaf7b25ed0962d Mon Sep 17 00:00:00 2001 From: lixin Date: Fri, 4 Jan 2019 16:21:13 +0800 Subject: [PATCH] lx --- src/api/Inventory/InventoryManagement.js | 4 ++-- src/api/Inventory/OfflinePurchase.js | 4 ++-- src/api/Inventory/PartOut.js | 4 ++-- src/views/Inventory/InventoryCheck/index.vue | 2 ++ src/views/Inventory/OfflinePurchase/index.vue | 2 +- src/views/Inventory/PartOut/index.vue | 5 ++--- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/api/Inventory/InventoryManagement.js b/src/api/Inventory/InventoryManagement.js index b121a949..2e6d2393 100644 --- a/src/api/Inventory/InventoryManagement.js +++ b/src/api/Inventory/InventoryManagement.js @@ -12,14 +12,14 @@ export function initWarehouse() { }) } // 增加仓库 -export function addWarehouse(num0, num1, num2, num3, num4) { +export function addWarehouse(num0, num1, num2, num3, num4, num5) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_货位仓库_仓库_增加数据', - param: '仓库编号=' + num0 + '&仓库名称=' + num1 + '&仓库描述=' + num2 + '&地址=' + num3 + '&联系人=' + num4 + '&备注=' + num4 + param: '仓库编号=' + num0 + '&仓库名称=' + num1 + '&仓库描述=' + num2 + '&地址=' + num3 + '&联系人=' + num4 + '&备注=' + num5 } }) } diff --git a/src/api/Inventory/OfflinePurchase.js b/src/api/Inventory/OfflinePurchase.js index c37abee8..5c90819b 100644 --- a/src/api/Inventory/OfflinePurchase.js +++ b/src/api/Inventory/OfflinePurchase.js @@ -74,14 +74,14 @@ export function addRequestCardDetail(data1, data2) { }) } // 请购单明细修改 -export function alterNumber(data1, data2, data3) { +export function alterNumber(data2, data3) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_离线请购单_请购单明细修改', - param: '离线请购单流水号=' + data1 + '&离线请购单明细流水号组=' + data2 + '&数量组=' + data3 + param: '离线请购单明细流水号组=' + data2 + '&数量组=' + data3 } }) } diff --git a/src/api/Inventory/PartOut.js b/src/api/Inventory/PartOut.js index 12adc983..066a83bb 100644 --- a/src/api/Inventory/PartOut.js +++ b/src/api/Inventory/PartOut.js @@ -98,14 +98,14 @@ export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8, }) } // 交换出库 -export function ExchangePartOut(data1, data2, data3, data4, data5) { +export function ExchangePartOut(data0, data1, data2, data3, data4, data5) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_交换件出库_修改数据', - param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + param: '交换单流水号=' + data0 + '&采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 } }) } diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue index 31511db2..a0d29766 100644 --- a/src/views/Inventory/InventoryCheck/index.vue +++ b/src/views/Inventory/InventoryCheck/index.vue @@ -1734,6 +1734,7 @@ export default { }) }, AlterNumber(row) { + this.form2 = [] this.project = row.项目流水号 this.machinenumber = row.机床流水号 this.partnumber = row.组件流水号 @@ -1752,6 +1753,7 @@ export default { this.material = row.材料 }, AlterBasicNumber(row) { + this.form2 = [] this.project = row.项目流水号 this.machinenumber = row.机床流水号 this.partnumber = row.组件流水号 diff --git a/src/views/Inventory/OfflinePurchase/index.vue b/src/views/Inventory/OfflinePurchase/index.vue index 20874713..b6cf9afc 100644 --- a/src/views/Inventory/OfflinePurchase/index.vue +++ b/src/views/Inventory/OfflinePurchase/index.vue @@ -568,7 +568,7 @@ export default { this.partGroup.push(this.tableData3[i].离线请购单明细流水号) this.numGroup.push(this.tableData3[i].数量) } - alterNumber(this.purchasecardnumber, this.partGroup, this.numGroup).then(response => { + alterNumber(this.partGroup, this.numGroup).then(response => { if (response.data[0].result === '1') { this.$message.success('请购单生成成功') this.searchTable2() diff --git a/src/views/Inventory/PartOut/index.vue b/src/views/Inventory/PartOut/index.vue index d1f4e05d..d4df1b65 100644 --- a/src/views/Inventory/PartOut/index.vue +++ b/src/views/Inventory/PartOut/index.vue @@ -289,10 +289,9 @@ 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].是否出库 === 1 ? data[i].是否禁用 = true : data[i].是否禁用 = false } this.tableDataExchange = data }) @@ -364,7 +363,7 @@ export default { this.dialogFormVisible = false }, execExchangePartOut(row) { - ExchangePartOut(row.采购合同明细流水号, row.申请人, row.交换数量, row.被交换货位流水号, row.备注).then(response => { + ExchangePartOut(row.交换单流水号, row.被交换件采购合同明细流水号, row.申请人, row.交换数量, row.被交换货位流水号, row.备注).then(response => { if (response.data[0].result === '1') { this.$message.success('出库成功') this.dialogFormVisible = false