This commit is contained in:
lixin
2018-12-25 20:08:03 +08:00
parent 3ee606fc82
commit baf94308ab
13 changed files with 109 additions and 81 deletions

View File

@@ -64,9 +64,9 @@
align="center"
type="index"
width="50"/>
<el-table-column label="物料名称" align="center" min-width="100">
<el-table-column label="名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="物料型号" align="center" min-width="100">
@@ -182,7 +182,7 @@
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="40">
<el-table-column label="计划数量" align="center" min-width="40">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
@@ -275,7 +275,7 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="80">
<el-table-column label="合同数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
@@ -320,6 +320,7 @@
v-loading="listLoadingx"
:data="tableDataHouse"
border
size="mini"
style="width: 100%;"
height="200">
<el-table-column
@@ -357,9 +358,9 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="80">
<el-table-column label="合同数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.数量 }}
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<el-table-column label="零件数量" align="center" min-width="80">
@@ -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()