From baf94308ab5cdf6ea510e8d0f1286ee6cb268701 Mon Sep 17 00:00:00 2001 From: lixin Date: Tue, 25 Dec 2018 20:08:03 +0800 Subject: [PATCH] lxtest --- src/api/Inventory/DirectPart.js | 4 +- src/api/Inventory/InventoryCheck.js | 10 ++-- src/api/Inventory/PartOut.js | 4 +- src/api/Inventory/PickingList.js | 4 +- src/api/Inventory/SubstitutePart.js | 9 ++-- src/views/Inventory/DirectPart/index.vue | 6 ++- src/views/Inventory/Inboundscanning/index.vue | 3 +- src/views/Inventory/InventoryCheck/index.vue | 28 +++++----- .../Inventory/InventoryManagement/index.vue | 8 +-- src/views/Inventory/PartOut/index.vue | 16 +++--- src/views/Inventory/PickingList/index.vue | 52 ++++++++++--------- src/views/Inventory/SubPartCome/index.vue | 10 ++++ src/views/Inventory/SubstitutePart/index.vue | 36 ++++++++----- 13 files changed, 109 insertions(+), 81 deletions(-) diff --git a/src/api/Inventory/DirectPart.js b/src/api/Inventory/DirectPart.js index 944d2ea0..dd91a708 100644 --- a/src/api/Inventory/DirectPart.js +++ b/src/api/Inventory/DirectPart.js @@ -84,14 +84,14 @@ export function searchPeople(data1) { }) } // 直达件增加 -export function addDirectPart(data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13, data14) { +export function addDirectPart(data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13, data14, data15) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_直达件_直达件增加', - param: '物料流水号=' + data1 + '&实际到货数量=' + data2 + '&货位流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&入库人员流水号=' + data5 + '&领用者=' + data6 + '&出库数量=' + data7 + '&组件零件流水号=' + data8 + '&项目名称=' + data9 + '&机床名称=' + data10 + '&组件名称=' + data11 + '&物料名称=' + data12 + '&采购合同编号=' + data13 + '&备注=' + data14 + param: '实际到货数量=' + data1 + '&采购合同明细流水号=' + data2 + '&入库人员流水号=' + data3 + '&领用者=' + data4 + '&出库数量=' + data5 + '&组件零件流水号=' + data6 + '&组件零件基本件流水号=' + data7 + '&项目流水号=' + data8 + '&机床流水号=' + data9 + '&组件流水号=' + data10 + '&名称=' + data11 + '&备注=' + data12 + '&物料型号=' + data13 + '&物料规格=' + data14 + '&零件图号=' + data15 } }) } diff --git a/src/api/Inventory/InventoryCheck.js b/src/api/Inventory/InventoryCheck.js index 4ba5b2ae..4618e7c5 100644 --- a/src/api/Inventory/InventoryCheck.js +++ b/src/api/Inventory/InventoryCheck.js @@ -42,7 +42,7 @@ export function searchPurchasePart(pageCurrent, pageSize, project_check, project method: 'post', data: { type: '1', - name: 'dbo.库存管理_库存盘点_外购件查询', + name: '库存管理_库存盘点_外购件查询', param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group, Pagination: pageCurrent + '&' + pageSize } @@ -79,7 +79,7 @@ export function searchStandardPart(pageCurrent, pageSize, project_check, project method: 'post', data: { type: '1', - name: 'dbo.库存管理_库存盘点_标准件查询', + name: '库存管理_库存盘点_标准件查询', param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group, Pagination: pageCurrent + '&' + pageSize } @@ -142,7 +142,7 @@ export function searchBasicPart(pageCurrent, pageSize, project_check, project, m method: 'post', data: { type: '1', - name: 'dbo.库存管理_库存盘点_基本件查询', + name: '库存管理_库存盘点_基本件查询', param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group, Pagination: pageCurrent + '&' + pageSize } @@ -155,7 +155,7 @@ export function searchBasicPartIn(craftNumber) { method: 'post', data: { type: '1', - name: 'dbo.库存管理_库存盘点_基本件入库记录', + name: '库存管理_库存盘点_基本件入库记录', param: '工艺计划流水号=' + craftNumber } }) @@ -211,7 +211,7 @@ export function searchHoursePurchasePart(pageCurrent, pageSize, project_check, p } }) } -// 车间采购外购件查询 +// 车间采购库存盘点修改 export function CheckAlter(receive, project, machinenumber, partnumber, oldnumber, reason, number, people, locate, contractdetail, alterdate, craftnumber, materialType, materiallocate) { return request({ url: '', diff --git a/src/api/Inventory/PartOut.js b/src/api/Inventory/PartOut.js index b68ee094..fed72d7e 100644 --- a/src/api/Inventory/PartOut.js +++ b/src/api/Inventory/PartOut.js @@ -44,7 +44,7 @@ export function PurchasePart(data1, data2, data3, data4, data5) { data: { type: '2', name: '库存管理_外购件出库_修改数据', - param: '组件零件流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 } }) } @@ -68,7 +68,7 @@ export function WorkShopPart(data1, data2, data3, data4, data5) { data: { type: '2', name: '库存管理_车间采购出库_修改数据', - param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + param: '请购单明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 } }) } diff --git a/src/api/Inventory/PickingList.js b/src/api/Inventory/PickingList.js index 9bc3eb10..2d87cc63 100644 --- a/src/api/Inventory/PickingList.js +++ b/src/api/Inventory/PickingList.js @@ -137,14 +137,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, data6, data7) { +export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, outNumber, partType, Note, data1, data2, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13) { 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 + '&车间外购=' + data6 + '&物料与货位对照流水号=' + data7 + param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&采购合同明细流水号=' + data4 + '&请购单明细流水号=' + data5 + '&货位流水号=' + data6 + '&出库类型=' + data7 + '&物料与货位对照流水号=' + data8 + '&名称=' + data9 + '&物料规格=' + data10 + '&物料型号=' + data11 + '&零件图号=' + data12 + '&材料=' + data13 } }) } diff --git a/src/api/Inventory/SubstitutePart.js b/src/api/Inventory/SubstitutePart.js index 3ea1316a..90408e00 100644 --- a/src/api/Inventory/SubstitutePart.js +++ b/src/api/Inventory/SubstitutePart.js @@ -48,13 +48,14 @@ export function searchPurchasePart(project_check, project, machine_check, machin }) } // 被替换件查询 -export function searchSubstituted() { +export function searchSubstituted(material_check, material) { return request({ url: '', method: 'post', data: { type: '1', - name: '库存管理_替换件_被替换件查询' + name: '库存管理_替换件_被替换件查询', + param: '物料名称_check=' + material_check + '&物料名称=' + material } }) } @@ -95,14 +96,14 @@ export function deleteSubstitutedCard(data1) { }) } // 增加替换件 -export function addSubstitutepart(data1, data2, data3, data4, data5, data6, data7, data8) { +export function addSubstitutepart(data1, data2, data3, data4, data55, data5, data6, data7, data8) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_替换件_零件替换', - param: '离线合同明细流水号=' + data1 + '&替换件采购合同明细流水号=' + data2 + '&替换单编号=' + data3 + '&替换件名称=' + data4 + '&被替换件名称=' + data5 + '&申请人=' + data6 + '&替换数量=' + data7 + '&备注=' + data8 + param: '离线合同明细流水号=' + data1 + '&替换件采购合同明细流水号=' + data2 + '&替换单编号=' + data3 + '&替换件名称=' + data4 + '&被替换件货位流水号=' + data55 + '&被替换件名称=' + data5 + '&申请人=' + data6 + '&替换数量=' + data7 + '&备注=' + data8 } }) } diff --git a/src/views/Inventory/DirectPart/index.vue b/src/views/Inventory/DirectPart/index.vue index fc4a7f6d..33df0fd7 100644 --- a/src/views/Inventory/DirectPart/index.vue +++ b/src/views/Inventory/DirectPart/index.vue @@ -40,6 +40,7 @@ v-loading="listLoading" :data="tableDataPurchase" border + size="mini" style="width: 100%;" height="200"> @@ -95,6 +96,7 @@ v-loading="listLoading1" :data="directRecord" border + size="mini" style="width: 100%;" height="200"> -
- 零件图号 @@ -13,6 +11,7 @@ v-loading="listLoading" :data="tableData" border + size="mini" style="width: 100%;height: 650px" > @@ -379,7 +379,8 @@ border size="mini" style="width: 100%;" - height="200"> + height="200" + @row-click="searchPurchasePartRecord"> @@ -535,7 +536,8 @@ size="mini" border style="width: 100%;" - height="200"> + height="200" + @row-click="standardselecting"> @@ -649,7 +651,8 @@ border size="mini" style="width: 100%;" - height="200"> + height="200" + @row-click="searchPurchasePartRecord"> @@ -863,7 +866,8 @@ border size="mini" style="width: 100%;" - height="200"> + height="200" + @row-click="HouseBasicRecord"> @@ -1021,7 +1025,8 @@ border size="mini" style="width: 100%;" - height="200"> + height="200" + @row-click="HousePurchaseRecord"> @@ -1721,7 +1726,6 @@ export default { this.dialogFormVisible = true }, submitChannge() { - console.log(this.receive, this.project, this.machinenumber, this.partnumber, this.oldnumber, this.form2.AlterReason, this.form2.Number, this.id, this.locate, this.contractdetail, this.craftnumber, this.materialType, this.materiallocate) CheckAlter(this.receive, this.project, this.machinenumber, this.partnumber, this.oldnumber, this.form2.AlterReason, this.form2.Number, this.id, this.locate, this.contractdetail, this.craftnumber, this.materialType, this.materiallocate).then(response => { if (response.data[0].result === '1') { this.$message.success('修改成功') diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue index 781eaae1..a0757d1d 100644 --- a/src/views/Inventory/InventoryManagement/index.vue +++ b/src/views/Inventory/InventoryManagement/index.vue @@ -7,6 +7,7 @@ @@ -40,7 +41,7 @@ {{ scope.row.备注 }} - + - - 增加 - diff --git a/src/views/Inventory/PartOut/index.vue b/src/views/Inventory/PartOut/index.vue index 47f51222..40b6bceb 100644 --- a/src/views/Inventory/PartOut/index.vue +++ b/src/views/Inventory/PartOut/index.vue @@ -64,7 +64,7 @@ {{ scope.row.组号 }} - + @@ -91,8 +91,8 @@ @@ -209,6 +209,7 @@ export default { data[i].是否出库 === '1' ? data[i].是否禁用 = true : data[i].是否禁用 = false } this.tableDataPicking = data + console.log(this.tableDataPicking) this.listLoading1 = false }) }, @@ -221,17 +222,16 @@ export default { }, // 出库 partOut(row) { - console.log(row) - if (row.车间外购 === 1) { - WorkShopPart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => { + if (row.出库类型 === 3) { + WorkShopPart(row.请购单明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => { if (response.data[0].result === '1') { ListDetailOut(row.领料单明细流水号) this.$message.success('出库成功') this.searchListDetailt() } else { this.$message.error('出库失败') } }) - } else if (row.零件类型 === 1 || row.零件类型 === 2) { - PurchasePart(row.组件零件流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => { + } else if (row.出库类型 === 2) { + PurchasePart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => { if (response.data[0].result === '1') { ListDetailOut(row.领料单明细流水号) this.$message.success('出库成功') diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue index 1258b84d..14118acd 100644 --- a/src/views/Inventory/PickingList/index.vue +++ b/src/views/Inventory/PickingList/index.vue @@ -64,9 +64,9 @@ align="center" type="index" width="50"/> - + @@ -182,7 +182,7 @@ {{ scope.row.零件名称 }} - + @@ -275,7 +275,7 @@ {{ scope.row.组号 }} - + @@ -320,6 +320,7 @@ v-loading="listLoadingx" :data="tableDataHouse" border + size="mini" style="width: 100%;" height="200"> - + @@ -583,13 +584,17 @@ export default { pickingListDetail: '', tableDataHouse: [], listLoadingx: '', - purchaseDetailNum: '', + purchaseDetailNum: '', // 采购合同明细流水号 + askPurchaseNumber: '', // 请购单明细流水号 dialogFormVisibleWork: false, time: [], materialLocate: '', enableOut: '', pickingListNumber_check: 1, - outNumber: '' + outNumber: '', + outType: '', + material: '', // 材料 + partPiant: '' // 零件图号 } }, computed: { @@ -664,7 +669,6 @@ export default { } } this.tableDataPurchase = response.data.rows - console.log(this.tableDataPurchase, 124124) this.listLoading = false this.total1 = response.data.total }) @@ -813,6 +817,7 @@ export default { // 增加基本件领料单明细 addBasicListDetailinfor(row) { this.form = [] + this.outType = 1 this.partProjectNumber = row.项目流水号 this.partProjectName = row.项目名称 this.partMachineNumber = row.机床流水号 @@ -827,11 +832,8 @@ export default { this.materialName = row.零件名称 this.materialNumber = row.零件图号 this.dialogFormVisible1 = true - this.materialName = row.零件名称 this.materialType = row.零件类型名称 - this.materialNumber = row.零件图号 this.enableOut = row.可出库数量 - this.purchaseDetailNum = row.采购合同明细流水号 }, addBasicListDetail(formName) { if (this.pickingListNumberx === '') { @@ -841,7 +843,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.materialNumber, this.materialType, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 0, this.materialLocate).then(response => { + addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.materialNumber, this.material).then(response => { if (response.data[0].result === '1') { this.$message.success('增加成功') this.searchPartinfo() @@ -859,6 +861,7 @@ export default { // 增加外购件领料单明细 addListDetailinfor(row) { this.form = [] + this.outType = 2 this.partProjectNumber = row.项目流水号 this.partProjectName = row.项目名称 this.partMachineNumber = row.机床流水号 @@ -874,6 +877,8 @@ export default { this.materialNumber = row.物料型号 this.materialType = row.物料规格 this.dialogFormVisible = true + this.partPiant = row.零件图号 + this.material = row.材料 this.purchaseDetailNum = row.采购合同明细流水号 this.materialLocate = row.物料与货位对照流水号 this.enableOut = row.货位存量 - row.待出库数量 @@ -887,7 +892,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.form2.OutNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 0, this.materialLocate).then(response => { + addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form2.OutNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.partPiant, this.material).then(response => { if (response.data[0].result === '1') { this.$message.success('增加成功') this.searchPartinfo() @@ -905,23 +910,22 @@ export default { // 增加车间采购领料单明细 addWorkshopDetailinfor(row) { this.form = [] + this.outType = 3 + console.log(row) this.partProjectNumber = row.项目流水号 - this.partProjectName = row.项目名称 this.partMachineNumber = row.机床流水号 - this.partMachineName = row.机床图号 this.partGroupNumber = row.组件流水号 - this.partGroupName = row.组号 this.partType = row.零件类型 - this.receive = row.收件信息ID this.locatenumber = row.货位流水号 + this.dialogFormVisibleWork = true + this.askPurchaseNumber = row.请购单明细流水号 + this.materialLocate = row.物料与货位对照流水号 + this.enableOut = row.货位存量 this.materialName = row.物料名称 this.materialNumber = row.物料型号 this.materialType = row.物料规格 - this.dialogFormVisibleWork = true - this.purchaseDetailNum = row.采购合同明细流水号 - this.materialLocate = row.物料与货位对照流水号 - this.enableOut = row.货位存量 - console.log(this.enableOut) + this.partPiant = row.零件图号 + this.material = row.材料 }, addWorkshopListDetail(formName) { this.$refs[formName].validate((valid) => { @@ -931,7 +935,7 @@ export default { } else if (this.form3.OutNumber === '' || this.form3.OutNumber > this.enableOut) { 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.form3.OutNumber, this.partType, this.form3.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 1, this.materialLocate).then(response => { + addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form3.OutNumber, this.partType, this.form3.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.partPiant, this.material).then(response => { if (response.data[0].result === '1') { this.$message.success('增加成功') this.searchPartinfo() diff --git a/src/views/Inventory/SubPartCome/index.vue b/src/views/Inventory/SubPartCome/index.vue index e478f8fa..3f2571e1 100644 --- a/src/views/Inventory/SubPartCome/index.vue +++ b/src/views/Inventory/SubPartCome/index.vue @@ -50,6 +50,16 @@ {{ scope.row.备注 }} + + + + + +