From 9b52cb01272556c53810342ec21b4c01fab2ab67 Mon Sep 17 00:00:00 2001 From: lixin Date: Mon, 19 Nov 2018 17:19:41 +0800 Subject: [PATCH] lx --- src/api/Inventory/PickingList.js | 4 +- src/api/ManufacturingCenter/GroupMatching.js | 12 ++ src/views/Inventory/DirectPart/index.vue | 4 +- src/views/Inventory/ExchangePart/index.vue | 4 +- src/views/Inventory/InventoryCheck/index.vue | 32 ++-- src/views/Inventory/OfflinePartOut/index.vue | 9 +- src/views/Inventory/PartOut/index.vue | 10 +- src/views/Inventory/PickingList/index.vue | 161 ++++++++++-------- src/views/Inventory/SubstitutePart/index.vue | 4 +- .../GroupMatching/index.vue | 78 ++++++++- 10 files changed, 210 insertions(+), 108 deletions(-) diff --git a/src/api/Inventory/PickingList.js b/src/api/Inventory/PickingList.js index 16426f6c..dffc6797 100644 --- a/src/api/Inventory/PickingList.js +++ b/src/api/Inventory/PickingList.js @@ -136,14 +136,14 @@ export function dropListDetail(DetailNumberx) { }) } // 增加领料单明细 -export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, project, machine, team, materialName, materialNumber, materialType, outNumber, partType, Note, data1, data2, data3, data4, data5) { +export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, project, machine, team, materialName, materialNumber, materialType, outNumber, partType, Note, data1, data2, data3, data4, data5, data6) { return request({ url: '', method: 'post', data: { type: '2', name: '车间装配管理_领料单_领料单明细增加', - param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&项目名称=' + project + '&机床名称=' + machine + '&组件名称=' + team + '&物料名称=' + materialName + '&物料型号=' + materialNumber + '&物料规格=' + materialType + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&组件零件流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&项目名称=' + project + '&机床图号=' + machine + '&组号=' + team + '&物料名称=' + materialName + '&物料型号=' + materialNumber + '&物料规格=' + materialType + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&组件零件流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + '&车间外购=' + data6 } }) } diff --git a/src/api/ManufacturingCenter/GroupMatching.js b/src/api/ManufacturingCenter/GroupMatching.js index 1b9b2502..a1a30ad5 100644 --- a/src/api/ManufacturingCenter/GroupMatching.js +++ b/src/api/ManufacturingCenter/GroupMatching.js @@ -44,3 +44,15 @@ export function searchTable(check, entryNameValue, check1, machine, check2, grou } }) } +export function searchPurchaseTable(check, entryNameValue, check1, machine, check2, groupNum, check3, year, check4, month, check5, time, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_外购件成组配套_查询数据', + param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&年_check=' + check3 + '=int&年=' + year + '=string&月_check=' + check4 + '=int&月=' + month + '=int&入库时间_check=' + check5 + '=int&入库时间=' + time + '=string', + pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/views/Inventory/DirectPart/index.vue b/src/views/Inventory/DirectPart/index.vue index 06ac5275..22dcde9c 100644 --- a/src/views/Inventory/DirectPart/index.vue +++ b/src/views/Inventory/DirectPart/index.vue @@ -59,12 +59,12 @@ diff --git a/src/views/Inventory/ExchangePart/index.vue b/src/views/Inventory/ExchangePart/index.vue index ca8adaa1..064a5477 100644 --- a/src/views/Inventory/ExchangePart/index.vue +++ b/src/views/Inventory/ExchangePart/index.vue @@ -46,12 +46,12 @@ diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue index ef018d8c..4cee236b 100644 --- a/src/views/Inventory/InventoryCheck/index.vue +++ b/src/views/Inventory/InventoryCheck/index.vue @@ -45,14 +45,14 @@ {{ scope.row.项目名称 }} - + - + @@ -205,14 +205,14 @@ {{ scope.row.项目名称 }} - + - + @@ -358,14 +358,14 @@ {{ scope.row.项目名称 }} - + - + @@ -513,14 +513,14 @@ {{ scope.row.项目名称 }} - + - + diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue index 972521a4..fb8e7574 100644 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ b/src/views/Inventory/OfflinePartOut/index.vue @@ -113,14 +113,14 @@ {{ scope.row.项目名称 }} - + - + @@ -243,6 +243,7 @@ export default { }, // 打开表单 parOut(row) { + console.log(row) this.form = [] this.MachineValue = '' this.GroupNumValue = '' diff --git a/src/views/Inventory/PartOut/index.vue b/src/views/Inventory/PartOut/index.vue index b5ae6bd5..f5a151bb 100644 --- a/src/views/Inventory/PartOut/index.vue +++ b/src/views/Inventory/PartOut/index.vue @@ -52,14 +52,14 @@ {{ scope.row.项目名称 }} - + - + @@ -168,7 +168,7 @@ export default { // 出库 partOut(row) { console.log(row) - if (row.采购合同明细流水号 !== null) { + if (row.车间外购 === 1) { WorkShopPart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => { if (response.data[0].result === '1') { this.$message.success('出库成功') diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue index 91df82e9..2e3d5444 100644 --- a/src/views/Inventory/PickingList/index.vue +++ b/src/views/Inventory/PickingList/index.vue @@ -81,14 +81,14 @@ {{ scope.row.项目名称 }} - + - + @@ -153,14 +153,14 @@ {{ scope.row.项目名称 }} - + - + @@ -230,14 +230,14 @@ {{ scope.row.项目名称 }} - + - + @@ -297,12 +297,12 @@ {{ scope.row.项目名称 }} - + - + @@ -314,7 +314,7 @@ @@ -346,51 +346,51 @@
取消 - 确 定 + 确 定
- + - - - - - - -
- 取消 - 确 定 -
- - - - - - - - - - - -
- 取消 - 确 定 -
- - - - - - +
- 取消 + 取消 + 确 定 +
+ + + + + + + + + + + +
+ 取消 + 确 定 +
+ + + + + + + + + + + +
+ 取消 确 定
@@ -473,6 +473,22 @@ export default { OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }], outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }] }, + form3: { + OutNumber: '', // 出库数量 + outNote: '' // 出库备注 + }, + rules3: { // 表单验证规则 + OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }], + outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }] + }, + form4: { + OutNumber: '', // 出库数量 + outNote: '' // 出库备注 + }, + rules4: { // 表单验证规则 + OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }], + outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }] + }, partType: '', // 零件类型 craftplannumber: '', // 工艺计划流水号 receive: '', // 收件信息ID @@ -712,9 +728,9 @@ export default { this.partProjectNumber = row.项目流水号 this.partProjectName = row.项目名称 this.partMachineNumber = row.机床流水号 - this.partMachineName = row.机床名称 + this.partMachineName = row.机床图号 this.partGroupNumber = row.组件流水号 - this.partGroupName = row.组件名称 + this.partGroupName = row.组号 this.partType = row.零件类型 this.craftplannumber = row.工艺计划流水号 this.receive = row.收件信息id @@ -726,7 +742,6 @@ export default { this.materialName = row.零件名称 this.materialType = row.零件类型名称 this.materialNumber = row.零件图号 - console.log(this.receive, 41645) }, addBasicListDetail(formName) { if (this.pickingListNumberx === '') { @@ -736,7 +751,7 @@ export default { } this.$refs[formName].validate((valid) => { if (valid) { - addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.locatenumber).then(response => { + addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.locatenumber, 0).then(response => { if (response.data[0].result === '1') { this.$message.success('增加成功') } else { @@ -754,9 +769,9 @@ export default { this.partProjectNumber = row.项目流水号 this.partProjectName = row.项目名称 this.partMachineNumber = row.机床流水号 - this.partMachineName = row.机床名称 + this.partMachineName = row.机床图号 this.partGroupNumber = row.组件流水号 - this.partGroupName = row.组件名称 + this.partGroupName = row.组号 this.partType = row.零件类型代码 this.craftplannumber = row.工艺计划流水号 this.receive = row.收件信息ID @@ -776,7 +791,7 @@ export default { } else { this.$refs[formName].validate((valid) => { if (valid) { - addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.locatenumber).then(response => { + addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form2.OutNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.teamPart, this.locatenumber, 0).then(response => { if (response.data[0].result === '1') { this.$message.success('增加成功') } else { @@ -795,9 +810,9 @@ export default { this.partProjectNumber = row.项目流水号 this.partProjectName = row.项目名称 this.partMachineNumber = row.机床流水号 - this.partMachineName = row.机床名称 + this.partMachineName = row.机床图号 this.partGroupNumber = row.组件流水号 - this.partGroupName = row.组件名称 + this.partGroupName = row.组号 this.partType = row.零件类型 this.receive = row.收件信息ID this.locatenumber = row.货位流水号 @@ -807,20 +822,24 @@ export default { this.dialogFormVisibleWork = true this.purchaseDetailNum = row.采购合同明细流水号 }, - addWorkshopListDetail() { - if (this.pickingListNumberx === '') { - this.$message.error('请选择领料单') - } else if (this.OutNumber === '') { - this.$message.error('请输入领用数量') - } else { - addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber).then(response => { - if (response.data[0].result === '1') { - this.$message.success('增加成功') + addWorkshopListDetail(formName) { + this.$refs[formName].validate((valid) => { + if (valid) { + if (this.pickingListNumberx === '') { + this.$message.error('请选择领料单') + } else if (this.OutNumber === '') { + this.$message.error('请输入领用数量') } else { - this.$message.error('增加失败') + addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form3.OutNumber, this.partType, this.form3.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 1).then(response => { + if (response.data[0].result === '1') { + this.$message.success('增加成功') + } else { + this.$message.error('增加失败') + } + }) } - }) - } + } + }) this.dialogFormVisibleWork = false this.searchListinfor() }, @@ -830,7 +849,7 @@ export default { this.pickingListDetail = row.领料单明细流水号 }, submitChannge() { - editListDetail(this.pickingListDetail, this.form2.OutNumber, this.form2.outNote).then(response => { + editListDetail(this.pickingListDetail, this.form4.OutNumber, this.form4.outNote).then(response => { if (response.data[0].result === '1') { this.$message.success('修改成功') } else { diff --git a/src/views/Inventory/SubstitutePart/index.vue b/src/views/Inventory/SubstitutePart/index.vue index 19a44088..a3c908db 100644 --- a/src/views/Inventory/SubstitutePart/index.vue +++ b/src/views/Inventory/SubstitutePart/index.vue @@ -46,12 +46,12 @@ diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue index 5058e5b8..162f5595 100644 --- a/src/views/ManufacturingCenter/GroupMatching/index.vue +++ b/src/views/ManufacturingCenter/GroupMatching/index.vue @@ -52,7 +52,7 @@ v-loading="loading" :data="tableData" style="width: 100%;max-height: 600px" - height="600" + height="300" highlight-current-row border> @@ -103,7 +103,70 @@ @current-change="handleCurrentChange"/> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+