From 07688282b5374b770cf8bd68ee7008f3f30714e3 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sun, 30 Dec 2018 11:16:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Outsourcing/OutsourcingTaskExecution/index.vue | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue index 0e01cc71..4dcebb5c 100644 --- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue +++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue @@ -1571,8 +1571,6 @@ export default { span{ margin: 10px 0 10px 10px; } - - - - From fbb57f02becded26632e9986d72e07ed6c5a794c Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sun, 30 Dec 2018 11:26:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E4=B8=8D=E5=90=88?= =?UTF-8?q?=E6=A0=BC=E5=A4=84=E7=90=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Outsourcing/UnqualifiedTreatment/index.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/Outsourcing/UnqualifiedTreatment/index.vue b/src/views/Outsourcing/UnqualifiedTreatment/index.vue index ad6ebdec..68f6b92e 100644 --- a/src/views/Outsourcing/UnqualifiedTreatment/index.vue +++ b/src/views/Outsourcing/UnqualifiedTreatment/index.vue @@ -78,18 +78,18 @@ {{ scope.row.废品数量 }} - + - + @@ -107,7 +107,7 @@ - + @@ -165,6 +165,7 @@ export default { }, created() { this.fetchData() + this.searchTable() }, methods: { fetchData() { From 144b5f9c8a9201779114853e7ecd3a375f74ac7b Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sun, 30 Dec 2018 11:33:42 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E4=B8=8D=E5=90=88?= =?UTF-8?q?=E6=A0=BC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MaterialArrivalManagement/index.vue | 2 +- .../UnqualifiedTreatment/index.vue | 32 +++++++++++-------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue index 2a147c6f..b8fce6f0 100644 --- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue +++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue @@ -7,7 +7,7 @@ 查询 查询全部 到货 - 刷新 + diff --git a/src/views/Outsourcing/UnqualifiedTreatment/index.vue b/src/views/Outsourcing/UnqualifiedTreatment/index.vue index 68f6b92e..545948fc 100644 --- a/src/views/Outsourcing/UnqualifiedTreatment/index.vue +++ b/src/views/Outsourcing/UnqualifiedTreatment/index.vue @@ -138,6 +138,7 @@ import { initOutHelp, searchTable, editList } from '@/api/Outsourcing/Unqualifie export default { data() { return { + num_bhg: '', count2: 0, form: { wasteQuantity: '', // 废品数量 @@ -219,24 +220,29 @@ export default { } this.number = row.外协加工任务单明细流水号 this.form.wasteQuantity = row.废品数量 + this.num_bhg = row.批次数量 this.form.processingMethod = row.不合格处理方式 this.dialogFormVisible1 = true }, // 提交编辑 submitEdit() { - editList(this.number, this.form.wasteQuantity, this.form.processingMethod).then(response => { - if (response.data[0].result === '1') { - this.dialogFormVisible1 = false - this.$message({ - type: 'success', - message: '信息更新成功!' - }) - this.searchTable() - } else { - this.dialogFormVisible1 = false - this.$message.error('信息更新失败') - } - }) + if (this.form.wasteQuantity > this.num_bhg) { + this.$message.error('废品数量大于总数量') + } else { + editList(this.number, this.form.wasteQuantity, this.form.processingMethod).then(response => { + if (response.data[0].result === '1') { + this.dialogFormVisible1 = false + this.$message({ + type: 'success', + message: '信息更新成功!' + }) + this.searchTable() + } else { + this.dialogFormVisible1 = false + this.$message.error('信息更新失败') + } + }) + } }, // 提交添加或者修改 submit(formName) { From b8da0f7deee9dad8bcb2050fe007100333eaeebc Mon Sep 17 00:00:00 2001 From: lixin Date: Tue, 1 Jan 2019 16:55:28 +0800 Subject: [PATCH 4/5] lx --- src/api/Inventory/PartOut.js | 12 +++++ src/views/Inventory/InboundCard/index.vue | 28 ++++++---- src/views/Inventory/InventoryCheck/index.vue | 4 +- src/views/Inventory/OfflinePurchase/index.vue | 1 + src/views/Inventory/PartOut/index.vue | 51 ++++++++++++++++++- 5 files changed, 82 insertions(+), 14 deletions(-) diff --git a/src/api/Inventory/PartOut.js b/src/api/Inventory/PartOut.js index aa7a250f..12adc983 100644 --- a/src/api/Inventory/PartOut.js +++ b/src/api/Inventory/PartOut.js @@ -97,3 +97,15 @@ export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8, } }) } +// 交换出库 +export function ExchangePartOut(data1, data2, data3, data4, data5) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_交换件出库_修改数据', + param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + } + }) +} diff --git a/src/views/Inventory/InboundCard/index.vue b/src/views/Inventory/InboundCard/index.vue index 603936c1..b812aef5 100644 --- a/src/views/Inventory/InboundCard/index.vue +++ b/src/views/Inventory/InboundCard/index.vue @@ -794,6 +794,7 @@ export default { } }) }, + // 选中采购部入库记录 handleSelectionChange(val) { this.nameGroup = [] this.modelGroup = [] @@ -810,6 +811,7 @@ export default { this.priceGroup.push(val[i].单价) } }, + // 选中车间采购入库记录 handleSelectionChange2(val) { this.nameGroup = [] this.modelGroup = [] @@ -827,17 +829,21 @@ export default { } }, InboundCardDetail() { - addInboundCardDetail(this.DetailNumber, this.nameGroup, this.modelGroup, this.specificationGroup, this.paintGroup, this.numberGroup, this.priceGroup).then(response => { - if (response.data[0].result === '1') { - this.$message.success('增加成功') - this.dialogVisible1 = false - searchInboundCardDetail(this.DetailNumber).then(response => { - this.tableData4 = response.data - }) - } else { - this.$message.error('增加失败') - } - }) + if (this.DetailNumber === '') { + this.$message.error('请选择入库单') + } else { + addInboundCardDetail(this.DetailNumber, this.nameGroup, this.modelGroup, this.specificationGroup, this.paintGroup, this.numberGroup, this.priceGroup).then(response => { + if (response.data[0].result === '1') { + this.$message.success('增加成功') + this.dialogVisible1 = false + searchInboundCardDetail(this.DetailNumber).then(response => { + this.tableData4 = response.data + }) + } else { + this.$message.error('增加失败') + } + }) + } }, // 修改入库单 editInboundCardInfor(row) { diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue index 22da3392..31511db2 100644 --- a/src/views/Inventory/InventoryCheck/index.vue +++ b/src/views/Inventory/InventoryCheck/index.vue @@ -325,10 +325,10 @@ - + - +
diff --git a/src/views/Inventory/OfflinePurchase/index.vue b/src/views/Inventory/OfflinePurchase/index.vue index 74d44954..20874713 100644 --- a/src/views/Inventory/OfflinePurchase/index.vue +++ b/src/views/Inventory/OfflinePurchase/index.vue @@ -351,6 +351,7 @@ export default { disable2: true, disable3: true, disable4: true, + purchasecardnumber: '', // 请购单流水号 disable: false, // 其他的禁用 House: [], HouseNumber: '', diff --git a/src/views/Inventory/PartOut/index.vue b/src/views/Inventory/PartOut/index.vue index 1b3b789b..f7fb9a76 100644 --- a/src/views/Inventory/PartOut/index.vue +++ b/src/views/Inventory/PartOut/index.vue @@ -116,11 +116,41 @@ {{ scope.row.交换件名称 }} + + + + + + + + + + + + + + + + + + + + + @@ -167,7 +202,7 @@